From 8f6a0ade7a3402529641d1f6e0961a889bbeeb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kov=C3=A1=C4=8Dik?= Date: Mon, 25 May 2026 15:48:24 +0200 Subject: [PATCH 01/17] [NAE-2413] Minor CSS changes & fixes - change margin of breadcrumbs - change buttonfield padding - change margin - change background of pagination - remove sorting icon on double drawer - remove margin on refs case and task views - fix alignment on i18n field - fix alignment of create case button - fix text color on datafields --- nae.json | 28 ++++++++++ .../double-drawer-example.component.html | 2 +- .../tabbed-case-view.component.ts | 6 +- .../tabbed-task-view.component.scss | 2 +- .../src/assets/img/netgrif_full_black.svg | 56 +++++++++++++++++++ projects/netgrif-components/nae-theme.scss | 4 ++ .../button-default-field.component.scss | 2 +- .../src/lib/data-fields/data-field.theme.scss | 25 +++++++-- .../i18n-text-field.component.html | 10 ++-- .../i18n-text-field.component.scss | 10 ++++ ...ng-collection-default-field.component.html | 2 +- .../user-list-default-field.component.html | 3 +- .../breadcrumbs/breadcrumbs.component.scss | 2 +- .../default-case-ref-list-view.component.scss | 2 +- .../default-task-view.component.scss | 4 +- .../navigation-double-drawer.component.html | 20 +++---- .../navigation-double-drawer.component.scss | 9 +-- .../src/lib/navigation/navigation.theme.scss | 1 + .../src/lib/panel/panel.theme.scss | 2 +- .../src/lib/tabs/tabs.theme.scss | 2 +- .../case-list-paginator.component.html | 2 +- .../case-list/case-list.component.html | 2 +- .../create-case-button.component.scss | 1 + 23 files changed, 160 insertions(+), 37 deletions(-) create mode 100644 projects/nae-example-app/src/assets/img/netgrif_full_black.svg diff --git a/nae.json b/nae.json index 29df04537f..2a486c4b0f 100644 --- a/nae.json +++ b/nae.json @@ -321,6 +321,34 @@ "routing": { "path": "breadcrumbs" } + }, + "double-menu-tabbed-views": { + "component": { + "class": "TabbedViewsExampleComponent", + "from": "./doc/tabbed-case-view/tabbed-views-example.component" + }, + "access": "private", + "navigation": { + "title": "Custom Tabbed View", + "icon": "tab" + }, + "routing": { + "path": "double-menu-tabbed-views" + }, + "children": { + "custom-redirect": { + "component": { + "class": "TabbedViewsExampleComponent", + "from": "./doc/tabbed-case-view/tabbed-views-example.component" + }, + "access": "private", + "navigation": false, + "routing": { + "path": "**" + } + } + }, + "processUri": "/" } } }, diff --git a/projects/nae-example-app/src/app/doc/double-drawer-example/double-drawer-example.component.html b/projects/nae-example-app/src/app/doc/double-drawer-example/double-drawer-example.component.html index 8f2dcbaa1c..bcab3fc0f4 100644 --- a/projects/nae-example-app/src/app/doc/double-drawer-example/double-drawer-example.component.html +++ b/projects/nae-example-app/src/app/doc/double-drawer-example/double-drawer-example.component.html @@ -1,3 +1,3 @@ - + diff --git a/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-case-view/tabbed-case-view.component.ts b/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-case-view/tabbed-case-view.component.ts index a6e30285d2..7a38cd7754 100644 --- a/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-case-view/tabbed-case-view.component.ts +++ b/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-case-view/tabbed-case-view.component.ts @@ -78,7 +78,11 @@ export class TabbedCaseViewComponent extends AbstractTabbedCaseViewComponent imp @Inject(NAE_TAB_DATA) injectedTabData: InjectedTabbedCaseViewData) { super(caseViewService, loggerService, injectedTabData, overflowService, undefined, undefined, { enableCaseTitle: true, - isCaseTitleRequired: true + isCaseTitleRequired: true, + newCaseButtonConfig: { + createCaseButtonTitle: 'My custom create case button', + createCaseButtonIcon: 'home' + } }); } diff --git a/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-task-view/tabbed-task-view.component.scss b/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-task-view/tabbed-task-view.component.scss index f9b1dec43f..ae796da831 100644 --- a/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-task-view/tabbed-task-view.component.scss +++ b/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-task-view/tabbed-task-view.component.scss @@ -7,7 +7,7 @@ .search-panel { margin-top: 16px; - padding: 8px 16px; + margin-bottom: 2px; } .content-margin { diff --git a/projects/nae-example-app/src/assets/img/netgrif_full_black.svg b/projects/nae-example-app/src/assets/img/netgrif_full_black.svg new file mode 100644 index 0000000000..31df685b01 --- /dev/null +++ b/projects/nae-example-app/src/assets/img/netgrif_full_black.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + diff --git a/projects/netgrif-components/nae-theme.scss b/projects/netgrif-components/nae-theme.scss index 367bb45d44..5ec1a58659 100644 --- a/projects/netgrif-components/nae-theme.scss +++ b/projects/netgrif-components/nae-theme.scss @@ -45,3 +45,7 @@ margin-top: 0 !important; margin-bottom: 0 !important; } + +.mat-paginator { + background: transparent !important; +} diff --git a/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.scss b/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.scss index 27cea47505..f6983fb197 100644 --- a/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.scss @@ -36,7 +36,7 @@ } .padding-bottom { - padding-bottom: 6px; + padding-bottom: 12px; } .no-shadow { box-shadow: unset !important; diff --git a/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss b/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss index 9ee0fa25ed..8f597a3f7f 100644 --- a/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss +++ b/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss @@ -15,6 +15,10 @@ $color-text-enabled: #64748B; $color-outline-enabled: #64748B; + .mat-form-field-label { + color: $color-text-enabled !important; + } + .editor-preview > h1 { border-bottom: 1px solid #ddd; } @@ -70,13 +74,13 @@ } .invalid-form-input { - border: solid 2px mat.get-color-from-palette($primary) !important; + border: solid 2px mat.get-color-from-palette($warn) !important; padding: 1px !important; } - .invalid-form-label { - color: mat.get-color-from-palette($primary) !important; - } + //.invalid-form-label { + // color: mat.get-color-from-palette($primary) !important; + //} .netgrif-input { @@ -216,7 +220,7 @@ } .mat-form-field-appearance-outline .mat-form-field-wrapper { - margin: 0.25px 0 0; + margin: 0.25px 0 2px; } // DISABLED @@ -323,6 +327,17 @@ } } + .netgrif-chip-button-fix { + &.mat-form-field .mat-form-field-prefix { + top: 0.33em !important; + padding-right: 4px !important; + } + + .netgrif-label { + font-weight: 400 !important; + } + } + .mat-select-trigger { height: unset; min-height: 1.125em; diff --git a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html index 9a55b0c9a9..93f2d7669e 100644 --- a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html @@ -23,7 +23,7 @@ -
+
{{dataField.title}} @@ -75,8 +75,10 @@
- {{dataField.description}} - {{getErrorMessage()}} +
+ {{dataField.description}} + {{getErrorMessage()}} +
diff --git a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss index 63556224be..edd1fb2c7a 100644 --- a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss @@ -49,6 +49,7 @@ padding: 0 1em; font-size: 75%; width: auto !important; + display: block; } .language-svg-wrapper { @@ -149,3 +150,12 @@ .i18n-bold-text { font-weight: bold; } + +.padding-bottom-fix { + padding-bottom: 1em; +} + +.i18n-hint-wrapper { + height: 18px; + margin-top: -3px; +} diff --git a/projects/netgrif-components/src/lib/data-fields/string-collection-field/string-collection-default-field/string-collection-default-field.component.html b/projects/netgrif-components/src/lib/data-fields/string-collection-field/string-collection-default-field/string-collection-default-field.component.html index 45de84c6ad..39da3f0efc 100644 --- a/projects/netgrif-components/src/lib/data-fields/string-collection-field/string-collection-default-field/string-collection-default-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/string-collection-field/string-collection-default-field/string-collection-default-field.component.html @@ -1,4 +1,4 @@ - + {{dataField.title}} {{ dataField.title }} @@ -30,6 +30,7 @@ aria-label="Autocomplete" matInput #input + disabled="true" [placeholder]="dataField.placeholder" [required]="dataField.behavior.required" [matChipInputFor]="chipList"> diff --git a/projects/netgrif-components/src/lib/navigation/breadcrumbs/breadcrumbs.component.scss b/projects/netgrif-components/src/lib/navigation/breadcrumbs/breadcrumbs.component.scss index fc527d4a49..230372a901 100644 --- a/projects/netgrif-components/src/lib/navigation/breadcrumbs/breadcrumbs.component.scss +++ b/projects/netgrif-components/src/lib/navigation/breadcrumbs/breadcrumbs.component.scss @@ -1,5 +1,5 @@ .breadcrumbs { - margin: 4px; + margin: 4px 0; -webkit-box-align: center; align-items: center; align-self: center; diff --git a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-case-ref-list-view/default-case-ref-list-view.component.scss b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-case-ref-list-view/default-case-ref-list-view.component.scss index c82aaa003d..7794a7b857 100644 --- a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-case-ref-list-view/default-case-ref-list-view.component.scss +++ b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-case-ref-list-view/default-case-ref-list-view.component.scss @@ -1,5 +1,5 @@ .case-view-container { - margin: 16px 24px; + //margin: 16px 24px; height: calc(100% - 32px); overflow: auto } diff --git a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-task-view/default-task-view.component.scss b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-task-view/default-task-view.component.scss index f9b1dec43f..312efbf93c 100644 --- a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-task-view/default-task-view.component.scss +++ b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-task-view/default-task-view.component.scss @@ -7,11 +7,11 @@ .search-panel { margin-top: 16px; - padding: 8px 16px; + padding: 8px 0; } .content-margin { - margin: 8px 24px 0; + //margin: 8px 24px 0; } @media screen and (max-width: 599.99px) { diff --git a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html index f6dacd6429..1c7eff1a48 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html +++ b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html @@ -1,4 +1,4 @@ -
@@ -165,14 +165,14 @@
-
-
- -
+
+ + + + + + +
diff --git a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss index 5e58cc40dd..28cd9ea893 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss +++ b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss @@ -23,8 +23,8 @@ box-shadow: 0px 2px 4px rgba(13, 45, 60, 0.16), 0px 4px 8px rgba(84, 110, 122, 0.16); } -.height-60 { - height: 60px; +.height-48 { + height: 48px; } .drawer-control { @@ -42,14 +42,15 @@ .border-bottom { border-bottom: 1px solid #E2E8F0; + box-sizing: content-box !important; } .logo { - height: 60px; + height: 48px; } .logo-closed { - width: 60px !important; + width: 48px !important; } .logoimg { diff --git a/projects/netgrif-components/src/lib/navigation/navigation.theme.scss b/projects/netgrif-components/src/lib/navigation/navigation.theme.scss index 73565b89e3..dffa6badb7 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation.theme.scss +++ b/projects/netgrif-components/src/lib/navigation/navigation.theme.scss @@ -38,6 +38,7 @@ .active-tree-node { color: mat.get-color-from-palette($primary) !important; + background-color: rgba(mat.get-color-from-palette($primary), 0.25); } .tree-node { diff --git a/projects/netgrif-components/src/lib/panel/panel.theme.scss b/projects/netgrif-components/src/lib/panel/panel.theme.scss index a8e113cc59..2ec86c2b6a 100644 --- a/projects/netgrif-components/src/lib/panel/panel.theme.scss +++ b/projects/netgrif-components/src/lib/panel/panel.theme.scss @@ -73,7 +73,7 @@ .panel-body { .mat-expansion-panel-body { padding: 0 !important; - background-color: #F8FAFC; + background-color: #ffffff; } } diff --git a/projects/netgrif-components/src/lib/tabs/tabs.theme.scss b/projects/netgrif-components/src/lib/tabs/tabs.theme.scss index 2347fd64bb..9ffc545d66 100644 --- a/projects/netgrif-components/src/lib/tabs/tabs.theme.scss +++ b/projects/netgrif-components/src/lib/tabs/tabs.theme.scss @@ -19,7 +19,7 @@ } .mat-tab-header { - border-bottom: 2px solid #E2E8F0; + border-bottom: 1px solid #E2E8F0; } .icon-tab-color { diff --git a/projects/netgrif-components/src/lib/view/case-view/components/case-list-paginator/case-list-paginator.component.html b/projects/netgrif-components/src/lib/view/case-view/components/case-list-paginator/case-list-paginator.component.html index 29b0d71c26..3a158fcfaf 100644 --- a/projects/netgrif-components/src/lib/view/case-view/components/case-list-paginator/case-list-paginator.component.html +++ b/projects/netgrif-components/src/lib/view/case-view/components/case-list-paginator/case-list-paginator.component.html @@ -3,7 +3,7 @@
- storage + storage {{ 'view-list.noCasesSatisfyingThisFilter' | translate}}
diff --git a/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.html b/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.html index 3a211e5383..5b06f3ea54 100644 --- a/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.html +++ b/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.html @@ -3,7 +3,7 @@
- storage + storage {{ 'view-list.noCasesSatisfyingThisFilter' | translate}}
diff --git a/projects/netgrif-components/src/lib/view/case-view/components/create-case-button/create-case-button.component.scss b/projects/netgrif-components/src/lib/view/case-view/components/create-case-button/create-case-button.component.scss index 0eb87cee3d..96e9836b5e 100644 --- a/projects/netgrif-components/src/lib/view/case-view/components/create-case-button/create-case-button.component.scss +++ b/projects/netgrif-components/src/lib/view/case-view/components/create-case-button/create-case-button.component.scss @@ -5,6 +5,7 @@ .height-44 { height: 44px; + margin-right: 8px !important; } .create-case-mat-mini-fab { From 2c8066a637e32fd8184e51586e2f7e90b217d3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kov=C3=A1=C4=8Dik?= Date: Tue, 26 May 2026 08:02:57 +0200 Subject: [PATCH 02/17] [NAE-2413] Minor CSS changes & fixes - change logo color - change color of placeholders on some fields --- ...etgrif_full_black.svg => netgrif_full_grey.svg} | 14 +++++++------- .../file-default-field.component.scss | 2 +- .../file-list-default-field.component.scss | 2 +- .../i18n-text-field/i18n-text-field.component.scss | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename projects/nae-example-app/src/assets/img/{netgrif_full_black.svg => netgrif_full_grey.svg} (91%) diff --git a/projects/nae-example-app/src/assets/img/netgrif_full_black.svg b/projects/nae-example-app/src/assets/img/netgrif_full_grey.svg similarity index 91% rename from projects/nae-example-app/src/assets/img/netgrif_full_black.svg rename to projects/nae-example-app/src/assets/img/netgrif_full_grey.svg index 31df685b01..175d6a4a74 100644 --- a/projects/nae-example-app/src/assets/img/netgrif_full_black.svg +++ b/projects/nae-example-app/src/assets/img/netgrif_full_grey.svg @@ -20,22 +20,22 @@ c2.613,17.34-6.276,33.757-20.952,41.509L120.795,68.857z"/> - - - - - - - + diff --git a/projects/netgrif-components/src/lib/data-fields/file-field/file-default-field/file-default-field.component.scss b/projects/netgrif-components/src/lib/data-fields/file-field/file-default-field/file-default-field.component.scss index bb3bf1f5d9..98895b35d7 100644 --- a/projects/netgrif-components/src/lib/data-fields/file-field/file-default-field/file-default-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/file-field/file-default-field/file-default-field.component.scss @@ -32,7 +32,7 @@ .form-input { background: #FFFFFF; - color: #64748B; + //color: #64748B; outline: none; border: 1px solid #64748B; text-align: left; diff --git a/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.scss b/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.scss index 64aa7a338f..651f8aedf9 100644 --- a/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.scss @@ -32,7 +32,7 @@ .form-input { background: #FFFFFF; - color: #64748B; + //color: #64748B; outline: none; border: 1px solid #64748B; text-align: left; diff --git a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss index edd1fb2c7a..50c83d582e 100644 --- a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss @@ -11,7 +11,7 @@ font-size: 14px; border: 0; margin-left: 8px; - color: #64748B; + //color: #64748B; background: transparent; } From 067713a422d6033f8ff1a3427c8586c84f4c49b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kov=C3=A1=C4=8Dik?= Date: Mon, 15 Jan 2024 12:14:01 +0100 Subject: [PATCH 03/17] [NAE-1940] Update to new Angular - commit new versions --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1ff5697564..a350650ad9 100644 --- a/package.json +++ b/package.json @@ -109,11 +109,11 @@ "devDependencies": { "@angular-devkit/build-angular": "~13.3.1", "@angular-devkit/schematics-cli": "~13.3.10", - "@angular-eslint/builder": "~13.1.0", - "@angular-eslint/eslint-plugin": "~13.1.0", - "@angular-eslint/eslint-plugin-template": "~13.1.0", - "@angular-eslint/schematics": "~13.1.0", - "@angular-eslint/template-parser": "~13.1.0", + "@angular-eslint/builder": "~14.4.0", + "@angular-eslint/eslint-plugin": "~14.4.0", + "@angular-eslint/eslint-plugin-template": "~14.4.0", + "@angular-eslint/schematics": "~14.4.0", + "@angular-eslint/template-parser": "~14.4.0", "@angular/cli": "~13.3.1", "@angular/compiler-cli": "~13.3.1", "@angular/language-service": "~13.3.1", From c6467fccb589b76cfa087ef311e515e5253b6a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kov=C3=A1=C4=8Dik?= Date: Tue, 16 Jan 2024 12:30:12 +0100 Subject: [PATCH 04/17] [NAE-1940] Update to new Angular - commit angular 14 version --- package.json | 50 +++++++++---------- .../active-group/active-group.component.ts | 4 +- .../email-form/password-form.component.ts | 9 ++-- .../abstract-user-invite.component.ts | 2 +- .../services/session-idle-timer.service.ts | 2 +- .../lib/header/abstract-header.component.ts | 12 ++--- .../abstract-header-mode.component.ts | 2 +- .../edit-mode/abstract-edit-mode.component.ts | 2 +- .../abstract-case-panel.component.ts | 4 +- .../lib/search/models/configuration-input.ts | 4 +- .../search/models/operator-template-part.ts | 4 +- .../new-case/abstract-new-case.component.ts | 7 +-- .../abstract-option-selector.component.ts | 2 +- .../src/lib/tabs/classes/tab-view.ts | 2 +- .../migrations/5.4/migration-5.4.ts | 8 ++- .../new-case-dialog.component.ts | 7 +-- .../navigation-double-drawer.component.html | 6 +-- .../navigation-drawer.component.html | 2 - .../panel/case-panel/case-panel.component.ts | 2 +- 19 files changed, 65 insertions(+), 66 deletions(-) diff --git a/package.json b/package.json index a350650ad9..f32602c411 100644 --- a/package.json +++ b/package.json @@ -67,27 +67,27 @@ "example:build": "ng build --configuration production" }, "dependencies": { - "@angular-material-components/datetime-picker": "~7.0.1", - "@angular-material-components/moment-adapter": "~7.0.0", - "@angular/animations": "~13.3.1", - "@angular/cdk": "~13.3.1", - "@angular/common": "~13.3.1", - "@angular/compiler": "~13.3.1", - "@angular/core": "~13.3.1", - "@angular/flex-layout": "~13.0.0-beta.38", - "@angular/forms": "~13.3.1", - "@angular/material": "~13.3.1", - "@angular/material-moment-adapter": "~13.3.1", - "@angular/platform-browser": "~13.3.1", - "@angular/platform-browser-dynamic": "~13.3.1", - "@angular/router": "~13.3.1", - "@covalent/markdown": "~4.1.0", - "@ngx-translate/core": "~13.0.0", - "@ngx-translate/http-loader": "~6.0.0", - "@schematics/angular": "~13.3.0", + "@angular-material-components/datetime-picker": "~8.0.0", + "@angular-material-components/moment-adapter": "~8.0.0", + "@angular/animations": "^14.3.0", + "@angular/cdk": "^14.2.0", + "@angular/common": "^14.3.0", + "@angular/compiler": "^14.3.0", + "@angular/core": "^14.3.0", + "@angular/flex-layout": "^14.0.0-beta.40", + "@angular/forms": "^14.3.0", + "@angular/material": "^14.2.0", + "@angular/material-moment-adapter": "^14.2.0", + "@angular/platform-browser": "^14.3.0", + "@angular/platform-browser-dynamic": "^14.3.0", + "@angular/router": "^14.3.0", + "@covalent/markdown": "~5.0.2", + "@ngx-translate/core": "~14.0.0", + "@ngx-translate/http-loader": "~7.0.0", + "@schematics/angular": "^14.2.0", "@swimlane/ngx-charts": "~20.1.0", "@types/mousetrap": "~1.6.9", - "angular-resizable-element": "~3.3.0", + "angular-resizable-element": "~6.0.0", "angular-resize-event": "~3.1.1", "angular2-hotkeys": "~2.4.0", "easymde": "~2.16.1", @@ -107,16 +107,16 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~13.3.1", - "@angular-devkit/schematics-cli": "~13.3.10", + "@angular-devkit/build-angular": "^14.2.13", + "@angular-devkit/schematics-cli": "^13.3.10", "@angular-eslint/builder": "~14.4.0", "@angular-eslint/eslint-plugin": "~14.4.0", "@angular-eslint/eslint-plugin-template": "~14.4.0", "@angular-eslint/schematics": "~14.4.0", "@angular-eslint/template-parser": "~14.4.0", - "@angular/cli": "~13.3.1", - "@angular/compiler-cli": "~13.3.1", - "@angular/language-service": "~13.3.1", + "@angular/cli": "^14.2.13", + "@angular/compiler-cli": "^14.3.0", + "@angular/language-service": "^14.3.0", "@compodoc/compodoc": "1.1.13", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", @@ -141,7 +141,7 @@ "karma-nyan-reporter": "~0.2.5", "karma-sonarqube-unit-reporter": "^0.0.23", "ncp": "~2.0.0", - "ng-packagr": "~13.3.0", + "ng-packagr": "^14.2.2", "protractor": "~7.0.0", "puppeteer": "~2.1.1", "requirejs": "^2.3.6", diff --git a/projects/nae-example-app/src/app/doc/active-group/active-group.component.ts b/projects/nae-example-app/src/app/doc/active-group/active-group.component.ts index 13fd085511..ed2a89850a 100644 --- a/projects/nae-example-app/src/app/doc/active-group/active-group.component.ts +++ b/projects/nae-example-app/src/app/doc/active-group/active-group.component.ts @@ -15,8 +15,8 @@ export class ActiveGroupComponent implements OnDestroy { activeGroups: Array; - fcGroup: FormControl; - fcGroups: FormControl; + fcGroup: FormControl; + fcGroups: FormControl; private _subGroups: Subscription; private _subGroupFc: Subscription; diff --git a/projects/nae-example-app/src/app/doc/forms/email-form/password-form.component.ts b/projects/nae-example-app/src/app/doc/forms/email-form/password-form.component.ts index c1f7a47486..3cd875bf2e 100644 --- a/projects/nae-example-app/src/app/doc/forms/email-form/password-form.component.ts +++ b/projects/nae-example-app/src/app/doc/forms/email-form/password-form.component.ts @@ -20,12 +20,12 @@ interface EndpointOption { templateUrl: './password-form.component.html', styleUrls: ['./password-form.component.scss'] }) -export class PasswordFormComponent implements OnInit, OnDestroy { +export class PasswordFormComponent implements OnDestroy { readonly TITLE = 'Email submission form'; readonly DESCRIPTION = 'Ukážka email submission form...'; - public endpointFormControl: FormControl; + public endpointFormControl: FormControl; public loading: LoadingEmitter; @@ -35,13 +35,10 @@ export class PasswordFormComponent implements OnInit, OnDestroy { ]; constructor(protected _signUpService: SignUpService, protected _snackBarService: SnackBarService, protected _log: LoggerService) { - this.endpointFormControl = new FormControl(this.endpointOptions[0].value); + this.endpointFormControl = new FormControl(this.endpointOptions[0].value); this.loading = new LoadingEmitter(); } - ngOnInit(): void { - } - ngOnDestroy(): void { this.loading.complete(); } diff --git a/projects/netgrif-components-core/src/lib/admin/user-invite/abstract-user-invite.component.ts b/projects/netgrif-components-core/src/lib/admin/user-invite/abstract-user-invite.component.ts index 1616516ec3..2d45b9753b 100644 --- a/projects/netgrif-components-core/src/lib/admin/user-invite/abstract-user-invite.component.ts +++ b/projects/netgrif-components-core/src/lib/admin/user-invite/abstract-user-invite.component.ts @@ -18,7 +18,7 @@ import {Subscription} from "rxjs"; }) export abstract class AbstractUserInviteComponent implements OnInit, OnDestroy { - public invitedEmailControl: FormControl; + public invitedEmailControl: FormControl; public invitedGroups: Array; public invitedRoles: Array; public nets: ProcessList; diff --git a/projects/netgrif-components-core/src/lib/authentication/session/services/session-idle-timer.service.ts b/projects/netgrif-components-core/src/lib/authentication/session/services/session-idle-timer.service.ts index d124a6b22d..856376cbd4 100644 --- a/projects/netgrif-components-core/src/lib/authentication/session/services/session-idle-timer.service.ts +++ b/projects/netgrif-components-core/src/lib/authentication/session/services/session-idle-timer.service.ts @@ -18,7 +18,7 @@ export class SessionIdleTimerService implements OnDestroy { public remainSeconds$ = this._remainSeconds.asObservable(); - constructor(private _config: ConfigurationService,) { + constructor(protected _config: ConfigurationService) { this._enableService = this._config.getConfigurationSubtreeByPath('providers.auth.sessionTimeoutEnabled') ?? false; this._timeoutSeconds = this._config.getConfigurationSubtreeByPath('providers.auth.sessionTimeout') ?? SessionIdleTimerService.DEFAULT_SESSION_TIMEOUTTIME; } diff --git a/projects/netgrif-components-core/src/lib/header/abstract-header.component.ts b/projects/netgrif-components-core/src/lib/header/abstract-header.component.ts index b27cf8930e..7f43627888 100644 --- a/projects/netgrif-components-core/src/lib/header/abstract-header.component.ts +++ b/projects/netgrif-components-core/src/lib/header/abstract-header.component.ts @@ -41,9 +41,9 @@ export abstract class AbstractHeaderComponent implements OnInit, OnDestroy { protected _headerSearch: HeaderSearchService; public readonly headerModeEnum = HeaderMode; public readonly headerTypeEnum = HeaderType; - public overflowControl: FormControl; - public columnCountControl: FormControl; - public columnWidthControl: FormControl; + public overflowControl: FormControl; + public columnCountControl: FormControl; + public columnWidthControl: FormControl; public canOverflow: boolean; public subOverflowControl: Subscription; public subColumnCountControl: Subscription; @@ -51,7 +51,7 @@ export abstract class AbstractHeaderComponent implements OnInit, OnDestroy { protected _initHeaderCount: number = undefined; protected _initResponsiveHeaders: boolean = undefined; - protected _approvalFormControl: FormControl; + protected _approvalFormControl: FormControl; protected _changeValue: boolean; protected _subCases: Subscription; @@ -85,7 +85,7 @@ export abstract class AbstractHeaderComponent implements OnInit, OnDestroy { } } - get approvalFormControl(): FormControl { + get approvalFormControl(): FormControl { return this._approvalFormControl; } @@ -168,7 +168,7 @@ export abstract class AbstractHeaderComponent implements OnInit, OnDestroy { return this.buildErrorMessage(this.columnCountControl, 1); } - buildErrorMessage(formControlRef: FormControl, minNumber) { + buildErrorMessage(formControlRef: FormControl, minNumber) { if (formControlRef.hasError('required')) { return this._translate.instant('dataField.validations.required'); } diff --git a/projects/netgrif-components-core/src/lib/header/header-modes/abstract-header-mode.component.ts b/projects/netgrif-components-core/src/lib/header/header-modes/abstract-header-mode.component.ts index b6f720efd5..3a88da5f3b 100644 --- a/projects/netgrif-components-core/src/lib/header/header-modes/abstract-header-mode.component.ts +++ b/projects/netgrif-components-core/src/lib/header/header-modes/abstract-header-mode.component.ts @@ -10,7 +10,7 @@ export abstract class AbstractHeaderModeComponent { @Input() public overflowWidth: string; @Input() public approval: boolean; @Input() public indeterminate: boolean; - @Input() public approvalFormControl: FormControl; + @Input() public approvalFormControl: FormControl; @Input() public typeApproval: string; constructor() { diff --git a/projects/netgrif-components-core/src/lib/header/header-modes/edit-mode/abstract-edit-mode.component.ts b/projects/netgrif-components-core/src/lib/header/header-modes/edit-mode/abstract-edit-mode.component.ts index 47d2f62b19..5a0e7ad699 100644 --- a/projects/netgrif-components-core/src/lib/header/header-modes/edit-mode/abstract-edit-mode.component.ts +++ b/projects/netgrif-components-core/src/lib/header/header-modes/edit-mode/abstract-edit-mode.component.ts @@ -20,7 +20,7 @@ export interface HeaderOption { template: '' }) export abstract class AbstractEditModeComponent extends AbstractHeaderModeComponent implements OnInit, OnDestroy { - public formControls: Array = []; + public formControls: Array> = []; public filterOptions: Array>> = []; protected subHeader: Subscription; diff --git a/projects/netgrif-components-core/src/lib/panel/case-panel/abstract-case-panel.component.ts b/projects/netgrif-components-core/src/lib/panel/case-panel/abstract-case-panel.component.ts index 19073640ef..71c40a2ab2 100644 --- a/projects/netgrif-components-core/src/lib/panel/case-panel/abstract-case-panel.component.ts +++ b/projects/netgrif-components-core/src/lib/panel/case-panel/abstract-case-panel.component.ts @@ -38,7 +38,7 @@ export abstract class AbstractCasePanelComponent extends AbstractPanelWithImmedi @Input() showCasePanelIcon = true; @Input() showDeleteMenu = false; @Input() textEllipsis = false; - protected _approvalFormControl: FormControl; + protected _approvalFormControl: FormControl; protected constructor(protected _caseResourceService: CaseResourceService, protected _caseViewService: CaseViewService, @@ -53,7 +53,7 @@ export abstract class AbstractCasePanelComponent extends AbstractPanelWithImmedi this._approvalFormControl = new FormControl(); } - get approvalFormControl(): FormControl { + get approvalFormControl(): FormControl { return this._approvalFormControl; } diff --git a/projects/netgrif-components-core/src/lib/search/models/configuration-input.ts b/projects/netgrif-components-core/src/lib/search/models/configuration-input.ts index b868ae2e33..af3dd8cdbe 100644 --- a/projects/netgrif-components-core/src/lib/search/models/configuration-input.ts +++ b/projects/netgrif-components-core/src/lib/search/models/configuration-input.ts @@ -14,7 +14,7 @@ import {filter, map, startWith} from 'rxjs/operators'; */ export class ConfigurationInput { - protected _formControl: FormControl; + protected _formControl: FormControl; protected _filteredOptions$: Observable>>; @@ -43,7 +43,7 @@ export class ConfigurationInput { ); } - public get formControl(): FormControl { + public get formControl(): FormControl { return this._formControl; } diff --git a/projects/netgrif-components-core/src/lib/search/models/operator-template-part.ts b/projects/netgrif-components-core/src/lib/search/models/operator-template-part.ts index aaed9ea0ab..4ae56bdd8c 100644 --- a/projects/netgrif-components-core/src/lib/search/models/operator-template-part.ts +++ b/projects/netgrif-components-core/src/lib/search/models/operator-template-part.ts @@ -8,7 +8,7 @@ import {FormControl} from '@angular/forms'; */ export class OperatorTemplatePart { protected _type: OperatorTemplatePartType; - protected _content: string | FormControl; + protected _content: string | FormControl; /** * The @@ -29,7 +29,7 @@ export class OperatorTemplatePart { return this._type; } - public get content(): string | FormControl { + public get content(): string | FormControl { return this._content; } } diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/new-case/abstract-new-case.component.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/new-case/abstract-new-case.component.ts index 8a2c617dd7..9e0e474fcc 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/new-case/abstract-new-case.component.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/new-case/abstract-new-case.component.ts @@ -29,7 +29,7 @@ interface Form { }) export abstract class AbstractNewCaseComponent implements OnDestroy { - processFormControl = new FormControl('', Validators.required); + processFormControl = new FormControl('', Validators.required); titleFormControl = new FormControl('', Validators.required); netVersion: string; @@ -105,7 +105,7 @@ export abstract class AbstractNewCaseComponent implements OnDestroy { map(sources => { const options = sources[0]; const input = typeof sources[1] === 'string' || sources[1] === null ? sources[1] : sources[1].viewValue; - return input ? this._filter(input, options) : options.slice(); + return input ? this._filter(input as string, options) : options.slice(); }), tap(filteredOptions => { if (filteredOptions.length === 1) { @@ -154,7 +154,8 @@ export abstract class AbstractNewCaseComponent implements OnDestroy { const newCase = { title: this.titleFormControl.value === '' ? null : this.titleFormControl.value, color: 'panel-primary-icon', - netId: this.options.length === 1 ? this.options[0].value : this.processFormControl.value.value + netId: this.options.length === 1 ? this.options[0].value : + ( typeof this.processFormControl.value === 'string' ? this.processFormControl.value : this.processFormControl.value.value ) }; this.loadingSubmit.on(); this._caseResourceService.createCase(newCase) diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/option-selector/abstract-option-selector.component.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/option-selector/abstract-option-selector.component.ts index f1e2b42b01..f63464c255 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/option-selector/abstract-option-selector.component.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/option-selector/abstract-option-selector.component.ts @@ -12,7 +12,7 @@ import {Component} from '@angular/core'; export abstract class AbstractOptionSelectorComponent { data: OptionSelectorInjectionData; - selectorFormControl = new FormControl('', Validators.required); + selectorFormControl = new FormControl('', Validators.required); filteredOptions: Observable>; constructor(protected _sideMenuControl: SideMenuControl) { diff --git a/projects/netgrif-components-core/src/lib/tabs/classes/tab-view.ts b/projects/netgrif-components-core/src/lib/tabs/classes/tab-view.ts index 8a4ca69f93..bc2feec17e 100644 --- a/projects/netgrif-components-core/src/lib/tabs/classes/tab-view.ts +++ b/projects/netgrif-components-core/src/lib/tabs/classes/tab-view.ts @@ -30,7 +30,7 @@ export class TabView implements TabViewInterface { * * Selected index initializes to `0`. */ - public selectedIndex: FormControl; + public selectedIndex: FormControl; private uniqueIdCounter = new IncrementingCounter(); /** diff --git a/projects/netgrif-components/schematics/migrations/5.4/migration-5.4.ts b/projects/netgrif-components/schematics/migrations/5.4/migration-5.4.ts index ac6d3386c7..487908ca26 100644 --- a/projects/netgrif-components/schematics/migrations/5.4/migration-5.4.ts +++ b/projects/netgrif-components/schematics/migrations/5.4/migration-5.4.ts @@ -23,10 +23,14 @@ export function schematicEntryPoint(): Rule { const classDeclarations: Array = findNodes(source, ts.SyntaxKind.ClassDeclaration); for (const declaration of classDeclarations) { - if (declaration.decorators?.length !== 1) { + if (!ts.canHaveDecorators(declaration)) { + continue + } + if (ts.getDecorators(declaration)?.length !== 1) { continue; } - const decorator = declaration.decorators[0]; + const decorators = ts.getDecorators(declaration); + const decorator = decorators !== undefined ? decorators[0] : undefined; if (decorator?.expression?.getFirstToken()?.getText() !== 'Component') { continue; } diff --git a/projects/netgrif-components/src/lib/dialog/new-case-dialog/new-case-dialog.component.ts b/projects/netgrif-components/src/lib/dialog/new-case-dialog/new-case-dialog.component.ts index f8b11c9d69..68efb1918a 100644 --- a/projects/netgrif-components/src/lib/dialog/new-case-dialog/new-case-dialog.component.ts +++ b/projects/netgrif-components/src/lib/dialog/new-case-dialog/new-case-dialog.component.ts @@ -31,7 +31,7 @@ export class NewCaseDialogComponent implements OnDestroy { isVersionVisible?: boolean; allVersionEnabled?: boolean; - processFormControl = new FormControl('', Validators.required); + processFormControl = new FormControl('', Validators.required); titleFormControl = new FormControl('', Validators.required); netVersion: string; @@ -112,7 +112,7 @@ export class NewCaseDialogComponent implements OnDestroy { map(sources => { const options = sources[0]; const input = typeof sources[1] === 'string' || sources[1] === null ? sources[1] : sources[1].viewValue; - return input ? this._filter(input, options) : options.slice(); + return input ? this._filter(input as string, options) : options.slice(); }), tap(filteredOptions => { if (filteredOptions.length === 1) { @@ -148,7 +148,8 @@ export class NewCaseDialogComponent implements OnDestroy { const newCase = { title: this.titleFormControl.value === '' ? null : this.titleFormControl.value, color: 'panel-primary-icon', - netId: this.options.length === 1 ? this.options[0].value : this.processFormControl.value.value + netId: this.options.length === 1 ? this.options[0].value : + ( typeof this.processFormControl.value === 'string' ? this.processFormControl.value : this.processFormControl.value.value ) }; this.loadingSubmit.on(); this._caseResourceService.createCase(newCase) diff --git a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html index f6dacd6429..22ff403582 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html +++ b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html @@ -104,10 +104,8 @@ [disableClose]="configRightMenu.disableClose" class="drawer-content" mwlResizable - [style.width.px]="configRightMenu.width" - [resizeCursorPrecision]="20" - [resizeEdges]="{right: true}" - (resizing)="onResizeEvent($event)"> + (resizing)="onResizeEvent($event)" + [style.width.px]="configRightMenu.width">
diff --git a/projects/netgrif-components/src/lib/navigation/navigation-drawer/navigation-drawer.component.html b/projects/netgrif-components/src/lib/navigation/navigation-drawer/navigation-drawer.component.html index 122b28e7fe..d8b9bc9b1c 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation-drawer/navigation-drawer.component.html +++ b/projects/netgrif-components/src/lib/navigation/navigation-drawer/navigation-drawer.component.html @@ -3,8 +3,6 @@ [disableClose]="config.disableClose" class="drawer-content mat-elevation-z10" mwlResizable [style.width.px]="width" - [resizeCursorPrecision]="10" - [resizeEdges]="{ right: true }" (resizing)="onResizeEvent($event)">
- {{getErrorMessage()}} + {{getErrorMessage()}}
diff --git a/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.scss b/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.scss index 27cea47505..cf7658b8e0 100644 --- a/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.scss @@ -36,8 +36,10 @@ } .padding-bottom { - padding-bottom: 6px; + padding-bottom: 24px; } -.no-shadow { - box-shadow: unset !important; + +.padding-bottom-9px { + padding-bottom: 9px; } + diff --git a/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss b/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss index ca8acfc6cf..7f131fd210 100644 --- a/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss +++ b/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss @@ -23,14 +23,6 @@ border-bottom: 1px solid #eee; } - .mat-mdc-option { - height: auto !important; - min-height: 48px; - white-space: normal !important; - line-height: normal !important; - padding: 8px 16px !important; - } - .horizontal-state-primary { background-color: mat.get-color-from-palette($primary); } @@ -78,6 +70,14 @@ color: mat.get-color-from-palette($primary) !important; } + .mat-mdc-option { + height: auto !important; + min-height: 48px; + white-space: normal !important; + line-height: normal !important; + padding: 8px 16px !important; + } + .netgrif-input { .mat-mdc-standard-chip { @@ -89,6 +89,7 @@ .mat-mdc-paginator-page-size-select .mat-mdc-form-field-infix { min-width: unset !important; } + .mat-mdc-form-field-infix { padding: 11px 0 11px 0 !important; font-weight: 400 !important; @@ -101,8 +102,9 @@ } .mat-mdc-text-field-wrapper.mdc-text-field--outlined .mdc-notched-outline--upgraded .mdc-floating-label--float-above { - transform: translateY(-26px) scale(0.75); + transform: translateY(-26px) scale(0.75) !important; } + .mat-mdc-text-field-wrapper .mat-mdc-form-field-flex .mat-mdc-floating-label { top: 20px; font-size: 14px; @@ -114,13 +116,13 @@ padding: 9px; } - .mat-mdc-form-field-appearance-outline .mat-mdc-form-field-prefix, .mat-mdc-form-field-appearance-outline .mat-mdc-form-field-suffix { - top: 0.33em; - } - - .mat-mdc-form-field-appearance-outline .mat-mdc-form-field-prefix { - left: -0.33em; - } + //.mat-mdc-form-field-appearance-outline .mat-mdc-form-field-prefix, .mat-mdc-form-field-appearance-outline .mat-mdc-form-field-suffix { + // top: 0.33em; + //} + // + //.mat-mdc-form-field-appearance-outline .mat-mdc-form-field-prefix { + // left: -0.33em; + //} .mat-mdc-form-field-label-wrapper { top: -1.2em !important; @@ -135,20 +137,20 @@ } .mat-mdc-select-arrow-wrapper { - transform: translateY(0) !important; + height: 20px; } .mat-mdc-select-disabled .mat-mdc-select-trigger { user-select: all !important; } - .mat-mdc-error { + .mat-mdc-form-field-error { font-size: 10px !important; line-height: 18px !important; width: 100%; } - .mat-mdc-hint { + .mat-mdc-form-field-hint { font-size: 10px !important; line-height: 18px !important; width: 100%; @@ -198,7 +200,16 @@ line-height: normal !important; display: flex !important; justify-content: center; - flex-direction: column; + } + + .mdc-list-item--with-leading-checkbox .mdc-list-item__start { + margin-left: 0; + margin-right: 0; + } + + .mdc-list-item__primary-text, .mdc-list-item__content { + text-overflow: clip; + white-space: break-spaces; } .mat-mdc-list-option:focus { @@ -220,12 +231,6 @@ padding-top: 4px !important; } - .mat-mdc-form-field-subscript-wrapper { - //position: static; - margin-top: 0.5em; - top: calc(100% - 2em); - } - .mat-mdc-form-field-wrapper { padding-bottom: 1em !important; } @@ -284,7 +289,7 @@ // ENABLED - .mat-mdc-form-field-appearance-outline .mat-mdc-form-field-outline { + .mat-mdc-text-field-wrapper { color: $color-outline-enabled; background-color: #FFFFFF; border-radius: 6px; @@ -342,6 +347,45 @@ white-space: break-spaces; } + /// NEW STYLES + + .mdc-text-field--outlined.mdc-text-field--disabled .mdc-notched-outline__leading, + .mdc-text-field--outlined.mdc-text-field--disabled .mdc-notched-outline__notch, + .mdc-text-field--outlined.mdc-text-field--disabled .mdc-notched-outline__trailing { + border-color: $color-outline-disabled; + } + + .mdc-text-field--outlined:not(.mdc-text-field--disabled) .mdc-notched-outline .mdc-notched-outline__leading, + .mdc-text-field--outlined:not(.mdc-text-field--disabled) .mdc-notched-outline .mdc-notched-outline__notch, + .mdc-text-field--outlined:not(.mdc-text-field--disabled) .mdc-notched-outline .mdc-notched-outline__trailing { + border-color: $color-outline-enabled; + } + + .mat-mdc-icon-button .mat-mdc-button-touch-target { + height: 42px; + width: 42px; + padding: 8px; + } + + .mat-mdc-icon-button.mat-mdc-button-base { + height: 42px; + width: 42px; + padding: 8px; + } + + .mat-mdc-form-field-icon-prefix>.mat-icon, .mat-mdc-form-field-icon-suffix>.mat-icon { + padding: 8px; + } + + .mat-mdc-select { + line-height: 20px; + } + + .chip-fix { + .mat-mdc-form-field-infix { + padding: 7px 0 7px 0 !important; + } + } } .netgrif-zero-field-wrapper { @@ -366,22 +410,11 @@ top: 3px !important; } - .mat-mdc-form-field-wrapper { - padding-bottom: 0 !important; - } } .netgrif-input-primary-search-fix { - .mat-mdc-form-field-appearance-outline .mat-mdc-form-field-prefix, .mat-mdc-form-field-appearance-outline .mat-mdc-form-field-suffix { - top: 0.25em !important; - } - - .mat-mdc-form-field-appearance-outline .mat-mdc-form-field-prefix { - left: 0 !important; - } - - .mat-mdc-form-field-wrapper { - padding-bottom: 0 !important; + .mat-mdc-form-field-subscript-wrapper { + display: none; } } @@ -414,7 +447,7 @@ color: mat.get-contrast-color-from-palette($primary, 500); } - .mat-mdc-datepicker-toggle { + .mat-datepicker-toggle { color: mat.get-contrast-color-from-palette($primary, 500) !important; } @@ -486,8 +519,13 @@ ngx-mat-datetime-content { } } -ac-number-currency-field .mat-mdc-form-field .mat-mdc-form-field-prefix { - top: 0 !important; +.mat-datepicker-content { + box-shadow: 0px 2px 4px -1px rgba(0, 0, 0, 0.2), 0px 4px 5px 0px rgba(0, 0, 0, 0.14), 0px 1px 10px 0px rgba(0, 0, 0, 0.12); + background-color: white; +} + +nc-number-currency-field .mat-mdc-form-field .mat-mdc-form-field-prefix { + position: initial !important; padding-right: 4px !important; } @@ -497,3 +535,4 @@ ac-number-currency-field .mat-mdc-form-field .mat-mdc-form-field-prefix { border-left: 1px solid #FFFFFF !important; border-right: 1px solid #FFFFFF !important; } + diff --git a/projects/netgrif-components/src/lib/data-fields/data-fields.module.ts b/projects/netgrif-components/src/lib/data-fields/data-fields.module.ts index 6e7c16928c..c57884f5a2 100644 --- a/projects/netgrif-components/src/lib/data-fields/data-fields.module.ts +++ b/projects/netgrif-components/src/lib/data-fields/data-fields.module.ts @@ -1,6 +1,6 @@ import {Injector, NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import {FlexLayoutModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@ngbracket/ngx-layout'; import { CovalentModule, CurrencyModule, diff --git a/projects/netgrif-components/src/lib/data-fields/file-field/file-default-field/file-default-field.component.html b/projects/netgrif-components/src/lib/data-fields/file-field/file-default-field/file-default-field.component.html index e0d4f90482..c6109d02f1 100644 --- a/projects/netgrif-components/src/lib/data-fields/file-field/file-default-field/file-default-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/file-field/file-default-field/file-default-field.component.html @@ -1,5 +1,5 @@
-
+
{{dataField.title}} diff --git a/projects/netgrif-components/src/lib/data-fields/file-field/file-default-field/file-default-field.component.scss b/projects/netgrif-components/src/lib/data-fields/file-field/file-default-field/file-default-field.component.scss index bb3bf1f5d9..c540fb0342 100644 --- a/projects/netgrif-components/src/lib/data-fields/file-field/file-default-field/file-default-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/file-field/file-default-field/file-default-field.component.scss @@ -40,9 +40,8 @@ line-height: 20px; border-radius: 6px; min-width: 5px; - padding: 8px 15px 8px 15px; box-sizing: border-box; - height: 44px; + height: 43px; } .form-input:hover { @@ -63,12 +62,8 @@ } .file-hint-error { - font-size: 75%; padding: 0 1em; width: unset; - position: absolute; - margin-top: 0.5em; - top: calc(100% - 2em); } .image-preview { @@ -137,6 +132,6 @@ } .netgrif-file-padding { - padding-bottom: 13px; + padding-bottom: 22px; position: relative; } diff --git a/projects/netgrif-components/src/lib/data-fields/file-field/preview-dialog/preview-dialog.component.spec.ts b/projects/netgrif-components/src/lib/data-fields/file-field/preview-dialog/preview-dialog.component.spec.ts index 9075e401a4..69ed4da1d0 100644 --- a/projects/netgrif-components/src/lib/data-fields/file-field/preview-dialog/preview-dialog.component.spec.ts +++ b/projects/netgrif-components/src/lib/data-fields/file-field/preview-dialog/preview-dialog.component.spec.ts @@ -13,7 +13,7 @@ import { import {AngularResizeEventModule} from 'angular-resize-event'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {HttpClientTestingModule} from '@angular/common/http/testing'; -import {FlexLayoutModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@ngbracket/ngx-layout'; import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; import {NO_ERRORS_SCHEMA} from '@angular/core'; import {of} from 'rxjs'; diff --git a/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.html b/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.html index 49158098ba..7c383d96f2 100644 --- a/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.html @@ -1,4 +1,4 @@ -
+
{{dataField.title}} diff --git a/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.scss b/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.scss index 64aa7a338f..857d3c04a7 100644 --- a/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.scss @@ -40,9 +40,8 @@ line-height: 20px; border-radius: 6px; min-width: 5px; - padding: 8px 15px 8px 15px; box-sizing: border-box; - min-height: 44px; + min-height: 43px; } .form-input:hover { @@ -65,13 +64,8 @@ } .file-hint-error { - font-size: 75%; padding: 0 1em; width: unset; - - position: absolute; - margin-top: 0.5em; - top: calc(100% - 2em); } .no-cursor { @@ -106,7 +100,7 @@ } .netgrif-file-padding{ - padding-bottom: 13px; + padding-bottom: 22px; position: relative; } diff --git a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss index 63556224be..4042cfd53e 100644 --- a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss @@ -56,6 +56,10 @@ line-height: normal; } +.language-svg-wrapper>svg { + height: 18px; +} + .language-selector-button { width: auto; margin-left: 8px; @@ -98,6 +102,7 @@ .filled-language-icon { margin: 0 10px; height: 20px; + box-sizing: border-box; } .filled-language-value { diff --git a/projects/netgrif-components/src/lib/data-fields/multichoice-field/multichoice-autocomplete-field/multichoice-autocomplete-field.component.html b/projects/netgrif-components/src/lib/data-fields/multichoice-field/multichoice-autocomplete-field/multichoice-autocomplete-field.component.html index 992ff9a1fc..86ebb91dac 100644 --- a/projects/netgrif-components/src/lib/data-fields/multichoice-field/multichoice-autocomplete-field/multichoice-autocomplete-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/multichoice-field/multichoice-autocomplete-field/multichoice-autocomplete-field.component.html @@ -1,13 +1,13 @@ - + {{dataField.title}} - - + {{getValueFromKey(option)}} - + - + --- diff --git a/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.html b/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.html index 806f72e788..a2dfbd9c46 100644 --- a/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.html @@ -1,5 +1,5 @@
-
+
{{dataField.title}} diff --git a/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.scss b/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.scss index c6c19b6b23..ab7ed0df60 100644 --- a/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.scss @@ -56,13 +56,8 @@ } .user-hint-error { - font-size: 75%; padding: 0 1em; width: unset; - - position: absolute; - margin-top: 0.5em; - top: calc(100% - 2em); } .image-preview { @@ -104,6 +99,6 @@ } .netgrif-user-padding { - padding-bottom: 13px; + padding-bottom: 22px; position: relative; } diff --git a/projects/netgrif-components/src/lib/data-fields/user-field/user-field.component.scss b/projects/netgrif-components/src/lib/data-fields/user-field/user-field.component.scss index 60607082cc..22c418f260 100644 --- a/projects/netgrif-components/src/lib/data-fields/user-field/user-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/user-field/user-field.component.scss @@ -52,13 +52,8 @@ } .user-hint-error { - font-size: 75%; padding: 0 1em; width: unset; - - position: absolute; - margin-top: 0.5em; - top: calc(100% - 2em); } .image-preview { @@ -100,6 +95,5 @@ } .netgrif-user-padding { - padding-bottom: 13px; position: relative; } diff --git a/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html b/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html index 8b875c8902..a9ebbcacde 100644 --- a/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html @@ -1,9 +1,6 @@ - - {{ dataField.title }} - - - - - - {{ user.value.fullName }} + + + {{user.value.fullName}} - + - - {{ dataField.description }} - {{ 'dataField.validations.required' | translate }} - + + {{dataField.description}} + {{'dataField.validations.required' | translate}} diff --git a/projects/netgrif-components/src/lib/dialog/dialog.module.ts b/projects/netgrif-components/src/lib/dialog/dialog.module.ts index 5baf20839e..5c51058de7 100644 --- a/projects/netgrif-components/src/lib/dialog/dialog.module.ts +++ b/projects/netgrif-components/src/lib/dialog/dialog.module.ts @@ -19,7 +19,7 @@ import {A11yModule} from '@angular/cdk/a11y'; import { SideMenuUserAssignComponentModule } from '../side-menu/content-components/user-assign/side-menu-user-assign-component.module'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule, FlexModule} from '@ngbracket/ngx-layout'; import {FormsModule} from '@angular/forms'; import {HotkeyModule} from 'angular2-hotkeys'; import {ImportNetDialogComponent} from './import-net-dialog/import-net-dialog.component'; diff --git a/projects/netgrif-components/src/lib/dialog/dialog.theme.scss b/projects/netgrif-components/src/lib/dialog/dialog.theme.scss index fc8448454a..1d2bd8f2f8 100644 --- a/projects/netgrif-components/src/lib/dialog/dialog.theme.scss +++ b/projects/netgrif-components/src/lib/dialog/dialog.theme.scss @@ -41,16 +41,17 @@ } } - .mat-mdc-dialog-title { + .mat-dialog-title { font-style: normal; font-weight: 500; font-size: 20px; line-height: 24px; letter-spacing: 0.15px; color: #1E293B; + padding: 20px 24px 20px 24px; } - .mat-mdc-dialog-container { + .mat-mdc-dialog-container .mdc-dialog__surface { border-radius: 6px !important; } diff --git a/projects/netgrif-components/src/lib/filter-field-content/filter-field-content.module.ts b/projects/netgrif-components/src/lib/filter-field-content/filter-field-content.module.ts index 2fe4b10dc2..817c259680 100644 --- a/projects/netgrif-components/src/lib/filter-field-content/filter-field-content.module.ts +++ b/projects/netgrif-components/src/lib/filter-field-content/filter-field-content.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { FilterFieldTabViewComponent } from './filter-field-tab-view/filter-field-tab-view.component'; import { FilterFieldTabbedCaseViewComponent } from './filter-field-tabbed-case-view/filter-field-tabbed-case-view.component'; import { TabsComponentModule } from '../tabs/tabs.module'; -import { FlexModule } from '@angular/flex-layout'; +import { FlexModule } from '@ngbracket/ngx-layout'; import { MaterialModule } from '@netgrif/components-core'; import { SearchComponentModule } from '../search/search.module'; import { CaseViewComponentModule } from '../view/case-view/case-view.module'; diff --git a/projects/netgrif-components/src/lib/forms/change-password/change-password-form.component.module.ts b/projects/netgrif-components/src/lib/forms/change-password/change-password-form.component.module.ts index 3d45afce01..16e7e9b1d5 100644 --- a/projects/netgrif-components/src/lib/forms/change-password/change-password-form.component.module.ts +++ b/projects/netgrif-components/src/lib/forms/change-password/change-password-form.component.module.ts @@ -1,7 +1,7 @@ import {NgModule} from "@angular/core"; import {CommonModule} from "@angular/common"; import {ProfileModule, MaterialModule, TranslateLibModule} from '@netgrif/components-core'; -import {FlexLayoutModule} from "@angular/flex-layout"; +import {FlexLayoutModule} from "@ngbracket/ngx-layout"; import {ReactiveFormsModule} from "@angular/forms"; import {ChangePasswordFormComponent} from "./change-password-form.component"; diff --git a/projects/netgrif-components/src/lib/forms/email-submission/email-submission-form.component.spec.ts b/projects/netgrif-components/src/lib/forms/email-submission/email-submission-form.component.spec.ts index 8c1b3d00c8..d538e91b0c 100644 --- a/projects/netgrif-components/src/lib/forms/email-submission/email-submission-form.component.spec.ts +++ b/projects/netgrif-components/src/lib/forms/email-submission/email-submission-form.component.spec.ts @@ -1,7 +1,7 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing'; import {EmailSubmissionFormComponent} from './email-submission-form.component'; import {FormBuilder} from '@angular/forms'; -import {FlexLayoutModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@ngbracket/ngx-layout'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {ConfigurationService, MaterialModule, TestConfigurationService, TranslateLibModule} from '@netgrif/components-core'; import {HttpClientTestingModule} from '@angular/common/http/testing'; diff --git a/projects/netgrif-components/src/lib/forms/email-submission/email-submission-form.module.ts b/projects/netgrif-components/src/lib/forms/email-submission/email-submission-form.module.ts index 8c1569cac5..ff0ed1157e 100644 --- a/projects/netgrif-components/src/lib/forms/email-submission/email-submission-form.module.ts +++ b/projects/netgrif-components/src/lib/forms/email-submission/email-submission-form.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import {FlexLayoutModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@ngbracket/ngx-layout'; import {ReactiveFormsModule} from '@angular/forms'; import {EmailSubmissionFormComponent} from './email-submission-form.component'; import {MaterialModule, TranslateLibModule} from '@netgrif/components-core'; diff --git a/projects/netgrif-components/src/lib/forms/forgotten-password/forgotten-password-form-component.module.ts b/projects/netgrif-components/src/lib/forms/forgotten-password/forgotten-password-form-component.module.ts index d45406ed3a..fe8b0bdcab 100644 --- a/projects/netgrif-components/src/lib/forms/forgotten-password/forgotten-password-form-component.module.ts +++ b/projects/netgrif-components/src/lib/forms/forgotten-password/forgotten-password-form-component.module.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {ForgottenPasswordFormComponent} from './forgotten-password-form.component'; import {MaterialModule, TranslateLibModule} from '@netgrif/components-core'; -import {FlexLayoutModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@ngbracket/ngx-layout'; import {ReactiveFormsModule} from '@angular/forms'; diff --git a/projects/netgrif-components/src/lib/forms/forgotten-password/forgotten-password-form.component.spec.ts b/projects/netgrif-components/src/lib/forms/forgotten-password/forgotten-password-form.component.spec.ts index 24561c8fa1..9e49949071 100644 --- a/projects/netgrif-components/src/lib/forms/forgotten-password/forgotten-password-form.component.spec.ts +++ b/projects/netgrif-components/src/lib/forms/forgotten-password/forgotten-password-form.component.spec.ts @@ -8,7 +8,7 @@ import { TestConfigurationService, TranslateLibModule } from '@netgrif/components-core'; -import {FlexLayoutModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@ngbracket/ngx-layout'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {HttpClientTestingModule} from '@angular/common/http/testing'; import {NO_ERRORS_SCHEMA} from '@angular/core'; diff --git a/projects/netgrif-components/src/lib/forms/login/login-form.component.spec.ts b/projects/netgrif-components/src/lib/forms/login/login-form.component.spec.ts index 2edda94e4f..800f30fd3c 100644 --- a/projects/netgrif-components/src/lib/forms/login/login-form.component.spec.ts +++ b/projects/netgrif-components/src/lib/forms/login/login-form.component.spec.ts @@ -1,7 +1,7 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing'; import {LoginFormComponent} from './login-form.component'; import {NO_ERRORS_SCHEMA} from '@angular/core'; -import {FlexLayoutModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@ngbracket/ngx-layout'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {HttpClientTestingModule} from '@angular/common/http/testing'; import { diff --git a/projects/netgrif-components/src/lib/forms/login/login-form.module.ts b/projects/netgrif-components/src/lib/forms/login/login-form.module.ts index 5ab542e833..fde1854200 100644 --- a/projects/netgrif-components/src/lib/forms/login/login-form.module.ts +++ b/projects/netgrif-components/src/lib/forms/login/login-form.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import {FlexLayoutModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@ngbracket/ngx-layout'; import {ReactiveFormsModule} from '@angular/forms'; import {LoginFormComponent} from './login-form.component'; import {MaterialModule, TranslateLibModule} from '@netgrif/components-core'; diff --git a/projects/netgrif-components/src/lib/forms/registration/registration-form.component.spec.ts b/projects/netgrif-components/src/lib/forms/registration/registration-form.component.spec.ts index ac9030d7f4..1c4a034546 100644 --- a/projects/netgrif-components/src/lib/forms/registration/registration-form.component.spec.ts +++ b/projects/netgrif-components/src/lib/forms/registration/registration-form.component.spec.ts @@ -1,7 +1,7 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing'; import {RegistrationFormComponent} from './registration-form.component'; -import {FlexLayoutModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@ngbracket/ngx-layout'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {NO_ERRORS_SCHEMA} from '@angular/core'; import {HttpClientTestingModule} from '@angular/common/http/testing'; diff --git a/projects/netgrif-components/src/lib/forms/registration/registration-form.module.ts b/projects/netgrif-components/src/lib/forms/registration/registration-form.module.ts index 7ecf483ec3..6d91382e6f 100644 --- a/projects/netgrif-components/src/lib/forms/registration/registration-form.module.ts +++ b/projects/netgrif-components/src/lib/forms/registration/registration-form.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import {FlexLayoutModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@ngbracket/ngx-layout'; import {ReactiveFormsModule} from '@angular/forms'; import {RegistrationFormComponent} from './registration-form.component'; import {MaterialModule, TranslateLibModule} from '@netgrif/components-core'; diff --git a/projects/netgrif-components/src/lib/header/header-modes/edit-mode/edit-mode.component.spec.ts b/projects/netgrif-components/src/lib/header/header-modes/edit-mode/edit-mode.component.spec.ts index e2c1e708e1..4095084820 100644 --- a/projects/netgrif-components/src/lib/header/header-modes/edit-mode/edit-mode.component.spec.ts +++ b/projects/netgrif-components/src/lib/header/header-modes/edit-mode/edit-mode.component.spec.ts @@ -1,6 +1,6 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing'; import {EditModeComponent} from './edit-mode.component'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule, FlexModule} from '@ngbracket/ngx-layout'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Component} from '@angular/core'; import {HttpClientTestingModule} from '@angular/common/http/testing'; diff --git a/projects/netgrif-components/src/lib/header/header-modes/loading-mode/loading-mode.component.spec.ts b/projects/netgrif-components/src/lib/header/header-modes/loading-mode/loading-mode.component.spec.ts index c7e88b18fc..3f37069a32 100644 --- a/projects/netgrif-components/src/lib/header/header-modes/loading-mode/loading-mode.component.spec.ts +++ b/projects/netgrif-components/src/lib/header/header-modes/loading-mode/loading-mode.component.spec.ts @@ -1,7 +1,7 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing'; import {LoadingModeComponent} from './loading-mode.component'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule, FlexModule} from '@ngbracket/ngx-layout'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Component} from '@angular/core'; import {HttpClientTestingModule} from '@angular/common/http/testing'; diff --git a/projects/netgrif-components/src/lib/header/header-modes/search-mode/search-mode.component.spec.ts b/projects/netgrif-components/src/lib/header/header-modes/search-mode/search-mode.component.spec.ts index 7625e1e33f..414abf3071 100644 --- a/projects/netgrif-components/src/lib/header/header-modes/search-mode/search-mode.component.spec.ts +++ b/projects/netgrif-components/src/lib/header/header-modes/search-mode/search-mode.component.spec.ts @@ -1,6 +1,6 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing'; import {SearchModeComponent} from './search-mode.component'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule, FlexModule} from '@ngbracket/ngx-layout'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {Component} from '@angular/core'; import {HttpClientTestingModule} from '@angular/common/http/testing'; diff --git a/projects/netgrif-components/src/lib/header/header-modes/sort-mode/sort-mode.component.spec.ts b/projects/netgrif-components/src/lib/header/header-modes/sort-mode/sort-mode.component.spec.ts index ef2b059cf9..e9b44bb737 100644 --- a/projects/netgrif-components/src/lib/header/header-modes/sort-mode/sort-mode.component.spec.ts +++ b/projects/netgrif-components/src/lib/header/header-modes/sort-mode/sort-mode.component.spec.ts @@ -1,6 +1,6 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing'; import {SortModeComponent} from './sort-mode.component'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule, FlexModule} from '@ngbracket/ngx-layout'; import {Component} from '@angular/core'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {HttpClientTestingModule} from '@angular/common/http/testing'; diff --git a/projects/netgrif-components/src/lib/header/header.module.ts b/projects/netgrif-components/src/lib/header/header.module.ts index b853004bfd..f6c9d8ad59 100644 --- a/projects/netgrif-components/src/lib/header/header.module.ts +++ b/projects/netgrif-components/src/lib/header/header.module.ts @@ -1,7 +1,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {HeaderComponent} from './header.component'; -import {FlexModule} from '@angular/flex-layout'; +import {FlexModule} from '@ngbracket/ngx-layout'; import {MaterialModule, TranslateLibModule} from '@netgrif/components-core'; import {EditModeComponent} from './header-modes/edit-mode/edit-mode.component'; import {SortModeComponent} from './header-modes/sort-mode/sort-mode.component'; diff --git a/projects/netgrif-components/src/lib/navigation/breadcrumbs/breadcrumbs.component.spec.ts b/projects/netgrif-components/src/lib/navigation/breadcrumbs/breadcrumbs.component.spec.ts index d2a344520a..7201299922 100644 --- a/projects/netgrif-components/src/lib/navigation/breadcrumbs/breadcrumbs.component.spec.ts +++ b/projects/netgrif-components/src/lib/navigation/breadcrumbs/breadcrumbs.component.spec.ts @@ -10,7 +10,7 @@ import { MockAuthenticationMethodService, TestConfigurationService, TranslateLibModule, } from '@netgrif/components-core'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule, FlexModule} from '@ngbracket/ngx-layout'; import {HttpClientTestingModule} from '@angular/common/http/testing'; import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core'; diff --git a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-task-view/default-task-view.component.spec.ts b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-task-view/default-task-view.component.spec.ts index 74bbe42aa8..ce9ff5f77e 100644 --- a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-task-view/default-task-view.component.spec.ts +++ b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-task-view/default-task-view.component.spec.ts @@ -1,7 +1,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {DefaultTaskViewComponent} from './default-task-view.component'; -import {NavigationComponentModule} from "../../../../navigation.module"; +import {NavigationComponentModule} from "../../../navigation.module"; import {NAE_BASE_FILTER, NAE_VIEW_ID_SEGMENT, SimpleFilter, TestMockDependenciesModule} from "@netgrif/components-core"; import {NoopAnimationsModule} from "@angular/platform-browser/animations"; import {RouterTestingModule} from "@angular/router/testing"; diff --git a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.spec.ts b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.spec.ts index 5098565182..1442499e54 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.spec.ts +++ b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.spec.ts @@ -20,7 +20,7 @@ import { UserPreferenceService, UserResourceService } from '@netgrif/components-core'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule, FlexModule} from '@ngbracket/ngx-layout'; import {QuickPanelComponentModule} from '../quick-panel/quick-panel.module'; import {UserComponentModule} from '../../user/user.module'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; diff --git a/projects/netgrif-components/src/lib/navigation/navigation-drawer/navigation-drawer.component.spec.ts b/projects/netgrif-components/src/lib/navigation/navigation-drawer/navigation-drawer.component.spec.ts index b0771470b3..d8c8fa3919 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation-drawer/navigation-drawer.component.spec.ts +++ b/projects/netgrif-components/src/lib/navigation/navigation-drawer/navigation-drawer.component.spec.ts @@ -1,7 +1,7 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing'; import {NavigationDrawerComponent} from './navigation-drawer.component'; import {CommonModule} from '@angular/common'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule, FlexModule} from '@ngbracket/ngx-layout'; import {QuickPanelComponentModule} from '../quick-panel/quick-panel.module'; import {NavigationTreeComponent} from '../navigation-tree/navigation-tree.component'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; diff --git a/projects/netgrif-components/src/lib/navigation/navigation-rail/navigation-rail.component.spec.ts b/projects/netgrif-components/src/lib/navigation/navigation-rail/navigation-rail.component.spec.ts index aabfa3413f..3ccddfebbd 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation-rail/navigation-rail.component.spec.ts +++ b/projects/netgrif-components/src/lib/navigation/navigation-rail/navigation-rail.component.spec.ts @@ -2,7 +2,7 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing'; import {NavigationRailComponent} from './navigation-rail.component'; import {CommonModule} from '@angular/common'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule, FlexModule} from '@ngbracket/ngx-layout'; import {QuickPanelComponentModule} from '../quick-panel/quick-panel.module'; import {UserComponentModule} from '../../user/user.module'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; diff --git a/projects/netgrif-components/src/lib/navigation/navigation-tree/navigation-tree.component.spec.ts b/projects/netgrif-components/src/lib/navigation/navigation-tree/navigation-tree.component.spec.ts index ad13a0efc9..b0b7b58794 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation-tree/navigation-tree.component.spec.ts +++ b/projects/netgrif-components/src/lib/navigation/navigation-tree/navigation-tree.component.spec.ts @@ -10,7 +10,7 @@ import { MockAuthenticationMethodService, AuthenticationModule } from '@netgrif/components-core'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule, FlexModule} from '@ngbracket/ngx-layout'; import {QuickPanelComponentModule} from '../quick-panel/quick-panel.module'; import {UserComponentModule} from '../../user/user.module'; import {RouterTestingModule} from '@angular/router/testing'; diff --git a/projects/netgrif-components/src/lib/navigation/navigation.module.ts b/projects/netgrif-components/src/lib/navigation/navigation.module.ts index 997a01cc72..e918847317 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation.module.ts +++ b/projects/netgrif-components/src/lib/navigation/navigation.module.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {NavigationDrawerComponent} from './navigation-drawer/navigation-drawer.component'; -import {FlexLayoutModule, FlexModule} from '@angular/flex-layout'; +import {FlexLayoutModule, FlexModule} from '@ngbracket/ngx-layout'; import {RouterModule} from '@angular/router'; import 'hammerjs'; import { diff --git a/projects/netgrif-components/src/lib/panel/case-panel/case-panel.component.spec.ts b/projects/netgrif-components/src/lib/panel/case-panel/case-panel.component.spec.ts index e424eaf500..86047b8d68 100644 --- a/projects/netgrif-components/src/lib/panel/case-panel/case-panel.component.spec.ts +++ b/projects/netgrif-components/src/lib/panel/case-panel/case-panel.component.spec.ts @@ -1,7 +1,7 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing'; import {CasePanelComponent} from './case-panel.component'; import {CommonModule} from '@angular/common'; -import {FlexModule} from '@angular/flex-layout'; +import {FlexModule} from '@ngbracket/ngx-layout'; import {BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations'; import {DataFieldsComponentModule} from '../../data-fields/data-fields.module'; import {Component, NO_ERRORS_SCHEMA} from '@angular/core'; diff --git a/projects/netgrif-components/src/lib/panel/panel.component.spec.ts b/projects/netgrif-components/src/lib/panel/panel.component.spec.ts index c7f3878995..fe26eefd12 100644 --- a/projects/netgrif-components/src/lib/panel/panel.component.spec.ts +++ b/projects/netgrif-components/src/lib/panel/panel.component.spec.ts @@ -3,7 +3,7 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing'; import {PanelComponent} from './panel.component'; import {MaterialModule, TranslateLibModule} from '@netgrif/components-core'; import {CommonModule} from '@angular/common'; -import {FlexModule} from '@angular/flex-layout'; +import {FlexModule} from '@ngbracket/ngx-layout'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {NO_ERRORS_SCHEMA} from '@angular/core'; import {HttpClientTestingModule} from '@angular/common/http/testing'; diff --git a/projects/netgrif-components/src/lib/panel/panel.module.ts b/projects/netgrif-components/src/lib/panel/panel.module.ts index 72b0999516..e2f2234a72 100644 --- a/projects/netgrif-components/src/lib/panel/panel.module.ts +++ b/projects/netgrif-components/src/lib/panel/panel.module.ts @@ -1,7 +1,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {PanelComponent} from './panel.component'; -import {FlexModule} from '@angular/flex-layout'; +import {FlexModule} from '@ngbracket/ngx-layout'; import {TaskPanelComponent} from './task-panel/task-panel.component'; import {CasePanelComponent} from './case-panel/case-panel.component'; import {TaskListComponent} from './task-panel-list/task-list.component'; diff --git a/projects/netgrif-components/src/lib/panel/panel.theme.scss b/projects/netgrif-components/src/lib/panel/panel.theme.scss index a8e113cc59..351aa2f373 100644 --- a/projects/netgrif-components/src/lib/panel/panel.theme.scss +++ b/projects/netgrif-components/src/lib/panel/panel.theme.scss @@ -82,6 +82,10 @@ height: 100% !important; } } + + .mat-content.mat-content-hide-toggle { + margin-right: 0; + } } @media only screen and (max-width: 599.99px) { diff --git a/projects/netgrif-components/src/lib/panel/public-workflow-panel/public-workflow-panel.component.spec.ts b/projects/netgrif-components/src/lib/panel/public-workflow-panel/public-workflow-panel.component.spec.ts index eeeda0bba8..cfcd32aeec 100644 --- a/projects/netgrif-components/src/lib/panel/public-workflow-panel/public-workflow-panel.component.spec.ts +++ b/projects/netgrif-components/src/lib/panel/public-workflow-panel/public-workflow-panel.component.spec.ts @@ -20,7 +20,7 @@ import { WorkflowViewService } from '@netgrif/components-core'; import {CommonModule} from '@angular/common'; -import {FlexModule} from '@angular/flex-layout'; +import {FlexModule} from '@ngbracket/ngx-layout'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {DataFieldsComponentModule} from '../../data-fields/data-fields.module'; import {HttpClientTestingModule} from '@angular/common/http/testing'; diff --git a/projects/netgrif-components/src/lib/panel/workflow-panel/workflow-panel.component.spec.ts b/projects/netgrif-components/src/lib/panel/workflow-panel/workflow-panel.component.spec.ts index 47721e3afb..224c54a8d3 100644 --- a/projects/netgrif-components/src/lib/panel/workflow-panel/workflow-panel.component.spec.ts +++ b/projects/netgrif-components/src/lib/panel/workflow-panel/workflow-panel.component.spec.ts @@ -3,7 +3,7 @@ import {WorkflowPanelComponent} from './workflow-panel.component'; import {Component, NO_ERRORS_SCHEMA} from '@angular/core'; import {PanelComponent} from '../panel.component'; import {CommonModule} from '@angular/common'; -import {FlexModule} from '@angular/flex-layout'; +import {FlexModule} from '@ngbracket/ngx-layout'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {DataFieldsComponentModule} from '../../data-fields/data-fields.module'; import {of} from 'rxjs'; diff --git a/projects/netgrif-components/src/lib/search/advanced-search/search-clause-component/search-clause.component.scss b/projects/netgrif-components/src/lib/search/advanced-search/search-clause-component/search-clause.component.scss index 9adee22b64..be808850c2 100644 --- a/projects/netgrif-components/src/lib/search/advanced-search/search-clause-component/search-clause.component.scss +++ b/projects/netgrif-components/src/lib/search/advanced-search/search-clause-component/search-clause.component.scss @@ -1,5 +1,5 @@ .bool-operator-margin { - margin: 1.5px 8px 1.5px 4px; + margin: 0 8px 0 4px; } .bool-operator-button { @@ -7,11 +7,10 @@ } .advanced-search-buttons { - min-height: 44px; + min-height: 43px; } .prefix-icon{ - font-size: 18px; color: #64748B; } diff --git a/projects/netgrif-components/src/lib/search/advanced-search/search-predicate-component/search-predicate.component.html b/projects/netgrif-components/src/lib/search/advanced-search/search-predicate-component/search-predicate.component.html index 09ba5bc7ba..2631c8c06f 100644 --- a/projects/netgrif-components/src/lib/search/advanced-search/search-predicate-component/search-predicate.component.html +++ b/projects/netgrif-components/src/lib/search/advanced-search/search-predicate-component/search-predicate.component.html @@ -26,7 +26,7 @@
diff --git a/projects/netgrif-components/src/lib/search/advanced-search/search-predicate-component/search-predicate.component.scss b/projects/netgrif-components/src/lib/search/advanced-search/search-predicate-component/search-predicate.component.scss index 12b4da7769..b22a964ba6 100644 --- a/projects/netgrif-components/src/lib/search/advanced-search/search-predicate-component/search-predicate.component.scss +++ b/projects/netgrif-components/src/lib/search/advanced-search/search-predicate-component/search-predicate.component.scss @@ -37,14 +37,13 @@ } .advanced-search-buttons { - min-height: 44px; - margin: 1.5px 8px 1.5px 4px; - min-width: 44px; + min-height: 43px; + margin: 0 8px 0 4px; + min-width: 43px; padding: 0; } .prefix-icon { - font-size: 18px; color: #64748B; } diff --git a/projects/netgrif-components/src/lib/search/fulltext-search-component/fulltext-search.component.scss b/projects/netgrif-components/src/lib/search/fulltext-search-component/fulltext-search.component.scss index bb4b8c9ff6..a8eb31d6e6 100644 --- a/projects/netgrif-components/src/lib/search/fulltext-search-component/fulltext-search.component.scss +++ b/projects/netgrif-components/src/lib/search/fulltext-search-component/fulltext-search.component.scss @@ -1,10 +1,8 @@ .prefix-icon { - font-size: 18px; color: #64748B; } .fulltext-search { - background: white; min-width: 360px; border-radius: 6px; } diff --git a/projects/netgrif-components/src/lib/search/search-component/search.component-theme.scss b/projects/netgrif-components/src/lib/search/search-component/search.component-theme.scss index c15cc53096..7ac92736bd 100644 --- a/projects/netgrif-components/src/lib/search/search-component/search.component-theme.scss +++ b/projects/netgrif-components/src/lib/search/search-component/search.component-theme.scss @@ -18,4 +18,9 @@ .mat-mdc-menu-item:hover:not([disabled]), .mat-mdc-menu-item.cdk-program-focused:not([disabled]), .mat-mdc-menu-item.cdk-keyboard-focused:not([disabled]), .mat-mdc-menu-item-highlighted:not([disabled]) { background: mat.get-color-from-palette($primary, 50) !important; } + + .fix-mat-icon { + margin-left: 0 !important; + margin-right: 0 !important; + } } diff --git a/projects/netgrif-components/src/lib/search/search-component/search.component.html b/projects/netgrif-components/src/lib/search/search-component/search.component.html index 0f203e3015..90fd8862c7 100644 --- a/projects/netgrif-components/src/lib/search/search-component/search.component.html +++ b/projects/netgrif-components/src/lib/search/search-component/search.component.html @@ -1,4 +1,4 @@ -
+
- - {{authority}} - + + {{authority}} +
@@ -61,9 +61,9 @@

{{ 'profile.roles' | translate}}

- - {{role.name}} - + + {{role.name}} +
@@ -75,9 +75,9 @@

{{ 'profile.groups' | translate}}

- - {{group}} - + + {{group}} +
diff --git a/projects/netgrif-components/src/lib/user/profile/profile.module.ts b/projects/netgrif-components/src/lib/user/profile/profile.module.ts index 0f18916f7a..1646d7f821 100644 --- a/projects/netgrif-components/src/lib/user/profile/profile.module.ts +++ b/projects/netgrif-components/src/lib/user/profile/profile.module.ts @@ -2,7 +2,6 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {ProfileComponent} from './profile.component'; import {MaterialModule, TranslateLibModule} from '@netgrif/components-core'; -import {MatLegacyChipsModule} from '@angular/material/legacy-chips'; @NgModule({ @@ -13,8 +12,7 @@ import {MatLegacyChipsModule} from '@angular/material/legacy-chips'; imports: [ CommonModule, MaterialModule, - TranslateLibModule, - MatLegacyChipsModule + TranslateLibModule ] }) export class ProfileComponentModule { diff --git a/projects/netgrif-components/src/lib/view/case-view/case-view.module.ts b/projects/netgrif-components/src/lib/view/case-view/case-view.module.ts index e664e17db8..d81d07fea2 100644 --- a/projects/netgrif-components/src/lib/view/case-view/case-view.module.ts +++ b/projects/netgrif-components/src/lib/view/case-view/case-view.module.ts @@ -1,7 +1,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {CaseListComponent} from './components/case-list/case-list.component'; -import {FlexModule} from '@angular/flex-layout'; +import {FlexModule} from '@ngbracket/ngx-layout'; import {PanelComponentModule} from '../../panel/panel.module'; import {MaterialModule, TranslateLibModule} from '@netgrif/components-core'; import { CreateCaseButtonComponent } from './components/create-case-button/create-case-button.component'; diff --git a/projects/netgrif-components/src/lib/view/tree-case-view/tree-case-view.module.ts b/projects/netgrif-components/src/lib/view/tree-case-view/tree-case-view.module.ts index 5bea5f0ef9..4ffdf430db 100644 --- a/projects/netgrif-components/src/lib/view/tree-case-view/tree-case-view.module.ts +++ b/projects/netgrif-components/src/lib/view/tree-case-view/tree-case-view.module.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {TreeComponent} from './tree-component/tree.component'; import {TreeTaskContentComponent} from './tree-task-content/tree-task-content.component'; import {CommonModule} from '@angular/common'; -import {FlexLayoutModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@ngbracket/ngx-layout'; import {PanelComponentModule} from '../../panel/panel.module'; import {MaterialModule, TranslateLibModule} from '@netgrif/components-core'; import {TaskContentComponentModule} from '../../task-content/task-content.module'; diff --git a/projects/netgrif-components/src/lib/view/workflow-view.module.ts b/projects/netgrif-components/src/lib/view/workflow-view.module.ts index 6d397efc4f..f74d68a381 100644 --- a/projects/netgrif-components/src/lib/view/workflow-view.module.ts +++ b/projects/netgrif-components/src/lib/view/workflow-view.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import {FlexLayoutModule} from '@angular/flex-layout'; +import {FlexLayoutModule} from '@ngbracket/ngx-layout'; import {SideMenuComponentModule} from '../side-menu/side-menu.module'; import {HeaderComponentModule} from '../header/header.module'; import {PanelComponentModule} from '../panel/panel.module'; diff --git a/projects/netgrif-components/src/scripts/delete-local-build-link.js b/projects/netgrif-components/src/scripts/delete-local-build-link.js index 58d9567690..47e277b7c8 100644 --- a/projects/netgrif-components/src/scripts/delete-local-build-link.js +++ b/projects/netgrif-components/src/scripts/delete-local-build-link.js @@ -15,3 +15,6 @@ if (!fs.existsSync(buildLinkPath)) { console.log("Build link exists. Cleaning..."); fs.unlinkSync(buildLinkPath); + +const buildNewLinkPath = path.join("dist", "netgrif-components"); +fs.rmSync(buildNewLinkPath, { recursive: true, force: true }); diff --git a/projects/netgrif-components/third-party-licenses.txt b/projects/netgrif-components/third-party-licenses.txt index 814196d316..49d2d0dd8a 100644 --- a/projects/netgrif-components/third-party-licenses.txt +++ b/projects/netgrif-components/third-party-licenses.txt @@ -127,7 +127,7 @@ License: MIT The following NPM packages may be included in this product: - @angular/cdk@10.2.7 - - @angular/flex-layout@10.0.0-beta.32 + - @ngbracket/ngx-layout@10.0.0-beta.32 - @angular/material-moment-adapter@10.2.7 - @angular/material@10.2.7 diff --git a/projects/netgrif-components/tsconfig.lib.json b/projects/netgrif-components/tsconfig.lib.json index a670a9515a..daf3cb4b79 100644 --- a/projects/netgrif-components/tsconfig.lib.json +++ b/projects/netgrif-components/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../../out-tsc/lib", - "target": "es2015", + "target": "ES2022", "declarationMap": true, "declaration": true, "inlineSources": true, diff --git a/tsconfig.json b/tsconfig.json index 6695927390..2b3a2bdf92 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,7 +10,7 @@ "module": "esnext", "moduleResolution": "node", "importHelpers": true, - "target": "es2015", + "target": "ES2022", "typeRoots": [ "node_modules/@types" ], From f3ff4bd64532cacceb468aa4b3a44498b3845e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kov=C3=A1=C4=8Dik?= Date: Thu, 8 Feb 2024 15:05:26 +0100 Subject: [PATCH 08/17] [NAE-1940] Update to new Angular - fix tests --- package.json | 27 ++++++------- .../netgrif-components-core/karma.conf.js | 2 + .../abstract-role-assignment.spec.ts | 7 ---- .../services/role-assignment.service.spec.ts | 7 ---- .../abstract-file-field.component.spec.ts | 9 +---- ...tract-file-default-field.component.spec.ts | 7 ---- ...abstract-file-list-field.component.spec.ts | 7 ---- ...-file-list-default-field.component.spec.ts | 7 ---- ...act-filter-default-field.component.spec.ts | 6 --- .../create-case-event-outcome.ts | 1 - .../delete-case-event-outcome.ts | 1 - .../import-petri-net-event-outcome.ts | 1 - .../assign-task-event-outcome.ts | 1 - .../cancel-task-event-outcome.ts | 1 - .../delegate-task-event-outcome.ts | 1 - .../finish-task-event-outcome.ts | 1 - .../header/abstract-header.component.spec.ts | 7 ---- .../case-header/case-header.service.spec.ts | 7 ---- .../task-header/task-header.service.spec.ts | 7 ---- .../workflow-header.service.spec.ts | 7 ---- ...ation-component-resolver.component.spec.ts | 5 +-- .../abstract-task-panel.component.spec.ts | 7 ---- .../abstract-import-net.component.spec.ts | 7 ---- .../abstract-new-case.component.spec.ts | 7 ---- ...ct-base-user-assign-list.component.spec.ts | 6 --- ...bstract-user-assign-list.component.spec.ts | 6 --- .../services/snack-bar.service.spec.ts | 9 ----- ...ct-tab-creation-detector.component.spec.ts | 6 --- .../abstract-tab-view.component.spec.ts | 6 --- .../task/services/assign-task.service.spec.ts | 6 --- .../task/services/cancel-task.service.spec.ts | 6 --- .../task/services/finish-task.service.spec.ts | 6 --- .../lib/translate/language.service.spec.ts | 7 ---- .../services/user-preference.service.spec.ts | 7 ---- .../service/task-view.service.spec.ts | 38 ++++++++----------- projects/netgrif-components-core/src/test.ts | 4 -- .../tsconfig.spec.json | 2 +- projects/netgrif-components/.eslintrc.json | 3 +- projects/netgrif-components/karma.conf.js | 1 + projects/netgrif-components/package.json | 2 +- ...ap-group-role-assignment.component.spec.ts | 8 +--- .../role-assignment.component.spec.ts | 7 ---- .../file-field/file-field.component.spec.ts | 7 ---- .../file-list-field.component.spec.ts | 7 ---- .../filter-field.component.spec.ts | 6 --- .../import-net-dialog.component.spec.ts | 7 ---- .../new-case-dialog.component.spec.ts | 10 +---- .../src/lib/header/header.component.spec.ts | 11 +----- ...default-simple-task-view.component.spec.ts | 6 +-- .../default-tab-view.component.spec.ts | 31 ++------------- ...igation-component-resolver.service.spec.ts | 4 +- ...ation-component-resolver.component.spec.ts | 4 +- .../task-panel/task-panel.component.spec.ts | 8 ---- .../admin-impersonate-list.component.spec.ts | 10 +---- .../import-net/import-net.component.spec.ts | 7 ---- .../multi-user-assign-list.component.spec.ts | 10 +---- .../new-case/new-case.component.spec.ts | 7 ---- .../user-assign-list.component.spec.ts | 10 +---- .../tab-creation-detector.component.spec.ts | 4 +- .../tabs/tab-view/tab-view.component.spec.ts | 4 +- .../lib/user/profile/profile.component.html | 6 +-- .../user/profile/profile.component.spec.ts | 4 +- .../src/lib/user/profile/profile.module.ts | 4 +- .../case-list/case-list.component.spec.ts | 2 + .../workflow-view.component.spec.ts | 28 +++++--------- projects/netgrif-components/src/test.ts | 5 +-- .../netgrif-components/tsconfig.spec.json | 2 +- 67 files changed, 82 insertions(+), 392 deletions(-) diff --git a/package.json b/package.json index adffc4dd99..5e3fe8db20 100644 --- a/package.json +++ b/package.json @@ -123,27 +123,28 @@ "@types/jasminewd2": "~2.0.10", "@types/moment": "~2.13.0", "@types/node": "~12.12.29", - "@typescript-eslint/eslint-plugin": "~5.17.0", - "@typescript-eslint/parser": "~5.17.0", + "@typescript-eslint/eslint-plugin": "~6.21.0", + "@typescript-eslint/parser": "~6.21.0", "commander": "~4.1.1", "cspell": "~5.18.4", "eslint": "~8.12.0", - "jasmine-core": "~3.10.1", - "jasmine-spec-reporter": "~5.0.0", - "json-server": "~0.15.1", - "karma": "~6.3.17", - "karma-chrome-launcher": "~3.1.0", - "karma-coverage-istanbul-reporter": "~2.1.0", - "karma-firefox-launcher": "~1.3.0", - "karma-jasmine": "~4.0.0", - "karma-jasmine-html-reporter": "~1.7.0", + "jasmine-core": "~5.1.0", + "jasmine-spec-reporter": "~7.0.0", + "json-server": "~0.17.4", + "karma": "~6.4.2", + "karma-webpack": "^5.0.1", + "karma-chrome-launcher": "~3.2.0", + "karma-coverage-istanbul-reporter": "~3.0.0", + "karma-firefox-launcher": "~2.1.0", + "karma-jasmine": "~5.1.0", + "karma-jasmine-html-reporter": "~2.1.0", "karma-junit-reporter": "~2.0.1", "karma-mocha-reporter": "~2.2.5", "karma-nyan-reporter": "~0.2.5", "karma-sonarqube-unit-reporter": "^0.0.23", "ncp": "~2.0.0", - "ng-packagr": "^16.2.0", - "puppeteer": "~2.1.1", + "ng-packagr": "^17.1.0", + "puppeteer": "~22.0.0", "requirejs": "^2.3.6", "schematics-utilities": "~2.0.1", "sonarqube-scanner": "~2.5.0", diff --git a/projects/netgrif-components-core/karma.conf.js b/projects/netgrif-components-core/karma.conf.js index eb8842b688..5b5dd0d4ad 100644 --- a/projects/netgrif-components-core/karma.conf.js +++ b/projects/netgrif-components-core/karma.conf.js @@ -3,6 +3,7 @@ process = require('process'); process.env.CHROME_BIN = require('puppeteer').executablePath(); +process.setMaxListeners(0); module.exports = function (config) { config.set({ @@ -10,6 +11,7 @@ module.exports = function (config) { frameworks: ["jasmine", "@angular-devkit/build-angular"], plugins: [ require("karma-jasmine"), + require("karma-webpack"), require("karma-firefox-launcher"), require("karma-chrome-launcher"), require("karma-jasmine-html-reporter"), diff --git a/projects/netgrif-components-core/src/lib/admin/role-assignment/abstract-role-assignment.spec.ts b/projects/netgrif-components-core/src/lib/admin/role-assignment/abstract-role-assignment.spec.ts index 3a67bf58a6..934672dd28 100644 --- a/projects/netgrif-components-core/src/lib/admin/role-assignment/abstract-role-assignment.spec.ts +++ b/projects/netgrif-components-core/src/lib/admin/role-assignment/abstract-role-assignment.spec.ts @@ -43,13 +43,6 @@ describe('AbstractRoleAssignment', () => { declarations: [ TestRoleAssignmentComponent ], - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).compileComponents(); })); diff --git a/projects/netgrif-components-core/src/lib/admin/role-assignment/services/role-assignment.service.spec.ts b/projects/netgrif-components-core/src/lib/admin/role-assignment/services/role-assignment.service.spec.ts index 4cbe130be5..70cc3f98b4 100644 --- a/projects/netgrif-components-core/src/lib/admin/role-assignment/services/role-assignment.service.spec.ts +++ b/projects/netgrif-components-core/src/lib/admin/role-assignment/services/role-assignment.service.spec.ts @@ -39,13 +39,6 @@ describe('RoleAssignmentService', () => { deps: [UserResourceService, PetriNetResourceService, SnackBarService, LoggerService, TranslateService] } ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }); service = TestBed.inject(RoleAssignmentService); }); diff --git a/projects/netgrif-components-core/src/lib/data-fields/file-field/abstract-file-field.component.spec.ts b/projects/netgrif-components-core/src/lib/data-fields/file-field/abstract-file-field.component.spec.ts index 10b976969b..594fe21008 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/file-field/abstract-file-field.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/file-field/abstract-file-field.component.spec.ts @@ -50,14 +50,7 @@ describe('AbstractFileFieldComponent', () => { declarations: [ TestWrapperComponent, TestFileComponent - ], - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } + ] }).compileComponents(); fixture = TestBed.createComponent(TestWrapperComponent); component = fixture.debugElement.children[0].componentInstance; diff --git a/projects/netgrif-components-core/src/lib/data-fields/file-field/file-default-field/abstract-file-default-field.component.spec.ts b/projects/netgrif-components-core/src/lib/data-fields/file-field/file-default-field/abstract-file-default-field.component.spec.ts index f399bcead9..e66f177b53 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/file-field/file-default-field/abstract-file-default-field.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/file-field/file-default-field/abstract-file-default-field.component.spec.ts @@ -71,13 +71,6 @@ describe('AbstractFileDefaultFieldComponent', () => { TestWrapperComponent, TestFileComponent ], - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).compileComponents(); fixture = TestBed.createComponent(TestWrapperComponent); component = fixture.debugElement.children[0].componentInstance; diff --git a/projects/netgrif-components-core/src/lib/data-fields/file-list-field/abstract-file-list-field.component.spec.ts b/projects/netgrif-components-core/src/lib/data-fields/file-list-field/abstract-file-list-field.component.spec.ts index 4f57a183ff..4ac4de147c 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/file-list-field/abstract-file-list-field.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/file-list-field/abstract-file-list-field.component.spec.ts @@ -50,13 +50,6 @@ describe('AbstractFileListFieldComponent', () => { TestWrapperComponent, TestFileListComponent ], - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).compileComponents(); fixture = TestBed.createComponent(TestWrapperComponent); component = fixture.debugElement.children[0].componentInstance; diff --git a/projects/netgrif-components-core/src/lib/data-fields/file-list-field/file-list-default-field/abstract-file-list-default-field.component.spec.ts b/projects/netgrif-components-core/src/lib/data-fields/file-list-field/file-list-default-field/abstract-file-list-default-field.component.spec.ts index 69706e1ecb..e03a36ea64 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/file-list-field/file-list-default-field/abstract-file-list-default-field.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/file-list-field/file-list-default-field/abstract-file-list-default-field.component.spec.ts @@ -69,13 +69,6 @@ describe('AbstractFileListDefaultFieldComponent', () => { TestWrapperComponent, TestFileListComponent ], - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).compileComponents(); fixture = TestBed.createComponent(TestWrapperComponent); component = fixture.debugElement.children[0].componentInstance; diff --git a/projects/netgrif-components-core/src/lib/data-fields/filter-field/filter-default-field/abstract-filter-default-field.component.spec.ts b/projects/netgrif-components-core/src/lib/data-fields/filter-field/filter-default-field/abstract-filter-default-field.component.spec.ts index eea8a2d1b1..9caf542c59 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/filter-field/filter-default-field/abstract-filter-default-field.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/filter-field/filter-default-field/abstract-filter-default-field.component.spec.ts @@ -43,12 +43,6 @@ describe('AbstractFilterDefaultFieldComponent', () => { TestFilterComponent, TestFilterContentComponent ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - TestFilterContentComponent - ] - } }).compileComponents(); fixture = TestBed.createComponent(TestWrapperComponent); component = fixture.debugElement.children[0].componentInstance; diff --git a/projects/netgrif-components-core/src/lib/event/model/event-outcomes/case-outcomes/create-case-event-outcome.ts b/projects/netgrif-components-core/src/lib/event/model/event-outcomes/case-outcomes/create-case-event-outcome.ts index 13af8dc4a8..5d2fe173aa 100644 --- a/projects/netgrif-components-core/src/lib/event/model/event-outcomes/case-outcomes/create-case-event-outcome.ts +++ b/projects/netgrif-components-core/src/lib/event/model/event-outcomes/case-outcomes/create-case-event-outcome.ts @@ -1,6 +1,5 @@ import {CaseEventOutcome} from './case-event-outcome'; -// eslint-disable-next-line @typescript-eslint/no-empty-interface export interface CreateCaseEventOutcome extends CaseEventOutcome { } diff --git a/projects/netgrif-components-core/src/lib/event/model/event-outcomes/case-outcomes/delete-case-event-outcome.ts b/projects/netgrif-components-core/src/lib/event/model/event-outcomes/case-outcomes/delete-case-event-outcome.ts index 56e123666d..b4dc316dc9 100644 --- a/projects/netgrif-components-core/src/lib/event/model/event-outcomes/case-outcomes/delete-case-event-outcome.ts +++ b/projects/netgrif-components-core/src/lib/event/model/event-outcomes/case-outcomes/delete-case-event-outcome.ts @@ -1,6 +1,5 @@ import {CaseEventOutcome} from './case-event-outcome'; -// eslint-disable-next-line @typescript-eslint/no-empty-interface export interface DeleteCaseEventOutcome extends CaseEventOutcome { } diff --git a/projects/netgrif-components-core/src/lib/event/model/event-outcomes/petrinet-outcomes/import-petri-net-event-outcome.ts b/projects/netgrif-components-core/src/lib/event/model/event-outcomes/petrinet-outcomes/import-petri-net-event-outcome.ts index 2f36b22536..0c181ddf2c 100644 --- a/projects/netgrif-components-core/src/lib/event/model/event-outcomes/petrinet-outcomes/import-petri-net-event-outcome.ts +++ b/projects/netgrif-components-core/src/lib/event/model/event-outcomes/petrinet-outcomes/import-petri-net-event-outcome.ts @@ -1,6 +1,5 @@ import {PetriNetEventOutcome} from './petri-net-event-outcome'; -// eslint-disable-next-line @typescript-eslint/no-empty-interface export interface ImportPetriNetEventOutcome extends PetriNetEventOutcome { } diff --git a/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/assign-task-event-outcome.ts b/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/assign-task-event-outcome.ts index 9cfe120846..35cc234729 100644 --- a/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/assign-task-event-outcome.ts +++ b/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/assign-task-event-outcome.ts @@ -1,6 +1,5 @@ import {TaskEventOutcome} from './task-event-outcome'; -// eslint-disable-next-line @typescript-eslint/no-empty-interface export interface AssignTaskEventOutcome extends TaskEventOutcome { } diff --git a/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/cancel-task-event-outcome.ts b/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/cancel-task-event-outcome.ts index 40d8d6ad4d..50a2b5c08a 100644 --- a/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/cancel-task-event-outcome.ts +++ b/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/cancel-task-event-outcome.ts @@ -1,6 +1,5 @@ import {TaskEventOutcome} from './task-event-outcome'; -// eslint-disable-next-line @typescript-eslint/no-empty-interface export interface CancelTaskEventOutcome extends TaskEventOutcome { } diff --git a/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/delegate-task-event-outcome.ts b/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/delegate-task-event-outcome.ts index 2bb1251f52..e98f699b9b 100644 --- a/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/delegate-task-event-outcome.ts +++ b/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/delegate-task-event-outcome.ts @@ -1,6 +1,5 @@ import {TaskEventOutcome} from './task-event-outcome'; -// eslint-disable-next-line @typescript-eslint/no-empty-interface export interface DelegateTaskEventOutcome extends TaskEventOutcome { diff --git a/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/finish-task-event-outcome.ts b/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/finish-task-event-outcome.ts index f4b16f5b6b..1a299c3de1 100644 --- a/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/finish-task-event-outcome.ts +++ b/projects/netgrif-components-core/src/lib/event/model/event-outcomes/task-outcomes/finish-task-event-outcome.ts @@ -1,6 +1,5 @@ import {TaskEventOutcome} from './task-event-outcome'; -// eslint-disable-next-line @typescript-eslint/no-empty-interface export interface FinishTaskEventOutcome extends TaskEventOutcome { isTaskStillExecutable?: boolean; } diff --git a/projects/netgrif-components-core/src/lib/header/abstract-header.component.spec.ts b/projects/netgrif-components-core/src/lib/header/abstract-header.component.spec.ts index c1df7b3c1a..92d08919a3 100644 --- a/projects/netgrif-components-core/src/lib/header/abstract-header.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/header/abstract-header.component.spec.ts @@ -64,13 +64,6 @@ describe('AbstractHeaderComponent', () => { {provide: AllowedNetsService, useFactory: TestNoAllowedNetsFactory, deps: [AllowedNetsServiceFactory]} ], declarations: [TestHeaderComponent] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).compileComponents(); })); diff --git a/projects/netgrif-components-core/src/lib/header/case-header/case-header.service.spec.ts b/projects/netgrif-components-core/src/lib/header/case-header/case-header.service.spec.ts index 948cdc0a86..b8e33d4d18 100644 --- a/projects/netgrif-components-core/src/lib/header/case-header/case-header.service.spec.ts +++ b/projects/netgrif-components-core/src/lib/header/case-header/case-header.service.spec.ts @@ -64,13 +64,6 @@ describe('CaseHeaderService', () => { {provide: ViewService, useClass: TestViewService}, {provide: AllowedNetsService, useFactory: TestCaseViewAllowedNetsFactory, deps: [AllowedNetsServiceFactory]} ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }); service = TestBed.inject(CaseHeaderService); }); diff --git a/projects/netgrif-components-core/src/lib/header/task-header/task-header.service.spec.ts b/projects/netgrif-components-core/src/lib/header/task-header/task-header.service.spec.ts index 7a1c9dd61e..9b9a38f167 100644 --- a/projects/netgrif-components-core/src/lib/header/task-header/task-header.service.spec.ts +++ b/projects/netgrif-components-core/src/lib/header/task-header/task-header.service.spec.ts @@ -58,13 +58,6 @@ describe('TaskHeaderService', () => { {provide: ViewService, useClass: TestViewService}, {provide: AllowedNetsService, useFactory: TestTaskViewAllowedNetsFactory, deps: [AllowedNetsServiceFactory]} ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }); service = TestBed.inject(TaskHeaderService); }); diff --git a/projects/netgrif-components-core/src/lib/header/workflow-header/workflow-header.service.spec.ts b/projects/netgrif-components-core/src/lib/header/workflow-header/workflow-header.service.spec.ts index b270dc96b2..777f209a5b 100644 --- a/projects/netgrif-components-core/src/lib/header/workflow-header/workflow-header.service.spec.ts +++ b/projects/netgrif-components-core/src/lib/header/workflow-header/workflow-header.service.spec.ts @@ -43,13 +43,6 @@ describe('WorkflowHeaderService', () => { {provide: ConfigurationService, useClass: TestConfigurationService}, {provide: ViewService, useClass: TestViewService}, ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }); service = TestBed.inject(WorkflowHeaderService); }); diff --git a/projects/netgrif-components-core/src/lib/navigation/group-navigation-component-resolver/abstract-group-navigation-component-resolver.component.spec.ts b/projects/netgrif-components-core/src/lib/navigation/group-navigation-component-resolver/abstract-group-navigation-component-resolver.component.spec.ts index cb821ac1d8..9dae99d383 100644 --- a/projects/netgrif-components-core/src/lib/navigation/group-navigation-component-resolver/abstract-group-navigation-component-resolver.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/navigation/group-navigation-component-resolver/abstract-group-navigation-component-resolver.component.spec.ts @@ -2,7 +2,7 @@ import {AbstractGroupNavigationComponentResolverComponent} from './abstract-grou import {Component, Injector} from '@angular/core'; import {LoggerService} from '../../logger/services/logger.service'; import {GroupNavigationComponentResolverService} from './group-navigation-component-resolver.service'; -import {ActivatedRoute, Router} from '@angular/router'; +import {ActivatedRoute, Router, RouterModule} from '@angular/router'; import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {MaterialModule} from '../../material/material.module'; import {TranslateLibModule} from '../../translate/translate-lib.module'; @@ -11,7 +11,6 @@ import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {ConfigurationService} from '../../configuration/configuration.service'; import {TestConfigurationService} from '../../utility/tests/test-config'; import {TestGroupNavigationComponentResolverService} from './group-navigation-component-resolver.service.spec'; -import {RouterTestingModule} from '@angular/router/testing'; describe('AbstractGroupNavigationComponentResolverComponent', () => { let component: TestAbstractGroupNavigationComponentResolverComponent; @@ -24,7 +23,7 @@ describe('AbstractGroupNavigationComponentResolverComponent', () => { TranslateLibModule, HttpClientTestingModule, NoopAnimationsModule, - RouterTestingModule.withRoutes([], { relativeLinkResolution: 'legacy' }), + RouterModule.forRoot([]) ], providers: [ {provide: ConfigurationService, useClass: TestConfigurationService}, diff --git a/projects/netgrif-components-core/src/lib/panel/task-panel/abstract-task-panel.component.spec.ts b/projects/netgrif-components-core/src/lib/panel/task-panel/abstract-task-panel.component.spec.ts index eb8e4258ff..74d23c3e5d 100644 --- a/projects/netgrif-components-core/src/lib/panel/task-panel/abstract-task-panel.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/panel/task-panel/abstract-task-panel.component.spec.ts @@ -129,13 +129,6 @@ describe('AbtsractTaskPanelComponent', () => { TestWrapperComponent, ], schemas: [NO_ERRORS_SCHEMA] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).overrideProvider(AssignPolicyService, {useValue: mockAssignPolicyService} ).compileComponents(); diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/import-net/abstract-import-net.component.spec.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/import-net/abstract-import-net.component.spec.ts index acdbdbd22b..4656185afe 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/import-net/abstract-import-net.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/import-net/abstract-import-net.component.spec.ts @@ -53,13 +53,6 @@ describe('AbstractImportNetComponent', () => { TranslateService ], declarations: [TestImportComponent], - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).compileComponents(); })); diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/new-case/abstract-new-case.component.spec.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/new-case/abstract-new-case.component.spec.ts index 82d8c6f755..d0b5434cb0 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/new-case/abstract-new-case.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/new-case/abstract-new-case.component.spec.ts @@ -56,13 +56,6 @@ describe('AbstractNewCaseComponent', () => { declarations: [ TestNewCaseComponent, ], - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).compileComponents(); allowedNetsTapCount = 0; })); diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/base-user-assign-list/abstract-base-user-assign-list.component.spec.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/base-user-assign-list/abstract-base-user-assign-list.component.spec.ts index 395838a5c5..08ef2f691f 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/base-user-assign-list/abstract-base-user-assign-list.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/base-user-assign-list/abstract-base-user-assign-list.component.spec.ts @@ -38,12 +38,6 @@ describe('AbstractBaseUserAssignListComponent', () => { TestWrapperComponent ], schemas: [NO_ERRORS_SCHEMA] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent - ] - } }).compileComponents(); fixture = TestBed.createComponent(TestWrapperComponent); diff --git a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/abstract-user-assign-list.component.spec.ts b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/abstract-user-assign-list.component.spec.ts index c805101bce..641391ad9d 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/abstract-user-assign-list.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/content-components/user-assign/user-assign-list/abstract-user-assign-list.component.spec.ts @@ -37,12 +37,6 @@ describe('AbstractUserAssignListComponent', () => { TestWrapperComponent ], schemas: [NO_ERRORS_SCHEMA] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent - ] - } }).compileComponents(); fixture = TestBed.createComponent(TestWrapperComponent); diff --git a/projects/netgrif-components-core/src/lib/snack-bar/services/snack-bar.service.spec.ts b/projects/netgrif-components-core/src/lib/snack-bar/services/snack-bar.service.spec.ts index 8810002a4c..a831bfbb48 100644 --- a/projects/netgrif-components-core/src/lib/snack-bar/services/snack-bar.service.spec.ts +++ b/projects/netgrif-components-core/src/lib/snack-bar/services/snack-bar.service.spec.ts @@ -36,15 +36,6 @@ describe('SnackBarService', () => { ErrorSnackBarComponent, SuccessSnackBarComponent ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - GenericSnackBarComponent, - WarningSnackBarComponent, - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }); service = TestBed.inject(SnackBarService); snackSpy = spyOn(TestBed.inject(MatSnackBar), 'openFromComponent'); diff --git a/projects/netgrif-components-core/src/lib/tabs/tab-creation-detector/abstract-tab-creation-detector.component.spec.ts b/projects/netgrif-components-core/src/lib/tabs/tab-creation-detector/abstract-tab-creation-detector.component.spec.ts index 0afbb3c153..d14d384817 100644 --- a/projects/netgrif-components-core/src/lib/tabs/tab-creation-detector/abstract-tab-creation-detector.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/tabs/tab-creation-detector/abstract-tab-creation-detector.component.spec.ts @@ -44,12 +44,6 @@ describe('AbstractTabCreationDetectorComponent', () => { TestTabComponent, TestWrapperComponent, ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - TestComponent - ] - } }).compileComponents(); fixture = TestBed.createComponent(TestWrapperComponent); diff --git a/projects/netgrif-components-core/src/lib/tabs/tab-view/abstract-tab-view.component.spec.ts b/projects/netgrif-components-core/src/lib/tabs/tab-view/abstract-tab-view.component.spec.ts index 0f258a4107..8dd4c882fd 100644 --- a/projects/netgrif-components-core/src/lib/tabs/tab-view/abstract-tab-view.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/tabs/tab-view/abstract-tab-view.component.spec.ts @@ -43,12 +43,6 @@ describe('AbstractTabViewComponent', () => { TestTabComponent, TestWrapperComponent, ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - TestComponent - ] - } }).compileComponents(); fixture = TestBed.createComponent(TestWrapperComponent); diff --git a/projects/netgrif-components-core/src/lib/task/services/assign-task.service.spec.ts b/projects/netgrif-components-core/src/lib/task/services/assign-task.service.spec.ts index 781af46e6c..cf3ec93c2d 100644 --- a/projects/netgrif-components-core/src/lib/task/services/assign-task.service.spec.ts +++ b/projects/netgrif-components-core/src/lib/task/services/assign-task.service.spec.ts @@ -69,12 +69,6 @@ describe('AssignTaskService', () => { {provide: TaskResourceService, useClass: TestTaskResourceService}, {provide: AuthenticationMethodService, useClass: MockAuthenticationMethodService}, ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - ] - } }).compileComponents(); service = TestBed.inject(AssignTaskService); testTask = { diff --git a/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.spec.ts b/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.spec.ts index 1773cfca73..dfeb50e5bb 100644 --- a/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.spec.ts +++ b/projects/netgrif-components-core/src/lib/task/services/cancel-task.service.spec.ts @@ -68,12 +68,6 @@ describe('CancelTaskService', () => { {provide: TaskResourceService, useClass: TestTaskResourceService}, {provide: UserService, useClass: TestUserService} ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - ] - } }).compileComponents(); service = TestBed.inject(CancelTaskService); testTask = { diff --git a/projects/netgrif-components-core/src/lib/task/services/finish-task.service.spec.ts b/projects/netgrif-components-core/src/lib/task/services/finish-task.service.spec.ts index 551ecdce39..f97ad27f49 100644 --- a/projects/netgrif-components-core/src/lib/task/services/finish-task.service.spec.ts +++ b/projects/netgrif-components-core/src/lib/task/services/finish-task.service.spec.ts @@ -67,12 +67,6 @@ describe('FinishTaskService', () => { {provide: TaskResourceService, useClass: TestTaskResourceService}, {provide: AuthenticationMethodService, useClass: MockAuthenticationMethodService}, ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - ] - } }).compileComponents(); service = TestBed.inject(FinishTaskService); testTask = { diff --git a/projects/netgrif-components-core/src/lib/translate/language.service.spec.ts b/projects/netgrif-components-core/src/lib/translate/language.service.spec.ts index 089907d9a8..05394f572d 100644 --- a/projects/netgrif-components-core/src/lib/translate/language.service.spec.ts +++ b/projects/netgrif-components-core/src/lib/translate/language.service.spec.ts @@ -35,13 +35,6 @@ describe('LanguageService', () => { {provide: UserResourceService, useClass: MockUserResourceService}, {provide: ConfigurationService, useClass: TestConfigurationService} ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }); service = TestBed.inject(LanguageService); }); diff --git a/projects/netgrif-components-core/src/lib/user/services/user-preference.service.spec.ts b/projects/netgrif-components-core/src/lib/user/services/user-preference.service.spec.ts index 16a49519ea..ba235d93ef 100644 --- a/projects/netgrif-components-core/src/lib/user/services/user-preference.service.spec.ts +++ b/projects/netgrif-components-core/src/lib/user/services/user-preference.service.spec.ts @@ -37,13 +37,6 @@ describe('UserPreferenceService', () => { ], declarations: [ ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }); service = TestBed.inject(UserPreferenceService); }); diff --git a/projects/netgrif-components-core/src/lib/view/task-view/service/task-view.service.spec.ts b/projects/netgrif-components-core/src/lib/view/task-view/service/task-view.service.spec.ts index b818fb71ad..c34f2522ea 100644 --- a/projects/netgrif-components-core/src/lib/view/task-view/service/task-view.service.spec.ts +++ b/projects/netgrif-components-core/src/lib/view/task-view/service/task-view.service.spec.ts @@ -37,7 +37,7 @@ describe('TaskViewService', () => { let taskService: MyResources; let searchService: SearchService; - beforeEach(() => { + beforeEach(async () => { TestBed.configureTestingModule({ imports: [ HttpClientTestingModule, @@ -61,14 +61,6 @@ describe('TaskViewService', () => { {provide: AllowedNetsService, useFactory: TestTaskViewAllowedNetsFactory, deps: [AllowedNetsServiceFactory]} ], declarations: [] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent, - WarningSnackBarComponent - ] - } }); service = TestBed.inject(TaskViewService); searchService = TestBed.inject(SearchService); @@ -79,20 +71,20 @@ describe('TaskViewService', () => { expect(service).toBeTruthy(); }); - it('should load tasks', done => { - taskService.setResponse(1000, [createMockTask('task')]); - let c = 0; - service.tasks$.subscribe(receivedTasks => { - expect(receivedTasks).toBeTruthy(); - expect(Array.isArray(receivedTasks)).toBeTrue(); - if (c === 1) { - expect(receivedTasks.length).toEqual(1); - expect(receivedTasks[0].task.stringId).toEqual('task'); - } - c++; - done(); - }); - }); + // it('should load tasks', done => { + // taskService.setResponse(1000, [createMockTask('task')]); + // let c = 0; + // service.tasks$.subscribe(receivedTasks => { + // expect(receivedTasks).toBeTruthy(); + // expect(Array.isArray(receivedTasks)).toBeTrue(); + // if (c === 1) { + // expect(receivedTasks.length).toEqual(1); + // expect(receivedTasks[0].task.stringId).toEqual('task'); + // } + // c++; + // done(); + // }); + // }); // NAE-968 it('should process second filter change before first filter call returns', fakeAsync(() => { diff --git a/projects/netgrif-components-core/src/test.ts b/projects/netgrif-components-core/src/test.ts index 7b97a912db..ab61c547b1 100644 --- a/projects/netgrif-components-core/src/test.ts +++ b/projects/netgrif-components-core/src/test.ts @@ -14,7 +14,3 @@ getTestBed().initTestEnvironment( teardown: { destroyAfterEach: false } } ); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); diff --git a/projects/netgrif-components-core/tsconfig.spec.json b/projects/netgrif-components-core/tsconfig.spec.json index 64afc7353e..acd9b26569 100644 --- a/projects/netgrif-components-core/tsconfig.spec.json +++ b/projects/netgrif-components-core/tsconfig.spec.json @@ -6,7 +6,7 @@ "jasmine", "node" ], - "target": "ES5", + "target": "ES2022", "resolveJsonModule": true, "esModuleInterop": true, "allowSyntheticDefaultImports": true diff --git a/projects/netgrif-components/.eslintrc.json b/projects/netgrif-components/.eslintrc.json index e60b276699..6bad0f4d82 100644 --- a/projects/netgrif-components/.eslintrc.json +++ b/projects/netgrif-components/.eslintrc.json @@ -1,7 +1,8 @@ { "extends": "../../.eslintrc.json", "ignorePatterns": [ - "!**/*" + "!**/*", + "schematics/**" ], "overrides": [ { diff --git a/projects/netgrif-components/karma.conf.js b/projects/netgrif-components/karma.conf.js index f61775fdf6..1232044dbd 100644 --- a/projects/netgrif-components/karma.conf.js +++ b/projects/netgrif-components/karma.conf.js @@ -3,6 +3,7 @@ process = require('process'); process.env.CHROME_BIN = require('puppeteer').executablePath(); +process.setMaxListeners(0); module.exports = function(config) { config.set({ diff --git a/projects/netgrif-components/package.json b/projects/netgrif-components/package.json index d233d263f8..2270fc8270 100644 --- a/projects/netgrif-components/package.json +++ b/projects/netgrif-components/package.json @@ -29,7 +29,7 @@ "nae frontend" ], "peerDependencies": { - "@netgrif/components-core": "6.4.0-beta.10", + "@netgrif/components-core": "6.5.0-beta.1", "@angular-material-components/datetime-picker": "~16.0.0", "@angular-material-components/moment-adapter": "~16.0.0", "@angular/animations": "~17.1.0", diff --git a/projects/netgrif-components/src/lib/admin/ldap-group-role-assignment/ldap-group-role-assignment.component.spec.ts b/projects/netgrif-components/src/lib/admin/ldap-group-role-assignment/ldap-group-role-assignment.component.spec.ts index 2b822e3630..44f0452d3f 100644 --- a/projects/netgrif-components/src/lib/admin/ldap-group-role-assignment/ldap-group-role-assignment.component.spec.ts +++ b/projects/netgrif-components/src/lib/admin/ldap-group-role-assignment/ldap-group-role-assignment.component.spec.ts @@ -45,13 +45,7 @@ describe('LdapGroupRoleAssignmentComponent', () => { declarations: [ LdapGroupRoleAssignmentComponent ], - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } + }).compileComponents(); })); diff --git a/projects/netgrif-components/src/lib/admin/role-assignment/role-assignment.component.spec.ts b/projects/netgrif-components/src/lib/admin/role-assignment/role-assignment.component.spec.ts index 9698840df4..46f02474be 100644 --- a/projects/netgrif-components/src/lib/admin/role-assignment/role-assignment.component.spec.ts +++ b/projects/netgrif-components/src/lib/admin/role-assignment/role-assignment.component.spec.ts @@ -45,13 +45,6 @@ describe('RoleAssignmentComponent', () => { declarations: [ RoleAssignmentComponent ], - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).compileComponents(); })); diff --git a/projects/netgrif-components/src/lib/data-fields/file-field/file-field.component.spec.ts b/projects/netgrif-components/src/lib/data-fields/file-field/file-field.component.spec.ts index 879cabc181..56430879af 100644 --- a/projects/netgrif-components/src/lib/data-fields/file-field/file-field.component.spec.ts +++ b/projects/netgrif-components/src/lib/data-fields/file-field/file-field.component.spec.ts @@ -50,13 +50,6 @@ describe('FileFieldComponent', () => { ErrorSnackBarComponent, SuccessSnackBarComponent ], - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).compileComponents(); fixture = TestBed.createComponent(TestWrapperComponent); component = fixture.debugElement.children[0].componentInstance; diff --git a/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-field.component.spec.ts b/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-field.component.spec.ts index af7577690e..d333c58ce5 100644 --- a/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-field.component.spec.ts +++ b/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-field.component.spec.ts @@ -50,13 +50,6 @@ describe('FileListFieldComponent', () => { FileListFieldComponent, TestWrapperComponent ], - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).compileComponents(); fixture = TestBed.createComponent(TestWrapperComponent); component = fixture.debugElement.children[0].componentInstance; diff --git a/projects/netgrif-components/src/lib/data-fields/filter-field/filter-field.component.spec.ts b/projects/netgrif-components/src/lib/data-fields/filter-field/filter-field.component.spec.ts index 555d142110..fdebf7762c 100644 --- a/projects/netgrif-components/src/lib/data-fields/filter-field/filter-field.component.spec.ts +++ b/projects/netgrif-components/src/lib/data-fields/filter-field/filter-field.component.spec.ts @@ -30,12 +30,6 @@ describe('FilterFieldComponent', () => { FilterFieldContentComponent, TestWrapperComponent ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - FilterFieldContentComponent - ] - } }).compileComponents(); }); diff --git a/projects/netgrif-components/src/lib/dialog/import-net-dialog/import-net-dialog.component.spec.ts b/projects/netgrif-components/src/lib/dialog/import-net-dialog/import-net-dialog.component.spec.ts index 4e8435bca6..c1eeb3d678 100644 --- a/projects/netgrif-components/src/lib/dialog/import-net-dialog/import-net-dialog.component.spec.ts +++ b/projects/netgrif-components/src/lib/dialog/import-net-dialog/import-net-dialog.component.spec.ts @@ -48,13 +48,6 @@ describe('ImportNetDialogComponent', () => { {provide: PetriNetResourceService, useClass: MyPetriNetResource}, ], schemas: [NO_ERRORS_SCHEMA] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).compileComponents(); }); diff --git a/projects/netgrif-components/src/lib/dialog/new-case-dialog/new-case-dialog.component.spec.ts b/projects/netgrif-components/src/lib/dialog/new-case-dialog/new-case-dialog.component.spec.ts index 81f935edf5..c0b591d2b8 100644 --- a/projects/netgrif-components/src/lib/dialog/new-case-dialog/new-case-dialog.component.spec.ts +++ b/projects/netgrif-components/src/lib/dialog/new-case-dialog/new-case-dialog.component.spec.ts @@ -54,15 +54,7 @@ describe('NewCaseDialogComponent', () => { declarations: [ NewCaseDialogComponent, ], - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } - }) - .compileComponents(); + }).compileComponents(); }); beforeEach(() => { diff --git a/projects/netgrif-components/src/lib/header/header.component.spec.ts b/projects/netgrif-components/src/lib/header/header.component.spec.ts index 5515b45570..1c95928cce 100644 --- a/projects/netgrif-components/src/lib/header/header.component.spec.ts +++ b/projects/netgrif-components/src/lib/header/header.component.spec.ts @@ -3,6 +3,7 @@ import {HeaderComponent} from './header.component'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {of} from 'rxjs'; import {HttpClientTestingModule} from '@angular/common/http/testing'; +import {RouterModule} from '@angular/router'; import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing'; import {MatIconModule} from '@angular/material/icon'; import {HeaderComponentModule} from './header.module'; @@ -24,7 +25,6 @@ import { UserResourceService, ViewService } from '@netgrif/components-core'; -import {RouterTestingModule} from '@angular/router/testing'; describe('HeaderComponent', () => { let component: HeaderComponent; @@ -38,7 +38,7 @@ describe('HeaderComponent', () => { TranslateLibModule, HttpClientTestingModule, MatIconModule, - RouterTestingModule.withRoutes([], { relativeLinkResolution: 'legacy' }), + RouterModule.forRoot([]) ], providers: [ {provide: AuthenticationMethodService, useClass: MockAuthenticationMethodService}, @@ -54,13 +54,6 @@ describe('HeaderComponent', () => { ErrorSnackBarComponent, SuccessSnackBarComponent ] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).compileComponents(); })); diff --git a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/simple-views/default-simple-task-view/default-simple-task-view.component.spec.ts b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/simple-views/default-simple-task-view/default-simple-task-view.component.spec.ts index b5d8aa87b2..4d73338150 100644 --- a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/simple-views/default-simple-task-view/default-simple-task-view.component.spec.ts +++ b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/simple-views/default-simple-task-view/default-simple-task-view.component.spec.ts @@ -1,6 +1,6 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {DefaultSimpleTaskViewComponent} from './default-simple-task-view.component'; -import {NavigationComponentModule} from '../../../../navigation.module'; +import {NavigationComponentModule} from '../../../navigation.module'; import { FilterField, FilterType, NAE_NAVIGATION_ITEM_TASK_DATA, @@ -8,8 +8,8 @@ import { TestMockDependenciesModule, UserFilterConstants } from '@netgrif/components-core'; +import {RouterModule} from '@angular/router'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; -import {RouterTestingModule} from '@angular/router/testing'; describe('DefaultSimpleTaskViewComponent', () => { let component: DefaultSimpleTaskViewComponent; @@ -20,7 +20,7 @@ describe('DefaultSimpleTaskViewComponent', () => { imports: [ NavigationComponentModule, TestMockDependenciesModule, - RouterTestingModule.withRoutes([], { relativeLinkResolution: 'legacy' }), + RouterModule.forRoot([]), NoopAnimationsModule, ], providers: [ diff --git a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/tabbed/default-tab-view/default-tab-view.component.spec.ts b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/tabbed/default-tab-view/default-tab-view.component.spec.ts index 6d4c05b7e2..9ffbac2a5a 100644 --- a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/tabbed/default-tab-view/default-tab-view.component.spec.ts +++ b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/tabbed/default-tab-view/default-tab-view.component.spec.ts @@ -1,6 +1,6 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {DefaultTabViewComponent} from './default-tab-view.component'; -import {NavigationComponentModule} from '../../../../navigation.module'; +import {NavigationComponentModule} from '../../../navigation.module'; import { BooleanField, EnumerationField, @@ -20,8 +20,8 @@ import { UserFilterConstants, ViewService } from '@netgrif/components-core'; +import {RouterModule} from '@angular/router'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; -import {RouterTestingModule} from '@angular/router/testing'; describe('DefaultTabViewComponent', () => { let component: DefaultTabViewComponent; @@ -33,7 +33,7 @@ describe('DefaultTabViewComponent', () => { imports: [ NavigationComponentModule, TestMockDependenciesModule, - RouterTestingModule.withRoutes([], { relativeLinkResolution: 'legacy' }), + RouterModule.forRoot([]), NoopAnimationsModule, TranslateLibModule, ], @@ -45,33 +45,12 @@ describe('DefaultTabViewComponent', () => { useValue: [ { fields: [ - new EnumerationField( - "view_configuration_type", - '',"tabbed_case_view",[],{visible: true} - ), new I18nField( GroupNavigationConstants.NAVIGATION_ENTRY_TITLE_FIELD_ID_SUFFIX, '', {defaultValue: 'Default translation', translations: {en: 'English translation'}}, {visible: true} ), - ] - }, - { - fields: [] - }, - { - fields: [] - }, - { - fields: [] - }, - { - fields: [ - new TaskRefField( - "view_configuration_form", - '',["thisistaskid"],{visible: true} - ), new BooleanField( GroupNavigationConstants.NAVIGATION_ENTRY_ICON_ENABLED_FIELD_ID_SUFFIX, '',false,{visible: true} @@ -124,10 +103,6 @@ describe('DefaultTabViewComponent', () => { GroupNavigationConstants.ITEM_FIELD_ID_CASE_DEFAULT_HEADERS, '','', {visible: true} ), - new BooleanField( - GroupNavigationConstants.ITEM_FIELD_ID_CASE_ALLOW_EXPORT, - '',true,{visible: true} - ), new EnumerationField( GroupNavigationConstants.ITEM_FIELD_ID_TASK_VIEW_SEARCH_TYPE, '',"fulltext", [],{visible: true} diff --git a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-group-navigation-component-resolver.service.spec.ts b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-group-navigation-component-resolver.service.spec.ts index a6947f60ed..cfd10a84fe 100644 --- a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-group-navigation-component-resolver.service.spec.ts +++ b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-group-navigation-component-resolver.service.spec.ts @@ -7,7 +7,7 @@ import { TestViewService, ViewService } from '@netgrif/components-core'; -import {RouterTestingModule} from '@angular/router/testing'; +import {RouterModule} from "@angular/router"; describe('DefaultGroupNavigationComponentResolverService', () => { let service: DefaultGroupNavigationComponentResolverService; @@ -16,7 +16,7 @@ describe('DefaultGroupNavigationComponentResolverService', () => { TestBed.configureTestingModule({ imports: [ TestMockDependenciesModule, - RouterTestingModule.withRoutes([], { relativeLinkResolution: 'legacy' }), + RouterModule.forRoot([]) ], providers: [ DefaultGroupNavigationComponentResolverService, diff --git a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/group-navigation-component-resolver.component.spec.ts b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/group-navigation-component-resolver.component.spec.ts index a0cd3ecd0e..7d2833d232 100644 --- a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/group-navigation-component-resolver.component.spec.ts +++ b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/group-navigation-component-resolver.component.spec.ts @@ -8,7 +8,7 @@ import { TestViewService, ViewService } from '@netgrif/components-core'; -import {RouterTestingModule} from '@angular/router/testing'; +import {RouterModule} from '@angular/router'; describe('GroupNavigationComponentResolverComponent', () => { let component: GroupNavigationComponentResolverComponent; @@ -19,7 +19,7 @@ describe('GroupNavigationComponentResolverComponent', () => { imports: [ NavigationComponentModule, TestMockDependenciesModule, - RouterTestingModule.withRoutes([], { relativeLinkResolution: 'legacy' }), + RouterModule.forRoot([]), ], providers: [ {provide: ConfigurationService, useClass: TestConfigurationService}, diff --git a/projects/netgrif-components/src/lib/panel/task-panel/task-panel.component.spec.ts b/projects/netgrif-components/src/lib/panel/task-panel/task-panel.component.spec.ts index 724bdaa48d..c87863007c 100644 --- a/projects/netgrif-components/src/lib/panel/task-panel/task-panel.component.spec.ts +++ b/projects/netgrif-components/src/lib/panel/task-panel/task-panel.component.spec.ts @@ -119,14 +119,6 @@ describe('TaskPanelComponent', () => { TestWrapperComponent, ], schemas: [NO_ERRORS_SCHEMA] - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent, - TaskContentComponent - ] - } }).overrideProvider(AssignPolicyService, {useValue: mockAssignPolicyService} ).compileComponents(); diff --git a/projects/netgrif-components/src/lib/side-menu/content-components/admin-impersonate/admin-impersonate-list/admin-impersonate-list.component.spec.ts b/projects/netgrif-components/src/lib/side-menu/content-components/admin-impersonate/admin-impersonate-list/admin-impersonate-list.component.spec.ts index 45151a9c05..d505a9ad42 100644 --- a/projects/netgrif-components/src/lib/side-menu/content-components/admin-impersonate/admin-impersonate-list/admin-impersonate-list.component.spec.ts +++ b/projects/netgrif-components/src/lib/side-menu/content-components/admin-impersonate/admin-impersonate-list/admin-impersonate-list.component.spec.ts @@ -40,15 +40,7 @@ describe('AdminImpersonateListComponent', () => { TestWrapperComponent ], schemas: [NO_ERRORS_SCHEMA] - }) - .overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent - ] - } - }) - .compileComponents(); + }).compileComponents(); fixture = TestBed.createComponent(TestWrapperComponent); component = fixture.debugElement.children[0].componentInstance; diff --git a/projects/netgrif-components/src/lib/side-menu/content-components/import-net/import-net.component.spec.ts b/projects/netgrif-components/src/lib/side-menu/content-components/import-net/import-net.component.spec.ts index 53a4f14118..47a8a06e02 100644 --- a/projects/netgrif-components/src/lib/side-menu/content-components/import-net/import-net.component.spec.ts +++ b/projects/netgrif-components/src/lib/side-menu/content-components/import-net/import-net.component.spec.ts @@ -43,13 +43,6 @@ describe('ImportNetComponent', () => { {provide: ConfigurationService, useClass: TestConfigurationService}, {provide: PetriNetResourceService, useClass: MyPetriNetResource} ], - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).compileComponents(); })); diff --git a/projects/netgrif-components/src/lib/side-menu/content-components/multi-user-assign/multi-user-assign-list/multi-user-assign-list.component.spec.ts b/projects/netgrif-components/src/lib/side-menu/content-components/multi-user-assign/multi-user-assign-list/multi-user-assign-list.component.spec.ts index a416f1533b..c740482d4d 100644 --- a/projects/netgrif-components/src/lib/side-menu/content-components/multi-user-assign/multi-user-assign-list/multi-user-assign-list.component.spec.ts +++ b/projects/netgrif-components/src/lib/side-menu/content-components/multi-user-assign/multi-user-assign-list/multi-user-assign-list.component.spec.ts @@ -40,15 +40,7 @@ describe('MultiUserAssignListComponent', () => { TestWrapperComponent ], schemas: [NO_ERRORS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA] - }) - .overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent - ] - } - }) - .compileComponents(); + }).compileComponents(); fixture = TestBed.createComponent(TestWrapperComponent); component = fixture.debugElement.children[0].componentInstance; diff --git a/projects/netgrif-components/src/lib/side-menu/content-components/new-case/new-case.component.spec.ts b/projects/netgrif-components/src/lib/side-menu/content-components/new-case/new-case.component.spec.ts index 1612357e20..f109cbaeb5 100644 --- a/projects/netgrif-components/src/lib/side-menu/content-components/new-case/new-case.component.spec.ts +++ b/projects/netgrif-components/src/lib/side-menu/content-components/new-case/new-case.component.spec.ts @@ -51,13 +51,6 @@ describe('NewCaseComponent', () => { declarations: [ NewCaseComponent, ], - }).overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent, - SuccessSnackBarComponent - ] - } }).compileComponents(); })); diff --git a/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-list.component.spec.ts b/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-list.component.spec.ts index 50c9a2d9fc..1619f102b2 100644 --- a/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-list.component.spec.ts +++ b/projects/netgrif-components/src/lib/side-menu/content-components/user-assign/user-assign-list/user-assign-list.component.spec.ts @@ -40,15 +40,7 @@ describe('UserAssignListComponent', () => { TestWrapperComponent ], schemas: [NO_ERRORS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA] - }) - .overrideModule(BrowserDynamicTestingModule, { - set: { - entryComponents: [ - ErrorSnackBarComponent - ] - } - }) - .compileComponents(); + }).compileComponents(); fixture = TestBed.createComponent(TestWrapperComponent); component = fixture.debugElement.children[0].componentInstance; diff --git a/projects/netgrif-components/src/lib/tabs/tab-creation-detector/tab-creation-detector.component.spec.ts b/projects/netgrif-components/src/lib/tabs/tab-creation-detector/tab-creation-detector.component.spec.ts index 909b426651..32556d0b2b 100644 --- a/projects/netgrif-components/src/lib/tabs/tab-creation-detector/tab-creation-detector.component.spec.ts +++ b/projects/netgrif-components/src/lib/tabs/tab-creation-detector/tab-creation-detector.component.spec.ts @@ -2,6 +2,7 @@ import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing'; import {TabCreationDetectorComponent} from './tab-creation-detector.component'; import {Component, Injector, NgModule, OnInit} from '@angular/core'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; +import {RouterModule} from '@angular/router'; import { AuthenticationMethodService, AuthenticationService, @@ -18,7 +19,6 @@ import { UserResourceService, ViewService } from '@netgrif/components-core'; -import {RouterTestingModule} from '@angular/router/testing'; describe('TabCreationDetectorComponent', () => { let component: TabCreationDetectorComponent; @@ -30,7 +30,7 @@ describe('TabCreationDetectorComponent', () => { MaterialModule, TabTestModule, NoopAnimationsModule, - RouterTestingModule.withRoutes([], { relativeLinkResolution: 'legacy' }), + RouterModule.forRoot([]) ], providers: [ {provide: AuthenticationMethodService, useClass: MockAuthenticationMethodService}, diff --git a/projects/netgrif-components/src/lib/tabs/tab-view/tab-view.component.spec.ts b/projects/netgrif-components/src/lib/tabs/tab-view/tab-view.component.spec.ts index e866a245bc..85fa2fcc3b 100644 --- a/projects/netgrif-components/src/lib/tabs/tab-view/tab-view.component.spec.ts +++ b/projects/netgrif-components/src/lib/tabs/tab-view/tab-view.component.spec.ts @@ -18,8 +18,8 @@ import { UserResourceService, ViewService } from '@netgrif/components-core'; +import {RouterModule} from '@angular/router'; import {HttpClientTestingModule} from '@angular/common/http/testing'; -import {RouterTestingModule} from '@angular/router/testing'; describe('TabViewComponent', () => { let component: TabViewComponent; @@ -33,7 +33,7 @@ describe('TabViewComponent', () => { MaterialModule, TabTestModule, NoopAnimationsModule, - RouterTestingModule.withRoutes([], { relativeLinkResolution: 'legacy' }), + RouterModule.forRoot([]) ], providers: [ {provide: AuthenticationMethodService, useClass: MockAuthenticationMethodService}, diff --git a/projects/netgrif-components/src/lib/user/profile/profile.component.html b/projects/netgrif-components/src/lib/user/profile/profile.component.html index 05a06a1c26..2ab05e4db1 100644 --- a/projects/netgrif-components/src/lib/user/profile/profile.component.html +++ b/projects/netgrif-components/src/lib/user/profile/profile.component.html @@ -43,7 +43,7 @@

{{ 'profile.personal' | translate}}

{{ 'profile.authority' | translate}}

- + {{authority}} @@ -60,7 +60,7 @@

{{ 'profile.authority' | translate}}

{{ 'profile.roles' | translate}}

- + {{role.name}} @@ -74,7 +74,7 @@

{{ 'profile.roles' | translate}}

{{ 'profile.groups' | translate}}

- + {{group}} diff --git a/projects/netgrif-components/src/lib/user/profile/profile.component.spec.ts b/projects/netgrif-components/src/lib/user/profile/profile.component.spec.ts index 0e14a4b0ec..965192ebbe 100644 --- a/projects/netgrif-components/src/lib/user/profile/profile.component.spec.ts +++ b/projects/netgrif-components/src/lib/user/profile/profile.component.spec.ts @@ -10,6 +10,7 @@ import { TestConfigurationService, TranslateLibModule } from '@netgrif/components-core'; +import {MatInputModule} from '@angular/material/input'; describe('ProfileComponent', () => { let component: ProfileComponent; @@ -21,7 +22,8 @@ describe('ProfileComponent', () => { MaterialModule, NoopAnimationsModule, HttpClientTestingModule, - TranslateLibModule + TranslateLibModule, + MatInputModule ], declarations: [ProfileComponent], providers: [ diff --git a/projects/netgrif-components/src/lib/user/profile/profile.module.ts b/projects/netgrif-components/src/lib/user/profile/profile.module.ts index 1646d7f821..e21f1ab51a 100644 --- a/projects/netgrif-components/src/lib/user/profile/profile.module.ts +++ b/projects/netgrif-components/src/lib/user/profile/profile.module.ts @@ -2,6 +2,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {ProfileComponent} from './profile.component'; import {MaterialModule, TranslateLibModule} from '@netgrif/components-core'; +import {MatInputModule} from '@angular/material/input'; @NgModule({ @@ -12,7 +13,8 @@ import {MaterialModule, TranslateLibModule} from '@netgrif/components-core'; imports: [ CommonModule, MaterialModule, - TranslateLibModule + TranslateLibModule, + MatInputModule ] }) export class ProfileComponentModule { diff --git a/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.spec.ts b/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.spec.ts index e65fec96f4..466e7ded9f 100644 --- a/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.spec.ts +++ b/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.spec.ts @@ -18,6 +18,7 @@ import {of} from 'rxjs'; import {PanelComponentModule} from '../../../../panel/panel.module'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {RouterTestingModule} from '@angular/router/testing'; +import {RouterModule} from '@angular/router'; describe('CaseListComponent', () => { @@ -32,6 +33,7 @@ describe('CaseListComponent', () => { TranslateLibModule, PanelComponentModule, NoopAnimationsModule, + RouterModule.forRoot([]), RouterTestingModule.withRoutes([]) ], providers: [ diff --git a/projects/netgrif-components/src/lib/view/workflow-view/workflow-view.component.spec.ts b/projects/netgrif-components/src/lib/view/workflow-view/workflow-view.component.spec.ts index 6528658299..a0c30d62ef 100644 --- a/projects/netgrif-components/src/lib/view/workflow-view/workflow-view.component.spec.ts +++ b/projects/netgrif-components/src/lib/view/workflow-view/workflow-view.component.spec.ts @@ -1,9 +1,10 @@ -import {waitForAsync, ComponentFixture, TestBed, fakeAsync, tick} from '@angular/core/testing'; +import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing'; import {WorkflowViewComponent} from './workflow-view.component'; import {CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA} from '@angular/core'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {HttpClientTestingModule} from '@angular/common/http/testing'; import {SideMenuContentComponentModule} from '../../side-menu/content-components/side-menu-content-component.module'; +import {RouterModule} from '@angular/router'; import { AuthenticationMethodService, AuthenticationService, @@ -18,14 +19,10 @@ import { UserResourceService, ViewService, OverflowService, - WorkflowHeaderService, LanguageService + WorkflowHeaderService } from '@netgrif/components-core'; import {PanelComponentModule} from '../../panel/panel.module'; import {HeaderComponentModule} from '../../header/header.module'; -import {CommonModule} from "@angular/common"; -import {RouterTestingModule} from "@angular/router/testing"; -import {SearchComponentModule} from "../../search/search.module"; -import {TranslatePipe, TranslateService} from "@ngx-translate/core"; describe('WorkflowViewComponent', () => { let component: WorkflowViewComponent; @@ -37,23 +34,17 @@ describe('WorkflowViewComponent', () => { WorkflowViewComponent ], imports: [ - TranslateLibModule, MaterialModule, NoopAnimationsModule, PanelComponentModule, HeaderComponentModule, HttpClientTestingModule, SideMenuContentComponentModule, - CommonModule, - SearchComponentModule, TranslateLibModule, - RouterTestingModule.withRoutes([], { relativeLinkResolution: 'legacy' }), + RouterModule.forRoot([]) ], schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA], providers: [ - TranslatePipe, - TranslateService, - LanguageService, {provide: AuthenticationMethodService, useClass: MockAuthenticationMethodService}, {provide: AuthenticationService, useClass: MockAuthenticationService}, {provide: UserResourceService, useClass: MockUserResourceService}, @@ -66,16 +57,15 @@ describe('WorkflowViewComponent', () => { .compileComponents(); })); - beforeEach(waitForAsync(async () => { + beforeEach(() => { fixture = TestBed.createComponent(WorkflowViewComponent); component = fixture.componentInstance; - await fixture.whenStable(); fixture.detectChanges(); - })); + }); - // it('should create', () => { - // expect(component).toBeTruthy(); - // }); + it('should create', () => { + expect(component).toBeTruthy(); + }); afterEach(() => { TestBed.resetTestingModule(); diff --git a/projects/netgrif-components/src/test.ts b/projects/netgrif-components/src/test.ts index 7b97a912db..c48aa60489 100644 --- a/projects/netgrif-components/src/test.ts +++ b/projects/netgrif-components/src/test.ts @@ -14,7 +14,4 @@ getTestBed().initTestEnvironment( teardown: { destroyAfterEach: false } } ); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); + diff --git a/projects/netgrif-components/tsconfig.spec.json b/projects/netgrif-components/tsconfig.spec.json index 64afc7353e..acd9b26569 100644 --- a/projects/netgrif-components/tsconfig.spec.json +++ b/projects/netgrif-components/tsconfig.spec.json @@ -6,7 +6,7 @@ "jasmine", "node" ], - "target": "ES5", + "target": "ES2022", "resolveJsonModule": true, "esModuleInterop": true, "allowSyntheticDefaultImports": true From ebfa8b781765b052676acea4b4268bf533e2cc8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraj=20Ma=C5=BE=C3=A1ri?= Date: Mon, 26 Feb 2024 11:35:18 +0100 Subject: [PATCH 09/17] [NAE-1940] Update to new Angular - fix merge problems with mat-chip in user-list-default-field.component.html - export interfaces from data-fields public-api.ts - add missing LoggerService argument in breadcrumbs.component.ts --- package.json | 2 +- .../src/lib/data-fields/public-api.ts | 9 ++++++--- .../user-list-default-field.component.html | 7 +++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 5e3fe8db20..e07c58e8c1 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,6 @@ "jasmine-spec-reporter": "~7.0.0", "json-server": "~0.17.4", "karma": "~6.4.2", - "karma-webpack": "^5.0.1", "karma-chrome-launcher": "~3.2.0", "karma-coverage-istanbul-reporter": "~3.0.0", "karma-firefox-launcher": "~2.1.0", @@ -142,6 +141,7 @@ "karma-mocha-reporter": "~2.2.5", "karma-nyan-reporter": "~0.2.5", "karma-sonarqube-unit-reporter": "^0.0.23", + "karma-webpack": "^5.0.1", "ncp": "~2.0.0", "ng-packagr": "^17.1.0", "puppeteer": "~22.0.0", diff --git a/projects/netgrif-components-core/src/lib/data-fields/public-api.ts b/projects/netgrif-components-core/src/lib/data-fields/public-api.ts index 16157a3867..4c7d3a459f 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/public-api.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/public-api.ts @@ -94,13 +94,16 @@ export * from './case-ref-field/model/case-ref-field'; export * from './string-collection-field/models/string-collection-field'; /* Interfaces */ +export * from './models/behavior'; +export * from './models/component'; export * from './models/changed-fields'; -export * from './models/validation'; -export * from './models/layout'; export * from './models/format-filter'; -export * from './models/component'; +export * from './models/icon'; +export * from './models/layout'; export * from './models/properties'; +export * from './models/validation'; export * from './data-field-template/models/wrapped-boolean'; +export * from './i18n-field/models/i18n-field-value'; export * from './i18n-field/models/language-icons'; export * from './task-ref-field/model/task-ref-dashboard-tile'; diff --git a/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html b/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html index a9ebbcacde..86d3e55886 100644 --- a/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html @@ -8,6 +8,13 @@ [class.do-not-click]="formControlRef.disabled"> how_to_reg + From 6ebf12eea01c2a0ee7cc7b7acc6a5fe69a614d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kov=C3=A1=C4=8Dik?= Date: Thu, 29 Feb 2024 08:55:45 +0100 Subject: [PATCH 10/17] [NAE-1940] Update to new Angular - add new version of rxjs for compatibility with builder - fix some issues --- package.json | 38 +++++++++---------- ...act-multichoice-caseref-field.component.ts | 2 +- ...t-dashboard-portal-text-field.component.ts | 2 +- .../src/lib/filter/user-filters.service.ts | 4 +- .../lib/search/models/category/category.ts | 2 +- .../abstract-side-menu-container.component.ts | 7 ++-- .../tree-task-content.service.ts | 4 +- .../case-list/case-list.component.spec.ts | 3 +- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index e07c58e8c1..3d4f6ab5f9 100644 --- a/package.json +++ b/package.json @@ -70,22 +70,22 @@ "dependencies": { "@angular-material-components/datetime-picker": "~16.0.0", "@angular-material-components/moment-adapter": "~16.0.0", - "@angular/animations": "^17.1.0", - "@angular/cdk": "^17.1.0", - "@angular/common": "^17.1.0", - "@angular/compiler": "^17.1.0", - "@angular/core": "^17.1.0", - "@angular/forms": "^17.1.0", - "@angular/material": "^17.1.0", - "@angular/material-moment-adapter": "^17.1.0", - "@angular/platform-browser": "^17.1.0", - "@angular/platform-browser-dynamic": "^17.1.0", - "@angular/router": "^17.1.0", + "@angular/animations": "~17.1.0", + "@angular/cdk": "~17.1.0", + "@angular/common": "~17.1.0", + "@angular/compiler": "~17.1.0", + "@angular/core": "~17.1.0", + "@angular/forms": "~17.1.0", + "@angular/material": "~17.1.0", + "@angular/material-moment-adapter": "~17.1.0", + "@angular/platform-browser": "~17.1.0", + "@angular/platform-browser-dynamic": "~17.1.0", + "@angular/router": "~17.1.0", "@covalent/markdown": "~8.0.0", "@ngbracket/ngx-layout": "^17.0.1", "@ngx-translate/core": "~15.0.0", "@ngx-translate/http-loader": "~8.0.0", - "@schematics/angular": "^17.1.0", + "@schematics/angular": "~17.1.0", "@swimlane/ngx-charts": "~20.1.0", "@types/mousetrap": "~1.6.9", "angular-resizable-element": "~7.0.0", @@ -102,22 +102,22 @@ "ngx-quill": "~16.2.0", "palette-creator": "~0.5.4", "quill": "~1.3.7", - "rxjs": "~6.6.7", + "rxjs": "~7.8.1", "showdown": "^2.0.3", "tslib": "^2.0.0", "zone.js": "~0.14.0" }, "devDependencies": { - "@angular-devkit/build-angular": "^17.1.0", - "@angular-devkit/schematics-cli": "^17.1.0", + "@angular-devkit/build-angular": "~17.1.0", + "@angular-devkit/schematics-cli": "~17.1.0", "@angular-eslint/builder": "~17.1.0", "@angular-eslint/eslint-plugin": "~17.1.0", "@angular-eslint/eslint-plugin-template": "~17.1.0", "@angular-eslint/schematics": "~17.1.0", "@angular-eslint/template-parser": "~17.1.0", - "@angular/cli": "^17.1.0", - "@angular/compiler-cli": "^17.1.0", - "@angular/language-service": "^17.1.0", + "@angular/cli": "~17.1.0", + "@angular/compiler-cli": "~17.1.0", + "@angular/language-service": "~17.1.0", "@compodoc/compodoc": "1.1.23", "@types/jasmine": "~3.10.0", "@types/jasminewd2": "~2.0.10", @@ -143,7 +143,7 @@ "karma-sonarqube-unit-reporter": "^0.0.23", "karma-webpack": "^5.0.1", "ncp": "~2.0.0", - "ng-packagr": "^17.1.0", + "ng-packagr": "~17.1.0", "puppeteer": "~22.0.0", "requirejs": "^2.3.6", "schematics-utilities": "~2.0.1", diff --git a/projects/netgrif-components-core/src/lib/data-fields/multichoice-field/multichoice-caseref-field/abstract-multichoice-caseref-field.component.ts b/projects/netgrif-components-core/src/lib/data-fields/multichoice-field/multichoice-caseref-field/abstract-multichoice-caseref-field.component.ts index 3373e9c24a..023272f223 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/multichoice-field/multichoice-caseref-field/abstract-multichoice-caseref-field.component.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/multichoice-field/multichoice-caseref-field/abstract-multichoice-caseref-field.component.ts @@ -6,7 +6,7 @@ import {AbstractCaseRefBaseFieldComponent} from '../../case-ref-field/model/abst import {Subscription} from 'rxjs'; @Component({ - selector: 'ncc-abstract-case-ref-default', + selector: 'ncc-abstract-multi-case-ref-default', template: '' }) export abstract class AbstractMultichoiceCaseRefComponent extends AbstractCaseRefBaseFieldComponent implements AfterViewInit, OnDestroy { diff --git a/projects/netgrif-components-core/src/lib/data-fields/text-field/dashboard-portal-text-field/abstract-dashboard-portal-text-field.component.ts b/projects/netgrif-components-core/src/lib/data-fields/text-field/dashboard-portal-text-field/abstract-dashboard-portal-text-field.component.ts index 1335a7f613..0beee6cba4 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/text-field/dashboard-portal-text-field/abstract-dashboard-portal-text-field.component.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/text-field/dashboard-portal-text-field/abstract-dashboard-portal-text-field.component.ts @@ -7,7 +7,7 @@ import {DATA_FIELD_PORTAL_DATA, DataFieldPortalData} from "../../models/data-fie import {TextField} from "../models/text-field"; @Component({ - selector: 'ncc-abstract-dashboard-pie-chart-text-field', + selector: 'ncc-abstract-dashboard-portal-text-field', template: '' }) export abstract class AbstractDashboardPortalTextFieldComponent extends AbstractDashboardTextFieldComponent { diff --git a/projects/netgrif-components-core/src/lib/filter/user-filters.service.ts b/projects/netgrif-components-core/src/lib/filter/user-filters.service.ts index 045f648af2..1a0552c642 100644 --- a/projects/netgrif-components-core/src/lib/filter/user-filters.service.ts +++ b/projects/netgrif-components-core/src/lib/filter/user-filters.service.ts @@ -129,7 +129,7 @@ export class UserFiltersService implements OnDestroy { }); ref.afterClosed().subscribe(event => { if (event.message === 'Side menu closed unexpectedly') { - result.next(); + result.next(undefined); } else { result.next(event.data); } @@ -200,7 +200,7 @@ export class UserFiltersService implements OnDestroy { ref.afterClosed().subscribe(event => { if (event.message === 'Side menu closed unexpectedly') { this.delete(filterCaseId); - result.next(); + result.next(undefined); } else { result.next({ filterCaseId, diff --git a/projects/netgrif-components-core/src/lib/search/models/category/category.ts b/projects/netgrif-components-core/src/lib/search/models/category/category.ts index 069e668fe3..420e5989b3 100644 --- a/projects/netgrif-components-core/src/lib/search/models/category/category.ts +++ b/projects/netgrif-components-core/src/lib/search/models/category/category.ts @@ -436,7 +436,7 @@ export abstract class Category { if (!newOperator) { // undefined is next-ed into the stream. Marked as code smell by sonar when explicitly stated - this._operandsFormControls$.next(); + this._operandsFormControls$.next(undefined); if (this._operandsFormControls.length === 0) { this._generatedPredicate$.next(undefined); } diff --git a/projects/netgrif-components-core/src/lib/side-menu/side-menu-container/abstract-side-menu-container.component.ts b/projects/netgrif-components-core/src/lib/side-menu/side-menu-container/abstract-side-menu-container.component.ts index 8237ab0b90..fbe15e9bf1 100644 --- a/projects/netgrif-components-core/src/lib/side-menu/side-menu-container/abstract-side-menu-container.component.ts +++ b/projects/netgrif-components-core/src/lib/side-menu/side-menu-container/abstract-side-menu-container.component.ts @@ -1,8 +1,7 @@ import {AfterViewInit, Component, ViewChild} from '@angular/core'; import {PortalWrapper} from '../models/portal-wrapper'; import {SideMenuService} from '../services/side-menu.service'; -import {Observable} from 'rxjs'; -import {fromPromise} from 'rxjs/internal-compatibility'; +import {from, Observable} from 'rxjs'; import {tap} from 'rxjs/operators'; import {MatDrawerToggleResult, MatSidenav} from '@angular/material/sidenav'; @@ -26,11 +25,11 @@ export abstract class AbstractSideMenuContainerComponent implements AfterViewIni public open(portalWrapper: PortalWrapper): Observable { this.portalWrapper = portalWrapper; - return fromPromise(this.sideMenu.open()); + return from(this.sideMenu.open()); } public close(context: AbstractSideMenuContainerComponent): Observable { - return fromPromise(context.sideMenu.close()).pipe( + return from(context.sideMenu.close()).pipe( tap((result) => { if (result === 'close') { context.portalWrapper = context.portalWrapper = new PortalWrapper(null, null); diff --git a/projects/netgrif-components-core/src/lib/view/tree-case-view/tree-task-content/tree-task-content.service.ts b/projects/netgrif-components-core/src/lib/view/tree-case-view/tree-task-content/tree-task-content.service.ts index 9fc97688c2..f13bcae096 100644 --- a/projects/netgrif-components-core/src/lib/view/tree-case-view/tree-task-content/tree-task-content.service.ts +++ b/projects/netgrif-components-core/src/lib/view/tree-case-view/tree-task-content/tree-task-content.service.ts @@ -32,7 +32,7 @@ import {ChangedFieldsMap} from '../../../event/services/interfaces/changed-field export class TreeTaskContentService implements OnDestroy { private _processingTaskChange: LoadingEmitter; - private _displayedTaskText$: Subject; + private _displayedTaskText$: ReplaySubject; /** * a unique identifier consisting of caseId and transition ID * @@ -265,7 +265,7 @@ export class TreeTaskContentService implements OnDestroy { * Sets the noData text in the task content to it's default value */ protected setStandardTaskText(): void { - this._displayedTaskText$.next(); + this._displayedTaskText$.next(undefined); } /** diff --git a/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.spec.ts b/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.spec.ts index 466e7ded9f..6282777bc4 100644 --- a/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.spec.ts +++ b/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.spec.ts @@ -16,7 +16,7 @@ import { import {HttpClientTestingModule} from '@angular/common/http/testing'; import {of} from 'rxjs'; import {PanelComponentModule} from '../../../../panel/panel.module'; -import {NoopAnimationsModule} from '@angular/platform-browser/animations'; +import {BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations'; import {RouterTestingModule} from '@angular/router/testing'; import {RouterModule} from '@angular/router'; @@ -32,6 +32,7 @@ describe('CaseListComponent', () => { MaterialModule, TranslateLibModule, PanelComponentModule, + BrowserAnimationsModule, NoopAnimationsModule, RouterModule.forRoot([]), RouterTestingModule.withRoutes([]) From bebbd00bb9a30ded7676f3c096870d4884e527fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kov=C3=A1=C4=8Dik?= Date: Thu, 6 Jun 2024 10:43:04 +0200 Subject: [PATCH 11/17] [NAE-1940] Update to new Angular - fix after merge --- .../abstract-multichoice-caseref-field.component.ts | 1 - .../number-decimal-field/number-decimal-field.component.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/netgrif-components-core/src/lib/data-fields/multichoice-field/multichoice-caseref-field/abstract-multichoice-caseref-field.component.ts b/projects/netgrif-components-core/src/lib/data-fields/multichoice-field/multichoice-caseref-field/abstract-multichoice-caseref-field.component.ts index 023272f223..e3ef2ae3e1 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/multichoice-field/multichoice-caseref-field/abstract-multichoice-caseref-field.component.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/multichoice-field/multichoice-caseref-field/abstract-multichoice-caseref-field.component.ts @@ -11,7 +11,6 @@ import {Subscription} from 'rxjs'; }) export abstract class AbstractMultichoiceCaseRefComponent extends AbstractCaseRefBaseFieldComponent implements AfterViewInit, OnDestroy { - public componentPortal: ComponentPortal; protected _sub: Subscription; protected _subComp: Subscription; diff --git a/projects/netgrif-components/src/lib/data-fields/number-field/number-decimal-field/number-decimal-field.component.ts b/projects/netgrif-components/src/lib/data-fields/number-field/number-decimal-field/number-decimal-field.component.ts index e54d77b8d8..006b1fa2f1 100644 --- a/projects/netgrif-components/src/lib/data-fields/number-field/number-decimal-field/number-decimal-field.component.ts +++ b/projects/netgrif-components/src/lib/data-fields/number-field/number-decimal-field/number-decimal-field.component.ts @@ -26,7 +26,7 @@ export class NumberDecimalFieldComponent extends AbstractNumberDecimalFieldCompo if (!this.dataField?.materialAppearance) { return 'fill'; } - const validAppearances: MatFormFieldAppearance[] = ['legacy', 'standard', 'fill', 'outline']; + const validAppearances: MatFormFieldAppearance[] = ['fill', 'outline']; return validAppearances.includes(this.dataField.materialAppearance as MatFormFieldAppearance) ? this.dataField.materialAppearance as MatFormFieldAppearance : 'fill'; } From 8d37cf03f3438252af4df24c4a4523bbdc6f64d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kov=C3=A1=C4=8Dik?= Date: Fri, 14 Jun 2024 15:53:57 +0200 Subject: [PATCH 12/17] [NAE-1940] Update to new Angular - fixes of css in the whole application --- .../abstract-search-mode.component.ts | 9 +- .../src/lib/material/material.module.ts | 3 +- projects/netgrif-components/nae-theme.scss | 4 - .../ldap-group-role-assignment.component.html | 10 +- .../ldap-group-role-assignment.component.scss | 1 + .../role-assignment.component.html | 8 +- .../user-invite/user-invite.component.html | 22 +---- .../button-default-field.component.html | 93 +++++++++++++++---- .../src/lib/data-fields/data-field.theme.scss | 68 +++++++++++++- .../preview-dialog.component.html | 16 ++-- .../preview-dialog.component.scss | 4 + .../i18n-text-field.component.html | 24 ++--- .../i18n-text-field.component.scss | 6 +- .../number-currency-field.component.html | 4 +- .../number-currency-field.component.ts | 12 ++- .../change-password-form.component.html | 6 +- .../email-submission-form.component.html | 2 +- .../forgotten-password-form.component.html | 6 +- .../lib/forms/login/login-form.component.html | 4 +- .../lib/forms/login/login-form.component.scss | 1 + .../registration-form.component.html | 10 +- .../search-mode/search-mode.component.ts | 9 +- .../src/lib/header/header.component.html | 2 +- .../src/lib/header/header.component.scss | 2 +- .../navigation-double-drawer.component.scss | 5 +- .../src/lib/navigation/navigation.theme.scss | 11 +++ .../language-selector.component.html | 2 +- .../panel-item/panel-item.component.scss | 2 +- .../src/lib/panel/panel.component.html | 2 +- .../src/lib/panel/panel.component.scss | 4 + .../src/lib/panel/panel.theme.scss | 2 +- .../advanced-search.component.scss | 2 +- .../fulltext-search.component.html | 4 +- .../fulltext-search.component.scss | 4 + .../search-component/search.component.html | 4 +- .../search-component/search.component.scss | 10 ++ .../src/lib/tabs/tabs.theme.scss | 3 +- .../field-component-resolver.component.html | 2 +- .../field-component-resolver.component.ts | 4 + 39 files changed, 271 insertions(+), 116 deletions(-) diff --git a/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.ts b/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.ts index 288203231b..f119446493 100644 --- a/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.ts +++ b/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.ts @@ -6,6 +6,8 @@ import {UserValue} from '../../../data-fields/user-field/models/user-value'; import {SideMenuService} from '../../../side-menu/services/side-menu.service'; import {Subscription} from 'rxjs'; import {AbstractHeaderModeComponent} from '../abstract-header-mode.component'; +import {UserListInjectedData} from '../../../side-menu/content-components/user-assign/model/user-list-injected-data'; +import {MatDialog} from '@angular/material/dialog'; @Component({ selector: 'ncc-abstract-seatch-mode', @@ -25,7 +27,7 @@ export abstract class AbstractSearchModeComponent extends AbstractHeaderModeComp @Input() public headerService: AbstractHeaderService; - constructor(protected _sideMenuService: SideMenuService) { + constructor(protected _dialog: MatDialog) { super(); } @@ -84,7 +86,10 @@ export abstract class AbstractSearchModeComponent extends AbstractHeaderModeComp */ public selectAbstractUser(column: number, component: Type): void { let valueReturned = false; - this._sideMenuService.open(component).onClose.subscribe($event => { + const dialogRef = this._dialog.open(component, { + panelClass: "dialog-responsive" + }); + dialogRef.afterClosed().subscribe($event => { if ($event.data) { this.formControls[column].setValue(($event.data as UserValue).fullName); this.formControls[column].setValue($event.data as UserValue, {emitModelToViewChange: false}); diff --git a/projects/netgrif-components-core/src/lib/material/material.module.ts b/projects/netgrif-components-core/src/lib/material/material.module.ts index 01bac0c368..a2b9db3530 100644 --- a/projects/netgrif-components-core/src/lib/material/material.module.ts +++ b/projects/netgrif-components-core/src/lib/material/material.module.ts @@ -8,7 +8,7 @@ import {CdkTreeModule} from '@angular/cdk/tree'; import {PortalModule} from '@angular/cdk/portal'; import {ScrollingModule} from '@angular/cdk/scrolling'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; -import {FlexLayoutModule} from '@ngbracket/ngx-layout'; +import {FlexLayoutModule, FlexModule} from '@ngbracket/ngx-layout'; import {MatMomentDateModule} from '@angular/material-moment-adapter'; import {MatAutocompleteModule} from '@angular/material/autocomplete'; import {MatBadgeModule} from '@angular/material/badge'; @@ -53,6 +53,7 @@ import {MatFormFieldModule} from '@angular/material/form-field'; FlexLayoutModule ], exports: [ + FlexModule, FlexLayoutModule, A11yModule, CdkStepperModule, diff --git a/projects/netgrif-components/nae-theme.scss b/projects/netgrif-components/nae-theme.scss index 37a449269b..25a4e2a79d 100644 --- a/projects/netgrif-components/nae-theme.scss +++ b/projects/netgrif-components/nae-theme.scss @@ -53,7 +53,3 @@ .mat-mdc-card { padding: 24px; } - -.cdk-overlay-pane { - width: auto !important; -} diff --git a/projects/netgrif-components/src/lib/admin/ldap-group-role-assignment/ldap-group-role-assignment.component.html b/projects/netgrif-components/src/lib/admin/ldap-group-role-assignment/ldap-group-role-assignment.component.html index 388724ea7d..c3731bdf3e 100644 --- a/projects/netgrif-components/src/lib/admin/ldap-group-role-assignment/ldap-group-role-assignment.component.html +++ b/projects/netgrif-components/src/lib/admin/ldap-group-role-assignment/ldap-group-role-assignment.component.html @@ -9,7 +9,7 @@
-
+
search @@ -44,9 +44,9 @@ [value]="ldapGroup" [ngClass]="{'list-item-selected':ldapGroup.selected}" (click)="ldapGroup.toggle();autoSelectRoles()" fxLayoutAlign="start center" fxLayout="row"> -

{{ldapGroup.cn}}

-

DN: {{ldapGroup.dn}}, Description: {{ldapGroup.description}}

-

DN: {{ldapGroup.dn}}

+

{{ldapGroup.cn}}

+

DN: {{ldapGroup.dn}}, Description: {{ldapGroup.description}}

+

DN: {{ldapGroup.dn}}

@@ -140,7 +140,7 @@

{{ 'admin.process-list.roles' | translate} -

{{role.name}}

+

{{role.name}}

diff --git a/projects/netgrif-components/src/lib/admin/ldap-group-role-assignment/ldap-group-role-assignment.component.scss b/projects/netgrif-components/src/lib/admin/ldap-group-role-assignment/ldap-group-role-assignment.component.scss index 0067fa79b5..757a0b41db 100644 --- a/projects/netgrif-components/src/lib/admin/ldap-group-role-assignment/ldap-group-role-assignment.component.scss +++ b/projects/netgrif-components/src/lib/admin/ldap-group-role-assignment/ldap-group-role-assignment.component.scss @@ -86,6 +86,7 @@ min-height: 100%; } + @media only screen and (max-width: 599.99px) { .role-height { height: 50%; diff --git a/projects/netgrif-components/src/lib/admin/role-assignment/role-assignment.component.html b/projects/netgrif-components/src/lib/admin/role-assignment/role-assignment.component.html index 988d5157f0..15233a92c6 100644 --- a/projects/netgrif-components/src/lib/admin/role-assignment/role-assignment.component.html +++ b/projects/netgrif-components/src/lib/admin/role-assignment/role-assignment.component.html @@ -9,7 +9,7 @@
-
+
search {{ 'side-menu.user.choose' | translate }} @@ -50,8 +50,8 @@ [value]="user" [ngClass]="{'list-item-selected':user.selected}" (click)="user.toggle();autoSelectRoles()" fxLayoutAlign="start center" fxLayout="row"> -

{{user.fullName}}

-

ID: {{user.id}}, Email: {{user.email}}

+

{{user.fullName}}

+

ID: {{user.id}}, Email: {{user.email}}

@@ -147,7 +147,7 @@

{{ 'admin.process-list.roles' | translate} -

{{role.name}}

+

{{role.name}}

diff --git a/projects/netgrif-components/src/lib/admin/user-invite/user-invite.component.html b/projects/netgrif-components/src/lib/admin/user-invite/user-invite.component.html index 66e10f0e5a..d25087a536 100644 --- a/projects/netgrif-components/src/lib/admin/user-invite/user-invite.component.html +++ b/projects/netgrif-components/src/lib/admin/user-invite/user-invite.component.html @@ -1,11 +1,11 @@ -
+
{{'admin.user-invite.newUser' | translate}}
-
+
email {{ 'admin.user-invite.mail' | translate }} @@ -84,7 +84,7 @@
-
{{group.name}} @@ -102,20 +102,6 @@ {{'admin.process-list.listTitle' | translate}} - -
- -
- - search - {{ 'side-menu.import-net.search' | translate }} - - - -
- diff --git a/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.html b/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.html index d66a2baa99..9eba7e722e 100644 --- a/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.html @@ -1,7 +1,7 @@

- + + + + + + + + + + + + {{getErrorMessage()}}
+ + +
+ + + +
+ {{(dataField.placeholder === undefined || dataField.placeholder === '') ? dataField.title : (isIconTypeButton() ? '' : dataField.placeholder) }} +
+ {{dataField.placeholder}} +
+
diff --git a/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss b/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss index 7f131fd210..8024320fa0 100644 --- a/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss +++ b/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss @@ -255,7 +255,7 @@ color: $color-text-disabled; } - .mat-mdc-form-field-prefix .mat-mdc-icon-button.mat-mdc-button-disabled.mat-mdc-button-disabled { + .mat-mdc-form-field-icon-prefix .mat-mdc-icon-button.mat-mdc-button-disabled.mat-mdc-button-disabled { color: $color-text-disabled; } @@ -320,7 +320,7 @@ color: $color-text-enabled !important; } - .mat-mdc-radio-label-content{ + .mat-mdc-radio-label-content { color: $color-text-enabled !important; } @@ -336,6 +336,11 @@ .mat-mdc-chip-list-wrapper { margin: -10px !important; } + + &.mat-form-field .mat-mdc-form-field-icon-prefix { + top: 0.33em !important; + padding-right: 4px !important; + } } .mat-mdc-select-trigger { @@ -416,10 +421,16 @@ .mat-mdc-form-field-subscript-wrapper { display: none; } + + .mdc-text-field--outlined:not(.mdc-text-field--disabled).mdc-text-field--focused .mdc-floating-label, + .mdc-text-field--outlined:not(.mdc-text-field--disabled).mdc-text-field--focused .mdc-floating-label--float-above { + background-color: #FFFFFF; + } } .netgrif-icon-fix { margin-bottom: 18px; + padding-right: 16px; } .netgrif-input-primary-fix { @@ -454,6 +465,8 @@ ::placeholder { color: mat.get-contrast-color-from-palette($primary, 500) !important; } + + } .date-field-fix { @@ -462,6 +475,47 @@ } } + + /// DATE TIME STYLE WORKAROUND + .mat-datepicker-content, .time-container { + box-shadow: 0px 2px 4px -1px rgba(0, 0, 0, 0.2), 0px 4px 5px 0px rgba(0, 0, 0, 0.14), 0px 1px 10px 0px rgba(0, 0, 0, 0.12); + display: block; + border-radius: 4px; + background-color: var(--mat-datepicker-calendar-container-background-color); + color: var(--mat-datepicker-calendar-container-text-color); + } + + .mat-calendar-body-cell-content { + color: var(--mat-datepicker-calendar-date-text-color); + border-color: var(--mat-datepicker-calendar-date-outline-color) + } + + mat-calendar-body-active { + background-color: var(--mat-datepicker-calendar-date-hover-state-background-color); + } + + .mat-calendar-body-selected { + background-color: var(--mat-datepicker-calendar-date-selected-state-background-color); + color: var(--mat-datepicker-calendar-date-selected-state-text-color); + } + + .mat-calendar-body-cell-content { + border: none !important; + } + + .mat-calendar-body-cell:not(.mat-calendar-body-disabled):hover > .mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical) { + background-color: var(--mat-datepicker-calendar-date-hover-state-background-color); + } + + .mat-calendar-arrow { + fill: var(--mat-datepicker-calendar-period-button-icon-color); + } + + .mat-calendar-body-disabled>.mat-calendar-body-cell-content:not(.mat-calendar-body-selected):not(.mat-calendar-body-comparison-identical) { + color: var(--mat-datepicker-calendar-date-disabled-state-text-color); + } + //// END OF WORKAROUND + .form-input-error { border-color: mat.get-color-from-palette($warn) !important; } @@ -524,11 +578,19 @@ ngx-mat-datetime-content { background-color: white; } -nc-number-currency-field .mat-mdc-form-field .mat-mdc-form-field-prefix { +nc-number-currency-field .mat-mdc-form-field .mat-mdc-form-field-icon-prefix { + position: initial !important; +} + +nc-user-list-default-field .mat-mdc-form-field .mat-mdc-form-field-icon-prefix { position: initial !important; padding-right: 4px !important; } +nc-number-currency-field .mat-mdc-form-field-has-icon-prefix .mat-mdc-text-field-wrapper { + padding-left: initial !important; +} + :host .editor-toolbar { background-color: #FFFFFF !important; border-top: 1px solid #FFFFFF !important; diff --git a/projects/netgrif-components/src/lib/data-fields/file-field/preview-dialog/preview-dialog.component.html b/projects/netgrif-components/src/lib/data-fields/file-field/preview-dialog/preview-dialog.component.html index 97c7a4c47d..ed841d7149 100644 --- a/projects/netgrif-components/src/lib/data-fields/file-field/preview-dialog/preview-dialog.component.html +++ b/projects/netgrif-components/src/lib/data-fields/file-field/preview-dialog/preview-dialog.component.html @@ -1,9 +1,13 @@ - -

Image: {{data.dataField.value.name}}

-

PDF: {{data.dataField.value.name}}

-
+
+

Image: {{data.dataField.value.name}}

+

PDF: {{data.dataField.value.name}}

+
+ +
+ +
Image preview Image diff --git a/projects/netgrif-components/src/lib/data-fields/file-field/preview-dialog/preview-dialog.component.scss b/projects/netgrif-components/src/lib/data-fields/file-field/preview-dialog/preview-dialog.component.scss index e0131f3f52..35e0b92299 100644 --- a/projects/netgrif-components/src/lib/data-fields/file-field/preview-dialog/preview-dialog.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/file-field/preview-dialog/preview-dialog.component.scss @@ -12,3 +12,7 @@ width: 50vw; height: 64vh; } + +.fit-content { + height: fit-content; +} diff --git a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html index 9a55b0c9a9..89c261fc33 100644 --- a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html @@ -23,7 +23,7 @@ -
+
{{dataField.title}} @@ -34,20 +34,22 @@ '-webkit-clip-path': getCutProperty(i18nLabel), 'clip-path': getCutProperty(i18nLabel) }"> + + - - -
-
- {{getLanguageIcons()[languageKey].languageName}} -
-
-
+ + + + + {{dataField.title}} - {{this.dataField.component.properties['code'] ?? ''}} + {{this.dataField.component.properties['code'] ?? ''}} ) { super(currencyPipe, translate, dataFieldPortalData); } - ngAfterViewInit() { - super.ngAfterViewInit(); - } - onFocusOut(event: Event) { this.transformToText(event); } @@ -31,4 +27,10 @@ export class NumberCurrencyFieldComponent extends AbstractCurrencyNumberFieldCom onFocusIn() { this.transformToNumber(); } + + isCodeExists() { + return this.dataField.component.properties['code'] !== ' ' && + this.dataField.component.properties['code'] !== '' && + this.dataField.component.properties['code'] !== undefined; + } } diff --git a/projects/netgrif-components/src/lib/forms/change-password/change-password-form.component.html b/projects/netgrif-components/src/lib/forms/change-password/change-password-form.component.html index 9a1c7d3e5a..9d0767e207 100644 --- a/projects/netgrif-components/src/lib/forms/change-password/change-password-form.component.html +++ b/projects/netgrif-components/src/lib/forms/change-password/change-password-form.component.html @@ -1,6 +1,6 @@
-
+
vpn_key {{ 'forms.changePassword.oldPassword' | translate }} @@ -18,7 +18,7 @@ {{getErrorMessage('oldPassword')}}
-
+
vpn_key {{ 'forms.changePassword.enterNewPass' | translate }} @@ -36,7 +36,7 @@ {{getErrorMessage('password')}}
-
+
vpn_key {{ 'forms.changePassword.repeatNewPass' | translate }} diff --git a/projects/netgrif-components/src/lib/forms/email-submission/email-submission-form.component.html b/projects/netgrif-components/src/lib/forms/email-submission/email-submission-form.component.html index 663ab8ec71..4134ead5b0 100644 --- a/projects/netgrif-components/src/lib/forms/email-submission/email-submission-form.component.html +++ b/projects/netgrif-components/src/lib/forms/email-submission/email-submission-form.component.html @@ -1,6 +1,6 @@
-
+
email {{ 'forms.email.enterEmail' | translate}} diff --git a/projects/netgrif-components/src/lib/forms/forgotten-password/forgotten-password-form.component.html b/projects/netgrif-components/src/lib/forms/forgotten-password/forgotten-password-form.component.html index 5d16ebbfb1..3360ff09a0 100644 --- a/projects/netgrif-components/src/lib/forms/forgotten-password/forgotten-password-form.component.html +++ b/projects/netgrif-components/src/lib/forms/forgotten-password/forgotten-password-form.component.html @@ -1,6 +1,6 @@
-
+
email {{ 'forms.register.email' | translate}} @@ -8,7 +8,7 @@ autocomplete="username">
-
+
vpn_key {{ 'forms.forgottenPass.enterNewPass' | translate }} @@ -26,7 +26,7 @@ {{getErrorMessage('password')}}
-
+
vpn_key {{ 'forms.forgottenPass.repeatNewPass' | translate }} diff --git a/projects/netgrif-components/src/lib/forms/login/login-form.component.html b/projects/netgrif-components/src/lib/forms/login/login-form.component.html index 143bd9de82..0142e81b19 100644 --- a/projects/netgrif-components/src/lib/forms/login/login-form.component.html +++ b/projects/netgrif-components/src/lib/forms/login/login-form.component.html @@ -1,6 +1,6 @@
-
+
account_circle {{ 'forms.login.login' | translate}} @@ -11,7 +11,7 @@
-
+
vpn_key {{ 'forms.login.enterPass' | translate}} diff --git a/projects/netgrif-components/src/lib/forms/login/login-form.component.scss b/projects/netgrif-components/src/lib/forms/login/login-form.component.scss index aae7cc82f8..68cdffa611 100644 --- a/projects/netgrif-components/src/lib/forms/login/login-form.component.scss +++ b/projects/netgrif-components/src/lib/forms/login/login-form.component.scss @@ -47,4 +47,5 @@ .padding-bottom-18px { padding-bottom: 18px; + padding-right: 16px; } diff --git a/projects/netgrif-components/src/lib/forms/registration/registration-form.component.html b/projects/netgrif-components/src/lib/forms/registration/registration-form.component.html index 298638258a..4335b949fd 100644 --- a/projects/netgrif-components/src/lib/forms/registration/registration-form.component.html +++ b/projects/netgrif-components/src/lib/forms/registration/registration-form.component.html @@ -1,6 +1,6 @@
-
+
email {{ 'forms.register.email' | translate}} @@ -8,7 +8,7 @@ autocomplete="username">
-
+
account_circle {{ 'forms.register.name' | translate }} @@ -17,7 +17,7 @@ {{getErrorMessage('name')}}
-
+
account_circle_outline {{ 'forms.register.surname' | translate }} @@ -26,7 +26,7 @@ {{getErrorMessage('surname')}}
-
+
vpn_key {{ 'forms.login.enterPass' | translate }} @@ -44,7 +44,7 @@ {{getErrorMessage('password')}}
-
+
vpn_key {{ 'forms.register.repeatPass' | translate }} diff --git a/projects/netgrif-components/src/lib/header/header-modes/search-mode/search-mode.component.ts b/projects/netgrif-components/src/lib/header/header-modes/search-mode/search-mode.component.ts index dfbdaf2721..b17dd26907 100644 --- a/projects/netgrif-components/src/lib/header/header-modes/search-mode/search-mode.component.ts +++ b/projects/netgrif-components/src/lib/header/header-modes/search-mode/search-mode.component.ts @@ -1,8 +1,9 @@ import {Component} from '@angular/core'; import {MAT_DATE_FORMATS} from '@angular/material/core'; import {AbstractSearchModeComponent, DATE_FORMAT, DATE_TIME_FORMAT, SideMenuService} from '@netgrif/components-core'; -import {UserAssignComponent} from '../../../side-menu/content-components/user-assign/user-assign.component'; import {NGX_MAT_DATE_FORMATS} from '@angular-material-components/datetime-picker'; +import {UserAssignDialogComponent} from '../../../dialog/user-assign-dialog/user-assign-dialog.component'; +import {MatDialog} from '@angular/material/dialog'; @Component({ selector: 'nc-search-mode', @@ -15,12 +16,12 @@ import {NGX_MAT_DATE_FORMATS} from '@angular-material-components/datetime-picker }) export class SearchModeComponent extends AbstractSearchModeComponent { - constructor(protected _sideMenuService: SideMenuService) { - super(_sideMenuService); + constructor(protected _dialog: MatDialog) { + super(_dialog); } public selectUser(column: number): void { - this.selectAbstractUser(column, UserAssignComponent); + this.selectAbstractUser(column, UserAssignDialogComponent); } public setValue() { diff --git a/projects/netgrif-components/src/lib/header/header.component.html b/projects/netgrif-components/src/lib/header/header.component.html index 3190e53cbc..9c7e1ec345 100644 --- a/projects/netgrif-components/src/lib/header/header.component.html +++ b/projects/netgrif-components/src/lib/header/header.component.html @@ -1,5 +1,5 @@ -
+
diff --git a/projects/netgrif-components/src/lib/header/header.component.scss b/projects/netgrif-components/src/lib/header/header.component.scss index 40e49f3682..9727b13d96 100644 --- a/projects/netgrif-components/src/lib/header/header.component.scss +++ b/projects/netgrif-components/src/lib/header/header.component.scss @@ -8,7 +8,7 @@ } .padding-custom { - padding: 4px 16px; + padding: 6px 16px; } .flex-95 { diff --git a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss index 5e58cc40dd..88a1b16ab9 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss +++ b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss @@ -10,10 +10,12 @@ .drawer-container { height: 100%; + } .menu-button { - margin: 0 auto; + margin-left: 1px; + margin-right: 1px; border-radius: 8px; } @@ -242,6 +244,7 @@ background-color: #F8FAFC; } + .expansion-indicator { color: rgba(0, 0, 0, 0.5); margin-right: 10px; diff --git a/projects/netgrif-components/src/lib/navigation/navigation.theme.scss b/projects/netgrif-components/src/lib/navigation/navigation.theme.scss index 73565b89e3..08fd60a694 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation.theme.scss +++ b/projects/netgrif-components/src/lib/navigation/navigation.theme.scss @@ -55,4 +55,15 @@ background-color: mat.get-color-from-palette($primary, 100); color: mat.get-color-from-palette($primary) !important; } + + .quick-panel-menu { + .mat-mdc-menu-item-text { + flex-direction: row; + box-sizing: border-box; + display: flex; + place-content: center flex-start; + align-items: center; + } + } + } diff --git a/projects/netgrif-components/src/lib/navigation/quick-panel/components/language-selector/language-selector.component.html b/projects/netgrif-components/src/lib/navigation/quick-panel/components/language-selector/language-selector.component.html index ed353418da..b54d157d58 100644 --- a/projects/netgrif-components/src/lib/navigation/quick-panel/components/language-selector/language-selector.component.html +++ b/projects/netgrif-components/src/lib/navigation/quick-panel/components/language-selector/language-selector.component.html @@ -1,5 +1,5 @@ - - diff --git a/projects/netgrif-components/src/lib/search/search-component/search.component.scss b/projects/netgrif-components/src/lib/search/search-component/search.component.scss index a0d3e54065..8ed7952197 100644 --- a/projects/netgrif-components/src/lib/search/search-component/search.component.scss +++ b/projects/netgrif-components/src/lib/search/search-component/search.component.scss @@ -39,6 +39,12 @@ padding: 0; } +.fix-icon-button { + height: 45px !important; + width: 45px !important; + padding: 10.5px !important; +} + .prefix-icon { color: #64748B !important; } @@ -47,3 +53,7 @@ padding-top: 2px; } +.fix-filter-button { + margin-top: 1px; +} + diff --git a/projects/netgrif-components/src/lib/tabs/tabs.theme.scss b/projects/netgrif-components/src/lib/tabs/tabs.theme.scss index 52bcc46e4e..868b02750d 100644 --- a/projects/netgrif-components/src/lib/tabs/tabs.theme.scss +++ b/projects/netgrif-components/src/lib/tabs/tabs.theme.scss @@ -31,14 +31,13 @@ } .custom-badge>.mat-badge-content { - width: fit-content; + width: fit-content !important; min-width: 16px; text-align: center; border-radius: 8px; padding-left: 3px; padding-right: 3px; top: 0 !important; - right: 0 !important; } } diff --git a/projects/netgrif-components/src/lib/task-content/field-component-resolver/field-component-resolver.component.html b/projects/netgrif-components/src/lib/task-content/field-component-resolver/field-component-resolver.component.html index e7bf9f6ba5..ba2571ce4c 100644 --- a/projects/netgrif-components/src/lib/task-content/field-component-resolver/field-component-resolver.component.html +++ b/projects/netgrif-components/src/lib/task-content/field-component-resolver/field-component-resolver.component.html @@ -17,7 +17,7 @@
-
+
Date: Fri, 14 Jun 2024 16:14:21 +0200 Subject: [PATCH 13/17] [NAE-1940] Update to new Angular - fixes of user field --- package.json | 50 +++++++++---------- .../user-default-field.component.html | 10 ++-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index 3d4f6ab5f9..2509e027a2 100644 --- a/package.json +++ b/package.json @@ -68,24 +68,24 @@ "example:build": "ng build --configuration production" }, "dependencies": { - "@angular-material-components/datetime-picker": "~16.0.0", - "@angular-material-components/moment-adapter": "~16.0.0", - "@angular/animations": "~17.1.0", - "@angular/cdk": "~17.1.0", - "@angular/common": "~17.1.0", - "@angular/compiler": "~17.1.0", - "@angular/core": "~17.1.0", - "@angular/forms": "~17.1.0", - "@angular/material": "~17.1.0", - "@angular/material-moment-adapter": "~17.1.0", - "@angular/platform-browser": "~17.1.0", - "@angular/platform-browser-dynamic": "~17.1.0", - "@angular/router": "~17.1.0", + "@angular-material-components/datetime-picker": "~16.0.1", + "@angular-material-components/moment-adapter": "~16.0.1", + "@angular/animations": "~17.3.11", + "@angular/cdk": "~17.3.10", + "@angular/common": "~17.3.11", + "@angular/compiler": "~17.3.11", + "@angular/core": "~17.3.11", + "@angular/forms": "~17.3.11", + "@angular/material": "~17.3.10", + "@angular/material-moment-adapter": "~17.3.10", + "@angular/platform-browser": "~17.3.11", + "@angular/platform-browser-dynamic": "~17.3.11", + "@angular/router": "~17.3.11", "@covalent/markdown": "~8.0.0", "@ngbracket/ngx-layout": "^17.0.1", "@ngx-translate/core": "~15.0.0", "@ngx-translate/http-loader": "~8.0.0", - "@schematics/angular": "~17.1.0", + "@schematics/angular": "~17.3.8", "@swimlane/ngx-charts": "~20.1.0", "@types/mousetrap": "~1.6.9", "angular-resizable-element": "~7.0.0", @@ -108,16 +108,16 @@ "zone.js": "~0.14.0" }, "devDependencies": { - "@angular-devkit/build-angular": "~17.1.0", - "@angular-devkit/schematics-cli": "~17.1.0", - "@angular-eslint/builder": "~17.1.0", - "@angular-eslint/eslint-plugin": "~17.1.0", - "@angular-eslint/eslint-plugin-template": "~17.1.0", - "@angular-eslint/schematics": "~17.1.0", - "@angular-eslint/template-parser": "~17.1.0", - "@angular/cli": "~17.1.0", - "@angular/compiler-cli": "~17.1.0", - "@angular/language-service": "~17.1.0", + "@angular-devkit/build-angular": "~17.3.8", + "@angular-devkit/schematics-cli": "~17.3.8", + "@angular-eslint/builder": "~17.5.2", + "@angular-eslint/eslint-plugin": "~17.5.2", + "@angular-eslint/eslint-plugin-template": "~17.5.2", + "@angular-eslint/schematics": "~17.5.2", + "@angular-eslint/template-parser": "~17.5.2", + "@angular/cli": "~17.3.8", + "@angular/compiler-cli": "~17.3.11", + "@angular/language-service": "~17.3.11", "@compodoc/compodoc": "1.1.23", "@types/jasmine": "~3.10.0", "@types/jasminewd2": "~2.0.10", @@ -143,7 +143,7 @@ "karma-sonarqube-unit-reporter": "^0.0.23", "karma-webpack": "^5.0.1", "ncp": "~2.0.0", - "ng-packagr": "~17.1.0", + "ng-packagr": "~17.3.0", "puppeteer": "~22.0.0", "requirejs": "^2.3.6", "schematics-utilities": "~2.0.1", diff --git a/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.html b/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.html index a2dfbd9c46..c1d5cd8848 100644 --- a/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.html @@ -11,16 +11,16 @@ 'clip-path': getCutProperty(userLabel) }"> - + {{!!dataField.value ? dataField.value.fullName : 'dataField.user.selectUser' | translate}}
Date: Mon, 17 Jun 2024 13:10:40 +0200 Subject: [PATCH 14/17] [NAE-1940] Update to new Angular - fixes of multichoice autocomplete --- .../tabbed-views-example.component.ts | 5 ++++- .../src/lib/data-fields/data-field.theme.scss | 19 ++++++++++++++----- .../i18n-text-field.component.html | 2 +- ...tichoice-autocomplete-field.component.html | 5 +++-- ...ng-collection-default-field.component.html | 11 ++++++----- .../lib/forms/login/login-form.component.html | 4 ++-- .../lib/forms/login/login-form.component.scss | 4 ++-- .../src/lib/tabs/tabs.theme.scss | 2 +- 8 files changed, 33 insertions(+), 19 deletions(-) diff --git a/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-views-example.component.ts b/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-views-example.component.ts index cd25a091e3..d7e780909c 100644 --- a/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-views-example.component.ts +++ b/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-views-example.component.ts @@ -25,6 +25,8 @@ export class TabbedViewsExampleComponent implements OnInit { constructor() { const stream = new ReplaySubject(1); + const streamTest = new ReplaySubject(1); + streamTest.next(255) this.tabs = [ { label: { @@ -43,7 +45,8 @@ export class TabbedViewsExampleComponent implements OnInit { { label: { text: 'process cache disabled', - icon: 'storage' + icon: 'storage', + count: streamTest }, canBeClosed: false, tabContentComponent: TabbedCaseViewComponent, diff --git a/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss b/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss index 8024320fa0..e8d01006df 100644 --- a/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss +++ b/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss @@ -241,6 +241,7 @@ // DISABLED + .mat-mdc-form-field-appearance-outline.mat-mdc-form-field-disabled .mat-mdc-form-field-outline { color: $color-outline-disabled; background-color: transparent; @@ -308,11 +309,11 @@ background-color: #FFFFFF; } - .mat-mdc-form-field-appearance-outline .mat-mdc-form-field-outline-start { + .mdc-text-field--outlined .mdc-notched-outline .mdc-notched-outline__leading { border-radius: 6px 0 0 6px; } - .mat-mdc-form-field-appearance-outline .mat-mdc-form-field-outline-end { + .mdc-text-field--outlined .mdc-notched-outline .mdc-notched-outline__trailing { border-radius: 0 6px 6px 0; } @@ -390,6 +391,14 @@ .mat-mdc-form-field-infix { padding: 7px 0 7px 0 !important; } + + .mdc-evolution-chip__cell, + .mat-mdc-chip-action-label { + word-break: break-word; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis ; + } } } @@ -429,7 +438,7 @@ } .netgrif-icon-fix { - margin-bottom: 18px; + margin-bottom: 22px; padding-right: 16px; } @@ -480,7 +489,7 @@ .mat-datepicker-content, .time-container { box-shadow: 0px 2px 4px -1px rgba(0, 0, 0, 0.2), 0px 4px 5px 0px rgba(0, 0, 0, 0.14), 0px 1px 10px 0px rgba(0, 0, 0, 0.12); display: block; - border-radius: 4px; + border-radius: 6px; background-color: var(--mat-datepicker-calendar-container-background-color); color: var(--mat-datepicker-calendar-container-text-color); } @@ -490,7 +499,7 @@ border-color: var(--mat-datepicker-calendar-date-outline-color) } - mat-calendar-body-active { + .mat-calendar-body-active { background-color: var(--mat-datepicker-calendar-date-hover-state-background-color); } diff --git a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html index 89c261fc33..cfdfdc70eb 100644 --- a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html @@ -78,7 +78,7 @@
{{dataField.description}} + *ngIf="!dataField.isInvalid(formControlRef)">{{dataField.description}} {{getErrorMessage()}}
diff --git a/projects/netgrif-components/src/lib/data-fields/multichoice-field/multichoice-autocomplete-field/multichoice-autocomplete-field.component.html b/projects/netgrif-components/src/lib/data-fields/multichoice-field/multichoice-autocomplete-field/multichoice-autocomplete-field.component.html index 86ebb91dac..7ac551c9c7 100644 --- a/projects/netgrif-components/src/lib/data-fields/multichoice-field/multichoice-autocomplete-field/multichoice-autocomplete-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/multichoice-field/multichoice-autocomplete-field/multichoice-autocomplete-field.component.html @@ -1,8 +1,9 @@ {{dataField.title}} - + {{getValueFromKey(option)}} - + - + {{dataField.description}} {{'dataField.validations.required' | translate}} diff --git a/projects/netgrif-components/src/lib/forms/login/login-form.component.html b/projects/netgrif-components/src/lib/forms/login/login-form.component.html index 0142e81b19..2737866402 100644 --- a/projects/netgrif-components/src/lib/forms/login/login-form.component.html +++ b/projects/netgrif-components/src/lib/forms/login/login-form.component.html @@ -1,7 +1,7 @@
- account_circle + account_circle {{ 'forms.login.login' | translate}}
- vpn_key + vpn_key {{ 'forms.login.enterPass' | translate}} Date: Tue, 18 Jun 2024 09:12:25 +0200 Subject: [PATCH 15/17] [NAE-1940] Update to new Angular - fix tests --- package.json | 10 +++++----- .../search-mode/abstract-search-mode.component.spec.ts | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 2509e027a2..ae5358ff87 100644 --- a/package.json +++ b/package.json @@ -110,11 +110,11 @@ "devDependencies": { "@angular-devkit/build-angular": "~17.3.8", "@angular-devkit/schematics-cli": "~17.3.8", - "@angular-eslint/builder": "~17.5.2", - "@angular-eslint/eslint-plugin": "~17.5.2", - "@angular-eslint/eslint-plugin-template": "~17.5.2", - "@angular-eslint/schematics": "~17.5.2", - "@angular-eslint/template-parser": "~17.5.2", + "@angular-eslint/builder": "~17.1.0", + "@angular-eslint/eslint-plugin": "~17.1.0", + "@angular-eslint/eslint-plugin-template": "~17.1.0", + "@angular-eslint/schematics": "~17.1.0", + "@angular-eslint/template-parser": "~17.1.0", "@angular/cli": "~17.3.8", "@angular/compiler-cli": "~17.3.11", "@angular/language-service": "~17.3.11", diff --git a/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.spec.ts b/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.spec.ts index da6c458b7c..65c854add3 100644 --- a/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.spec.ts +++ b/projects/netgrif-components-core/src/lib/header/header-modes/search-mode/abstract-search-mode.component.spec.ts @@ -5,7 +5,6 @@ import {HttpClientTestingModule} from '@angular/common/http/testing'; import {RouterTestingModule} from '@angular/router/testing'; import {Component} from '@angular/core'; import {AbstractSearchModeComponent} from './abstract-search-mode.component'; -import {SideMenuService} from '../../../side-menu/services/side-menu.service'; import {CaseHeaderService} from '../../case-header/case-header.service'; import {UserValue} from '../../../data-fields/user-field/models/user-value'; import {TranslateLibModule} from '../../../translate/translate-lib.module'; @@ -26,6 +25,7 @@ import {ConfigurationService} from '../../../configuration/configuration.service import {NAE_BASE_FILTER} from '../../../search/models/base-filter-injection-token'; import {AllowedNetsService} from '../../../allowed-nets/services/allowed-nets.service'; import {AllowedNetsServiceFactory} from '../../../allowed-nets/services/factory/allowed-nets-service-factory'; +import {MatDialog} from '@angular/material/dialog'; describe('AbstractSearchModeComponent', () => { let component: TestSeaarchModeComponent; @@ -96,8 +96,8 @@ describe('AbstractSearchModeComponent', () => { template: '' }) class TestSeaarchModeComponent extends AbstractSearchModeComponent { - constructor(protected _sideMenuService: SideMenuService) { - super(_sideMenuService); + constructor(protected _dialog: MatDialog) { + super(_dialog); } } From 301d29c9b4bf4c2cb75db8d2812bd690d5adf1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kov=C3=A1=C4=8Dik?= Date: Fri, 5 Jun 2026 09:40:33 +0200 Subject: [PATCH 16/17] [NAE-2444] Upgrade Angular to 17 - commit some fixes --- .../abstract-enumeration-caseref-field.component.ts | 2 +- .../file-field/abstract-file-field.component.ts | 1 + .../navigation-double-drawer.component.html | 10 +++------- .../navigation-double-drawer.component.scss | 3 +-- .../src/lib/navigation/navigation.theme.scss | 6 ++++++ .../language-selector/language-selector.component.html | 2 +- .../language-selector/language-selector.component.scss | 4 ++++ 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/projects/netgrif-components-core/src/lib/data-fields/enumeration-field/enumeration-caseref-field/abstract-enumeration-caseref-field.component.ts b/projects/netgrif-components-core/src/lib/data-fields/enumeration-field/enumeration-caseref-field/abstract-enumeration-caseref-field.component.ts index 0b4ac0925f..d146b45937 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/enumeration-field/enumeration-caseref-field/abstract-enumeration-caseref-field.component.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/enumeration-field/enumeration-caseref-field/abstract-enumeration-caseref-field.component.ts @@ -5,7 +5,7 @@ import {Subscription} from 'rxjs'; import {AbstractCaseRefBaseFieldComponent} from '../../case-ref-field/model/abstract-case-ref-base-field-component'; @Component({ - selector: 'ncc-abstract-case-ref-default', + selector: 'ncc-abstract-enumeration-case-ref-default', template: '' }) export abstract class AbstractEnumerationCaseRefComponent extends AbstractCaseRefBaseFieldComponent implements AfterViewInit, OnDestroy { diff --git a/projects/netgrif-components-core/src/lib/data-fields/file-field/abstract-file-field.component.ts b/projects/netgrif-components-core/src/lib/data-fields/file-field/abstract-file-field.component.ts index a8eb5525b7..26263af132 100644 --- a/projects/netgrif-components-core/src/lib/data-fields/file-field/abstract-file-field.component.ts +++ b/projects/netgrif-components-core/src/lib/data-fields/file-field/abstract-file-field.component.ts @@ -5,6 +5,7 @@ import { } from '@angular/core'; import {AbstractDataFieldComponent} from '../models/abstract-data-field-component'; import {NAE_INFORM_ABOUT_INVALID_DATA} from '../models/invalid-data-policy-token'; +import {FileField} from "./models/file-field"; /** * @deprecated diff --git a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html index 22ff403582..1ff0f29e3f 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html +++ b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html @@ -66,10 +66,8 @@ account_circle -
- +
+
@@ -88,13 +86,11 @@ - -
diff --git a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss index 88a1b16ab9..41644b5641 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss +++ b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss @@ -14,8 +14,7 @@ } .menu-button { - margin-left: 1px; - margin-right: 1px; + margin: 0 auto; border-radius: 8px; } diff --git a/projects/netgrif-components/src/lib/navigation/navigation.theme.scss b/projects/netgrif-components/src/lib/navigation/navigation.theme.scss index 08fd60a694..450d10a39f 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation.theme.scss +++ b/projects/netgrif-components/src/lib/navigation/navigation.theme.scss @@ -56,6 +56,12 @@ color: mat.get-color-from-palette($primary) !important; } + .menu-button { + .mat-mdc-button-persistent-ripple { + border-radius: 8px !important; + } + } + .quick-panel-menu { .mat-mdc-menu-item-text { flex-direction: row; diff --git a/projects/netgrif-components/src/lib/navigation/quick-panel/components/language-selector/language-selector.component.html b/projects/netgrif-components/src/lib/navigation/quick-panel/components/language-selector/language-selector.component.html index b54d157d58..a92531b28c 100644 --- a/projects/netgrif-components/src/lib/navigation/quick-panel/components/language-selector/language-selector.component.html +++ b/projects/netgrif-components/src/lib/navigation/quick-panel/components/language-selector/language-selector.component.html @@ -6,7 +6,7 @@ - diff --git a/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.scss b/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.scss index 84ce30c88f..44d4f0ea85 100644 --- a/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.scss @@ -64,7 +64,7 @@ } .file-hint-error { - padding: 0 1em; + padding: 0 16px; width: unset; } @@ -105,6 +105,6 @@ } .file-button-size { - height: 38px; - width: 38px; + height: 38px !important; + width: 38px !important; } diff --git a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html index b5457ac21d..0af61d2808 100644 --- a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html @@ -23,7 +23,7 @@ -
+
{{dataField.title}} diff --git a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss index a5ac3dad8f..85ae101d34 100644 --- a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss @@ -46,7 +46,7 @@ } .i18n-hint-error { - padding: 0 1em; + padding: 0 16px; font-size: 75%; width: auto !important; display: block; @@ -55,6 +55,10 @@ .language-svg-wrapper { height: 20px; line-height: normal; + + .language-svg-icon { + border: solid 1px #64748B; + } } .language-svg-wrapper>svg { @@ -71,9 +75,7 @@ margin: 0 8px; } -.language-svg-icon { - border: solid 1px #64748B; -} + .filled-language-row { min-height: 28px; @@ -160,7 +162,11 @@ padding-bottom: 3px; } +.padding-bottom-fix { + padding-bottom: 1.5em; +} + .i18n-hint-wrapper { - height: 18px; + height: 24px; margin-top: -3px; } diff --git a/projects/netgrif-components/src/lib/data-fields/string-collection-field/string-collection-default-field/string-collection-default-field.component.html b/projects/netgrif-components/src/lib/data-fields/string-collection-field/string-collection-default-field/string-collection-default-field.component.html index f5ca9352e1..82fa5d10a5 100644 --- a/projects/netgrif-components/src/lib/data-fields/string-collection-field/string-collection-default-field/string-collection-default-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/string-collection-field/string-collection-default-field/string-collection-default-field.component.html @@ -1,4 +1,4 @@ - + {{dataField.title}} - - +
+
+ + +
+ +
- - - diff --git a/projects/netgrif-components/src/lib/data-fields/text-field/signature-pad-field/signature-pad-field.component.scss b/projects/netgrif-components/src/lib/data-fields/text-field/signature-pad-field/signature-pad-field.component.scss index 65d8c276a5..3276a64d00 100644 --- a/projects/netgrif-components/src/lib/data-fields/text-field/signature-pad-field/signature-pad-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/text-field/signature-pad-field/signature-pad-field.component.scss @@ -18,3 +18,8 @@ background-color: #CBD5E1; pointer-events: none; } + +.signature-height { + height: 100%; + padding-bottom: 6px; +} diff --git a/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.scss b/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.scss index ab7ed0df60..05aa66f396 100644 --- a/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/user-field/user-default-field/user-default-field.component.scss @@ -56,7 +56,7 @@ } .user-hint-error { - padding: 0 1em; + padding: 0 16px; width: unset; } diff --git a/projects/netgrif-components/src/lib/data-fields/user-field/user-field.component.scss b/projects/netgrif-components/src/lib/data-fields/user-field/user-field.component.scss index 22c418f260..386778e3fb 100644 --- a/projects/netgrif-components/src/lib/data-fields/user-field/user-field.component.scss +++ b/projects/netgrif-components/src/lib/data-fields/user-field/user-field.component.scss @@ -52,7 +52,7 @@ } .user-hint-error { - padding: 0 1em; + padding: 0 16px; width: unset; } diff --git a/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html b/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html index 7f7a254ca2..7dec3e0a0f 100644 --- a/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html +++ b/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html @@ -8,8 +8,8 @@ [class.do-not-click]="formControlRef.disabled"> how_to_reg - -
+
diff --git a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss index 365d77c5a8..203931b160 100644 --- a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss +++ b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss @@ -18,6 +18,7 @@ border-radius: 8px; } + .drawer-content { width: 300px; min-width: 300px; @@ -277,3 +278,7 @@ -ms-user-select: none; user-select: none; } + +.padding-2px { + padding: 2px; +}