Merge pull request #1 from nscuro/issue-2041-resolve-merge-conflicts

Resolve merge conflicts in collection projects PR

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/ISSUE_TEMPLATE/defect-report.yml

@@ -65,6 +65,8 @@ body:
     - 4.10.x
     - 4.11.x
     - 4.12.0
+    - 4.12.1
+    - 4.12.2
     - 4.13.0-SNAPSHOT
   validations:
     required: true

.github/workflows/_meta-build.yaml

@@ -27,10 +27,10 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       - name: Set up NodeJs
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.1.0
         with:
           node-version: '20'
           cache: 'npm'
@@ -43,7 +43,7 @@ jobs:
           npm run build --if-present
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.3
         with:
           name: assembled-frontend
           path: |-
@@ -57,7 +57,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       - name: Download Artifacts
         uses: actions/[email protected]
@@ -68,7 +68,7 @@ jobs:
         uses: docker/[email protected]
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.6.1
+        uses: docker/setup-buildx-action@v3.7.1
         id: buildx
         with:
           install: true
@@ -99,7 +99,7 @@ jobs:
           echo "tags=${TAGS}" >> $GITHUB_OUTPUT
 
       - name: Build multi-arch Container Image
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v6.10.0
         with:
           tags: ${{ steps.tags.outputs.tags }}
           build-args: |-
@@ -112,7 +112,7 @@ jobs:
 
       - name: Run Trivy Vulnerability Scanner
         if: ${{ inputs.publish-container }}
-        uses: aquasecurity/trivy-action@0.24.0
+        uses: aquasecurity/trivy-action@0.29.0
         env:
           # https://github.com/aquasecurity/trivy-action/issues/389
           TRIVY_DB_REPOSITORY: 'public.ecr.aws/aquasecurity/trivy-db:2'

.github/workflows/ci-publish.yaml

@@ -20,7 +20,7 @@ jobs:
           fi
 
       - name: Checkout Repository
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       - name: Parse Version from package.json
         id: parse
@@ -47,7 +47,7 @@ jobs:
       - call-build
     steps:
       - name: Checkout Repository
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       - name: Download Artifacts
         uses: actions/[email protected]

.github/workflows/ci-release.yaml

@@ -21,10 +21,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       - name: Set up NodeJs
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.1.0
         with:
           node-version: '20'
           cache: 'npm'

.github/workflows/codeql-analysis.yaml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/dependency-review.yaml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       - name: Dependency Review
         uses: actions/dependency-review-action@v4

.github/workflows/i18n.yaml

@@ -18,10 +18,10 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       - name: Set up NodeJs
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.1.0
         with:
           node-version: '20'
           cache: 'npm'

.github/workflows/lint.yaml

@@ -18,10 +18,10 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/[email protected].0
+        uses: actions/[email protected].2
 
       - name: Set up NodeJs
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.1.0
         with:
           node-version: '20'
           cache: 'npm'

docker/Dockerfile.alpine

@@ -1,4 +1,4 @@
-FROM nginxinc/nginx-unprivileged:1.27.1-alpine@sha256:c149247b2e5997ce60f337bcb19f61c0c09b906224e6f1683be64248c814d7e1
+FROM nginxinc/nginx-unprivileged:1.27.3-alpine@sha256:6097fa6666257aa3e991a2d4b48df07468ea3adb58acba3ab9c6de34c664d714
 
 # Arguments that can be passed at build time
 ARG COMMIT_SHA=unknown

docker/docker-entrypoint.d/10-listen-on-ipv6-by-default.sh

@@ -13,7 +13,7 @@ entrypoint_log() {
 }
 
 ME=$(basename $0)
-DEFAULT_CONF_FILE="etc/nginx/conf.d/default.conf"
+DEFAULT_CONF_FILE="etc/nginx/templates/default.conf.template"
 
 # check if we have ipv6 available
 if [ ! -f "/proc/net/if_inet6" ]; then

docker/etc/nginx/templates/default.conf.template

@@ -7,6 +7,12 @@ server {
     index     index.html;
     try_files $uri $uri/ /index.html;
 
+    location ~ (config\.json|index\.html)$ {
+      add_header Cache-Control "max-age=0, no-cache, no-store, must-revalidate";
+      add_header Pragma "no-cache";
+      add_header Expires 0;
+    }
+
     sub_filter '<base href=/'  '<base href=${BASE_PATH}';
     sub_filter_once on;
   }
@@ -16,4 +22,4 @@ server {
   location = /50x.html {
     root /usr/share/nginx/html;
   }
-}
+}

src/containers/DefaultContainer.vue

@@ -172,12 +172,17 @@ export default {
       subSectionUuid,
       subSectionLabel,
     ) {
+      let sectionName = this.$route.meta.sectionName;
       let sectionLabel = this.$t(this.$route.meta.i18n);
       let sectionPath = this.$route.meta.sectionPath;
       if (crumbName && subSectionName && subSectionUuid && subSectionLabel) {
         return [
-          { path: '', name: this.$t('message.home') },
-          { path: sectionPath, name: sectionLabel },
+          { path: '', name: 'Home', meta: { label: this.$t('message.home') } },
+          {
+            path: sectionPath,
+            name: sectionName,
+            meta: { label: sectionLabel },
+          },
           {
             name: subSectionName,
             params: { uuid: subSectionUuid },
@@ -187,44 +192,49 @@ export default {
         ];
       } else if (crumbName) {
         return [
-          { path: '', name: this.$t('message.home') },
-          { path: sectionPath, name: sectionLabel },
+          { path: '', name: 'Home', meta: { label: this.$t('message.home') } },
+          {
+            path: sectionPath,
+            name: sectionName,
+            meta: { label: sectionLabel },
+          },
           { name: crumbName, active: true },
         ];
       } else {
         return [
-          { path: '', name: this.$t('message.home') },
-          { path: sectionPath, name: sectionLabel },
+          { path: '', name: 'Home', meta: { label: this.$t('message.home') } },
+          {
+            path: sectionPath,
+            name: sectionName,
+            meta: { label: sectionLabel },
+          },
         ];
       }
     },
   },
   mounted() {
     if (this.$dtrack && this.$dtrack.version.includes('SNAPSHOT')) {
       this.$root.$emit('bv::show::modal', 'snapshotModal');
+    }
 
-      this.isSidebarMinimized =
-        localStorage && localStorage.getItem('isSidebarMinimized') !== null
-          ? localStorage.getItem('isSidebarMinimized') === 'true'
-          : false;
-      const sidebar = document.body;
-      if (sidebar) {
-        if (this.isSidebarMinimized) {
-          sidebar.classList.add('sidebar-minimized');
-        } else {
-          sidebar.classList.remove('sidebar-minimized');
-        }
+    this.isSidebarMinimized =
+      localStorage && localStorage.getItem('isSidebarMinimized') !== null
+        ? localStorage.getItem('isSidebarMinimized') === 'true'
+        : false;
+    const sidebar = document.body;
+    if (sidebar) {
+      if (this.isSidebarMinimized) {
+        sidebar.classList.add('sidebar-minimized');
+      } else {
+        sidebar.classList.remove('sidebar-minimized');
       }
-      this.$nextTick(() => {
-        const sidebarMinimizer = this.$el.querySelector('.sidebar-minimizer');
-        if (sidebarMinimizer) {
-          sidebarMinimizer.addEventListener(
-            'click',
-            this.handleMinimizedUpdate,
-          );
-        }
-      });
     }
+    this.$nextTick(() => {
+      const sidebarMinimizer = this.$el.querySelector('.sidebar-minimizer');
+      if (sidebarMinimizer) {
+        sidebarMinimizer.addEventListener('click', this.handleMinimizedUpdate);
+      }
+    });
   },
   computed: {
     name() {

src/i18n/locales/de.json

@@ -492,6 +492,8 @@
     "direction": "Richtung",
     "download_bom": "BOM herunterladen",
     "download_component": "Komponenten herunterladen",
+    "edit": "Bearbeiten",
+    "edit_affected_component": "Bearbeiten Sie die betroffene Komponente",
     "email": "E-Mail",
     "empty_selection": "Keine Elemente ausgewählt",
     "endpoints": "Endpunkte",

src/i18n/locales/en.json

@@ -492,6 +492,8 @@
     "direction": "Direction",
     "download_bom": "Download BOM",
     "download_component": "Download Components",
+    "edit": "Edit",
+    "edit_affected_component": "Edit Affected Component",
     "email": "Email",
     "empty_selection": "No items selected",
     "endpoints": "Endpoints",

src/i18n/locales/es.json

@@ -492,6 +492,8 @@
     "direction": "Dirección",
     "download_bom": "Descargar lista de materiales",
     "download_component": "Descargar componentes",
+    "edit": "Editar",
+    "edit_affected_component": "Editar componente afectado",
     "email": "Correo electrónico",
     "empty_selection": "No hay elementos seleccionados",
     "endpoints": "Puntos finales",

src/i18n/locales/fr.json

@@ -492,6 +492,8 @@
     "direction": "Direction",
     "download_bom": "Télécharger la nomenclature",
     "download_component": "Télécharger les composants",
+    "edit": "Modifier",
+    "edit_affected_component": "Modifier le composant concerné",
     "email": "Courriel",
     "empty_selection": "Aucun élément sélectionné",
     "endpoints": "Points de terminaison",

src/i18n/locales/hi.json

@@ -492,6 +492,8 @@
     "direction": "दिशा",
     "download_bom": "BOM डाउनलोड करें",
     "download_component": "घटक डाउनलोड करें",
+    "edit": "संपादन करना",
+    "edit_affected_component": "प्रभावित घटक संपादित करें",
     "email": "ईमेल",
     "empty_selection": "कोई आइटम चयनित नहीं",
     "endpoints": "अंतिमबिंदुओं",

src/i18n/locales/it.json

@@ -492,6 +492,8 @@
     "direction": "Direzione",
     "download_bom": "Scarica distinta base",
     "download_component": "Scarica Componenti",
+    "edit": "Modificare",
+    "edit_affected_component": "Modifica componente interessato",
     "email": "E-mail",
     "empty_selection": "Nessun elemento selezionato",
     "endpoints": "Endpoint",

src/i18n/locales/ja.json

@@ -492,6 +492,8 @@
     "direction": "方向",
     "download_bom": "BOMをダウンロード",
     "download_component": "コンポーネントをダウンロードする",
+    "edit": "編集",
+    "edit_affected_component": "影響を受けるコンポーネントの編集",
     "email": "Eメール",
     "empty_selection": "項目が選択されていません",
     "endpoints": "エンドポイント",

src/i18n/locales/pl.json

@@ -492,6 +492,8 @@
     "direction": "Kierunek",
     "download_bom": "Pobierz BOM",
     "download_component": "Pobierz komponenty",
+    "edit": "Redagować",
+    "edit_affected_component": "Edytuj komponent, którego dotyczy problem",
     "email": "E-mail",
     "empty_selection": "Nie wybrano żadnych elementów",
     "endpoints": "Punkty końcowe",

src/i18n/locales/pt-BR.json

@@ -492,6 +492,8 @@
     "direction": "Direção",
     "download_bom": "Baixe a lista técnica",
     "download_component": "Baixar componentes",
+    "edit": "Editar",
+    "edit_affected_component": "Editar componente afetado",
     "email": "E-mail",
     "empty_selection": "Nenhum item selecionado",
     "endpoints": "Pontos finais",

src/i18n/locales/pt.json

@@ -492,6 +492,8 @@
     "direction": "Direção",
     "download_bom": "Baixe a lista técnica",
     "download_component": "Baixar componentes",
+    "edit": "Editar",
+    "edit_affected_component": "Editar componente afetado",
     "email": "E-mail",
     "empty_selection": "Nenhum item selecionado",
     "endpoints": "Pontos finais",