From bd60f00a77baef4909f30cc869b31ab849665ee0 Mon Sep 17 00:00:00 2001
From: mdelez <60604010+mdelez@users.noreply.github.com>
Date: Tue, 7 Sep 2021 14:02:43 +0200
Subject: [PATCH] refactor: removes ActionModule dependency (#523)

---
 src/app/app.component.spec.ts                 |  7 ++++--
 src/app/app.module.ts                         |  3 +--
 .../login-form/login-form.component.html      |  4 +--
 src/app/main/cache/cache.service.spec.ts      |  2 --
 src/app/main/dialog/dialog.component.spec.ts  |  2 --
 .../main/error/error-handler.service.spec.ts  |  2 --
 src/app/main/header/header.component.spec.ts  |  6 +++--
 src/app/main/login/login.component.spec.ts    |  2 --
 src/app/main/main.component.html              |  2 +-
 src/app/main/main.component.spec.ts           |  5 ++--
 src/app/project/board/board.component.html    |  2 +-
 src/app/project/board/board.component.spec.ts |  5 ++--
 .../add-user/add-user.component.html          |  2 +-
 .../add-user/add-user.component.spec.ts       |  5 ++--
 .../collaboration.component.html              |  2 +-
 .../collaboration.component.spec.ts           |  7 ++++--
 .../list-info-form.component.spec.ts          |  7 +++---
 .../edit-list-item.component.spec.ts          |  7 ++++--
 .../list-item-form.component.spec.ts          |  4 +--
 .../list-item/list-item.component.spec.ts     |  8 +++---
 src/app/project/list/list.component.spec.ts   |  4 +--
 .../ontology-form.component.html              |  4 +--
 .../ontology-form.component.spec.ts           |  7 ++++--
 .../ontology-visualizer.component.spec.ts     |  3 +--
 .../project/ontology/ontology.component.html  |  8 +++---
 .../ontology/ontology.component.spec.ts       |  4 +--
 .../property-form.component.spec.ts           |  6 +++--
 .../property-info.component.html              |  2 +-
 .../property-info.component.spec.ts           |  2 --
 .../resource-class-form.component.spec.ts     |  6 +++--
 .../resource-class-info.component.html        |  2 +-
 .../resource-class-info.component.spec.ts     | 25 ++++++++++++++++---
 .../permission/permission.component.html      |  2 +-
 .../permission/permission.component.spec.ts   |  7 ++++--
 .../project-form.component.spec.ts            |  7 ++++--
 src/app/project/project.component.html        |  2 +-
 src/app/project/project.component.spec.ts     |  7 ++++--
 .../groups-list/groups-list.component.html    |  2 +-
 .../groups-list/groups-list.component.spec.ts |  2 --
 src/app/system/groups/groups.component.html   |  2 +-
 .../system/groups/groups.component.spec.ts    |  6 +++--
 .../projects-list.component.html              |  4 +--
 .../projects-list.component.spec.ts           |  5 ++--
 .../system/projects/projects.component.html   |  4 +--
 .../projects/projects.component.spec.ts       |  5 ++--
 src/app/system/system.component.spec.ts       |  2 --
 .../users-list/users-list.component.html      |  6 ++---
 .../users-list/users-list.component.spec.ts   |  5 ++--
 src/app/system/users/users.component.html     |  2 +-
 src/app/system/users/users.component.spec.ts  |  5 ++--
 src/app/user/account/account.component.html   |  2 +-
 .../user/account/account.component.spec.ts    |  5 ++--
 .../collection-list.component.html            |  2 +-
 .../collection-list.component.spec.ts         |  6 +++--
 .../user/dashboard/dashboard.component.html   |  2 +-
 .../dashboard/dashboard.component.spec.ts     |  7 ++++--
 .../user/membership/membership.component.html |  2 +-
 .../membership/membership.component.spec.ts   |  7 ++++--
 src/app/user/profile/profile.component.html   |  6 ++---
 .../user/profile/profile.component.spec.ts    |  5 ++--
 .../password-form.component.html              |  6 ++---
 .../password-form.component.spec.ts           |  7 ++++--
 .../user/user-form/user-form.component.html   |  4 +--
 .../user-form/user-form.component.spec.ts     |  7 ++++--
 .../user/user-menu/user-menu.component.html   |  2 +-
 .../user-menu/user-menu.component.spec.ts     |  7 ++++--
 src/app/user/user.component.html              |  2 +-
 src/app/user/user.component.spec.ts           |  5 ++--
 .../intermediate.component.spec.ts            |  8 +++---
 .../resource/project.service.spec.ts          |  2 --
 .../properties/properties.component.spec.ts   |  4 +--
 .../upload/upload.component.html              |  2 +-
 .../upload/upload.component.spec.ts           |  4 +--
 .../resource-instance-form.component.spec.ts  |  3 +--
 .../resource-link-form.component.html         |  4 +--
 .../resource-link-form.component.spec.ts      |  5 ++--
 .../resource/resource.component.html          |  2 +-
 77 files changed, 206 insertions(+), 144 deletions(-)

diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index b7d3b2c94a..fa0da4ce04 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -1,12 +1,14 @@
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { waitForAsync, TestBed } from '@angular/core/testing';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
 import { MatMenuModule } from '@angular/material/menu';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { TestConfig } from 'test.config';
 import { AppComponent } from './app.component';
@@ -27,11 +29,12 @@ describe('AppComponent', () => {
             ],
             imports: [
                 HttpClientTestingModule,
+                MatDialogModule,
                 MatIconModule,
                 MatListModule,
                 MatMenuModule,
+                MatSnackBarModule,
                 MatToolbarModule,
-                DspActionModule,
                 RouterTestingModule,
                 TranslateModule.forRoot()
             ],
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 93b6f439fe..a2fc45b09a 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -7,7 +7,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { DspActionModule, DspViewerModule } from '@dasch-swiss/dsp-ui';
+import { DspViewerModule } from '@dasch-swiss/dsp-ui';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { AngularSplitModule } from 'angular-split';
@@ -319,7 +319,6 @@ export function httpLoaderFactory(httpClient: HttpClient) {
         ClipboardModule,
         ColorPickerModule,
         CommonModule,
-        DspActionModule,
         DspViewerModule,
         FormsModule,
         HttpClientModule,
diff --git a/src/app/main/action/login-form/login-form.component.html b/src/app/main/action/login-form/login-form.component.html
index 347f1b3bdd..8288480846 100644
--- a/src/app/main/action/login-form/login-form.component.html
+++ b/src/app/main/action/login-form/login-form.component.html
@@ -42,7 +42,7 @@ <h2 class="login-form-title mat-title">{{formLabel.title}}</h2>
             class="full-width submit-button"
             [class.mat-primary]="!isError"
             [class.mat-warn]="isError">
-                <dsp-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="login-progress"></dsp-progress-indicator>
+                <app-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="login-progress"></app-progress-indicator>
                 <mat-icon *ngIf="isError && !loading">close</mat-icon>
                 {{isError ? formLabel.retry : formLabel.submit}}
         </button>
@@ -61,7 +61,7 @@ <h2 class="login-form-title mat-title">{{formLabel.title}}</h2>
     <br>
     <p>Please log out if it's not you.</p>
     <button mat-raised-button (click)="logout()" class="full-width mat-warn logout-button">
-        <dsp-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="login-progress"></dsp-progress-indicator>
+        <app-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="login-progress"></app-progress-indicator>
         {{formLabel.logout}}
     </button>
 </div>
diff --git a/src/app/main/cache/cache.service.spec.ts b/src/app/main/cache/cache.service.spec.ts
index 73d6965956..e2caa25543 100644
--- a/src/app/main/cache/cache.service.spec.ts
+++ b/src/app/main/cache/cache.service.spec.ts
@@ -2,7 +2,6 @@ import { TestBed } from '@angular/core/testing';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { DspApiConnectionToken } from '../declarations/dsp-api-tokens';
 import { CacheService } from './cache.service';
 
@@ -18,7 +17,6 @@ describe('CacheService', () => {
         TestBed.configureTestingModule({
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatDialogModule,
                 MatSnackBarModule
             ],
diff --git a/src/app/main/dialog/dialog.component.spec.ts b/src/app/main/dialog/dialog.component.spec.ts
index 66123239f1..b195a22a6b 100644
--- a/src/app/main/dialog/dialog.component.spec.ts
+++ b/src/app/main/dialog/dialog.component.spec.ts
@@ -15,7 +15,6 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { MatTreeModule } from '@angular/material/tree';
 import { RouterTestingModule } from '@angular/router/testing';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { ListInfoFormComponent } from 'src/app/project/list/list-info-form/list-info-form.component';
 import { ListItemFormComponent } from 'src/app/project/list/list-item-form/list-item-form.component';
@@ -54,7 +53,6 @@ describe('DialogComponent', () => {
             ],
             imports: [
                 CommonModule,
-                DspActionModule,
                 MatAutocompleteModule,
                 MatButtonModule,
                 MatChipsModule,
diff --git a/src/app/main/error/error-handler.service.spec.ts b/src/app/main/error/error-handler.service.spec.ts
index 8a2ec459bf..4084068a60 100644
--- a/src/app/main/error/error-handler.service.spec.ts
+++ b/src/app/main/error/error-handler.service.spec.ts
@@ -2,7 +2,6 @@ import { TestBed } from '@angular/core/testing';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { DspApiConnectionToken } from '../declarations/dsp-api-tokens';
 import { ErrorHandlerService } from './error-handler.service';
 
@@ -20,7 +19,6 @@ describe('ErrorHandlerService', () => {
         TestBed.configureTestingModule({
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatDialogModule,
                 MatSnackBarModule
             ],
diff --git a/src/app/main/header/header.component.spec.ts b/src/app/main/header/header.component.spec.ts
index 5d65c69e3c..d765ade934 100644
--- a/src/app/main/header/header.component.spec.ts
+++ b/src/app/main/header/header.component.spec.ts
@@ -1,15 +1,16 @@
 import { HttpClientModule } from '@angular/common/http';
 import { Component, Input, OnInit, ViewChild } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
 import { MatMenuModule } from '@angular/material/menu';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { AppInitService } from 'src/app/app-init.service';
 import { ComponentCommunicationEventService, EmitEvent, Events } from 'src/app/main/services/component-communication-event.service';
@@ -64,10 +65,11 @@ describe('HeaderComponent', () => {
             imports: [
                 BrowserAnimationsModule,
                 HttpClientModule,
-                DspActionModule,
+                MatDialogModule,
                 MatIconModule,
                 MatListModule,
                 MatMenuModule,
+                MatSnackBarModule,
                 MatToolbarModule,
                 RouterTestingModule,
                 TranslateModule.forRoot()
diff --git a/src/app/main/login/login.component.spec.ts b/src/app/main/login/login.component.spec.ts
index e306b5fc22..aa6f401619 100644
--- a/src/app/main/login/login.component.spec.ts
+++ b/src/app/main/login/login.component.spec.ts
@@ -3,7 +3,6 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { AppInitService } from 'src/app/app-init.service';
 import { TestConfig } from 'test.config';
 import { DspApiConfigToken, DspApiConnectionToken } from '../declarations/dsp-api-tokens';
@@ -40,7 +39,6 @@ describe('LoginComponent', () => {
                 TestLoginFormComponent
             ],
             imports: [
-                DspActionModule,
                 RouterTestingModule
             ],
             providers: [
diff --git a/src/app/main/main.component.html b/src/app/main/main.component.html
index 12e78f0771..c1e6aa57e6 100644
--- a/src/app/main/main.component.html
+++ b/src/app/main/main.component.html
@@ -76,7 +76,7 @@ <h4 class="mat-subheading-2">Another tool based on DSP-API and designed to work
     <section class="projects">
         <div class="content large middle">
             <h2 class="mat-title">The following projects have already stored their data in DSP-API</h2>
-            <dsp-progress-indicator [color]="'primary'" *ngIf="loading"></dsp-progress-indicator>
+            <app-progress-indicator [color]="'primary'" *ngIf="loading"></app-progress-indicator>
             <div *ngIf="!loading">
                 <app-grid class="project-list" [list]="projects"></app-grid>
             </div>
diff --git a/src/app/main/main.component.spec.ts b/src/app/main/main.component.spec.ts
index 515f0989d8..061f250b9a 100644
--- a/src/app/main/main.component.spec.ts
+++ b/src/app/main/main.component.spec.ts
@@ -1,5 +1,6 @@
 import { waitForAsync, ComponentFixture, inject, TestBed } from '@angular/core/testing';
 import { MatButtonModule } from '@angular/material/button';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
@@ -9,7 +10,7 @@ import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { TestConfig } from 'test.config';
 import { DspApiConfigToken, DspApiConnectionToken } from './declarations/dsp-api-tokens';
@@ -37,8 +38,8 @@ describe('MainComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatButtonModule,
+                MatDialogModule,
                 MatDividerModule,
                 MatFormFieldModule,
                 MatIconModule,
diff --git a/src/app/project/board/board.component.html b/src/app/project/board/board.component.html
index 6f5d3ada6c..87a796e97c 100644
--- a/src/app/project/board/board.component.html
+++ b/src/app/project/board/board.component.html
@@ -1,4 +1,4 @@
-<dsp-progress-indicator *ngIf="metadataLoading && !projectsMetadata"></dsp-progress-indicator>
+<app-progress-indicator *ngIf="metadataLoading && !projectsMetadata"></app-progress-indicator>
 
 <div *ngIf="!loading && project">
     <div class="content large middle">
diff --git a/src/app/project/board/board.component.spec.ts b/src/app/project/board/board.component.spec.ts
index 77b66c092e..71874f1b4c 100644
--- a/src/app/project/board/board.component.spec.ts
+++ b/src/app/project/board/board.component.spec.ts
@@ -3,11 +3,12 @@ import { MatChipsModule } from '@angular/material/chips';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatIconModule } from '@angular/material/icon';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
@@ -38,11 +39,11 @@ describe('BoardComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatChipsModule,
                 MatDialogModule,
                 MatDividerModule,
                 MatIconModule,
+                MatSnackBarModule,
                 RouterTestingModule
             ],
             providers: [
diff --git a/src/app/project/collaboration/add-user/add-user.component.html b/src/app/project/collaboration/add-user/add-user.component.html
index 8890a9543b..9010b8b176 100644
--- a/src/app/project/collaboration/add-user/add-user.component.html
+++ b/src/app/project/collaboration/add-user/add-user.component.html
@@ -59,4 +59,4 @@ <h2 class="mat-title">
     </div>
 </div>
 
-<dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+<app-progress-indicator *ngIf="loading"></app-progress-indicator>
diff --git a/src/app/project/collaboration/add-user/add-user.component.spec.ts b/src/app/project/collaboration/add-user/add-user.component.spec.ts
index 8aa5e08c6c..6cce042ee7 100644
--- a/src/app/project/collaboration/add-user/add-user.component.spec.ts
+++ b/src/app/project/collaboration/add-user/add-user.component.spec.ts
@@ -4,10 +4,11 @@ import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
@@ -28,11 +29,11 @@ describe('AddUserComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatAutocompleteModule,
                 MatDialogModule,
                 MatIconModule,
                 MatInputModule,
+                MatSnackBarModule,
                 ReactiveFormsModule,
                 RouterTestingModule,
                 TranslateModule.forRoot()
diff --git a/src/app/project/collaboration/collaboration.component.html b/src/app/project/collaboration/collaboration.component.html
index 8aad59d9ff..d7f803156c 100644
--- a/src/app/project/collaboration/collaboration.component.html
+++ b/src/app/project/collaboration/collaboration.component.html
@@ -4,7 +4,7 @@
         (refreshParent)="refresh()" #addUserComponent></app-add-user>
 
     <!-- main content: list of project members -->
-    <dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+    <app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
     <div *ngIf="!loading" class="users-list">
         <!-- list of active users -->
diff --git a/src/app/project/collaboration/collaboration.component.spec.ts b/src/app/project/collaboration/collaboration.component.spec.ts
index 1997e00b40..8229951588 100644
--- a/src/app/project/collaboration/collaboration.component.spec.ts
+++ b/src/app/project/collaboration/collaboration.component.spec.ts
@@ -3,15 +3,17 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatButtonModule } from '@angular/material/button';
 import { MatChipsModule } from '@angular/material/chips';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatSelectModule } from '@angular/material/select';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
@@ -39,14 +41,15 @@ describe('CollaborationComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatAutocompleteModule,
                 MatButtonModule,
                 MatChipsModule,
+                MatDialogModule,
                 MatIconModule,
                 MatInputModule,
                 MatMenuModule,
                 MatSelectModule,
+                MatSnackBarModule,
                 ReactiveFormsModule,
                 RouterTestingModule,
                 TranslateModule.forRoot()
diff --git a/src/app/project/list/list-info-form/list-info-form.component.spec.ts b/src/app/project/list/list-info-form/list-info-form.component.spec.ts
index 998850f638..5e40f4083b 100644
--- a/src/app/project/list/list-info-form/list-info-form.component.spec.ts
+++ b/src/app/project/list/list-info-form/list-info-form.component.spec.ts
@@ -5,13 +5,13 @@ import { Component, ViewChild } from '@angular/core';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatButtonHarness } from '@angular/material/button/testing';
-import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ApiResponseData, CreateListRequest, ListInfoResponse, ListResponse, ListsEndpointAdmin, UpdateListInfoRequest } from '@dasch-swiss/dsp-js';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
@@ -85,9 +85,10 @@ describe('ListInfoFormComponent', () => {
             imports: [
                 BrowserAnimationsModule,
                 HttpClientModule,
-                DspActionModule,
+                MatDialogModule,
                 MatIconModule,
                 MatInputModule,
+                MatSnackBarModule,
                 ReactiveFormsModule,
                 RouterTestingModule,
                 TranslateModule.forRoot()
diff --git a/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.spec.ts b/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.spec.ts
index b7d7ae53b5..c4f4e09137 100644
--- a/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.spec.ts
+++ b/src/app/project/list/list-item-form/edit-list-item/edit-list-item.component.spec.ts
@@ -1,9 +1,11 @@
 import { Component, DebugElement, ViewChild } from '@angular/core';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ApiResponseData, CreateChildNodeRequest, ListNodeInfoResponse, ListsEndpointAdmin, UpdateChildNodeRequest } from '@dasch-swiss/dsp-js';
-import { DspActionModule, ProgressIndicatorComponent } from '@dasch-swiss/dsp-ui';
+import { ProgressIndicatorComponent } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
@@ -77,7 +79,8 @@ describe('EditListItemComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
+                MatDialogModule,
+                MatSnackBarModule,
                 TranslateModule.forRoot()
             ],
             providers: [
diff --git a/src/app/project/list/list-item-form/list-item-form.component.spec.ts b/src/app/project/list/list-item-form/list-item-form.component.spec.ts
index 89f5b54f60..d3d58f4563 100644
--- a/src/app/project/list/list-item-form/list-item-form.component.spec.ts
+++ b/src/app/project/list/list-item-form/list-item-form.component.spec.ts
@@ -8,9 +8,9 @@ import { MatButtonHarness } from '@angular/material/button/testing';
 import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatDialogHarness } from '@angular/material/dialog/testing';
 import { MatIconModule } from '@angular/material/icon';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ApiResponseData, DeleteListNodeResponse, ListsEndpointAdmin, StringLiteral } from '@dasch-swiss/dsp-js';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
@@ -88,10 +88,10 @@ describe('ListItemFormComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatIconModule,
                 MatDialogModule,
                 MatButtonModule,
+                MatSnackBarModule,
                 TranslateModule.forRoot()
             ],
             providers: [
diff --git a/src/app/project/list/list-item/list-item.component.spec.ts b/src/app/project/list/list-item/list-item.component.spec.ts
index 3008237ccc..9997b44b29 100644
--- a/src/app/project/list/list-item/list-item.component.spec.ts
+++ b/src/app/project/list/list-item/list-item.component.spec.ts
@@ -1,9 +1,10 @@
 import { Component, CUSTOM_ELEMENTS_SCHEMA, OnInit, ViewChild } from '@angular/core';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ApiResponseData, ListNode, ListNodeInfo, ListResponse, ListsEndpointAdmin, RepositionChildNodeResponse } from '@dasch-swiss/dsp-js';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
 import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
@@ -78,8 +79,9 @@ describe('ListItemComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
-                MatIconModule
+                MatDialogModule,
+                MatIconModule,
+                MatSnackBarModule,
             ],
             providers: [
                 {
diff --git a/src/app/project/list/list.component.spec.ts b/src/app/project/list/list.component.spec.ts
index 0ed5b03350..e5daea0e1e 100644
--- a/src/app/project/list/list.component.spec.ts
+++ b/src/app/project/list/list.component.spec.ts
@@ -11,12 +11,12 @@ import { MatDialogHarness } from '@angular/material/dialog/testing';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSelectModule } from '@angular/material/select';
 import { MatSelectHarness } from '@angular/material/select/testing';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ApiResponseData, DeleteListResponse, ListNodeInfo, ListsEndpointAdmin, ListsResponse, MockProjects, ProjectResponse, ProjectsEndpointAdmin, ReadProject } from '@dasch-swiss/dsp-js';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
@@ -90,11 +90,11 @@ describe('ListComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatButtonModule,
                 MatDialogModule,
                 MatIconModule,
                 MatSelectModule,
+                MatSnackBarModule,
                 MatToolbarModule,
                 MatTooltipModule,
                 ReactiveFormsModule,
diff --git a/src/app/project/ontology/ontology-form/ontology-form.component.html b/src/app/project/ontology/ontology-form/ontology-form.component.html
index d832103f7e..44ae70500c 100644
--- a/src/app/project/ontology/ontology-form/ontology-form.component.html
+++ b/src/app/project/ontology/ontology-form/ontology-form.component.html
@@ -36,8 +36,8 @@
             <span class="fill-remaining-space"></span>
             <span>
                 <button mat-raised-button type="submit" [color]="error ? 'warn' : 'primary'" [disabled]="!ontologyForm.valid">
-                    <dsp-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="submit-progress">
-                    </dsp-progress-indicator>
+                    <app-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="submit-progress">
+                    </app-progress-indicator>
                     <mat-icon *ngIf="error && !loading">close</mat-icon>
                     {{error ? 'Failed' : (iri ? 'Update' : 'Create')}}
                 </button>
diff --git a/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts b/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts
index cf5b301ece..ca15f88e2f 100644
--- a/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts
+++ b/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts
@@ -1,13 +1,15 @@
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection, MockProjects } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { CacheService } from 'src/app/main/cache/cache.service';
@@ -30,10 +32,11 @@ describe('OntologyFormComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 HttpClientTestingModule,
+                MatDialogModule,
                 MatFormFieldModule,
                 MatInputModule,
+                MatSnackBarModule,
                 ReactiveFormsModule,
                 RouterTestingModule,
                 TranslateModule.forRoot()
diff --git a/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.spec.ts b/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.spec.ts
index 74f9ec4047..4afaa8adf9 100644
--- a/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.spec.ts
+++ b/src/app/project/ontology/ontology-visualizer/ontology-visualizer.component.spec.ts
@@ -11,7 +11,7 @@ import {
     ResourceClassDefinition,
     ResourcePropertyDefinition
 } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ErrorComponent } from 'src/app/main/error/error.component';
 import { TestConfig } from 'test.config';
@@ -70,7 +70,6 @@ describe('OntologyVisualizerComponent', () => {
             ],
             imports: [
                 HttpClientTestingModule,
-                DspActionModule,
                 MatRadioModule,
                 MatSliderModule,
                 MatSlideToggleModule,
diff --git a/src/app/project/ontology/ontology.component.html b/src/app/project/ontology/ontology.component.html
index 8ae7785a92..a16b3d17b3 100644
--- a/src/app/project/ontology/ontology.component.html
+++ b/src/app/project/ontology/ontology.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="projectAdmin" class="desktop-only">
 
-    <dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+    <app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
     <!-- toolbar: select ontology -->
     <div class="content large middle" *ngIf="!loading">
@@ -214,7 +214,7 @@ <h2 class="mat-title">
             <app-ontology-visualizer [ontology]="ontology" [ontoClasses]="ontoClasses"></app-ontology-visualizer>
         </div>
 
-        <dsp-progress-indicator *ngIf="loadOntology && !loading && view !== 'graph'"></dsp-progress-indicator>
+        <app-progress-indicator *ngIf="loadOntology && !loading && view !== 'graph'"></app-progress-indicator>
     </div>
 
 </div>
@@ -224,6 +224,6 @@ <h2 class="mat-title">
 </div>
 
 <div class="mobile-only">
-    <dsp-message [message]="{status: 415, statusText: 'This content is not supported on small devices.'}">
-    </dsp-message>
+    <app-message [message]="{status: 415, statusText: 'This content is not supported on small devices.'}">
+    </app-message>
 </div>
diff --git a/src/app/project/ontology/ontology.component.spec.ts b/src/app/project/ontology/ontology.component.spec.ts
index afeee6155e..398fce9ed8 100644
--- a/src/app/project/ontology/ontology.component.spec.ts
+++ b/src/app/project/ontology/ontology.component.spec.ts
@@ -9,13 +9,13 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatSelectModule } from '@angular/material/select';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ApiResponseData, CanDoResponse, ListNodeInfo, ListsEndpointAdmin, ListsResponse, MockOntology, OntologiesEndpointV2, OntologiesMetadata, ReadOntology } from '@dasch-swiss/dsp-js';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
 import { CacheService } from 'src/app/main/cache/cache.service';
@@ -62,7 +62,6 @@ describe('OntologyComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 HttpClientTestingModule,
                 MatCardModule,
                 MatDialogModule,
@@ -72,6 +71,7 @@ describe('OntologyComponent', () => {
                 MatMenuModule,
                 MatOptionModule,
                 MatSelectModule,
+                MatSnackBarModule,
                 MatToolbarModule,
                 MatTooltipModule,
                 ReactiveFormsModule,
diff --git a/src/app/project/ontology/property-form/property-form.component.spec.ts b/src/app/project/ontology/property-form/property-form.component.spec.ts
index bd0b9a921b..b0cc82fc94 100644
--- a/src/app/project/ontology/property-form/property-form.component.spec.ts
+++ b/src/app/project/ontology/property-form/property-form.component.spec.ts
@@ -5,15 +5,16 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatButtonModule } from '@angular/material/button';
 import { MatOptionModule } from '@angular/material/core';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 import { MatSelectModule } from '@angular/material/select';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { MockOntology, ReadOntology } from '@dasch-swiss/dsp-js';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { CacheService } from 'src/app/main/cache/cache.service';
@@ -149,15 +150,16 @@ describe('PropertyFormComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 HttpClientTestingModule,
                 MatAutocompleteModule,
                 MatButtonModule,
+                MatDialogModule,
                 MatFormFieldModule,
                 MatIconModule,
                 MatInputModule,
                 MatOptionModule,
                 MatSelectModule,
+                MatSnackBarModule,
                 ReactiveFormsModule,
                 RouterTestingModule,
                 TranslateModule.forRoot()
diff --git a/src/app/project/ontology/property-info/property-info.component.html b/src/app/project/ontology/property-info/property-info.component.html
index 0d7ee1a74c..28dfb2398a 100644
--- a/src/app/project/ontology/property-info/property-info.component.html
+++ b/src/app/project/ontology/property-info/property-info.component.html
@@ -10,7 +10,7 @@
             <span *ngIf="propCard; else displayAllLabels">{{propDef.label ? propDef.label : propDef.id}}</span>
             <!-- otherwise display label in all languages (if defined) -->
             <ng-template #displayAllLabels>{{!propDef.labels.length ? propDef?.label : propDef.labels |
-                dspStringifyStringLiteral:'all'}}</ng-template>
+                appStringifyStringLiteral:'all'}}</ng-template>
         </span>
         <!-- property is linked to a class or to a list: display connected class or list -->
         <span class="attribute additional-info" *ngIf="propAttribute" [matTooltip]="propAttributeComment"
diff --git a/src/app/project/ontology/property-info/property-info.component.spec.ts b/src/app/project/ontology/property-info/property-info.component.spec.ts
index 740e56155e..b5dfa36854 100644
--- a/src/app/project/ontology/property-info/property-info.component.spec.ts
+++ b/src/app/project/ontology/property-info/property-info.component.spec.ts
@@ -22,7 +22,6 @@ import {
     ReadOntology,
     ResourcePropertyDefinitionWithAllLanguages
 } from '@dasch-swiss/dsp-js';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { CacheService } from 'src/app/main/cache/cache.service';
 import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
@@ -198,7 +197,6 @@ describe('PropertyInfoComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatButtonModule,
                 MatDialogModule,
                 MatIconModule,
diff --git a/src/app/project/ontology/resource-class-form/resource-class-form.component.spec.ts b/src/app/project/ontology/resource-class-form/resource-class-form.component.spec.ts
index efa60dd726..653bed3e01 100644
--- a/src/app/project/ontology/resource-class-form/resource-class-form.component.spec.ts
+++ b/src/app/project/ontology/resource-class-form/resource-class-form.component.spec.ts
@@ -4,6 +4,7 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatOptionModule } from '@angular/material/core';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
@@ -11,10 +12,10 @@ import { MatInputModule } from '@angular/material/input';
 import { MatListModule } from '@angular/material/list';
 import { MatSelectModule } from '@angular/material/select';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection, MockOntology, ReadOntology } from '@dasch-swiss/dsp-js';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { AppInitService } from 'src/app/app-init.service';
@@ -49,9 +50,9 @@ describe('ResourceClassFormComponent', () => {
                 ErrorComponent
             ],
             imports: [
-                DspActionModule,
                 HttpClientTestingModule,
                 MatAutocompleteModule,
+                MatDialogModule,
                 MatDividerModule,
                 MatFormFieldModule,
                 MatIconModule,
@@ -60,6 +61,7 @@ describe('ResourceClassFormComponent', () => {
                 MatOptionModule,
                 MatSelectModule,
                 MatSlideToggleModule,
+                MatSnackBarModule,
                 MatTooltipModule,
                 ReactiveFormsModule,
                 RouterTestingModule,
diff --git a/src/app/project/ontology/resource-class-info/resource-class-info.component.html b/src/app/project/ontology/resource-class-info/resource-class-info.component.html
index 92992cb7e0..042d6abfab 100644
--- a/src/app/project/ontology/resource-class-info/resource-class-info.component.html
+++ b/src/app/project/ontology/resource-class-info/resource-class-info.component.html
@@ -4,7 +4,7 @@
         <!-- TODO: the res class icon is missing in ClassDefinition from DSP-JS-Lib; DSP-JS has to be updated first (s. DSP-1366) -->
         <!-- <mat-icon mat-card-avatar>{{resourceClass.icon}}</mat-icon> -->
         <mat-card-title [matTooltip]="resourceClass.comment" matTooltipPosition="above">
-            {{resourceClass.label | dspTruncate: 24}}
+            {{resourceClass.label | appTruncate: 24}}
         </mat-card-title>
         <mat-card-subtitle>
             <span matTooltip="subclass of" matTooltipPosition="above">
diff --git a/src/app/project/ontology/resource-class-info/resource-class-info.component.spec.ts b/src/app/project/ontology/resource-class-info/resource-class-info.component.spec.ts
index b5c0e35c1d..84878f6cd1 100644
--- a/src/app/project/ontology/resource-class-info/resource-class-info.component.spec.ts
+++ b/src/app/project/ontology/resource-class-info/resource-class-info.component.spec.ts
@@ -1,15 +1,25 @@
 import { Component, DebugElement, OnInit, ViewChild } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { MatAutocompleteModule } from '@angular/material/autocomplete';
+import { MatButtonModule } from '@angular/material/button';
+import { MatButtonToggleModule } from '@angular/material/button-toggle';
 import { MatCardModule } from '@angular/material/card';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+import { MatListModule } from '@angular/material/list';
 import { MatMenuModule } from '@angular/material/menu';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { By } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { CanDoResponse, ClassDefinition, Constants, MockOntology, OntologiesEndpointV2, ReadOntology } from '@dasch-swiss/dsp-js';
-import { DspActionModule, SortingService } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { CacheService } from 'src/app/main/cache/cache.service';
 import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
+import { TruncatePipe } from 'src/app/main/pipes/string-transformation/truncate.pipe';
+import { SortingService } from 'src/app/main/services/sorting.service';
 import { ResourceClassInfoComponent } from './resource-class-info.component';
 
 /**
@@ -79,13 +89,22 @@ describe('ResourceClassInfoComponent', () => {
         TestBed.configureTestingModule({
             declarations: [
                 HostComponent,
-                ResourceClassInfoComponent
+                ResourceClassInfoComponent,
+                TruncatePipe
             ],
             imports: [
-                DspActionModule,
+                BrowserAnimationsModule,
+                MatAutocompleteModule,
+                MatButtonModule,
+                MatButtonToggleModule,
                 MatCardModule,
+                MatDialogModule,
+                MatFormFieldModule,
                 MatIconModule,
+                MatInputModule,
+                MatListModule,
                 MatMenuModule,
+                MatSnackBarModule,
                 MatTooltipModule
             ],
             providers: [
diff --git a/src/app/project/permission/permission.component.html b/src/app/project/permission/permission.component.html
index 8813242505..aaa6ae479e 100644
--- a/src/app/project/permission/permission.component.html
+++ b/src/app/project/permission/permission.component.html
@@ -6,7 +6,7 @@
 
     <!-- <mat-divider *ngIf="project?.status" ></mat-divider> -->
 
-    <dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+    <app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
     <div *ngIf="!loading" class="content">
 
diff --git a/src/app/project/permission/permission.component.spec.ts b/src/app/project/permission/permission.component.spec.ts
index dcc2b83f41..e495b7b22e 100644
--- a/src/app/project/permission/permission.component.spec.ts
+++ b/src/app/project/permission/permission.component.spec.ts
@@ -1,11 +1,13 @@
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
@@ -30,8 +32,9 @@ describe('PermissionComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
+                MatDialogModule,
                 MatIconModule,
+                MatSnackBarModule,
                 HttpClientTestingModule,
                 RouterTestingModule
             ],
diff --git a/src/app/project/project-form/project-form.component.spec.ts b/src/app/project/project-form/project-form.component.spec.ts
index 0f7890b80a..f9145c1eb1 100644
--- a/src/app/project/project-form/project-form.component.spec.ts
+++ b/src/app/project/project-form/project-form.component.spec.ts
@@ -1,12 +1,14 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatChipsModule } from '@angular/material/chips';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
@@ -28,10 +30,11 @@ describe('ProjectFormComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatChipsModule,
+                MatDialogModule,
                 MatIconModule,
                 MatInputModule,
+                MatSnackBarModule,
                 ReactiveFormsModule,
                 RouterTestingModule,
                 TranslateModule.forRoot()
diff --git a/src/app/project/project.component.html b/src/app/project/project.component.html
index 86d15fa40e..3315c3e1bd 100644
--- a/src/app/project/project.component.html
+++ b/src/app/project/project.component.html
@@ -10,7 +10,7 @@
         </a>
     </nav>
 
-    <dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+    <app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
     <router-outlet *ngIf="!loading"></router-outlet>
 
diff --git a/src/app/project/project.component.spec.ts b/src/app/project/project.component.spec.ts
index 7cc857fd91..ab1a59e3ec 100644
--- a/src/app/project/project.component.spec.ts
+++ b/src/app/project/project.component.spec.ts
@@ -1,10 +1,12 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatTabsModule } from '@angular/material/tabs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { TestConfig } from 'test.config';
 import { DspApiConfigToken, DspApiConnectionToken } from '../main/declarations/dsp-api-tokens';
 import { DialogComponent } from '../main/dialog/dialog.component';
@@ -24,8 +26,9 @@ describe('ProjectComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
+                MatDialogModule,
                 MatIconModule,
+                MatSnackBarModule,
                 MatTabsModule,
                 RouterTestingModule
             ],
diff --git a/src/app/system/groups/groups-list/groups-list.component.html b/src/app/system/groups/groups-list/groups-list.component.html
index 39f9190049..0e896d4302 100644
--- a/src/app/system/groups/groups-list/groups-list.component.html
+++ b/src/app/system/groups/groups-list/groups-list.component.html
@@ -1 +1 @@
-<dsp-message [message]="message" [medium]="true"></dsp-message>
+<app-message [message]="message" [medium]="true"></app-message>
diff --git a/src/app/system/groups/groups-list/groups-list.component.spec.ts b/src/app/system/groups/groups-list/groups-list.component.spec.ts
index 3999538b06..30dd47c4cd 100644
--- a/src/app/system/groups/groups-list/groups-list.component.spec.ts
+++ b/src/app/system/groups/groups-list/groups-list.component.spec.ts
@@ -1,6 +1,5 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { GroupsListComponent } from './groups-list.component';
 
 describe('GroupsListComponent', () => {
@@ -13,7 +12,6 @@ describe('GroupsListComponent', () => {
                 GroupsListComponent
             ],
             imports: [
-                DspActionModule,
                 RouterTestingModule
             ]
         })
diff --git a/src/app/system/groups/groups.component.html b/src/app/system/groups/groups.component.html
index 558bb1f687..84a758bf2e 100644
--- a/src/app/system/groups/groups.component.html
+++ b/src/app/system/groups/groups.component.html
@@ -1,4 +1,4 @@
-<dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+<app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
 <div *ngIf="!loading">
     <app-groups-list></app-groups-list>
diff --git a/src/app/system/groups/groups.component.spec.ts b/src/app/system/groups/groups.component.spec.ts
index e822a789f7..f797ef5b64 100644
--- a/src/app/system/groups/groups.component.spec.ts
+++ b/src/app/system/groups/groups.component.spec.ts
@@ -1,8 +1,9 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { RouterTestingModule } from '@angular/router/testing';
 import { GroupsListComponent } from './groups-list/groups-list.component';
 import { GroupsComponent } from './groups.component';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 
 describe('GroupsComponent', () => {
     let component: GroupsComponent;
@@ -15,7 +16,8 @@ describe('GroupsComponent', () => {
                 GroupsListComponent
             ],
             imports: [
-                DspActionModule,
+                MatDialogModule,
+                MatSnackBarModule,
                 RouterTestingModule
             ]
         })
diff --git a/src/app/system/projects/projects-list/projects-list.component.html b/src/app/system/projects/projects-list/projects-list.component.html
index 94c3ad6b44..f8f1bc3d43 100644
--- a/src/app/system/projects/projects-list/projects-list.component.html
+++ b/src/app/system/projects/projects-list/projects-list.component.html
@@ -14,12 +14,12 @@ <h3 class="mat-body subtitle">
         <div class="app-toolbar-row">
             <span class="app-toolbar-action button left">
                 <!-- sort button if more than one item in the list -->
-                <dsp-sort-button *ngIf="list.length > 1"
+                <app-sort-button *ngIf="list.length > 1"
                     [icon]="'sort_by_alpha'"
                     [sortProps]="sortProps"
                     [activeKey]="sortBy"
                     (sortKeyChange)="sortList($event)">
-                </dsp-sort-button>
+                </app-sort-button>
             </span>
             <h2 class="mat-title">{{list.length | i18nPlural: itemPluralMapping['project']}}</h2>
             <span class="fill-remaining-space"></span>
diff --git a/src/app/system/projects/projects-list/projects-list.component.spec.ts b/src/app/system/projects/projects-list/projects-list.component.spec.ts
index 08810c8fc5..e9699ab698 100644
--- a/src/app/system/projects/projects-list/projects-list.component.spec.ts
+++ b/src/app/system/projects/projects-list/projects-list.component.spec.ts
@@ -4,10 +4,11 @@ import { MatChipsModule } from '@angular/material/chips';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
@@ -28,12 +29,12 @@ describe('ProjectsListComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatButtonModule,
                 MatChipsModule,
                 MatDialogModule,
                 MatIconModule,
                 MatMenuModule,
+                MatSnackBarModule,
                 RouterTestingModule
             ],
             providers: [
diff --git a/src/app/system/projects/projects.component.html b/src/app/system/projects/projects.component.html
index 51b461b0a5..ec461abc7f 100644
--- a/src/app/system/projects/projects.component.html
+++ b/src/app/system/projects/projects.component.html
@@ -11,7 +11,7 @@
 </form>
  -->
 
-<dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+<app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
 <div *ngIf="!loading" class="app-projects">
     <!-- <mat-divider></mat-divider> -->
@@ -28,7 +28,7 @@
     <button mat-raised-button [color]="'primary'" class="add-new" (click)="openDialog('createProject')">
             NEW project
     </button>
-    <dsp-progress-indicator *ngIf="loadSystem"></dsp-progress-indicator>
+    <app-progress-indicator *ngIf="loadSystem"></app-progress-indicator>
     <app-projects-list *ngIf="!loadSystem" [list]="active" [system]="system"></app-projects-list>
     <app-projects-list *ngIf="!loadSystem" [list]="inactive" [system]="system"></app-projects-list>
 </div>
diff --git a/src/app/system/projects/projects.component.spec.ts b/src/app/system/projects/projects.component.spec.ts
index 6d2c31179a..bef9d1db37 100644
--- a/src/app/system/projects/projects.component.spec.ts
+++ b/src/app/system/projects/projects.component.spec.ts
@@ -4,10 +4,11 @@ import { MatChipsModule } from '@angular/material/chips';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
@@ -29,12 +30,12 @@ describe('ProjectsComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatButtonModule,
                 MatChipsModule,
                 MatDialogModule,
                 MatIconModule,
                 MatMenuModule,
+                MatSnackBarModule,
                 RouterTestingModule
             ],
             providers: [
diff --git a/src/app/system/system.component.spec.ts b/src/app/system/system.component.spec.ts
index dd2e039292..6f32ac5b3e 100644
--- a/src/app/system/system.component.spec.ts
+++ b/src/app/system/system.component.spec.ts
@@ -3,7 +3,6 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatTabsModule } from '@angular/material/tabs';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { TestConfig } from 'test.config';
 import { DspApiConnectionToken } from '../main/declarations/dsp-api-tokens';
 import { ErrorComponent } from '../main/error/error.component';
@@ -18,7 +17,6 @@ describe('SystemComponent', () => {
         TestBed.configureTestingModule({
             declarations: [SystemComponent, ErrorComponent],
             imports: [
-                DspActionModule,
                 MatIconModule,
                 MatTabsModule,
                 RouterTestingModule
diff --git a/src/app/system/users/users-list/users-list.component.html b/src/app/system/users/users-list/users-list.component.html
index 8cf788db2b..91fd205725 100644
--- a/src/app/system/users/users-list/users-list.component.html
+++ b/src/app/system/users/users-list/users-list.component.html
@@ -14,12 +14,12 @@ <h3 class="mat-body subtitle">
         <div class="app-toolbar-row">
             <span class="app-toolbar-action button left">
                 <!-- sort button if more than one item in the list -->
-                <dsp-sort-button *ngIf="list.length > 1"
+                <app-sort-button *ngIf="list.length > 1"
                     [icon]="'sort_by_alpha'"
                     [sortProps]="sortProps"
                     [activeKey]="sortBy"
                     (sortKeyChange)="sortList($event)">
-                </dsp-sort-button>
+                </app-sort-button>
             </span>
             <h2 class="mat-title">
                 <span *ngIf="projectCode">{{list.length | i18nPlural: itemPluralMapping['member']}}</span>
@@ -37,7 +37,7 @@ <h2 class="mat-title">
         <tr class="table-entry" *ngFor="let user of list; let last = last" [class.no-border]="last">
             <!-- avatar -->
             <td class="avatar-cell">
-                <img dspAdminImage [image]="user.email" [type]="'user'" class="avatar-image" />
+                <img appAdminImage [image]="user.email" [type]="'user'" class="avatar-image" />
             </td>
 
             <!-- name and e-mail address -->
diff --git a/src/app/system/users/users-list/users-list.component.spec.ts b/src/app/system/users/users-list/users-list.component.spec.ts
index b94b65a6d9..adf0422552 100644
--- a/src/app/system/users/users-list/users-list.component.spec.ts
+++ b/src/app/system/users/users-list/users-list.component.spec.ts
@@ -6,11 +6,12 @@ import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatSelectModule } from '@angular/material/select';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
@@ -33,13 +34,13 @@ describe('UsersListComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatButtonModule,
                 MatChipsModule,
                 MatDialogModule,
                 MatIconModule,
                 MatMenuModule,
                 MatSelectModule,
+                MatSnackBarModule,
                 ReactiveFormsModule,
                 RouterTestingModule
             ],
diff --git a/src/app/system/users/users.component.html b/src/app/system/users/users.component.html
index 5b55042efb..67582f955c 100644
--- a/src/app/system/users/users.component.html
+++ b/src/app/system/users/users.component.html
@@ -1,4 +1,4 @@
-<dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+<app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
 <div *ngIf="!loading">
 
diff --git a/src/app/system/users/users.component.spec.ts b/src/app/system/users/users.component.spec.ts
index c08828fe95..892da10f69 100644
--- a/src/app/system/users/users.component.spec.ts
+++ b/src/app/system/users/users.component.spec.ts
@@ -6,10 +6,11 @@ import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatSelectModule } from '@angular/material/select';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
@@ -33,13 +34,13 @@ describe('UsersComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatButtonModule,
                 MatChipsModule,
                 MatDialogModule,
                 MatIconModule,
                 MatMenuModule,
                 MatSelectModule,
+                MatSnackBarModule,
                 ReactiveFormsModule,
                 RouterTestingModule
             ],
diff --git a/src/app/user/account/account.component.html b/src/app/user/account/account.component.html
index 7f0d63d0df..1eccb80d3f 100644
--- a/src/app/user/account/account.component.html
+++ b/src/app/user/account/account.component.html
@@ -1,4 +1,4 @@
-<dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+<app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
 <div *ngIf="user && !loading">
 
diff --git a/src/app/user/account/account.component.spec.ts b/src/app/user/account/account.component.spec.ts
index fc8fc0e0bc..bc9d49aa03 100644
--- a/src/app/user/account/account.component.spec.ts
+++ b/src/app/user/account/account.component.spec.ts
@@ -5,10 +5,11 @@ import { MatDialogModule } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
@@ -31,12 +32,12 @@ describe('AccountComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatButtonModule,
                 MatDialogModule,
                 MatFormFieldModule,
                 MatIconModule,
                 MatInputModule,
+                MatSnackBarModule,
                 ReactiveFormsModule,
                 RouterTestingModule,
                 TranslateModule.forRoot()
diff --git a/src/app/user/collection-list/collection-list.component.html b/src/app/user/collection-list/collection-list.component.html
index a4c77e3257..14f86782d5 100644
--- a/src/app/user/collection-list/collection-list.component.html
+++ b/src/app/user/collection-list/collection-list.component.html
@@ -1,4 +1,4 @@
-<dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+<app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
 <div *ngIf="!loading">
     <div class="app-toolbar">
diff --git a/src/app/user/collection-list/collection-list.component.spec.ts b/src/app/user/collection-list/collection-list.component.spec.ts
index e4633c0ca5..369d86dffb 100644
--- a/src/app/user/collection-list/collection-list.component.spec.ts
+++ b/src/app/user/collection-list/collection-list.component.spec.ts
@@ -1,5 +1,6 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { CollectionListComponent } from './collection-list.component';
 
 describe('CollectionListComponent', () => {
@@ -10,7 +11,8 @@ describe('CollectionListComponent', () => {
         TestBed.configureTestingModule({
             declarations: [CollectionListComponent],
             imports: [
-                DspActionModule
+                MatDialogModule,
+                MatSnackBarModule
             ]
         }).compileComponents();
     }));
diff --git a/src/app/user/dashboard/dashboard.component.html b/src/app/user/dashboard/dashboard.component.html
index cc734b6a0a..85ff23a9cd 100644
--- a/src/app/user/dashboard/dashboard.component.html
+++ b/src/app/user/dashboard/dashboard.component.html
@@ -1,5 +1,5 @@
 <div class="content large middle">
-    <dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+    <app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
     <div *ngIf="!loading" class="content">
 
diff --git a/src/app/user/dashboard/dashboard.component.spec.ts b/src/app/user/dashboard/dashboard.component.spec.ts
index 5ee21bfc78..48091dbf4c 100644
--- a/src/app/user/dashboard/dashboard.component.spec.ts
+++ b/src/app/user/dashboard/dashboard.component.spec.ts
@@ -1,12 +1,14 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatButtonModule } from '@angular/material/button';
 import { MatChipsModule } from '@angular/material/chips';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
@@ -30,11 +32,12 @@ describe('DashboardComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatButtonModule,
                 MatChipsModule,
+                MatDialogModule,
                 MatIconModule,
                 MatMenuModule,
+                MatSnackBarModule,
                 RouterTestingModule
             ],
             providers: [
diff --git a/src/app/user/membership/membership.component.html b/src/app/user/membership/membership.component.html
index 6c198cd73b..9df81fdf5c 100644
--- a/src/app/user/membership/membership.component.html
+++ b/src/app/user/membership/membership.component.html
@@ -1,4 +1,4 @@
-<dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+<app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
 <div class="content" *ngIf="!loading">
 
diff --git a/src/app/user/membership/membership.component.spec.ts b/src/app/user/membership/membership.component.spec.ts
index 2b6e2391af..7a89aad94a 100644
--- a/src/app/user/membership/membership.component.spec.ts
+++ b/src/app/user/membership/membership.component.spec.ts
@@ -1,14 +1,16 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
 import { MatSelectModule } from '@angular/material/select';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
@@ -28,12 +30,13 @@ describe('MembershipComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatButtonModule,
+                MatDialogModule,
                 MatDividerModule,
                 MatIconModule,
                 MatListModule,
                 MatSelectModule,
+                MatSnackBarModule,
                 ReactiveFormsModule,
                 RouterTestingModule
             ],
diff --git a/src/app/user/profile/profile.component.html b/src/app/user/profile/profile.component.html
index 50eb7e0a45..695eb332d7 100644
--- a/src/app/user/profile/profile.component.html
+++ b/src/app/user/profile/profile.component.html
@@ -1,8 +1,8 @@
-<dsp-progress-indicator *ngIf="loading && !user"></dsp-progress-indicator>
+<app-progress-indicator *ngIf="loading && !user"></app-progress-indicator>
 
 <!-- own user profile (logged-in user) -->
 <div *ngIf="!loading && user && loggedInUser" class="user-profile">
-    <img dspAdminImage [image]="user.email" [type]="'user'" class="user-profile-image">
+    <img appAdminImage [image]="user.email" [type]="'user'" class="user-profile-image">
     <div class="user-profile-headline">
         <!-- user names -->
         <h2 class="mat-title">{{user.givenName}}
@@ -41,7 +41,7 @@ <h3 class="mat-body subtitle">{{user.username}}</h3>
 <!-- phone view -->
 <div *ngIf="!loading && user && loggedInUser" class="user-profile-mobile">
 
-    <img dspAdminImage [image]="user.email" [type]="'user'" class="user-profile-image">
+    <img appAdminImage [image]="user.email" [type]="'user'" class="user-profile-image">
 
     <div class="user-profile-headline">
         <!-- user names -->
diff --git a/src/app/user/profile/profile.component.spec.ts b/src/app/user/profile/profile.component.spec.ts
index e8bb4c31bd..23a74b37e8 100644
--- a/src/app/user/profile/profile.component.spec.ts
+++ b/src/app/user/profile/profile.component.spec.ts
@@ -3,10 +3,11 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatIconModule } from '@angular/material/icon';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
@@ -26,11 +27,11 @@ describe('ProfileComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatButtonModule,
                 MatDialogModule,
                 MatDividerModule,
                 MatIconModule,
+                MatSnackBarModule,
                 RouterTestingModule
             ],
             providers: [
diff --git a/src/app/user/user-form/password-form/password-form.component.html b/src/app/user/user-form/password-form/password-form.component.html
index 537ed1d80f..324c50281e 100644
--- a/src/app/user/user-form/password-form/password-form.component.html
+++ b/src/app/user/user-form/password-form/password-form.component.html
@@ -1,13 +1,13 @@
 <div>
 
-    <dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+    <app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
     <div *ngIf="!loading">
 
         <!-- message after updating: success message or error message if something went wrong -->
-        <dsp-message *ngIf="showResponse" [message]="showResponse" [short]="true"
+        <app-message *ngIf="showResponse" [message]="showResponse" [short]="true"
             (click)="closeMessage(showResponse.status)">
-        </dsp-message>
+        </app-message>
 
         <!-- in case of changing not own password: input for requester password = own form -->
         <!-- System admin must enter his password before changing the user's password. -->
diff --git a/src/app/user/user-form/password-form/password-form.component.spec.ts b/src/app/user/user-form/password-form/password-form.component.spec.ts
index 32437dc71c..4468a5411e 100644
--- a/src/app/user/user-form/password-form/password-form.component.spec.ts
+++ b/src/app/user/user-form/password-form/password-form.component.spec.ts
@@ -1,12 +1,14 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
@@ -27,10 +29,11 @@ describe('PasswordFormComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
+                MatDialogModule,
                 MatIconModule,
                 MatInputModule,
                 MatFormFieldModule,
+                MatSnackBarModule,
                 ReactiveFormsModule,
                 RouterTestingModule,
                 TranslateModule.forRoot()
diff --git a/src/app/user/user-form/user-form.component.html b/src/app/user/user-form/user-form.component.html
index 1ef39cee9c..67945e2bdf 100644
--- a/src/app/user/user-form/user-form.component.html
+++ b/src/app/user/user-form/user-form.component.html
@@ -1,9 +1,9 @@
 <div>
 
-    <dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+    <app-progress-indicator *ngIf="loading"></app-progress-indicator>
 
     <!-- success message after updating -->
-    <dsp-message *ngIf="success" [message]="successMessage" [short]="true"></dsp-message>
+    <app-message *ngIf="success" [message]="successMessage" [short]="true"></app-message>
 
     <!-- content -->
     <form *ngIf="!loading" [formGroup]="form" class="form-content user-data" (ngSubmit)="submitData()">
diff --git a/src/app/user/user-form/user-form.component.spec.ts b/src/app/user/user-form/user-form.component.spec.ts
index 4acd1bac90..8b1604f0fd 100644
--- a/src/app/user/user-form/user-form.component.spec.ts
+++ b/src/app/user/user-form/user-form.component.spec.ts
@@ -1,13 +1,15 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 import { MatSelectModule } from '@angular/material/select';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
@@ -30,11 +32,12 @@ describe('UserFormComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
+                MatDialogModule,
                 MatIconModule,
                 MatInputModule,
                 MatSelectModule,
                 MatSlideToggleModule,
+                MatSnackBarModule,
                 ReactiveFormsModule,
                 RouterTestingModule,
                 TranslateModule.forRoot()
diff --git a/src/app/user/user-menu/user-menu.component.html b/src/app/user/user-menu/user-menu.component.html
index d8de950c56..416a62c713 100644
--- a/src/app/user/user-menu/user-menu.component.html
+++ b/src/app/user/user-menu/user-menu.component.html
@@ -1,5 +1,5 @@
 <button mat-button [matMenuTriggerFor]="userMenu" class="main-toolbar-button user-menu">
-    <img dspAdminImage [image]="user?.email" [type]="'user'" class="avatar" />
+    <img appAdminImage [image]="user?.email" [type]="'user'" class="avatar" />
 </button>
 
 <mat-menu #userMenu="matMenu" xPosition="before" class="menu">
diff --git a/src/app/user/user-menu/user-menu.component.spec.ts b/src/app/user/user-menu/user-menu.component.spec.ts
index 8840dc6cc5..614d089073 100644
--- a/src/app/user/user-menu/user-menu.component.spec.ts
+++ b/src/app/user/user-menu/user-menu.component.spec.ts
@@ -1,12 +1,14 @@
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatButtonModule } from '@angular/material/button';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
 import { MatMenuModule } from '@angular/material/menu';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { DialogComponent } from 'src/app/main/dialog/dialog.component';
 import { ErrorComponent } from 'src/app/main/error/error.component';
@@ -26,11 +28,12 @@ describe('UserMenuComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatButtonModule,
+                MatDialogModule,
                 MatIconModule,
                 MatListModule,
                 MatMenuModule,
+                MatSnackBarModule,
                 RouterTestingModule
             ],
             providers: [
diff --git a/src/app/user/user.component.html b/src/app/user/user.component.html
index 21b9c087c1..2e9d2cb307 100644
--- a/src/app/user/user.component.html
+++ b/src/app/user/user.component.html
@@ -1,4 +1,4 @@
-<dsp-progress-indicator *ngIf="loading"></dsp-progress-indicator>
+<app-progress-indicator *ngIf="loading"></app-progress-indicator>
 <app-error *ngIf="error"></app-error>
 
 <div class="content large middle" *ngIf="!loading">
diff --git a/src/app/user/user.component.spec.ts b/src/app/user/user.component.spec.ts
index a9dc39737b..ab55571d33 100644
--- a/src/app/user/user.component.spec.ts
+++ b/src/app/user/user.component.spec.ts
@@ -8,11 +8,12 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 import { MatMenuModule } from '@angular/material/menu';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatTabsModule } from '@angular/material/tabs';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { TestConfig } from 'test.config';
 import { DspApiConfigToken, DspApiConnectionToken } from '../main/declarations/dsp-api-tokens';
@@ -46,7 +47,6 @@ describe('UserComponent', () => {
                 UserComponent
             ],
             imports: [
-                DspActionModule,
                 MatButtonModule,
                 MatChipsModule,
                 MatDialogModule,
@@ -55,6 +55,7 @@ describe('UserComponent', () => {
                 MatIconModule,
                 MatInputModule,
                 MatMenuModule,
+                MatSnackBarModule,
                 MatTabsModule,
                 ReactiveFormsModule,
                 RouterTestingModule,
diff --git a/src/app/workspace/intermediate/intermediate.component.spec.ts b/src/app/workspace/intermediate/intermediate.component.spec.ts
index 10bd5958f9..4f4a413e11 100644
--- a/src/app/workspace/intermediate/intermediate.component.spec.ts
+++ b/src/app/workspace/intermediate/intermediate.component.spec.ts
@@ -3,12 +3,14 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { By } from '@angular/platform-browser';
 import { KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { AppInitService, DspActionModule, FilteredResources } from '@dasch-swiss/dsp-ui';
+import { AppInitService } from '@dasch-swiss/dsp-ui';
 import { DspApiConfigToken, DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { TestConfig } from 'test.config';
+import { FilteredResources } from '../results/list-view/list-view.component';
 import { IntermediateComponent } from './intermediate.component';
 
 /**
@@ -82,13 +84,13 @@ describe('IntermediateComponent', () => {
             declarations: [
                 IntermediateComponent,
                 OneSelectedResourcesComponent,
-                ThreeSelectedResourcesComponent
+                ThreeSelectedResourcesComponent,
             ],
             imports: [
-                DspActionModule,
                 MatButtonModule,
                 MatDialogModule,
                 MatIconModule,
+                MatSnackBarModule,
                 MatTooltipModule
             ],
             providers: [
diff --git a/src/app/workspace/resource/project.service.spec.ts b/src/app/workspace/resource/project.service.spec.ts
index a0122d7aab..d6c93f9a84 100644
--- a/src/app/workspace/resource/project.service.spec.ts
+++ b/src/app/workspace/resource/project.service.spec.ts
@@ -2,7 +2,6 @@ import { TestBed } from '@angular/core/testing';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { ProjectService } from './project.service';
 
@@ -21,7 +20,6 @@ describe('ProjectService', () => {
         TestBed.configureTestingModule({
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatDialogModule,
                 MatSnackBarModule
             ],
diff --git a/src/app/workspace/resource/properties/properties.component.spec.ts b/src/app/workspace/resource/properties/properties.component.spec.ts
index d5e2b89e5e..407974bae0 100644
--- a/src/app/workspace/resource/properties/properties.component.spec.ts
+++ b/src/app/workspace/resource/properties/properties.component.spec.ts
@@ -24,7 +24,6 @@ import {
 } from '@dasch-swiss/dsp-js';
 import {
     AppInitService,
-    DspActionModule,
     EmitEvent,
     Events,
     PropertyInfoValues,
@@ -36,6 +35,7 @@ import { PropertiesComponent } from './properties.component';
 import { IncomingService } from '../incoming.service';
 import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { UserService } from '../services/user.service';
+import { MatDialogModule } from '@angular/material/dialog';
 
 /**
  * test host component to simulate parent component.
@@ -151,7 +151,7 @@ describe('PropertiesComponent', () => {
         TestBed.configureTestingModule({
             imports: [
                 ClipboardModule,
-                DspActionModule,
+                MatDialogModule,
                 MatIconModule,
                 MatMenuModule,
                 MatSnackBarModule,
diff --git a/src/app/workspace/resource/representation/upload/upload.component.html b/src/app/workspace/resource/representation/upload/upload.component.html
index a61d2c605f..396534d866 100644
--- a/src/app/workspace/resource/representation/upload/upload.component.html
+++ b/src/app/workspace/resource/representation/upload/upload.component.html
@@ -6,7 +6,7 @@
             <mat-icon *ngIf="!isLoading" class="upload-icon">
                 cloud_upload
             </mat-icon>
-            <dsp-progress-indicator *ngIf="isLoading"></dsp-progress-indicator>
+            <app-progress-indicator *ngIf="isLoading"></app-progress-indicator>
             <p class="title">Upload file<br>
                 <span class="mat-body-1">The following file types are supported:<br>
                     <span *ngFor="let item of allowedFileTypes; let last = last">{{ item | split: '/':1 }}
diff --git a/src/app/workspace/resource/representation/upload/upload.component.spec.ts b/src/app/workspace/resource/representation/upload/upload.component.spec.ts
index d762a5c496..8f154df1ee 100644
--- a/src/app/workspace/resource/representation/upload/upload.component.spec.ts
+++ b/src/app/workspace/resource/representation/upload/upload.component.spec.ts
@@ -1,11 +1,11 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { FormBuilder, FormGroup, ReactiveFormsModule } from '@angular/forms';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { CreateStillImageFileValue } from '@dasch-swiss/dsp-js';
-import { DspActionModule } from '@dasch-swiss/dsp-ui';
 import { of } from 'rxjs';
 import { SplitPipe } from 'src/app/main/pipes/split.pipe';
 import { UploadFileService } from './upload-file.service';
@@ -54,7 +54,7 @@ describe('UploadComponent', () => {
                 SplitPipe
             ],
             imports: [
-                DspActionModule,
+                MatDialogModule,
                 MatInputModule,
                 MatSnackBarModule,
                 ReactiveFormsModule,
diff --git a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts
index 49d3212cfb..52c716d60e 100644
--- a/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts
+++ b/src/app/workspace/resource/resource-instance-form/resource-instance-form.component.spec.ts
@@ -36,7 +36,7 @@ import {
     UsersEndpointAdmin
 } from '@dasch-swiss/dsp-js';
 import { OntologyCache } from '@dasch-swiss/dsp-js/src/cache/ontology-cache/OntologyCache';
-import { DspActionModule, IntValueComponent, TextValueAsStringComponent, ValueService } from '@dasch-swiss/dsp-ui';
+import { IntValueComponent, TextValueAsStringComponent, ValueService } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
@@ -323,7 +323,6 @@ describe('ResourceInstanceFormComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatButtonModule,
                 MatDialogModule,
                 MatFormFieldModule,
diff --git a/src/app/workspace/resource/resource-link-form/resource-link-form.component.html b/src/app/workspace/resource/resource-link-form/resource-link-form.component.html
index 37ea351862..718b5c173c 100644
--- a/src/app/workspace/resource/resource-link-form/resource-link-form.component.html
+++ b/src/app/workspace/resource/resource-link-form/resource-link-form.component.html
@@ -41,8 +41,8 @@
             <span class="fill-remaining-space"></span>
             <span>
                 <button mat-raised-button type="submit" [color]="error ? 'warn' : 'primary'" [disabled]="!form.valid">
-                    <dsp-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="submit-progress">
-                    </dsp-progress-indicator>
+                    <app-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="submit-progress">
+                    </app-progress-indicator>
                     <mat-icon *ngIf="error && !loading">close</mat-icon>
                     {{error ? 'Failed' : 'Create'}}
                 </button>
diff --git a/src/app/workspace/resource/resource-link-form/resource-link-form.component.spec.ts b/src/app/workspace/resource/resource-link-form/resource-link-form.component.spec.ts
index f4a86a4446..5a384fdf56 100644
--- a/src/app/workspace/resource/resource-link-form/resource-link-form.component.spec.ts
+++ b/src/app/workspace/resource/resource-link-form/resource-link-form.component.spec.ts
@@ -2,6 +2,7 @@ import { Component, DebugElement, EventEmitter, Inject, Input, OnInit, Output, V
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
+import { MatDialogModule } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
@@ -24,13 +25,13 @@ import {
     UserResponse,
     UsersEndpointAdmin
 } from '@dasch-swiss/dsp-js';
-import { DspActionModule, FilteredResources } from '@dasch-swiss/dsp-ui';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { AjaxResponse } from 'rxjs/ajax';
 import { CacheService } from 'src/app/main/cache/cache.service';
 import { DspApiConnectionToken } from 'src/app/main/declarations/dsp-api-tokens';
 import { Session, SessionService } from 'src/app/main/services/session.service';
+import { FilteredResources } from '../../results/list-view/list-view.component';
 import { ResourceLinkFormComponent } from './resource-link-form.component';
 
 const resolvedPromise = Promise.resolve(null);
@@ -129,8 +130,8 @@ describe('ResourceLinkFormComponent', () => {
             ],
             imports: [
                 BrowserAnimationsModule,
-                DspActionModule,
                 MatButtonModule,
+                MatDialogModule,
                 MatFormFieldModule,
                 MatIconModule,
                 MatInputModule,
diff --git a/src/app/workspace/resource/resource.component.html b/src/app/workspace/resource/resource.component.html
index 2be66434eb..a8e751b3c5 100644
--- a/src/app/workspace/resource/resource.component.html
+++ b/src/app/workspace/resource/resource.component.html
@@ -63,7 +63,7 @@
         </mat-tab-group>
     </div>
     <!-- progress indicator -->
-    <dsp-progress-indicator *ngIf="!resource && loading"></dsp-progress-indicator>
+    <app-progress-indicator *ngIf="!resource && loading"></app-progress-indicator>
 
     <!-- resource not found  -->
     <div *ngIf="!resource && !loading" class="no-results">