chore: replace link to registration with link to catalog-portal

Informasjonsforvaltning · Sep 18, 2024 · 3f932c3 · 3f932c3
1 parent 166c411
commit 3f932c3
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 83 deletions.
diff --git a/config.template.js b/config.template.js
@@ -23,5 +23,6 @@ window.env = {
   REPORT_API_HOST: '$REPORT_API_HOST',
   RESOURCE_API_HOST: '$RESOURCE_API_HOST',
   SEARCH_SERVICE_HOST: '$SEARCH_SERVICE_HOST',
-  USE_DEMO_LOGO: '$USE_DEMO_LOGO'
+  USE_DEMO_LOGO: '$USE_DEMO_LOGO',
+  CATALOG_PORTAL_BASE_URI: '$CATALOG_PORTAL_BASE_URI'
 };
diff --git a/deploy/demo/env.yaml b/deploy/demo/env.yaml
@@ -129,3 +129,8 @@ spec:
                 secretKeyRef:
                   name: commonurl-demo
                   key: FDK_RESOURCE_SERVICE_BASE_URI
+            - name: CATALOG_PORTAL_BASE_URI
+              valueFrom:
+                secretKeyRef:
+                  name: commonurl-demo
+                  key: CATALOG_PORTAL_BASE_URI
diff --git a/deploy/prod/env.yaml b/deploy/prod/env.yaml
@@ -129,3 +129,8 @@ spec:
                 secretKeyRef:
                   name: commonurl-prod
                   key: FDK_RESOURCE_SERVICE_BASE_URI
+            - name: CATALOG_PORTAL_BASE_URI
+              valueFrom:
+                secretKeyRef:
+                  name: commonurl-prod
+                  key: CATALOG_PORTAL_BASE_URI
diff --git a/deploy/staging/env.yaml b/deploy/staging/env.yaml
@@ -129,3 +129,8 @@ spec:
                 secretKeyRef:
                   name: commonurl-staging
                   key: FDK_RESOURCE_SERVICE_BASE_URI
+            - name: CATALOG_PORTAL_BASE_URI
+              valueFrom:
+                secretKeyRef:
+                  name: commonurl-staging
+                  key: CATALOG_PORTAL_BASE_URI
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -22,4 +22,5 @@ services:
       - REPORT_API_HOST=https://reports-bff.staging.fellesdatakatalog.digdir.no
       - RESOURCE_API_HOST=https://resource.api.staging.fellesdatakatalog.digdir.no
       - SEARCH_SERVICE_HOST=https://search.api.staging.fellesdatakatalog.digdir.no
+      - CATALOG_PORTAL_BASE_URI=https://catalog.portal.staging.fellesdatakatalog.digdir.no
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/entrypoints/publishing/components/header/index.tsx b/src/entrypoints/publishing/components/header/index.tsx
@@ -10,7 +10,7 @@ import SC from './styled';
 import { PATHNAME_PUBLISHING } from '../../../../constants/constants';
 import localization from '../../../../lib/localization';
 
-const { FDK_REGISTRATION_BASE_URI, ADMIN_GUI_BASE_URI } = env;
+const { ADMIN_GUI_BASE_URI, CATALOG_PORTAL_BASE_URI } = env;
 
 const Header: FC = () => {
   const [isDropdownMenuOpen, setIsDropdownMenuOpen] = useState(false);
@@ -27,7 +27,7 @@ const Header: FC = () => {
         </a>
         <SC.NavigationLinks>
           <li>
-            <SC.Link href={FDK_REGISTRATION_BASE_URI}>
+            <SC.Link href={CATALOG_PORTAL_BASE_URI}>
               <Translation id='menu.registerData' />
             </SC.Link>
           </li>
@@ -59,7 +59,7 @@ const Header: FC = () => {
           <Menu>
             <SC.Menu>
               <li>
-                <SC.Link href={FDK_REGISTRATION_BASE_URI}>
+                <SC.Link href={CATALOG_PORTAL_BASE_URI}>
                   <Translation id='menu.registerData' />
                 </SC.Link>
               </li>

diff --git a/src/entrypoints/publishing/router/publishing/pages/publishing-page/index.tsx b/src/entrypoints/publishing/router/publishing/pages/publishing-page/index.tsx
@@ -16,7 +16,7 @@ import ServiceMessages from '../../../../../../components/service-messages';
 
 import SC from './styled';
 
-const { FDK_REGISTRATION_BASE_URI, ADMIN_GUI_BASE_URI } = env;
+const { ADMIN_GUI_BASE_URI, CATALOG_PORTAL_BASE_URI } = env;
 
 interface Props extends RouteComponentProps {}
 
@@ -64,7 +64,7 @@ const PublishingPage: FC<Props> = ({ match: { url } }) => {
           <p>
             <Translation id='publishingPage.methodSections.register.description' />
           </p>
-          <a href={FDK_REGISTRATION_BASE_URI}>
+          <a href={CATALOG_PORTAL_BASE_URI}>
             <Translation id='publishingPage.methodSections.register.cta' />
           </a>
           <p>

diff --git a/src/env.ts b/src/env.ts
@@ -28,6 +28,8 @@ export default validateEnv(
     RESOURCE_API_HOST:
       'https://resource.api.staging.fellesdatakatalog.digdir.no',
     INFORMATIONMODEL_HARVESTER_HOST:
-      'https://informationmodels.staging.fellesdatakatalog.digdir.no'
+      'https://informationmodels.staging.fellesdatakatalog.digdir.no',
+    CATALOG_PORTAL_BASE_URI:
+      'https://catalog-portal.staging.fellesdatakatalog.digdir.no'
   }
 );
diff --git a/src/types/env.d.ts b/src/types/env.d.ts
@@ -17,4 +17,5 @@ export interface EnvironmentVariables {
   AI_PROJECT_SERVICE_BASE_URI: string;
   RESOURCE_API_HOST: string;
   INFORMATIONMODEL_HARVESTER_HOST: string;
+  CATALOG_PORTAL_BASE_URI: string;
 }