Merge pull request #8463 from google/release/0.10-Raspberry

Merge 1.24.0-Strawberry into master
Marcel-Zaripov · Sep 26, 2018 · 2162d22 · 2162d22
2 parents 0d0da1a + d159a0f
commit 2162d22
Show file tree

Hide file tree

Showing 312 changed files with 9,012 additions and 5,001 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -8,11 +8,10 @@
     "jquery": true
   },
 
+  "parser": "babel-eslint",
+
   "parserOptions": {
-    "ecmaVersion": 2017,
-    "ecmaFeatures": {
-      "experimentalObjectRestSpread": true
-    },
+    "ecmaVersion": 2018,
     "sourceType": "module"
   },
 

diff --git a/docs/source/backend/object_manipulation.rst b/docs/source/backend/object_manipulation.rst
@@ -372,20 +372,6 @@ Examples
           }
       }
 
-Object owner
-------------
-
-Overview
-~~~~~~~~
-
-+---------------------+-----------------------------------+
-| URL                 | /api/object_owners                |
-+---------------------+-----------------------------------+
-| Methods supported   | ``POST``, ``DELETE``              |
-+---------------------+-----------------------------------+
-| Description         | Creates an object owner object.   |
-+---------------------+-----------------------------------+
-
 Elements
 ~~~~~~~~
 
@@ -1205,7 +1191,6 @@ GGRC object Type
 * Audit
 * AccessGroup
 * Assessment
-* Clause
 * Contract
 * Control
 * CycleTaskGroupObjectTask

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
   },
   "devDependencies": {
     "babel-core": "^6.26.3",
+    "babel-eslint": "^9.0.0",
     "babel-loader": "^7.1.5",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",

diff --git a/src/ggrc-client/js/apps/base_widgets.js b/src/ggrc-client/js/apps/base_widgets.js
@@ -13,7 +13,6 @@
     'Assessment',
     'AssessmentTemplate',
     'Audit',
-    'Clause',
     'Contract',
     'Control',
     'DataAsset',
@@ -92,7 +91,6 @@
     AccessGroup: _.difference(filteredTypes, ['AccessGroup']),
     Audit: [].concat(snapshotWidgetsConfig, excludeMappingConfig,
       auditInclusion).sort(),
-    Clause: _.difference(filteredTypes, ['Clause']),
     Contract: _.difference(filteredTypes,
       ['Contract', 'Policy', 'Regulation', 'Standard']),
     Control: filteredTypes,

diff --git a/src/ggrc-client/js/apps/business_objects.js b/src/ggrc-client/js/apps/business_objects.js
@@ -48,15 +48,13 @@ import * as businessModels from '../models/business-models/index';
         issue: businessModels.Issue,
         objective: businessModels.Objective,
         requirement: businessModels.Requirement,
-        clause: businessModels.Clause,
         person: businessModels.Person,
         product_group: businessModels.ProductGroup,
         role: Role,
         technology_environment: businessModels.TechnologyEnvironment,
         threat: businessModels.Threat,
         risk: businessModels.Risk,
-        vulnerability: businessModels.Vulnerability,
-        template: businessModels.Template,
+        workflow: businessModels.Workflow,
       };
     },
     init_widgets: function () {
@@ -235,15 +233,6 @@ import * as businessModels from '../models/business-models/index';
 
           return all;
         })(),
-        Contract: {
-          Clause: {
-            widget_name: function () {
-              let $objectArea = $('.object-area');
-              return $objectArea.hasClass('dashboard-area') ?
-                'Clauses' : 'Mapped Clauses';
-            },
-          },
-        },
         Program: {
           Person: {
             widget_id: 'person',
@@ -389,9 +378,6 @@ import * as businessModels from '../models/business-models/index';
           Requirement: {
             draw_children: true,
           },
-          Clause: {
-            draw_children: true,
-          },
         },
         Program: {
           _mixins: [
@@ -424,9 +410,6 @@ import * as businessModels from '../models/business-models/index';
           Requirement: {
             draw_children: true,
           },
-          Clause: {
-            draw_children: true,
-          },
           Threat: {
             draw_children: true,
           },
@@ -464,9 +447,6 @@ import * as businessModels from '../models/business-models/index';
           Requirement: {
             draw_children: true,
           },
-          Clause: {
-            draw_children: true,
-          },
           Audit: {
             draw_children: true,
           },
@@ -483,12 +463,6 @@ import * as businessModels from '../models/business-models/index';
         Contract: {
           _mixins: ['directive', 'issues'],
         },
-        Clause: {
-          _mixins: ['governance_objects', 'business_objects', 'issues'],
-          Audit: {
-            draw_children: true,
-          },
-        },
         Requirement: {
           _mixins: ['governance_objects', 'business_objects', 'issues'],
           Audit: {
@@ -518,9 +492,6 @@ import * as businessModels from '../models/business-models/index';
           Requirement: {
             draw_children: true,
           },
-          Clause: {
-            draw_children: true,
-          },
         },
         AssessmentTemplate: {
           Audit: {
@@ -617,11 +588,6 @@ import * as businessModels from '../models/business-models/index';
               GGRC.mustache_path + '/base_objects/tree_add_item.mustache',
             draw_children: true,
           },
-          Clause: {
-            add_item_view:
-              GGRC.mustache_path + '/base_objects/tree_add_item.mustache',
-            draw_children: true,
-          },
           Objective: {
             draw_children: true,
             add_item_view: path + '/base_objects/tree_add_item.mustache',

diff --git a/src/ggrc-client/js/apps/risk_assessments.js b/src/ggrc-client/js/apps/risk_assessments.js
@@ -13,14 +13,6 @@ let allowedObjectTypes = ['Program'];
 GGRC.extensions.push(RiskAssessmentsExtension);
 
 RiskAssessmentsExtension.name = 'risk_assessments';
-
-// Register RA models for use with `inferObjectType`
-RiskAssessmentsExtension.object_type_decision_tree = function () {
-  return {
-    risk_assessment: RiskAssessment,
-  };
-};
-
 Program.attributes.risk_assessments = Stub.List;
 
 // Override GGRC.extra_widget_descriptors and GGRC.extra_default_widgets