Skip to content

Commit ffc6cd0

Browse files
committed
Sørger for at archive sites er ferdig initialisert før serveren starter
1 parent 320a76a commit ffc6cd0

File tree

2 files changed

+26
-22
lines changed

2 files changed

+26
-22
lines changed

server/src/cms/CmsArchiveSite.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ export class CmsArchiveSite {
3333
client: dbClient,
3434
});
3535

36-
this.cmsArchiveCategoriesService.init();
37-
3836
this.cmsArchiveService = new CmsArchiveContentService({
3937
client: dbClient,
4038
siteConfig: config,
@@ -52,6 +50,10 @@ export class CmsArchiveSite {
5250
this.setupFileRoutes(siteRouter);
5351
}
5452

53+
async init() {
54+
this.cmsArchiveCategoriesService.init();
55+
}
56+
5557
private setupApiRoutes(router: Router) {
5658
router.get('/root-categories', (req, res) => {
5759
const rootCategories = this.cmsArchiveCategoriesService.getRootCategories();

server/src/routing/site.ts

+22-20
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
11
import { Express } from 'express';
2-
import { CmsArchiveSite } from '../cms/CmsArchiveSite';
2+
import { CmsArchiveSite, CmsArchiveSiteConfig } from '../cms/CmsArchiveSite';
33
import { CmsArchiveOpenSearchClient } from '../opensearch/CmsArchiveOpenSearchClient';
44
import { initAndGetRenderer } from '../site/ssr/initRenderer';
55

6+
const archiveConfigs: CmsArchiveSiteConfig[] = [
7+
{
8+
name: 'Selvbetjeningssonen',
9+
basePath: '/sbs',
10+
indexPrefix: 'cmssbs',
11+
},
12+
{
13+
name: 'Fagsystemsonen',
14+
basePath: '/fss',
15+
indexPrefix: 'cmsfss',
16+
},
17+
];
18+
619
export const setupCmsArchiveSites = async (expressApp: Express) => {
720
const archiveClient = new CmsArchiveOpenSearchClient();
821
const htmlRenderer = await initAndGetRenderer(expressApp);
922

10-
new CmsArchiveSite({
11-
config: {
12-
name: 'Selvbetjeningssonen',
13-
basePath: '/sbs',
14-
indexPrefix: 'cmssbs',
15-
},
16-
expressApp,
17-
dbClient: archiveClient,
18-
htmlRenderer,
23+
const sites = archiveConfigs.map((config) => {
24+
return new CmsArchiveSite({
25+
config,
26+
expressApp,
27+
dbClient: archiveClient,
28+
htmlRenderer,
29+
});
1930
});
2031

21-
new CmsArchiveSite({
22-
config: {
23-
name: 'Fagsystemsonen',
24-
basePath: '/fss',
25-
indexPrefix: 'cmsfss',
26-
},
27-
expressApp,
28-
dbClient: archiveClient,
29-
htmlRenderer,
30-
});
32+
await Promise.all(sites.map((site) => site.init()));
3133

3234
expressApp.get('/', (req, res) => {
3335
return res.redirect('/sbs');

0 commit comments

Comments
 (0)