Prod Deploy - merge (Master < Develop)

Prod Deploy

Author: Carl-OW

.github/dependabot.yml

@@ -7,29 +7,29 @@
 
 version: 2
 updates:
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 10
-    # Grouping patch updates and minor updates into two pull requests for all packages
-    groups:
-      dependencies-patch-updates:
-        update-types:
-          - "patch"
-      dependencies-minor-updates:
-        update-types:
-          - "minor"
-    ignore:
-      # enonic types should update only when updating enonic version on server
-      - dependency-name: "@enonic-types/*"
-  - package-ecosystem: "gradle"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 10
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 10
+- package-ecosystem: "npm"
+  directory: "/"
+  schedule:
+    interval: "weekly"
+  open-pull-requests-limit: 10
+  # Grouping patch updates and minor updates into two pull requests for all packages
+  groups:
+    dependencies-patch-updates:
+      update-types:
+      - "patch"
+    dependencies-minor-updates:
+      update-types:
+      - "minor"
+  ignore:
+  # enonic types should update only when updating enonic version on server
+  - dependency-name: "@enonic-types/*"
+- package-ecosystem: "gradle"
+  directory: "/"
+  schedule:
+    interval: "weekly"
+  open-pull-requests-limit: 10
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "weekly"
+  open-pull-requests-limit: 10

.github/workflows/deploy_to_prod.yaml

@@ -19,22 +19,6 @@ jobs:
         uses: enonic/release-tools/build-and-publish@master
         with:
           skipPublishing: true
-      - id: deploy_app_to_XP
-        uses: 'enonic/action-app-deploy@main'
-        with:
-          url: ${{ secrets.ENONIC_PROD_URL }}
-          username: ${{ secrets.ENONIC_USER }}
-          password: ${{ secrets.ENONIC_PROD_PASS }}
-          client_cert: ${{ secrets.ENONIC_CERT }}
-          client_key: ${{ secrets.ENONIC_KEY }}
-          app_jar: "./build/libs/*.jar"
-      - name: Upload artifacts
-        id: upload_artifacts
-        if: success()
-        uses: actions/upload-artifact@v4
-        with:
-          name: mimir-prod-${{ github.run_number }}
-          path: "./build/libs/*.jar"
       - name: Get Version Number
         id: get_version_number
         run: |
@@ -45,6 +29,22 @@ jobs:
         run: gh release create $VERSION --generate-notes
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload artifacts
+        id: upload_artifacts
+        if: success()
+        uses: actions/upload-artifact@v4
+        with:
+          name: mimir-prod-${{ github.run_number }}
+          path: "./build/libs/*.jar"
+      - id: deploy_app_to_XP
+        uses: 'enonic/action-app-deploy@main'
+        with:
+          url: ${{ secrets.ENONIC_PROD_URL }}
+          username: ${{ secrets.ENONIC_USER }}
+          password: ${{ secrets.ENONIC_PROD_PASS }}
+          client_cert: ${{ secrets.ENONIC_CERT }}
+          client_key: ${{ secrets.ENONIC_KEY }}
+          app_jar: "./build/libs/*.jar"
       - name: Send success message to Slack
         id: slack_success
         if: success()

build.gradle

@@ -26,7 +26,7 @@ dependencies {
     include "com.enonic.xp:lib-admin:${xpVersion}"
     include "com.enonic.lib:lib-http-client:3.2.2"
     include "com.enonic.xp:lib-i18n:${xpVersion}"
-    include "com.enonic.lib:lib-cron:1.1.2"
+    include "com.enonic.lib:lib-cron:1.1.4"
     include "com.enonic.xp:lib-context:${xpVersion}"
     include 'com.enonic.lib:lib-cache:2.2.1'
     include "com.enonic.xp:lib-event:${xpVersion}"

gradle.properties

@@ -1,6 +1,6 @@
 # Gradle Project settings
 projectName = mimir
-version = 2.22.1
+version = 2.23.0
 
 # XP App values
 appDisplayName = Mimir application

package-lock.json

@@ -76,7 +76,7 @@
     "@item-enonic-types/lib-thymeleaf": "~2.1.0",
     "@item-enonic-types/lib-time": "~1.0.4",
     "@reduxjs/toolkit": "~2.5.0",
-    "@statisticsnorway/ssb-component-library": "~2.4.7",
+    "@statisticsnorway/ssb-component-library": "~2.4.9",
     "@types/grecaptcha": "^3.0.9",
     "@types/ramda": "~0.30.2",
     "@types/react": "~18.3.12",

package.json

@@ -1,5 +1,6 @@
 .statistic-description {
   margin-top: 4.5rem;
+
   .content-wrapper {
     background-color: white;
     padding: 1.5rem 2.5rem 4.5rem;
@@ -23,11 +24,6 @@
     gap: 0.75rem;
     margin-top: 1.5rem;
     margin-bottom: 3rem;
-
-    .ssb-tag.active {
-      background: $ssb-green-4;
-      color: $ssb-white;
-    }
   }
 
   .selected-category {

src/main/resources/assets/styles/_statisticDescription.scss

@@ -6,14 +6,15 @@ import {
   getAllSubSubjectByContent,
   getMainSubjects,
   getSubSubjects,
+  getSubSubjectsByPath,
 } from '/lib/ssb/utils/subjectUtils'
 import { formatDate } from '/lib/ssb/utils/dateUtils'
 import { notNullOrUndefined } from '/lib/ssb/utils/coreUtils'
 import { ENONIC_CMS_DEFAULT_REPO, withSuperUserContext } from '/lib/ssb/repo/common'
 import { arraysEqual, ensureArray } from '/lib/ssb/utils/arrayUtils'
 import { type ArticleResult, type AssociatedLink, type CMS, type PreparedArticles } from '/lib/types/article'
 import { type SubjectItem } from '/lib/types/subject'
-import { type Article } from '/site/content-types'
+import { Page, type Article } from '/site/content-types'
 
 const dummyReq: Partial<XP.Request> = {
   branch: 'master',
@@ -225,3 +226,18 @@ export function getAssociatedArticleArchiveLinks(
   }
   return []
 }
+
+export function getSubtopics(
+  content: Content<Page>,
+  currentPath: string,
+  req: XP.Request,
+  language: string
+): string | string[] {
+  const isMainSubject: boolean = content.page?.config?.subjectType === 'mainSubject'
+  if (isMainSubject) {
+    const allSubSubjects: SubjectItem[] = getSubSubjects(req, language)
+    const subSubjectByPath = getSubSubjectsByPath(allSubSubjects, currentPath)
+    return subSubjectByPath.map((subSubject) => subSubject.id)
+  }
+  return content._id
+}

src/main/resources/lib/ssb/utils/articleUtils.ts

@@ -1,5 +1,5 @@
 import { getContent } from '/lib/xp/portal'
-import { getChildArticles, prepareArticles } from '/lib/ssb/utils/articleUtils'
+import { getChildArticles, getSubtopics, prepareArticles } from '/lib/ssb/utils/articleUtils'
 import { type PreparedArticles } from '/lib/types/article'
 
 let totalCount = 0
@@ -16,9 +16,8 @@ export const get = (req: XP.Request): XP.Response => {
       status: 404,
     }
   }
-  const subTopicId: string = content._id
-
-  const childArticles = getChildArticles(currentPath, subTopicId, start, count, sort)
+  const subTopicIds: string | string[] = getSubtopics(content, currentPath, req, language)
+  const childArticles = getChildArticles(currentPath, subTopicIds, start, count, sort)
   const preparedArticles: Array<PreparedArticles> = prepareArticles(childArticles, language)
   totalCount = childArticles.total
 

src/main/resources/services/articles/articles.ts

@@ -44,7 +44,7 @@ function getOmStatistikken(req: XP.Request, page: Content<any>, aboutTheStatisti
   const props: AboutTheStatisticsProps = getAboutTheStatisticsProps(req, page, aboutTheStatisticsId)
 
   return render('site/parts/statisticDescription/statisticDescription', props, req, {
-    body: `<section id="om-statistikken" class="xp-part statistic-description container-fluid"></section>`,
+    body: `<section id="om-statistikken" class="xp-part statistic-description container"></section>`,
     id: 'statistic-description',
   })
 }