chore: updated dev dependencies and raised node version

.github/workflows/build.yml

@@ -29,7 +29,7 @@ jobs:
             - uses: actions/[email protected]
             - uses: actions/setup-node@v3
               with:
-                  node-version: 14
+                  node-version: 18
                   registry-url: 'https://npm.pkg.github.com'
                   cache: 'npm'
             - name: Load .env file

.github/workflows/dockerImage.yml

@@ -34,7 +34,7 @@ jobs:
                   fi
             - uses: actions/setup-node@v3
               with:
-                  node-version: 14
+                  node-version: 18
                   cache: 'npm'
             - name: Load .env file
               uses: xom9ikk/dotenv@v2

.stylelintrc.js

@@ -3,13 +3,9 @@ const defaultConfig = require('@biotope/quality-gate/config/.stylelintrc');
 module.exports = {
 	...defaultConfig,
 	extends: [
-		// TODO: From the admin app. Probably a good idea to enable.
-		// 'stylelint-config-idiomatic-order',
-
 		// The config from quality-gate isn't compatible with stylelint@^14,
 		// therefore merge it with working alternatives.
-		'stylelint-config-standard-scss',
-		'stylelint-config-prettier'
+		'stylelint-config-standard-scss'
 	],
 	rules: {
 		...defaultConfig.rules,

Dockerfile

@@ -1,4 +1,4 @@
-ARG NODE_VERSION=14.21.1
+ARG NODE_VERSION=18.16.1
 ARG PORT=80
 
 FROM node:$NODE_VERSION as proxyBuild
@@ -41,6 +41,6 @@ COPY build /app/build
 ENV NODE_ENV=production
 ENV PORT=$PORT
 
-RUN npm install --ignore-scripts
+RUN npm ci --ignore-scripts
 
 CMD ["npm", "run", "start"]

config/env.js

@@ -84,7 +84,10 @@ function getClientEnvironment(publicUrl) {
 				// and `sockPort` options in webpack-dev-server.
 				WDS_SOCKET_HOST: process.env.WDS_SOCKET_HOST,
 				WDS_SOCKET_PATH: process.env.WDS_SOCKET_PATH,
-				WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT
+				WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT,
+				// Whether or not react-refresh is enabled.
+				// It is defined here so it is available in the webpackHotDevClient.
+				FAST_REFRESH: process.env.FAST_REFRESH !== 'false'
 			}
 		);
 	// Stringify all values so we can feed into webpack DefinePlugin

config/paths.js

@@ -68,7 +68,7 @@ module.exports = {
 	appJsConfig: resolveApp('jsconfig.json'),
 	yarnLockFile: resolveApp('yarn.lock'),
 	testsSetup: resolveModule(resolveApp, 'src/setupTests'),
-	proxySetup: resolveApp('src/setupProxy.js'),
+	proxySetup: resolveApp('proxy/routes/index.js'),
 	appNodeModules: resolveApp('node_modules'),
 	appWebpackCache: resolveApp('node_modules/.cache'),
 	appTsBuildInfoFile: resolveApp('node_modules/.cache/tsconfig.tsbuildinfo'),

cypress/e2e/tokens.cy.ts

@@ -47,7 +47,7 @@ describe('Keycloak Tokens', () => {
 		});
 	});
 
-	it.skip('should keep refreshing access token before it expires', () => {
+	it('should keep refreshing access token before it expires', () => {
 		cy.clock();
 		cy.login();
 		cy.wait('@askerSessions');
@@ -67,7 +67,7 @@ describe('Keycloak Tokens', () => {
 		}
 	});
 
-	it.skip('should refresh the access token if its expired when loading the app', () => {
+	it('should refresh the access token if its expired when loading the app', () => {
 		cy.willReturn('consultingType', { statusCode: 404 });
 
 		cy.clock();
@@ -93,10 +93,10 @@ describe('Keycloak Tokens', () => {
 	});
 
 	it.skip('should logout if refresh token is already expired when loading the app', () => {
+		cy.clock();
 		cy.login();
 		cy.wait('@askerSessions');
 		cy.wait('@usersData');
-		cy.clock();
 
 		cy.clock().then((clock) => {
 			clock.restore();
@@ -112,10 +112,10 @@ describe('Keycloak Tokens', () => {
 
 	//TODO: inspect this test, as there seems to be a race condition
 	it.skip('should logout if refresh token is expired while the app is loaded', () => {
+		cy.clock();
 		cy.login();
 		cy.wait('@askerSessions');
 		cy.wait('@usersData');
-		cy.clock();
 
 		waitForTokenProcessing();
 
@@ -126,7 +126,7 @@ describe('Keycloak Tokens', () => {
 		cy.get('.loginForm').should('exist');
 	});
 
-	it.skip('should not logout if refresh token is expired but access token is still valid', () => {
+	it('should not logout if refresh token is expired but access token is still valid', () => {
 		cy.clock();
 		cy.login({
 			auth: { expires_in: 1800, refresh_expires_in: 600 }
@@ -142,7 +142,7 @@ describe('Keycloak Tokens', () => {
 		cy.get('.loginForm').should('not.exist');
 	});
 
-	it.skip('should not logout if refresh token is expired but access token is still valid when the app loads', () => {
+	it('should not logout if refresh token is expired but access token is still valid when the app loads', () => {
 		const refreshExpiresIn = 600;
 
 		cy.clock();

cypress/support/commands/mockApi.ts

@@ -30,10 +30,10 @@ import {
 let overrides = {};
 
 const defaultReturns = {
-	attachmentUpload: {
+	'attachmentUpload': {
 		statusCode: 201
 	},
-	userData: {
+	'userData': {
 		emailToggles: [
 			{
 				name: 'DAILY_ENQUIRY',
@@ -49,22 +49,23 @@ const defaultReturns = {
 			}
 		]
 	},
-	consultingTypes: [],
-	settings: {},
-	releases: {
+	'consultingTypes': [],
+	'settings': {},
+	'releases': {
 		statusCode: 404
 	},
-	releases_markup: {
+	'releases_markup': {
 		statusCode: 404
 	},
-	sessionRooms: {
+	'sessionRooms': {
 		statusCode: 200,
 		body: {
 			sessions: []
 		}
 	},
-	agencyConsultants: [],
-	agencyConsultantsLanguages: ['de']
+	'frontend.settings': {},
+	'agencyConsultants': [],
+	'agencyConsultantsLanguages': ['de']
 };
 
 Cypress.Commands.add('willReturn', (name: string, data: any) => {
@@ -224,6 +225,15 @@ Cypress.Commands.add('mockApi', () => {
 		})
 	);
 
+	cy.intercept('GET', endpoints.frontend.settings, (req) =>
+		req.reply(
+			JSON.stringify({
+				...defaultReturns['frontend.settings'],
+				...(overrides['frontend.settings'] || {})
+			})
+		)
+	);
+
 	cy.intercept(
 		'GET',
 		`${endpoints.rc.settings.public}*`,