Skip to content

Commit accbb5c

Browse files
feat: diamond production/staging settings no longer gets overwritten on deployments (#1619)
1 parent e56210d commit accbb5c

2 files changed

Lines changed: 20 additions & 12 deletions

File tree

apps/backend/src/config/dependencyConfigDLS.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { ConsoleLogger, setLogger } from '@user-office-software/duo-logger';
22

33
import 'reflect-metadata';
4+
import { getSecondsFromAllocationTimeUnits } from './base/allocationTimeUnitConverter';
5+
import { configureDLSEnvironment } from './dls/configureDLSEnvironment';
46
import { Tokens } from './Tokens';
7+
import { mapClass, mapValue } from './utils';
58
import { DataAccessUsersAuthorization } from '../auth/DataAccessUsersAuthorization';
69
import { DLSUserAuthorization } from '../auth/DLSUserAuthorization';
7-
import { getSecondsFromAllocationTimeUnits } from './base/allocationTimeUnitConverter';
810
import { ProposalAuthorization } from '../auth/ProposalAuthorization';
911
import { VisitAuthorization } from '../auth/VisitAuthorization';
1012
import { VisitRegistrationAuthorization } from '../auth/VisitRegistrationAuthorization';
11-
import { configureDLSEnvironment } from './dls/configureDLSEnvironment';
12-
import { mapClass, mapValue } from './utils';
1313
import { PostgresAdminDataSourceWithAutoUpgrade } from '../datasources/postgres/AdminDataSource';
1414
import PostgresCallDataSource from '../datasources/postgres/CallDataSource';
1515
import PostgresCoProposerClaimDataSource from '../datasources/postgres/CoProposerClaimDataSource';

apps/backend/src/config/dls/configureDLSEnvironment.ts

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { container } from 'tsyringe';
33
import { AdminDataSource } from '../../datasources/AdminDataSource';
44
import { FeatureId } from '../../models/Feature';
55
import { SettingsId } from '../../models/Settings';
6+
import { isDevelopment, isStaging } from '../../utils/helperFunctions';
67
import { setTimezone, setDateTimeFormats } from '../setTimezoneAndFormat';
78
import { Tokens } from '../Tokens';
89
import { updateOIDCSettings } from '../updateOIDCSettings';
@@ -16,7 +17,7 @@ function getBaseURL() {
1617
return url;
1718
}
1819

19-
async function setDLSColourTheme() {
20+
async function setDLSColourTheme(primaryMainColour: string) {
2021
const db = container.resolve<AdminDataSource>(Tokens.AdminDataSource);
2122

2223
await db.waitForDBUpgrade();
@@ -28,7 +29,7 @@ async function setDLSColourTheme() {
2829
}),
2930
db.updateSettings({
3031
settingsId: SettingsId.PALETTE_PRIMARY_MAIN,
31-
settingsValue: '#202945',
32+
settingsValue: primaryMainColour,
3233
}),
3334
db.updateSettings({
3435
settingsId: SettingsId.PALETTE_PRIMARY_LIGHT,
@@ -142,13 +143,20 @@ async function enableDefaultDLSFeatures() {
142143
}
143144

144145
async function configureDLSEnvironment() {
145-
await Promise.all([
146-
setDLSColourTheme(),
147-
enableDefaultDLSFeatures(),
148-
setTimezone(),
149-
setDateTimeFormats(),
150-
updateOIDCSettings(),
151-
]);
146+
if (isDevelopment) {
147+
await setDLSColourTheme('#b3022b');
148+
}
149+
if (isStaging) {
150+
await setDLSColourTheme('#8B008B');
151+
}
152+
if (isDevelopment) {
153+
await Promise.all([
154+
enableDefaultDLSFeatures(),
155+
setTimezone(),
156+
setDateTimeFormats(),
157+
updateOIDCSettings(),
158+
]);
159+
}
152160
}
153161

154162
export { configureDLSEnvironment, getBaseURL };

0 commit comments

Comments
 (0)