Measurable Category - Fixes based on code review

- fixing permissions - removing commented-out route - clarifying input label - aligning default icon to the default used in the database schema #CTCTOWALTZ-3278 #7023
finos · Aug 22, 2024 · a5f73c0 · a5f73c0
1 parent ecccdb5
commit a5f73c0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/waltz-ng/client/system/routes.js b/waltz-ng/client/system/routes.js
@@ -145,13 +145,6 @@ const measurableCategoryEditState = {
 };
 
 
-
-// const measurableCategoryEdit = {
-//     url: "/measurable-category/{id:int}/edit",
-//     views: { "content@": MeasurableCategoryEdit }
-// };
-
-
 const eudaListState = {
     url: "/euda-list",
     views: {"content@": EudaListView}

diff --git a/waltz-ng/client/system/svelte/measurable-categories/MeasurableCategoryEditView.svelte b/waltz-ng/client/system/svelte/measurable-categories/MeasurableCategoryEditView.svelte
@@ -18,7 +18,7 @@
         id: null, // we want a new category
         position: 0,
         lastUpdatedBy: "defaultValue",
-        icon: "cog",
+        icon: "puzzle-piece",
         allowPrimaryRatings: false
     };
 
@@ -191,16 +191,16 @@
                 </div>
             </div>
         </div>
+
+
         <div class="form-group">
-            <label for="editor_role">
-                Editor Role
-            </label>
-            <div>
-                <input id="editor_role"
-                       bind:value={$workingCopy.ratingEditorRole}>
-                <div class="help-inline">
-                    Which role is needed to edit the taxonomy
-                </div>
+            <label for="editor_role">Ratings Editor Role</label>
+            <input id="editor_role"
+                   class="form-control"
+                   style="width: 20%"
+                   bind:value={$workingCopy.ratingEditorRole}>
+            <div class="help-inline">
+                The role needed by users to perform mappings against this taxonomy.
             </div>
         </div>
 

diff --git a/waltz-ng/client/system/svelte/measurable-categories/MeasurableCategoryListView.svelte b/waltz-ng/client/system/svelte/measurable-categories/MeasurableCategoryListView.svelte
@@ -17,6 +17,11 @@
         DELETE: "delete"
     };
 
+    const requiredPermissions = [  // user should have at least one of these
+        systemRoles.ADMIN.key,
+        systemRoles.TAXONOMY_EDITOR.key
+    ];
+
     const permissionsCall = userStore.load();
 
     let loadCategoriesCall;
@@ -27,7 +32,10 @@
     let hasEditPermissions = false;
 
     $: permissions = $permissionsCall?.data;
-    $: hasEditPermissions = _.includes(permissions?.roles, systemRoles.AGGREGATE_OVERLAY_DIAGRAM_EDITOR.key) || false;
+
+    $: hasEditPermissions = _.some(
+        permissions?.roles,
+        r => _.includes(requiredPermissions, r));
 
     function loadCategories() {
         loadCategoriesCall = measurableCategoryStore.findAll(true);

diff --git a/waltz-ng/client/system/system-admin-list.js b/waltz-ng/client/system/system-admin-list.js
@@ -106,7 +106,7 @@ const referenceDataOptions= [
         icon: "id-card-o"
     }, {
         name: "Measurable Categories",
-        role: "ADMIN",
+        role: "TAXONOMY_EDITOR",
         description: "View and edit measurable categories",
         state: "main.system.measurable-category.list",
         icon: "puzzle-piece"