merge

statisticsnorway · Oct 24, 2023 · 841ad9f · 841ad9f
2 parents dfda186 + 19626ee
commit 841ad9f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 16 deletions.
diff --git a/src/main/resources/admin/tools/dashboard/dashboard.es6 b/src/main/resources/admin/tools/dashboard/dashboard.es6
@@ -73,6 +73,9 @@ function renderPart(req) {
     ...assets,
     pageContributions,
     username: user.displayName,
+    linkToGuide: userHasAdmin
+      ? 'https://wiki.ssb.no/display/VEILEDNING/Brukerdokumentasjon+for+publisering+i+XP'
+      : 'https://wiki.ssb.no/display/VEILEDNING/Brukerdokumentasjon+i+publisering+i+XP+-+for+statistikkseksjon',
   }
 
   let body = render(view, model)

diff --git a/src/main/resources/admin/tools/dashboard/dashboard.html b/src/main/resources/admin/tools/dashboard/dashboard.html
@@ -19,7 +19,7 @@
             <nav class="y-2">
               <span data-th-text="${username}"></span> |
               <a href="mailto:[email protected]">[email protected]</a> |
-              <a href="">Veiledning</a>
+              <a th:href="${linkToGuide}">Veiledning</a>
             </nav>
             <div class="misc">
               <img data-th-src="${logoUrl}" class="logo" alt=""></img>

diff --git a/src/main/resources/lib/ssb/parts/publicationArchive.ts b/src/main/resources/lib/ssb/parts/publicationArchive.ts
@@ -133,7 +133,7 @@ function prepareStatisticRelease(
 
     return {
       title: language === 'en' ? release.statisticNameEn : release.statisticName,
-      period: period.charAt(0) + period.slice(1),
+      period: period,
       preface: aboutTheStatisticsContent ? aboutTheStatisticsContent.data.ingress : seoDescription,
       url: statisticsPageUrl,
       publishDate: publishDate ?? '',

diff --git a/src/main/resources/lib/ssb/utils/language.ts b/src/main/resources/lib/ssb/utils/language.ts
@@ -120,7 +120,7 @@ exports.localizeTimePeriod = (time: string): string => {
  * @return {string}
  */
 function parseTimeInterval(time: string): string {
-  const splitYearLetterNumberIntoArray = new RegExp(/(\d{4})([HKMTU])(\d{1,2})/)
+  const splitYearLetterNumberIntoArray = new RegExp(/(\d{4})([HKMTU-])(\d{1,2})/)
   const interval: RegExpExecArray | null = splitYearLetterNumberIntoArray.exec(time)
 
   let parsedTime = ''
@@ -151,6 +151,10 @@ function parseTimeInterval(time: string): string {
           key: 'interval.' + interval[2],
         })} ${interval[3]} ${interval[1]}`
         break
+      case '-':
+        // e.g. 2022-2023
+        parsedTime = time
+        break
     }
     return parsedTime
   }

diff --git a/src/main/resources/react4xp/dashboard/containers/DashboardTools/index.jsx b/src/main/resources/react4xp/dashboard/containers/DashboardTools/index.jsx
@@ -157,17 +157,21 @@ export function DashboardTools() {
         id: 'link-statreg',
         title: 'Statistikkregisteret',
       },
-      {
-        id: 'link-designer',
-        title: 'Tabellbygger',
-      },
       {
         id: 'link-statbank',
         title: 'Intern statistikkbank',
       },
       {
         id: 'link-guide-publications',
-        title: 'Veiledninger i publiseringer på ssb.no',
+        title: 'Veiledninger i publisering',
+      },
+      {
+        id: 'link-status-statreg',
+        title: 'Statusrapporter StatReg',
+      },
+      {
+        id: 'link-tbml-validation',
+        title: 'TBML validering',
       }
     )
     return linkOptions
@@ -180,15 +184,16 @@ export function DashboardTools() {
   function renderLinkTools() {
     const openLinks = (item) => {
       if (item.id === 'link-statreg') {
-        return openLinkInNewWindow(`${internalBaseUrl}/statistikkregisteret/publisering/list`)
-      } else if (item.id === 'link-designer') {
-        return openLinkInNewWindow(`${internalBaseUrl}/designer`)
+        openLinkInNewWindow(`${internalBaseUrl}/statistikkregisteret/publisering/list`)
       } else if (item.id === 'link-statbank') {
-        return openLinkInNewWindow(internalStatbankUrl)
+        openLinkInNewWindow(internalStatbankUrl)
       } else if (item.id === 'link-guide-publications') {
-        return openLinkInNewWindow('https://wiki.ssb.no/display/VEILEDNING/Home')
+        openLinkInNewWindow('https://wiki.ssb.no/display/VEILEDNING/Brukerdokumentasjon+for+publisering+i+XP')
+      } else if (item.id === 'link-status-statreg') {
+        openLinkInNewWindow(`${internalBaseUrl}/dashboard/statusrapport`)
+      } else if (item.id === 'link-tbml-validation') {
+        openLinkInNewWindow(`${internalBaseUrl}/tbprocessor/document/validateTbml/216725`)
       }
-      return
     }
 
     return (

diff --git a/src/main/resources/site/parts/releasedStatistics/releasedStatistics.ts b/src/main/resources/site/parts/releasedStatistics/releasedStatistics.ts
@@ -107,7 +107,7 @@ function getGroupedWithMonthNames(config: ReleasedStatisticsPartConfig, currentL
 function prepReleases(
   variant: ContentLight<ReleaseVariant>,
   date: Date,
-  periodRelease: string | undefined
+  periodRelease: string
 ): PreparedStatistics {
   return {
     id: Number(variant.data.statisticId),
@@ -119,7 +119,7 @@ function prepReleases(
       monthNumber: date.getMonth(),
       year: date.getFullYear(),
       frequency: variant.data.frequency,
-      period: periodRelease ? periodRelease.toLowerCase() : '',
+      period: periodRelease,
     },
   }
 }