Merge pull request #11 from cyberspect/merge-4.13.2

brice-syslogic · web-flow · commit e455e22d2d9c · 2025-05-14T15:29:38.000-07:00
Merge 4.13.2
diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM nginxinc/nginx-unprivileged:1.27.4-alpine@sha256:d43566af1caeaf6d16d4880f587cdeb9e0efe172aad1d1d43ca4ce0fa304e293
+FROM nginxinc/nginx-unprivileged:1.27.5-alpine@sha256:9d092c1eb75601818712e759efe19be8d4d77218aefe3673679d7b76a161ce6e
 
 # Arguments that can be passed at build time
 ARG COMMIT_SHA=unknown
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dependencytrack/frontend",
-  "version": "4.13.0",
+  "version": "4.13.2",
   "description": "Single Page Application for OWASP Dependency-Track",
   "author": "Steve Springett",
   "homepage": "https://dependencytrack.org/",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
@@ -392,6 +392,7 @@
     "collection_logic_metrics_by_aggregate_direct_children_with_tags": "Die Metriken des Sammlungsprojekts werden berechnet, indem die Zahlen aller direkten untergeordneten Elemente mit dem Tag „{tag}“ aggregiert werden.",
     "collection_logic_metrics_by_aggregate_latest_version": "Die Metriken des Sammlungsprojekts werden durch die Aggregation der Anzahl der neuesten Versionen direkter untergeordneter Elemente berechnet.",
     "collection_projects": "Projekte in Sammlung",
+    "collection_projects_using_tag": "Projektsammlungen mit Tag {tag}",
     "comment": "Kommentar",
     "comments": "Kommentare",
     "component": "Komponente",
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
@@ -392,6 +392,7 @@
     "collection_logic_metrics_by_aggregate_direct_children_with_tags": "Metrics of collection project are calculated by aggregating numbers of direct children with tag '{tag}'.",
     "collection_logic_metrics_by_aggregate_latest_version": "Metrics of collection project are calculated by aggregating numbers of latest versions of direct children.",
     "collection_projects": "Collection Projects",
+    "collection_projects_using_tag": "Collection projects using tag {tag}",
     "comment": "Comment",
     "comments": "Comments",
     "component": "Component",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
@@ -392,6 +392,7 @@
     "collection_logic_metrics_by_aggregate_direct_children_with_tags": "Las métricas del proyecto de recopilación se calculan agregando números de hijos directos con la etiqueta '{tag}'.",
     "collection_logic_metrics_by_aggregate_latest_version": "Las métricas del proyecto de recopilación se calculan agregando números de las últimas versiones de los hijos directos.",
     "collection_projects": "Proyectos de colección",
+    "collection_projects_using_tag": "Proyectos de recopilación utilizando la etiqueta {tag}",
     "comment": "Comentario",
     "comments": "Comentarios",
     "component": "Componente",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
@@ -392,6 +392,7 @@
     "collection_logic_metrics_by_aggregate_direct_children_with_tags": "Les métriques du projet de collection sont calculées en agrégeant le nombre d'enfants directs avec la balise « {tag} ».",
     "collection_logic_metrics_by_aggregate_latest_version": "Les mesures du projet de collection sont calculées en agrégeant le nombre des dernières versions des enfants directs.",
     "collection_projects": "Projets de collecte",
+    "collection_projects_using_tag": "Projets de collecte à l'aide de tag {tag}",
     "comment": "Commentaire",
     "comments": "Commentaires",
     "component": "Composant",
diff --git a/src/i18n/locales/hi.json b/src/i18n/locales/hi.json
@@ -392,6 +392,7 @@
     "collection_logic_metrics_by_aggregate_direct_children_with_tags": "संग्रह परियोजना के मेट्रिक्स की गणना '{टैग}' टैग वाले प्रत्यक्ष बच्चों की संख्या को एकत्रित करके की जाती है।",
     "collection_logic_metrics_by_aggregate_latest_version": "संग्रह परियोजना के मेट्रिक्स की गणना प्रत्यक्ष बच्चों के नवीनतम संस्करणों की संख्या को एकत्रित करके की जाती है।",
     "collection_projects": "संग्रह परियोजनाएँ",
+    "collection_projects_using_tag": "टैग {tag} का उपयोग करके संग्रह परियोजनाएं",
     "comment": "टिप्पणी",
     "comments": "टिप्पणियाँ",
     "component": "अवयव",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
@@ -392,6 +392,7 @@
     "collection_logic_metrics_by_aggregate_direct_children_with_tags": "Le metriche del progetto di raccolta vengono calcolate aggregando il numero di figli diretti con tag '{tag}'.",
     "collection_logic_metrics_by_aggregate_latest_version": "Le metriche del progetto di raccolta vengono calcolate aggregando i numeri delle ultime versioni dei figli diretti.",
     "collection_projects": "Progetti di raccolta",
+    "collection_projects_using_tag": "Progetti di raccolta usando tag {tag}",
     "comment": "Commento",
     "comments": "Commenti",
     "component": "Componente",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
@@ -392,6 +392,7 @@
     "collection_logic_metrics_by_aggregate_direct_children_with_tags": "コレクション プロジェクトのメトリクスは、タグ「{tag}」を持つ直接の子の数を集計することによって計算されます。",
     "collection_logic_metrics_by_aggregate_latest_version": "コレクション プロジェクトのメトリックは、直接の子の最新バージョンの数を集計することによって計算されます。",
     "collection_projects": "コレクションプロジェクト",
+    "collection_projects_using_tag": "タグ{tag}を使用したコレクションプロジェクト",
     "comment": "コメント",
     "comments": "コメント",
     "component": "コンポーネント",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
@@ -392,6 +392,7 @@
     "collection_logic_metrics_by_aggregate_direct_children_with_tags": "Metryki projektu kolekcji są obliczane poprzez agregację liczby bezpośrednich elementów podrzędnych ze znacznikiem „{tag}”.",
     "collection_logic_metrics_by_aggregate_latest_version": "Metryki projektu kolekcji są obliczane poprzez agregację liczby najnowszych wersji bezpośrednich elementów podrzędnych.",
     "collection_projects": "Projekty kolekcji",
+    "collection_projects_using_tag": "Projekty kolekcyjne za pomocą tag {tag}",
     "comment": "Komentarz",
     "comments": "Uwagi",
     "component": "Część",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
@@ -392,6 +392,7 @@
     "collection_logic_metrics_by_aggregate_direct_children_with_tags": "As métricas do projeto de coleção são calculadas agregando o número de filhos diretos com a tag '{tag}'.",
     "collection_logic_metrics_by_aggregate_latest_version": "As métricas do projeto de coleta são calculadas agregando os números das versões mais recentes dos filhos diretos.",
     "collection_projects": "Projetos de Coleção",
+    "collection_projects_using_tag": "Projetos de coleção usando tag {tag}",
     "comment": "Comente",
     "comments": "Comentários",
     "component": "Componente",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
@@ -392,6 +392,7 @@
     "collection_logic_metrics_by_aggregate_direct_children_with_tags": "As métricas do projeto de coleção são calculadas agregando o número de filhos diretos com a tag '{tag}'.",
     "collection_logic_metrics_by_aggregate_latest_version": "As métricas do projeto de coleta são calculadas agregando os números das versões mais recentes dos filhos diretos.",
     "collection_projects": "Projetos de Coleção",
+    "collection_projects_using_tag": "Projetos de coleção usando tag {tag}",
     "comment": "Comente",
     "comments": "Comentários",
     "component": "Componente",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
@@ -392,6 +392,7 @@
     "collection_logic_metrics_by_aggregate_direct_children_with_tags": "Метрики проекта сбора рассчитываются путем агрегирования количества прямых дочерних элементов с тегом «{tag}».",
     "collection_logic_metrics_by_aggregate_latest_version": "Метрики проекта сбора рассчитываются путем агрегирования количества последних версий прямых дочерних элементов.",
     "collection_projects": "Коллекционные проекты",
+    "collection_projects_using_tag": "Коллекционные проекты с использованием тега {tag}",
     "comment": "Комментарий",
     "comments": "Комментарии",
     "component": "Компонент",
diff --git a/src/i18n/locales/uk-UA.json b/src/i18n/locales/uk-UA.json
@@ -392,6 +392,7 @@
     "collection_logic_metrics_by_aggregate_direct_children_with_tags": "Показники проекту колекції обчислюються шляхом агрегування кількості прямих дочірніх елементів із тегом \"{tag}\".",
     "collection_logic_metrics_by_aggregate_latest_version": "Показники проекту колекції обчислюються шляхом агрегування чисел останніх версій прямих дочірніх елементів.",
     "collection_projects": "Колекція проектів",
+    "collection_projects_using_tag": "Проекти колекції з використанням тегу {tag}",
     "comment": "коментар",
     "comments": "Коментарі",
     "component": "компонент",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
@@ -392,6 +392,7 @@
     "collection_logic_metrics_by_aggregate_direct_children_with_tags": "收集项目的指标是通过聚合带有标签“{tag}”的直接子项的数量来计算的。",
     "collection_logic_metrics_by_aggregate_latest_version": "收集项目的指标是通过汇总直接子项的最新版本的数量来计算的。",
     "collection_projects": "收藏项目",
+    "collection_projects_using_tag": "使用标签{tag}收集项目",
     "comment": "评论",
     "comments": "评论",
     "component": "组件",
diff --git a/src/views/portfolio/tags/TagList.vue b/src/views/portfolio/tags/TagList.vue
@@ -19,6 +19,7 @@ import xssFilters from 'xss-filters';
 import permissionsMixin from '../../../mixins/permissionsMixin';
 import routerMixin from '../../../mixins/routerMixin';
 import bootstrapTableMixin from '@/mixins/bootstrapTableMixin';
+import TaggedCollectionProjectListModal from '@/views/portfolio/tags/TaggedCollectionProjectListModal.vue';
 import TaggedNotificationRuleListModal from '@/views/portfolio/tags/TaggedNotificationRuleListModal.vue';
 import TaggedPoliciesListModal from '@/views/portfolio/tags/TaggedPoliciesListModal.vue';
 import TaggedProjectListModal from '@/views/portfolio/tags/TaggedProjectListModal.vue';
@@ -96,6 +97,37 @@ export default {
             });
           },
         },
+        {
+          title: this.$t('message.collection_projects'),
+          field: 'collectionProjectCount',
+          sortable: true,
+          formatter: (value, row, index) => {
+            if (value === 0) {
+              return value;
+            }
+
+            return this.vueFormatter({
+              i18n,
+              components: {
+                TaggedCollectionProjectListModal,
+              },
+              mixins: [permissionsMixin],
+              template: `
+                <div>
+                  <b-link v-b-modal="\`taggedCollectionProjectListModal-${index}\`">{{ value }}</b-link>
+                  <tagged-collection-project-list-modal :tag="tagName" :index="index"/>
+                </div>`,
+              data() {
+                return {
+                  index: index,
+                  tagName: row.name,
+                  error: row.error,
+                  value: value,
+                };
+              },
+            });
+          },
+        },
         {
           title: this.$t('message.policies'),
           field: 'policyCount',
diff --git a/src/views/portfolio/tags/TaggedCollectionProjectListModal.vue b/src/views/portfolio/tags/TaggedCollectionProjectListModal.vue
@@ -0,0 +1,104 @@
+<template>
+  <b-modal
+    :id="`taggedCollectionProjectListModal-${index}`"
+    size="lg"
+    hide-header-close
+    no-stacking
+    v-permission="'VIEW_PORTFOLIO'"
+    :title="$t('message.collection_projects_using_tag', { tag: this.tag })"
+  >
+    <bootstrap-table
+      ref="table"
+      :columns="columns"
+      :data="data"
+      :options="options"
+    >
+    </bootstrap-table>
+    <template v-slot:modal-footer="{ cancel }">
+      <b-button size="md" variant="secondary" @click="cancel()"
+        >{{ $t('message.cancel') }}
+      </b-button>
+    </template>
+  </b-modal>
+</template>
+
+<script>
+import xssFilters from 'xss-filters';
+import permissionsMixin from '../../../mixins/permissionsMixin';
+import common from '../../../shared/common';
+import router from '@/router';
+import bootstrapTableMixin from '@/mixins/bootstrapTableMixin';
+
+export default {
+  props: {
+    tag: String,
+    index: Number,
+  },
+  mixins: [bootstrapTableMixin, permissionsMixin],
+  methods: {
+    apiUrl: function () {
+      return `${this.$api.BASE_URL}/${this.$api.URL_TAG}/${encodeURIComponent(this.tag)}/collectionProject`;
+    },
+    refreshTable: function () {
+      this.$refs.table.refresh({
+        url: this.apiUrl(),
+        pageNumber: 1,
+        silent: true,
+      });
+    },
+  },
+  data() {
+    return {
+      labelIcon: {
+        dataOn: '\u2713',
+        dataOff: '\u2715',
+      },
+      columns: [
+        {
+          title: this.$t('message.name'),
+          field: 'name',
+          sortable: true,
+          formatter: (value, row) => {
+            // TODO: Close modal when link is clicked.
+            const href = router.resolve({
+              name: 'Project',
+              params: { uuid: row.uuid },
+            }).href;
+            return `<a href="${href}">${xssFilters.inHTMLData(value)}</a>`;
+          },
+        },
+        {
+          title: this.$t('message.version'),
+          field: 'version',
+          sortable: true,
+          formatter(value) {
+            return xssFilters.inHTMLData(common.valueWithDefault(value, ''));
+          },
+        },
+      ],
+      data: [],
+      options: {
+        buttonsOrder: ['refresh', 'columns'],
+        search: true,
+        showColumns: true,
+        showRefresh: true,
+        pagination: true,
+        silentSort: false,
+        sidePagination: 'server',
+        queryParamsType: 'pageSize',
+        pageList: '[10, 25, 50, 100]',
+        pageSize: 10,
+        icons: {
+          refresh: 'fa-refresh',
+        },
+        toolbar: '#tagsToolbar',
+        responseHandler: function (res, xhr) {
+          res.total = xhr.getResponseHeader('X-Total-Count');
+          return res;
+        },
+        url: this.apiUrl(),
+      },
+    };
+  },
+};
+</script>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM nginxinc/nginx-unprivileged:1.27.4-alpine@sha256:d43566af1caeaf6d16d4880f587cdeb9e0efe172aad1d1d43ca4ce0fa304e293`
	`1`	`+FROM nginxinc/nginx-unprivileged:1.27.5-alpine@sha256:9d092c1eb75601818712e759efe19be8d4d77218aefe3673679d7b76a161ce6e`
`2`	`2`
`3`	`3`	`# Arguments that can be passed at build time`
`4`	`4`	`ARG COMMIT_SHA=unknown`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@dependencytrack/frontend",`
`3`		`- "version": "4.13.0",`
	`3`	`+ "version": "4.13.2",`
`4`	`4`	`"description": "Single Page Application for OWASP Dependency-Track",`
`5`	`5`	`"author": "Steve Springett",`
`6`	`6`	`"homepage": "https://dependencytrack.org/",`