From 66d30315f0f801b6edc23e6755aa617c3a78e7bf Mon Sep 17 00:00:00 2001 From: "david.watkins@db.com" Date: Wed, 11 Oct 2023 14:00:36 +0100 Subject: [PATCH] Assessments: add support for Actors - added section to actor page - added subsection to actor overview section - updated admin screens to support actors - limited bulk edit to only those entities where it works :) #CTCTOWALTZ-2909 #6800 --- .../actor/components/actor-overview.html | 78 ++++++++++--------- .../client/actor/components/actor-overview.js | 2 +- .../assessment-rating-sub-section.js | 10 ++- .../view/assessment-definition-view.html | 1 + .../pages/view/assessment-definition-view.js | 7 +- .../dynamic-section-definitions.js | 1 + .../assessment-definition-utils.js | 1 + 7 files changed, 59 insertions(+), 41 deletions(-) diff --git a/waltz-ng/client/actor/components/actor-overview.html b/waltz-ng/client/actor/components/actor-overview.html index 1fe18ee9ce..c3f962453d 100644 --- a/waltz-ng/client/actor/components/actor-overview.html +++ b/waltz-ng/client/actor/components/actor-overview.html @@ -16,56 +16,64 @@ ~ --> -
-
-
- -
-
+
+
+
+
+ +
+
+
-
-
-
- -
-
- - +
+
+ +
+
+ + +
-
-
-
- -
-
+
+
+ +
+
+
-
-
-
- -
-
+
+
+ +
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/waltz-ng/client/actor/components/actor-overview.js b/waltz-ng/client/actor/components/actor-overview.js index 2a0e44bd6b..c2387a298d 100644 --- a/waltz-ng/client/actor/components/actor-overview.js +++ b/waltz-ng/client/actor/components/actor-overview.js @@ -36,7 +36,7 @@ function controller() { vm.$onChanges = (changes) => { if (vm.actor) { - vm.entityRef = { + vm.parentEntityRef = { kind: "ACTOR", id: vm.actor.id }; diff --git a/waltz-ng/client/assessments/components/sub-section/assessment-rating-sub-section.js b/waltz-ng/client/assessments/components/sub-section/assessment-rating-sub-section.js index a8deafd119..85a92332d1 100644 --- a/waltz-ng/client/assessments/components/sub-section/assessment-rating-sub-section.js +++ b/waltz-ng/client/assessments/components/sub-section/assessment-rating-sub-section.js @@ -25,7 +25,7 @@ import {resolveResponses} from "../../../common/promise-utils"; const bindings = { - parentEntityRef: "<" + parentEntityRef: " { - loadAll(); - vm.useExternalEditorPage = _.includes(["CHANGE_UNIT"], vm.parentEntityRef.kind); + vm.$onChanges = () => { + if (vm.parentEntityRef) { + loadAll(); + vm.useExternalEditorPage = _.includes(["CHANGE_UNIT"], vm.parentEntityRef.kind); + } }; diff --git a/waltz-ng/client/assessments/pages/view/assessment-definition-view.html b/waltz-ng/client/assessments/pages/view/assessment-definition-view.html index 0d88a8bb7f..cd0d98c203 100644 --- a/waltz-ng/client/assessments/pages/view/assessment-definition-view.html +++ b/waltz-ng/client/assessments/pages/view/assessment-definition-view.html @@ -42,6 +42,7 @@