Merge branch 'master' into version-latest

talepre · talepre · commit b9f58147f024 · 2024-10-30T10:37:52.000+01:00
diff --git a/.github/workflows/.xp-archive-deploy.yml b/.github/workflows/.xp-archive-deploy.yml
@@ -63,6 +63,7 @@ jobs:
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
           dockerfile: Dockerfile_xp
+          image_suffix: ${{ inputs.naisEnv }}
       - name: Deploy application
         uses: nais/deploy/actions/deploy@v2
         env:
diff --git a/common/src/shared/siteConfigs.ts b/common/src/shared/siteConfigs.ts
@@ -30,7 +30,7 @@ export const legacyArchiveConfigs: LegacyArchiveSiteConfig[] = [
 ] as const;
 
 export const xpArchiveConfig: XpArchiveSiteConfig = {
-    name: 'nav.no (2024)',
+    name: 'nav.no (Enonic XP)',
     basePath: '/xp',
     type: 'enonic-xp',
 } as const;
diff --git a/legacy-archive/.env-template b/legacy-archive/.env-template
@@ -1,7 +1,7 @@
 NODE_ENV=development
 APP_PORT=3399
 APP_BASEPATH=/
-APP_ORIGIN=http://localhost:3399
+APP_ORIGIN_INTERNAL=http://localhost:3399
 OPEN_SEARCH_URI=http://my-opensearch-instance
 OPEN_SEARCH_USERNAME=username
 OPEN_SEARCH_PASSWORD=password
diff --git a/legacy-archive/.nais/config.yml b/legacy-archive/.nais/config.yml
@@ -11,6 +11,7 @@ spec:
   port: 3399
   ingresses:
      - https://cms-arkiv.intern.nav.no
+     - https://cms-arkiv.ansatt.nav.no
   liveness:
     path: /internal/isAlive
     initialDelay: 10
@@ -22,7 +23,7 @@ spec:
       value: "3399"
     - name: APP_BASEPATH
       value: "/"
-    - name: APP_ORIGIN
+    - name: APP_ORIGIN_INTERNAL
       value: "https://cms-arkiv.intern.nav.no"
   openSearch:
     access: read
diff --git a/legacy-archive/server/src/cms/CmsArchiveSite.ts b/legacy-archive/server/src/cms/CmsArchiveSite.ts
@@ -21,6 +21,9 @@ type ContructorProps = {
     htmlRenderer: HtmlRenderer;
 };
 
+const HOST_SUFFIX_INTERNAL = 'intern.nav.no';
+const HOST_SUFFIX_EXTERNAL = 'ansatt.nav.no';
+
 export class CmsArchiveSite {
     private readonly config: LegacyArchiveSiteConfig;
     private readonly pdfGenerator: PdfGenerator;
@@ -113,6 +116,18 @@ export class CmsArchiveSite {
     }
 
     private setupSiteRoutes(router: Router, htmlRenderer: HtmlRenderer) {
+        // Redirect from internal urls
+        router.get('*', (req, res, next) => {
+            const { hostname, protocol, originalUrl } = req;
+
+            if (hostname.endsWith(HOST_SUFFIX_INTERNAL)) {
+                const externalUrl = `${protocol}://${hostname.replace(HOST_SUFFIX_INTERNAL, HOST_SUFFIX_EXTERNAL)}${originalUrl}`;
+                return res.redirect(externalUrl);
+            }
+
+            return next();
+        });
+
         router.get('/:versionKey?', cspMiddleware, async (req, res) => {
             const rootCategories = this.categoriesService.getRootCategories();
 
diff --git a/legacy-archive/server/src/global.d.ts b/legacy-archive/server/src/global.d.ts
@@ -4,7 +4,7 @@ declare global {
             NODE_ENV: 'development' | 'production';
             APP_BASEPATH: string;
             APP_PORT: string;
-            APP_ORIGIN: string;
+            APP_ORIGIN_INTERNAL: string;
             OPEN_SEARCH_URI: string;
             OPEN_SEARCH_USERNAME: string;
             OPEN_SEARCH_PASSWORD: string;
diff --git a/legacy-archive/server/src/opensearch/queries/contentSearch.ts b/legacy-archive/server/src/opensearch/queries/contentSearch.ts
@@ -78,7 +78,7 @@ export const buildContentSearchParams = (
 
     if (query) {
         if (type === 'locations') {
-            const { pathname } = new URL(query, process.env.APP_ORIGIN);
+            const { pathname } = new URL(query, process.env.APP_ORIGIN_INTERNAL);
 
             must.push({
                 prefix: {
diff --git a/legacy-archive/server/src/pdf/PdfGenerator.ts b/legacy-archive/server/src/pdf/PdfGenerator.ts
@@ -123,7 +123,7 @@ export class PdfGenerator {
         // Ensures assets with relative urls are loaded from the correct origin
         const htmlWithBase = html.replace(
             '<head>',
-            `<head><base href="${process.env.APP_ORIGIN}"/>`
+            `<head><base href="${process.env.APP_ORIGIN_INTERNAL}"/>`
         );
 
         try {
diff --git a/legacy-archive/server/src/server.ts b/legacy-archive/server/src/server.ts
@@ -9,7 +9,7 @@ const expectedEnv = [
     'NODE_ENV',
     'APP_PORT',
     'APP_BASEPATH',
-    'APP_ORIGIN',
+    'APP_ORIGIN_INTERNAL',
     'OPEN_SEARCH_URI',
     'OPEN_SEARCH_USERNAME',
     'OPEN_SEARCH_PASSWORD',
diff --git a/xp-archive/client/contentTree/NavigationBar.tsx b/xp-archive/client/contentTree/NavigationBar.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
-import { Heading, Loader } from '@navikt/ds-react';
+import { Alert, Heading, Loader } from '@navikt/ds-react';
 import { useContentTree } from '../hooks/useContentTree';
 import { NavigationItem } from './contentTreeEntry/NavigationItem';
 import { SimpleTreeView } from '@mui/x-tree-view';
 
 export const NavigationBar = () => {
-    const { data, isLoading } = useContentTree('/');
+    const { data, isLoading } = useContentTree('/', 'no');
 
     return (
         <div>
@@ -17,6 +17,9 @@ export const NavigationBar = () => {
                     {data?.children.map((entry) => <NavigationItem entry={entry} key={entry.id} />)}
                 </SimpleTreeView>
             )}
+            <Alert variant={'warning'} size={'small'} inline={true} style={{ marginTop: '1.5rem' }}>
+                {'Obs: dette arkivet er under utvikling og er ikke klart til bruk!'}
+            </Alert>
         </div>
     );
 };
diff --git a/xp-archive/client/contentTree/contentTreeEntry/NavigationItem.tsx b/xp-archive/client/contentTree/contentTreeEntry/NavigationItem.tsx
@@ -27,13 +27,15 @@ export const NavigationItem = ({ entry }: Props) => {
                 setSelectedContentId(entry.id);
             }}
         >
-            {entry.numChildren > 0 ? <NavigationItems path={entry.path} /> : null}
+            {entry.numChildren > 0 ? (
+                <NavigationItems path={entry.path} locale={entry.locale} />
+            ) : null}
         </TreeItem>
     );
 };
 
-const NavigationItems = ({ path }: { path: string }) => {
-    const { data, isLoading } = useContentTree(path);
+const NavigationItems = ({ path, locale }: { path: string; locale: string }) => {
+    const { data, isLoading } = useContentTree(path, locale);
     return (
         <>
             {isLoading ? (
diff --git a/xp-archive/client/contentView/ContentView.tsx b/xp-archive/client/contentView/ContentView.tsx
@@ -32,7 +32,7 @@ export const ContentView = () => {
 
     const { data, isLoading } = useFetchContent({
         id: fetchId || '',
-        version: selectedVersion?.versionId ?? undefined,
+        versionId: selectedVersion?.versionId ?? undefined,
     });
 
     const [selectedView, setSelectedView] = useState<ViewVariant>('json');
diff --git a/xp-archive/client/hooks/useContentTree.ts b/xp-archive/client/hooks/useContentTree.ts
@@ -4,10 +4,10 @@ import { XPContentTreeServiceResponse } from '../../shared/types';
 
 const CONTENT_TREE_API = `${import.meta.env.VITE_APP_ORIGIN}/xp/api/contentTree`;
 
-const fetchContentTree = async (path: string) => {
-    return fetchJson<XPContentTreeServiceResponse>(CONTENT_TREE_API, { params: { path } });
+const fetchContentTree = async ({ path, locale }: { path: string; locale: string }) => {
+    return fetchJson<XPContentTreeServiceResponse>(CONTENT_TREE_API, { params: { path, locale } });
 };
 
-export const useContentTree = (path: string) => {
-    return useSWRImmutable(path, fetchContentTree);
+export const useContentTree = (path: string, locale: string) => {
+    return useSWRImmutable({ path, locale }, fetchContentTree);
 };
diff --git a/xp-archive/client/hooks/useFetchContent.ts b/xp-archive/client/hooks/useFetchContent.ts
@@ -4,7 +4,7 @@ import { ContentServiceResponse } from '../../shared/types';
 
 const CONTENT_API = `${import.meta.env.VITE_APP_ORIGIN}/xp/api/content`;
 
-type FetchContentParams = { id: string; version?: string };
+type FetchContentParams = { id: string; versionId?: string };
 
 const fetchContent = async (params: FetchContentParams) => {
     if (!params.id) return;
@@ -13,6 +13,6 @@ const fetchContent = async (params: FetchContentParams) => {
     });
 };
 
-export const useFetchContent = ({ id, version }: FetchContentParams) => {
-    return useSWRImmutable({ id, version }, fetchContent);
+export const useFetchContent = ({ id, versionId }: FetchContentParams) => {
+    return useSWRImmutable({ id, versionId }, fetchContent);
 };
diff --git a/xp-archive/server/src/services/ContentService.ts b/xp-archive/server/src/services/ContentService.ts
@@ -57,7 +57,7 @@ export class ContentService {
                 'Content-Type': 'application/json',
             },
             method: 'POST',
-            body: JSON.stringify({ contentProps }),
+            body: JSON.stringify({ contentProps: { ...contentProps, noRedirect: true } }),
         });
     }
 }
diff --git a/xp-archive/server/src/services/ContentTreeService.ts b/xp-archive/server/src/services/ContentTreeService.ts
@@ -8,21 +8,21 @@ export class ContentTreeService {
     private readonly CONTENT_TREE_API = xpServiceUrl('externalArchive/contentTree');
 
     public getContentTreeHandler: RequestHandler = async (req, res) => {
-        if (!validateQuery(req.query, ['path'])) {
-            return res.status(400).send('Parameter path is required');
+        if (!validateQuery(req.query, ['path', 'locale'])) {
+            return res.status(400).send('Parameters path and locale are required');
         }
 
-        const { path } = req.query;
+        const { path, locale } = req.query;
 
-        const contentTreeResponse = await this.fetchContentTree(path);
+        const contentTreeResponse = await this.fetchContentTree(path, locale);
 
         return res.status(200).json(contentTreeResponse);
     };
 
-    private async fetchContentTree(path: string) {
+    private async fetchContentTree(path: string, locale: string) {
         const response = await fetchJson<XPContentTreeServiceResponse>(this.CONTENT_TREE_API, {
             headers: { secret: process.env.SERVICE_SECRET },
-            params: { path, locale: 'no' }, // TODO: ikke hardkode locale
+            params: { path, locale },
         });
 
         return response;
diff --git a/xp-archive/shared/types.ts b/xp-archive/shared/types.ts
@@ -6,6 +6,7 @@ export type ContentTreeEntryData = {
     name: string;
     displayName: string;
     type: string;
+    locale: string;
     numChildren: number;
     isLocalized: boolean;
     hasLocalizedDescendants: boolean;

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ export class ContentService {`
`57`	`57`	`'Content-Type': 'application/json',`
`58`	`58`	`},`
`59`	`59`	`method: 'POST',`
`60`		`- body: JSON.stringify({ contentProps }),`
	`60`	`+ body: JSON.stringify({ contentProps: { ...contentProps, noRedirect: true } }),`
`61`	`61`	`});`
`62`	`62`	`}`
`63`	`63`	`}`