From ad4016f6d0632b257dd5fbcc94ee98336cd6eea1 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Tue, 9 Jul 2024 12:55:44 +0300 Subject: [PATCH] fix help mode keys import --- apps/red-ui/src/app/app.module.ts | 2 +- apps/red-ui/src/app/services/features.service.ts | 4 ++-- docker/red-ui/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 4f63c1e66..52a8534ed 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -69,7 +69,7 @@ import { UI_CACHES } from '@utils/constants'; import { ColorPickerService } from 'ngx-color-picker'; import { LoggerModule, NGXLogger, NgxLoggerLevel, TOKEN_LOGGER_CONFIG, TOKEN_LOGGER_RULES_SERVICE } from 'ngx-logger'; import { ToastrModule } from 'ngx-toastr'; -import * as helpModeKeys from '../assets/help-mode/help-mode-keys.json'; +import helpModeKeys from '../assets/help-mode/help-mode-keys.json'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { IconsModule } from './modules/icons/icons.module'; diff --git a/apps/red-ui/src/app/services/features.service.ts b/apps/red-ui/src/app/services/features.service.ts index 93243e6eb..0d1c0b7f5 100644 --- a/apps/red-ui/src/app/services/features.service.ts +++ b/apps/red-ui/src/app/services/features.service.ts @@ -1,8 +1,8 @@ import { inject, Injectable } from '@angular/core'; -import featuresJson from '../../assets/features/features.json'; import { getConfig } from '@iqser/common-ui'; import { AppConfig } from '@red/domain'; import { NGXLogger } from 'ngx-logger'; +import featuresJson from '../../assets/features/features.json'; function transform(version: string): number { const [major, minor, patch, release] = version.split(/[.-]/).map(x => parseInt(x, 10)); @@ -23,7 +23,7 @@ export class FeaturesService { } loadConfig() { - const BACKEND_APP_VERSION = transform(this.#config.BACKEND_APP_VERSION as string); + const BACKEND_APP_VERSION = transform(this.#config.BACKEND_APP_VERSION); featuresJson.features.forEach(feature => { this.#features.set(feature.name, transform(feature.minVersion) <= BACKEND_APP_VERSION); }); diff --git a/docker/red-ui/Dockerfile b/docker/red-ui/Dockerfile index e85f4c56c..10b455384 100644 --- a/docker/red-ui/Dockerfile +++ b/docker/red-ui/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20.14-buster AS builder +FROM node:20.15-buster AS builder WORKDIR /ng-app