From 535e30cd25e1c27515c6b5ec81d26b4a6784e3f6 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Sun, 19 Mar 2023 16:03:47 +0200 Subject: [PATCH] RED-3800: update common-ui --- apps/red-ui/jest.config.ts | 9 +++++---- apps/red-ui/src/app/app.module.ts | 2 ++ .../downloads-list-screen.component.html | 5 +++-- libs/common-ui | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/red-ui/jest.config.ts b/apps/red-ui/jest.config.ts index fa9e1b508..d48e080e9 100644 --- a/apps/red-ui/jest.config.ts +++ b/apps/red-ui/jest.config.ts @@ -1,6 +1,8 @@ import type { Config } from 'jest'; +import { defaults } from 'jest-config'; -const config: Config = { +export default { + ...defaults, displayName: 'red-ui', preset: '../../jest.preset.js', setupFilesAfterEnv: ['jest-preset-angular/setup-jest.js', 'jest-extended/all'], @@ -14,12 +16,11 @@ const config: Config = { }, ], }, + testEnvironment: 'jest-environment-jsdom', transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'], snapshotSerializers: [ 'jest-preset-angular/build/serializers/no-ng-attributes', 'jest-preset-angular/build/serializers/ng-snapshot', 'jest-preset-angular/build/serializers/html-comment', ], -}; - -export default config; +} as Config; diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 08368aca3..dd6efcb22 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -17,6 +17,7 @@ import { IqserAllowDirective, IqserDenyDirective, IqserHelpModeModule, + IqserListingModule, IqserLoadingModule, IqserPermissionsService, IqserTranslateModule, @@ -169,6 +170,7 @@ export const appModuleFactory = (config: AppConfig) => { RoundCheckboxComponent, IqserAllowDirective, IqserDenyDirective, + IqserListingModule, ], providers: [ { diff --git a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html index 9915adfb9..78c12e1ac 100644 --- a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html +++ b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.html @@ -5,11 +5,11 @@
@@ -26,6 +26,7 @@ > +
@@ -42,7 +43,7 @@
- {{ download.creationDate | date: 'd MMM yyyy, hh:mm a' }} + {{ download.creationDate | date : 'd MMM yyyy, hh:mm a' }}
diff --git a/libs/common-ui b/libs/common-ui index 39e862b12..cb8a0ddcf 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 39e862b1298ba1930bde9e71f39778bc51c5185f +Subproject commit cb8a0ddcf9a3858ec698e52488a51fabaff55849