Replace collection logic highestSemVer with LATEST_VERSION_CHILDREN o…

…ption, to match latest server version. Signed-off-by: Ralf King <[email protected]>
DependencyTrack · Sep 16, 2024 · 83649f8 · 83649f8
1 parent fc359ae
commit 83649f8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
@@ -709,7 +709,7 @@
     "project_collection_logic_aggregate_direct_children": "Aggregate direct children",
     "project_collection_logic_aggregate_direct_children_with_tag": "Aggregate direct children with tag",
     "project_collection_logic_desc": "Specifies if this project is a collection project and which metrics calculation logic to apply for a collection project. Collection projects do not have own components but display data of their children using one of the available logics.",
-    "project_collection_logic_highest_semver_child": "Show highest SemVer child",
+    "project_collection_logic_latest_version_children": "Aggregate direct children marked as latest",
     "project_collection_logic_none": "None",
     "project_created": "Project created",
     "project_deleted": "Project deleted",

diff --git a/src/views/portfolio/projects/Project.vue b/src/views/portfolio/projects/Project.vue
@@ -607,21 +607,21 @@ export default {
       return this.$refs[tab && tab[1] ? tab[1].toLowerCase() : 'overview'];
     },
     getCollectionLogicText: function (project) {
-      let title = 'Metrics of collection project are calculated ';
+      let title = 'Metrics of collection project are calculated by aggregating numbers of ';
       switch (project.collectionLogic) {
         case 'NONE':
           return '';
         case 'AGGREGATE_DIRECT_CHILDREN':
-          title += 'by aggregating numbers of all direct children.';
+          title += 'all direct children.';
           break;
         case 'AGGREGATE_DIRECT_CHILDREN_WITH_TAG':
           const tag = !project.collectionTag
             ? ''
             : xssFilters.inDoubleQuotedAttr(project.collectionTag.name);
-          title += `by aggregating numbers of direct children with tag '${tag}'.`;
+          title += `direct children with tag '${tag}'.`;
           break;
-        case 'HIGHEST_SEMVER_CHILD':
-          title += 'by using the child with highest SemVer version.';
+        case 'LATEST_VERSION_CHILDREN':
+          title += 'latest versions of direct children.';
           break;
       }
       return title;

diff --git a/src/views/portfolio/projects/ProjectCreateProjectModal.vue b/src/views/portfolio/projects/ProjectCreateProjectModal.vue
@@ -281,9 +281,9 @@ export default {
           ),
         },
         {
-          value: 'HIGHEST_SEMVER_CHILD',
+          value: 'LATEST_VERSION_CHILDREN',
           text: this.$i18n.t(
-            'message.project_collection_logic_highest_semver_child',
+            'message.project_collection_logic_latest_version_children',
           ),
         },
       ],

diff --git a/src/views/portfolio/projects/ProjectDetailsModal.vue b/src/views/portfolio/projects/ProjectDetailsModal.vue
@@ -538,9 +538,9 @@ export default {
           ),
         },
         {
-          value: 'HIGHEST_SEMVER_CHILD',
+          value: 'LATEST_VERSION_CHILDREN',
           text: this.$i18n.t(
-            'message.project_collection_logic_highest_semver_child',
+            'message.project_collection_logic_latest_version_children',
           ),
         },
       ],

diff --git a/src/views/portfolio/projects/ProjectList.vue b/src/views/portfolio/projects/ProjectList.vue
@@ -261,19 +261,19 @@ export default {
             );
             let collectionIcon = '';
             if (row.collectionLogic !== 'NONE') {
-              let title = 'Metrics of collection project are calculated ';
+              let title = 'Metrics of collection project are calculated by aggregating numbers of ';
               switch (row.collectionLogic) {
                 case 'AGGREGATE_DIRECT_CHILDREN':
-                  title += 'by aggregating numbers of all direct children.';
+                  title += 'all direct children.';
                   break;
                 case 'AGGREGATE_DIRECT_CHILDREN_WITH_TAG':
                   const tag = !row.collectionTag
                     ? ''
                     : xssFilters.inDoubleQuotedAttr(row.collectionTag.name);
-                  title += `by aggregating numbers of direct children with tag '${tag}'.`;
+                  title += `direct children with tag '${tag}'.`;
                   break;
-                case 'HIGHEST_SEMVER_CHILD':
-                  title += 'by using the child with highest SemVer version.';
+                case 'LATEST_VERSION_CHILDREN':
+                  title += 'latest versions of direct children.';
                   break;
               }
               collectionIcon = ` <i class="fa fa-calculator fa-fw icon-cellend" title="${title}"></i>`;