From 037088b270bac1962949cb3f9acf1646f8927a5b Mon Sep 17 00:00:00 2001
From: CRoberto1926 <3205022+CRoberto1926@users.noreply.github.com>
Date: Tue, 24 Sep 2024 10:30:57 +0200
Subject: [PATCH] Closes #58 - Update Angular to v15
---
web/angular.json | 5 +
web/package.json | 44 +-
.../administration/administration.module.ts | 2 -
.../access-items-management.component.scss | 11 +-
.../administration-overview.component.html | 58 +-
.../administration-overview.component.scss | 39 +-
.../classification-details.component.html | 83 +-
.../classification-details.component.scss | 6 +-
.../classification-list.component.html | 32 +-
.../classification-list.component.scss | 6 +-
.../classification-list.component.spec.ts | 17 +-
...assification-types-selector.component.scss | 5 -
.../type-icon/icon-type.component.scss | 1 -
.../workbasket-access-items.component.scss | 22 +-
.../workbasket-details.component.html | 6 +-
.../workbasket-details.component.scss | 6 +-
...t-distribution-targets-list.component.html | 30 +-
...t-distribution-targets-list.component.scss | 22 +-
...basket-distribution-targets.component.scss | 2 +-
.../workbasket-information.component.scss | 5 +
.../workbasket-list-toolbar.component.html | 15 +-
.../workbasket-list-toolbar.component.scss | 66 +-
.../workbasket-list.component.html | 35 +-
.../workbasket-list.component.scss | 9 +-
.../workbasket-overview.component.html | 12 +-
.../workbasket-overview.component.scss | 7 +
web/src/app/app.component.scss | 103 +-
.../components/canvas/canvas.component.scss | 1 -
.../classification-report.component.scss | 1 -
.../components/monitor/monitor.component.html | 15 +-
.../components/monitor/monitor.component.scss | 7 +-
...task-priority-report-filter.component.scss | 1 -
.../task-report/task-report.component.scss | 1 -
.../timestamp-report.component.scss | 1 -
.../workbasket-report-due-date.component.scss | 1 -
...kbasket-report-planned-date.component.scss | 1 -
.../workbasket-report.component.html | 10 +-
.../workbasket-report.component.scss | 1 -
.../Settings/settings.component.scss | 2 +-
.../field-error-display.component.scss | 1 -
.../master-and-detail.component.scss | 2 +-
.../components/nav-bar/nav-bar.component.html | 4 +-
.../components/nav-bar/nav-bar.component.scss | 35 +-
.../pagination/pagination.component.html | 8 +-
.../pagination/pagination.component.scss | 7 +
.../pagination/pagination.component.ts | 30 +-
.../popup/dialog-pop-up.component.scss | 1 -
.../progress-spinner.component.scss | 2 +-
.../sidenav-list/sidenav-list.component.scss | 25 +-
.../components/sort/sort.component.html | 22 +-
.../components/sort/sort.component.scss | 24 +-
.../task-filter/task-filter.component.scss | 7 +-
.../type-ahead/type-ahead.component.scss | 6 +-
.../user-information.component.html | 7 +-
.../user-information.component.scss | 11 +-
.../workbasket-filter.component.html | 23 +-
.../workbasket-filter.component.scss | 18 +-
web/src/app/shared/guards/history.guard.ts | 4 +-
web/src/app/shared/shared.module.ts | 2 -
.../shared/store/filter-store/filter.state.ts | 4 +-
.../routing-upload.component.scss | 2 +-
.../task-routing/guards/task-routing.guard.ts | 4 +-
.../task-details-container.component.scss | 1 -
.../task-details/task-details.component.scss | 1 -
.../task-overview.component.scss | 1 -
.../task-attribute-value.component.html | 26 +-
.../task-attribute-value.component.scss | 33 +-
.../task-details/task-details.component.html | 33 +-
.../task-details/task-details.component.scss | 21 +-
.../task-information.component.scss | 2 +-
.../task-list-toolbar.component.html | 50 +-
.../task-list-toolbar.component.scss | 19 +-
.../task-list/task-list.component.html | 14 +-
.../task-list/task-list.component.scss | 9 +-
.../task-master/task-master.component.scss | 1 -
.../task-processing.component.scss | 2 +-
.../task-status-details.component.scss | 8 +-
web/src/app/workplace/workplace.module.ts | 2 -
web/src/theme/_main.scss | 2 -
web/src/theme/_material_styles.scss | 27 +-
web/src/theme/_ngxbootstrap.scss | 1 -
web/src/theme/_site.scss | 7 +-
web/src/theme/custom-theme-material.scss | 2 +
web/tsconfig.json | 5 +-
web/yarn.lock | 3777 +++++++++--------
85 files changed, 2710 insertions(+), 2274 deletions(-)
diff --git a/web/angular.json b/web/angular.json
index d2ffdff36..375801d25 100644
--- a/web/angular.json
+++ b/web/angular.json
@@ -26,10 +26,15 @@
"polyfills": "src/polyfills.ts",
"assets": ["src/assets", "src/environments/data-sources"],
"styles": [
+ "./node_modules/@ngneat/hot-toast/src/styles/styles.css",
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
+ "./node_modules/@circlon/angular-tree-component/css/angular-tree-component.css",
"src/theme/_main.scss",
"src/theme/custom-theme-material.scss"
],
+ "stylePreprocessorOptions": {
+ "includePaths": ["src/theme"]
+ },
"scripts": []
},
"configurations": {
diff --git a/web/package.json b/web/package.json
index 449f304ef..809c7531b 100644
--- a/web/package.json
+++ b/web/package.json
@@ -22,39 +22,39 @@
},
"private": true,
"dependencies": {
- "@angular/animations": "14.3.0",
- "@angular/cdk": "14.2.7",
- "@angular/common": "14.3.0",
- "@angular/core": "14.3.0",
- "@angular/forms": "14.3.0",
- "@angular/material": "14.2.7",
- "@angular/platform-browser": "14.3.0",
- "@angular/platform-browser-dynamic": "14.3.0",
- "@angular/router": "14.3.0",
+ "@angular/animations": "15.2.10",
+ "@angular/cdk": "15.2.9",
+ "@angular/common": "15.2.10",
+ "@angular/core": "15.2.10",
+ "@angular/forms": "15.2.10",
+ "@angular/material": "15.2.9",
+ "@angular/platform-browser": "15.2.10",
+ "@angular/platform-browser-dynamic": "15.2.10",
+ "@angular/router": "15.2.10",
"@circlon/angular-tree-component": "11.0.4",
- "@ngneat/hot-toast": "4.1.0",
+ "@ngneat/hot-toast": "5.0.2",
"@ngneat/overview": "3.0.4",
- "@ngxs/router-plugin": "3.7.3",
- "@ngxs/store": "3.7.3",
+ "@ngxs/router-plugin": "3.8.2",
+ "@ngxs/store": "3.8.2",
"angular-svg-icon": "13.0.0",
"chart.js": "2.9.4",
"core-js": "3.21.1",
"file-saver": "2.0.5",
"lodash": "4.17.21",
"ng2-charts": "2.4.3",
- "ngx-bootstrap": "8.0.0",
- "ngx-infinite-scroll": "13.0.1",
+ "ngx-bootstrap": "10.3.0",
+ "ngx-infinite-scroll": "15.0.0",
"rxjs": "7.5.5",
"tslib": "2.3.1",
"zone.js": "0.11.5"
},
"devDependencies": {
- "@angular-builders/custom-webpack": "14.1.0",
- "@angular-devkit/build-angular": "14.2.13",
- "@angular/cli": "14.2.13",
- "@angular/compiler": "14.3.0",
- "@angular/compiler-cli": "14.3.0",
- "@ngxs/devtools-plugin": "3.7.3",
+ "@angular-builders/custom-webpack": "15.0.0",
+ "@angular-devkit/build-angular": "15.2.11",
+ "@angular/cli": "15.2.11",
+ "@angular/compiler": "15.2.10",
+ "@angular/compiler-cli": "15.2.10",
+ "@ngxs/devtools-plugin": "3.8.2",
"@types/jest": "27.4.1",
"@types/lodash": "4.14.181",
"@types/node": "17.0.23",
@@ -69,12 +69,12 @@
"eslint-plugin-import": "2.26.0",
"eslint-plugin-prettier": "4.0.0",
"jest": "28.1.3",
- "jest-preset-angular": "12.1.0",
+ "jest-preset-angular": "12.2.6",
"prettier": "2.6.2",
"sass": "1.49.11",
"ts-jest": "28.0.8",
"tslint": "6.1.3",
- "typescript": "4.6.3"
+ "typescript": "4.8.4"
},
"packageManager": "yarn@4.4.1"
}
diff --git a/web/src/app/administration/administration.module.ts b/web/src/app/administration/administration.module.ts
index d34440a66..8267a5b89 100644
--- a/web/src/app/administration/administration.module.ts
+++ b/web/src/app/administration/administration.module.ts
@@ -28,7 +28,6 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll';
import { ClassificationTypesSelectorComponent } from 'app/administration/components/classification-types-selector/classification-types-selector.component';
import { ClassificationCategoriesService } from 'app/shared/services/classification-categories/classification-categories.service';
import { AccessItemsManagementComponent } from 'app/administration/components/access-items-management/access-items-management.component';
-import { MatRadioModule } from '@angular/material/radio';
import { AdministrationRoutingModule } from './administration-routing.module';
/**
* Components
@@ -111,7 +110,6 @@ const DECLARATIONS = [
declarations: DECLARATIONS,
imports: [
MODULES,
- MatRadioModule,
MatFormFieldModule,
MatSelectModule,
MatMenuModule,
diff --git a/web/src/app/administration/components/access-items-management/access-items-management.component.scss b/web/src/app/administration/components/access-items-management/access-items-management.component.scss
index 9c569540f..30793083f 100644
--- a/web/src/app/administration/components/access-items-management/access-items-management.component.scss
+++ b/web/src/app/administration/components/access-items-management/access-items-management.component.scss
@@ -16,7 +16,7 @@
*
*/
-@import '../../../../theme/colors';
+@import 'colors';
table {
font-family: arial, sans-serif;
@@ -25,7 +25,7 @@ table {
margin-bottom: 10px;
}
-::ng-deep .mat-header-cell {
+::ng-deep .mat-mdc-header-cell {
color: black;
font-weight: bold;
}
@@ -119,7 +119,12 @@ tr:first-child > td {
}
}
-.mat-mini-fab {
+::ng-deep .access-items__groups-expansion-panel * th,
+::ng-deep .access-items__permissions-expansion-panel * th {
+ text-align: left;
+}
+
+.mat-mdc-mini-fab {
outline-color: none;
border: none;
box-shadow: none !important;
diff --git a/web/src/app/administration/components/administration-overview/administration-overview.component.html b/web/src/app/administration/components/administration-overview/administration-overview.component.html
index 3c6210acd..b77726c82 100644
--- a/web/src/app/administration/components/administration-overview/administration-overview.component.html
+++ b/web/src/app/administration/components/administration-overview/administration-overview.component.html
@@ -17,31 +17,37 @@
-->
-
-
-
-
-
- {{domain ? domain : 'MASTER DOMAIN'}}
-
-
-
+
-
+
+
+
diff --git a/web/src/app/administration/components/administration-overview/administration-overview.component.scss b/web/src/app/administration/components/administration-overview/administration-overview.component.scss
index 7027eb17c..c50c9f081 100644
--- a/web/src/app/administration/components/administration-overview/administration-overview.component.scss
+++ b/web/src/app/administration/components/administration-overview/administration-overview.component.scss
@@ -16,30 +16,39 @@
*
*/
-@import 'src/theme/_colors.scss';
+@import 'colors';
-.administration-overview__navbar {
- position: relative;
-}
+.administration-overview {
+ &__navbar-container {
+ display: flex;
+ background-color: $light-grey;
+ justify-content: space-between;
+ align-items: flex-end;
+ }
+
+ &__navbar {
+ position: relative;
+ background-color: $light-grey;
+ flex-grow: 2;
+ }
-.administration-overview__navbar {
- background-color: $light-grey;
+ &__domain {
+ height: 48px;
+ margin-right: 24px;
+ z-index: 11;
+ flex-shrink: 1;
+ }
}
-.administration-overview__domain {
- max-height: 48px;
- position: absolute;
- top: 46px;
- right: 24px;
- z-index: 11;
+::ng-deep .administration-overview__navbar-container * .mat-mdc-text-field-wrapper {
+ height: 48px;
}
-.mat-tab-link {
+.mat-mdc-tab-link {
color: #1a202c !important;
}
-.mat-tab-label-active {
+.mdc-tab--active {
font-weight: bolder !important;
- color: unset;
opacity: 1;
}
diff --git a/web/src/app/administration/components/classification-details/classification-details.component.html b/web/src/app/administration/components/classification-details/classification-details.component.html
index 4ef9bfb07..d5f487f60 100644
--- a/web/src/app/administration/components/classification-details/classification-details.component.html
+++ b/web/src/app/administration/components/classification-details/classification-details.component.html
@@ -18,20 +18,21 @@
-
@@ -205,10 +219,13 @@
General
id="classification-application-entry-point"
matInput
maxlength="255"
- name="classification.applicationEntryPoint" placeholder="Application entry point"
+ name="classification.applicationEntryPoint"
+ placeholder="Application entry point"
type="text">
-
{{lengthError}}
+
{{ lengthError }}
+
@@ -216,15 +233,15 @@ General
+ [src]="(getCategoryIcon(this.classification.category) | async)?.left"
+ class="detailed-fields__category-icon">
- {{this.classification.category}}
+ {{ this.classification.category }}
- {{category}}
+ {{ category }}
@@ -240,7 +257,7 @@
Custom Fields
diff --git a/web/src/app/administration/components/classification-details/classification-details.component.scss b/web/src/app/administration/components/classification-details/classification-details.component.scss
index e5672d798..971daacbe 100644
--- a/web/src/app/administration/components/classification-details/classification-details.component.scss
+++ b/web/src/app/administration/components/classification-details/classification-details.component.scss
@@ -16,7 +16,7 @@
*
*/
-@import 'src/theme/_colors.scss';
+@import 'colors';
.classification-details {
height: calc(100vh - 100px);
@@ -95,6 +95,10 @@
&__red-button {
color: $invalid;
}
+
+ &__mat-icon {
+ margin-left: 8px;
+ }
}
.detailed-fields {
diff --git a/web/src/app/administration/components/classification-list/classification-list.component.html b/web/src/app/administration/components/classification-list/classification-list.component.html
index 17e631f4d..baa539f0e 100644
--- a/web/src/app/administration/components/classification-list/classification-list.component.html
+++ b/web/src/app/administration/components/classification-list/classification-list.component.html
@@ -23,7 +23,8 @@
-
@@ -41,30 +42,37 @@
-
-
-
+
Filter classification
@@ -73,7 +81,7 @@
+ class="pull-right">
diff --git a/web/src/app/administration/components/classification-list/classification-list.component.scss b/web/src/app/administration/components/classification-list/classification-list.component.scss
index 856e25576..016d2a53e 100644
--- a/web/src/app/administration/components/classification-list/classification-list.component.scss
+++ b/web/src/app/administration/components/classification-list/classification-list.component.scss
@@ -16,7 +16,7 @@
*
*/
-@import 'src/theme/_colors.scss';
+@import 'colors';
.classification-list {
height: 100%;
@@ -88,4 +88,8 @@
&__input-field {
width: 100% !important;
}
+
+ &__mat-icon {
+ margin-left: 8px;
+ }
}
diff --git a/web/src/app/administration/components/classification-list/classification-list.component.spec.ts b/web/src/app/administration/components/classification-list/classification-list.component.spec.ts
index a9b798bbb..10e6d8f35 100644
--- a/web/src/app/administration/components/classification-list/classification-list.component.spec.ts
+++ b/web/src/app/administration/components/classification-list/classification-list.component.spec.ts
@@ -112,10 +112,19 @@ describe('ClassificationListComponent', () => {
InputStub
],
providers: [
- { provide: ClassificationsService, useValue: classificationServiceSpy },
- { provide: ClassificationCategoriesService, useValue: classificationCategoriesServiceSpy },
+ {
+ provide: ClassificationsService,
+ useValue: classificationServiceSpy
+ },
+ {
+ provide: ClassificationCategoriesService,
+ useValue: classificationCategoriesServiceSpy
+ },
{ provide: DomainService, useValue: domainServiceSpy },
- { provide: ImportExportService, useValue: importExportServiceSpy },
+ {
+ provide: ImportExportService,
+ useValue: importExportServiceSpy
+ },
{ provide: RequestInProgressService, useValue: requestInProgressServiceSpy }
]
}).compileComponents();
@@ -168,7 +177,7 @@ describe('ClassificationListComponent', () => {
it('should display filter button', () => {
const button = debugElement.nativeElement.querySelector('.classification-list__filter-button');
expect(button).toBeTruthy();
- expect(button.textContent).toBe('filter_list');
+ expect(button.textContent.trim()).toBe('filter_list');
});
it('should change selectedCategory property when button is clicked', () => {
diff --git a/web/src/app/administration/components/classification-types-selector/classification-types-selector.component.scss b/web/src/app/administration/components/classification-types-selector/classification-types-selector.component.scss
index 12174f4a8..cfbae1e4c 100644
--- a/web/src/app/administration/components/classification-types-selector/classification-types-selector.component.scss
+++ b/web/src/app/administration/components/classification-types-selector/classification-types-selector.component.scss
@@ -19,8 +19,3 @@
mat-form-field {
max-width: 120px !important;
}
-.radio-group {
- display: flex;
- flex-direction: column;
- margin: 0.5rem 2.5rem;
-}
diff --git a/web/src/app/administration/components/type-icon/icon-type.component.scss b/web/src/app/administration/components/type-icon/icon-type.component.scss
index ee1e1901e..3fbcb5677 100644
--- a/web/src/app/administration/components/type-icon/icon-type.component.scss
+++ b/web/src/app/administration/components/type-icon/icon-type.component.scss
@@ -15,4 +15,3 @@
*
*
*/
-
diff --git a/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.scss b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.scss
index be16a9800..84dbba27b 100644
--- a/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.scss
+++ b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.scss
@@ -16,7 +16,7 @@
*
*/
-@import '../../../../theme/colors';
+@import 'colors';
.workbasket-access-items {
height: calc(100vh - 213px);
@@ -100,13 +100,13 @@
color: white;
border: none;
background: $aquamarine;
- margin: 10px 3px 0px 6px;
+ margin: 10px 3px 0 6px;
outline: none;
}
&__buttons-delete-access {
color: red;
- margin: 2px 0px 0px 3px;
+ margin: 10px 3px 0 6px;
outline: none;
}
@@ -142,19 +142,13 @@
color: red;
}
-::ng-deep .workbasket-access-items__form .mat-form-field-wrapper {
- padding-bottom: 0em;
- height: 58px;
+::ng-deep .workbasket-access-items__typeahead .type-ahead__form-field .mat-mdc-form-field-infix {
+ padding-top: 24px;
+ padding-bottom: 0;
}
-::ng-deep .workbasket-access-items__typeahead .type-ahead__form-field .mat-form-field-infix {
- padding: 0 0 0 0;
- position: initial;
- font-size: medium;
-}
-
-::ng-deep .mat-form-field-appearance-outline .mat-form-field-flex {
- margin-top: 0.7em;
+::ng-deep .workbasket-access-items__typeahead .type-ahead__form-field .mdc-notched-outline {
+ padding-top: 16px;
}
table {
diff --git a/web/src/app/administration/components/workbasket-details/workbasket-details.component.html b/web/src/app/administration/components/workbasket-details/workbasket-details.component.html
index 3c9c73a7e..834efb8f7 100644
--- a/web/src/app/administration/components/workbasket-details/workbasket-details.component.html
+++ b/web/src/app/administration/components/workbasket-details/workbasket-details.component.html
@@ -22,7 +22,7 @@
{{workbasket.name}}
+ matTooltip="{{workbasket.name}}">{{ workbasket.name }}
{{ badgeMessage$ | async }}
@@ -46,7 +46,7 @@
- more_vert
+ more_vert
@@ -84,7 +84,7 @@
+ animationDuration="0ms" mat-stretch-tabs="false">
diff --git a/web/src/app/administration/components/workbasket-details/workbasket-details.component.scss b/web/src/app/administration/components/workbasket-details/workbasket-details.component.scss
index 4554fa68c..aad705985 100644
--- a/web/src/app/administration/components/workbasket-details/workbasket-details.component.scss
+++ b/web/src/app/administration/components/workbasket-details/workbasket-details.component.scss
@@ -16,7 +16,7 @@
*
*/
-@import 'src/theme/_colors.scss';
+@import 'colors';
.workbasket-details {
&__toolbar {
@@ -67,4 +67,8 @@
&__button-red {
color: $invalid;
}
+
+ &__mat-icon {
+ margin-left: 8px;
+ }
}
diff --git a/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.html b/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.html
index fb6c35cd7..1dd6d94fb 100644
--- a/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.html
+++ b/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.html
@@ -18,7 +18,7 @@
-
+
- check_box
+ check_box
-
+
check_box_outline_blank
@@ -73,11 +75,11 @@
class="{{toolbarState? 'distribution-targets-list__list--with-filter' : 'distribution-targets-list__list--no-filter'}}"
itemSize="90">
+ (click)="updateSelectAll(!workbasket.selected) && (workbasket.selected = !workbasket.selected)"
+ *cdkVirtualFor="let workbasket of distributionTargets| orderBy: ['name']; templateCacheSize: 0"
+ [selected]="workbasket.selected"
+ [value]="workbasket.workbasketId"
+ class="workbasket-distribution-targets__workbaskets-item">
@@ -90,18 +92,18 @@
- {{workbasket.name}}, {{workbasket.key}}
+ {{ workbasket.name }}, {{ workbasket.key }}
-
{{workbasket.description}}
-
{{workbasket.owner}}
+
{{ workbasket.description }}
+
{{ workbasket.owner }}
error
+ class="material-icons md-20 red "
+ matTooltip="Marked for deletion"
+ title="Marked for deletion">error
diff --git a/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.scss b/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.scss
index ef14515ec..995b0c6d8 100644
--- a/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.scss
+++ b/web/src/app/administration/components/workbasket-distribution-targets-list/workbasket-distribution-targets-list.component.scss
@@ -16,7 +16,8 @@
*
*/
-@import 'src/theme/_colors.scss';
+@import 'colors';
+
.distribution-targets-list {
&__header {
text-overflow: ellipsis;
@@ -26,6 +27,7 @@
max-width: 100px;
}
}
+
&__action-button {
margin-left: 0.5rem;
}
@@ -42,6 +44,7 @@
min-height: 83px;
}
}
+
&__list--with-filter {
min-width: 100%;
background-color: white;
@@ -54,16 +57,20 @@
min-height: 83px;
}
}
+
&__item-wrapper {
display: flex;
}
+
&__item-icon {
padding: 32px 24px 24px 8px;
}
+
&__item-info {
display: block;
padding: 8px 0;
}
+
&__empty-list {
height: calc(100vh - 360px);
border-radius: 10px;
@@ -84,15 +91,18 @@
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
+
+ &__mat-icon {
+ margin-left: 8px;
+ }
}
-.mat-list-item {
- height: 90px !important;
+::ng-deep .distribution-targets-list * .cdk-virtual-scroll-content-wrapper {
+ width: 100%;
}
-.mat-list-single-selected-option {
- background-color: $green !important;
- color: white;
+.mat-mdc-list-item {
+ height: 90px !important;
}
p {
diff --git a/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.scss b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.scss
index 81f1b20e2..05c881570 100644
--- a/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.scss
+++ b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.scss
@@ -16,7 +16,7 @@
*
*/
-@import 'src/theme/_colors.scss';
+@import 'colors';
.distribution-targets-list {
&__action-buttons {
diff --git a/web/src/app/administration/components/workbasket-information/workbasket-information.component.scss b/web/src/app/administration/components/workbasket-information/workbasket-information.component.scss
index e2d4b08ac..b8969307c 100644
--- a/web/src/app/administration/components/workbasket-information/workbasket-information.component.scss
+++ b/web/src/app/administration/components/workbasket-information/workbasket-information.component.scss
@@ -88,3 +88,8 @@
width: 100%;
}
}
+
+::ng-deep .general__description-and-type > .mat-mdc-form-field {
+ display: unset;
+ flex-direction: unset;
+}
diff --git a/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.html b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.html
index 4749876c5..58ca64d22 100644
--- a/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.html
+++ b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.html
@@ -21,22 +21,25 @@
-
Add
add
-
+ (performSorting)="sorting($event)" [defaultSortBy]="workbasketDefaultSortBy"
+ [sortingFields]="sortingFields"
+ style="margin-right: 4px;">
@@ -45,8 +48,8 @@