dossier and ruleset rename v2

apps/red-ui/src/app/modules/admin/admin-routing.module.ts

@@ -3,7 +3,7 @@ import { AuthGuard } from '../auth/auth.guard';
 import { CompositeRouteGuard } from '@guards/composite-route.guard';
 import { RedRoleGuard } from '../auth/red-role.guard';
 import { AppStateGuard } from '@state/app-state.guard';
-import { DossierTemplatesListingScreenComponent } from './screens/dossier-template-listing/rule-sets-listing-screen.component';
+import { DossierTemplatesListingScreenComponent } from './screens/dossier-template-listing/dossier-templates-listing-screen.component';
 import { DictionaryListingScreenComponent } from './screens/dictionary-listing/dictionary-listing-screen.component';
 import { DictionaryOverviewScreenComponent } from './screens/dictionary-overview/dictionary-overview-screen.component';
 import { PendingChangesGuard } from '@guards/can-deactivate.guard';

apps/red-ui/src/app/modules/admin/admin.module.ts

@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
 import { AdminRoutingModule } from './admin-routing.module';
 import { RulesScreenComponent } from './screens/rules/rules-screen.component';
 import { SharedModule } from '@shared/shared.module';
-import { DossierTemplatesListingScreenComponent } from './screens/dossier-template-listing/rule-sets-listing-screen.component';
+import { DossierTemplatesListingScreenComponent } from './screens/dossier-template-listing/dossier-templates-listing-screen.component';
 import { AuditScreenComponent } from './screens/audit/audit-screen.component';
 import { DefaultColorsScreenComponent } from './screens/default-colors/default-colors-screen.component';
 import { DictionaryListingScreenComponent } from './screens/dictionary-listing/dictionary-listing-screen.component';
@@ -14,10 +14,10 @@ import { LicenseInformationScreenComponent } from './screens/license-information
 import { UserListingScreenComponent } from './screens/user-listing/user-listing-screen.component';
 import { WatermarkScreenComponent } from './screens/watermark/watermark-screen.component';
 import { AdminBreadcrumbsComponent } from './components/breadcrumbs/admin-breadcrumbs.component';
-import { DossierTemplateActionsComponent } from './components/dossier-template-actions/rule-set-actions.component';
+import { DossierTemplateActionsComponent } from './components/dossier-template-actions/dossier-template-actions.component';
 import { ColorPickerModule } from 'ngx-color-picker';
 import { AddEditFileAttributeDialogComponent } from './dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component';
-import { AddEditDossierTemplateDialogComponent } from './dialogs/add-edit-dossier-template-dialog/add-edit-rule-set-dialog.component';
+import { AddEditDossierTemplateDialogComponent } from './dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component';
 import { AddEditDictionaryDialogComponent } from './dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component';
 import { ConfirmDeleteFileAttributeDialogComponent } from './dialogs/confirm-delete-file-attribute-dialog/confirm-delete-file-attribute-dialog.component';
 import { EditColorDialogComponent } from './dialogs/edit-color-dialog/edit-color-dialog.component';

apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts

@@ -5,9 +5,9 @@ import { Router } from '@angular/router';
 import { AdminDialogService } from '../../services/admin-dialog.service';
 
 @Component({
-    selector: 'redaction-rule-set-actions',
-    templateUrl: './rule-set-actions.component.html',
-    styleUrls: ['./rule-set-actions.component.scss']
+    selector: 'redaction-dossier-template-actions',
+    templateUrl: './dossier-template-actions.component.html',
+    styleUrls: ['./dossier-template-actions.component.scss']
 })
 export class DossierTemplateActionsComponent {
     @Input() dossierTemplateId: string;

apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts

@@ -8,9 +8,9 @@ import { DossierTemplateControllerService, DossierTemplateModel } from '@redacti
 import { applyIntervalConstraints } from '@utils/date-inputs-utils';
 
 @Component({
-    selector: 'redaction-add-edit-rule-set-dialog',
-    templateUrl: './add-edit-rule-set-dialog.component.html',
-    styleUrls: ['./add-edit-rule-set-dialog.component.scss']
+    selector: 'redaction-add-edit-dossier-template-dialog',
+    templateUrl: './add-edit-dossier-template-dialog.component.html',
+    styleUrls: ['./add-edit-dossier-template-dialog.component.scss']
 })
 export class AddEditDossierTemplateDialogComponent {
     dossierTemplateForm: FormGroup;

apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html

@@ -3,7 +3,7 @@
         <redaction-admin-breadcrumbs class="flex-1"></redaction-admin-breadcrumbs>
 
         <div class="flex-1 actions">
-            <redaction-rule-set-actions></redaction-rule-set-actions>
+            <redaction-dossier-template-actions></redaction-dossier-template-actions>
 
             <redaction-circle-button
                 [routerLink]="['../..']"

apps/red-ui/src/app/modules/admin/screens/dictionary-listing/dictionary-listing-screen.component.html

@@ -3,7 +3,7 @@
         <redaction-admin-breadcrumbs class="flex-1"></redaction-admin-breadcrumbs>
 
         <div class="flex-1 actions">
-            <redaction-rule-set-actions></redaction-rule-set-actions>
+            <redaction-dossier-template-actions></redaction-dossier-template-actions>
 
             <redaction-circle-button
                 [routerLink]="['../..']"

apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.html

@@ -148,11 +148,11 @@
                                 {{ dossierTemplate.dateModified | date: 'd MMM. yyyy' }}
                             </div>
 
-                            <redaction-rule-set-actions
+                            <redaction-dossier-template-actions
                                 (loadDossierTemplatesData)="loadDossierTemplatesData()"
                                 [dossierTemplateId]="dossierTemplate.dossierTemplateId"
                                 class="actions-container"
-                            ></redaction-rule-set-actions>
+                            ></redaction-dossier-template-actions>
                         </div>
                         <div class="scrollbar-placeholder"></div>
                     </div>

apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts

@@ -7,9 +7,9 @@ import { BaseListingComponent } from '@shared/base/base-listing.component';
 import { DossierTemplateModel } from '@redaction/red-ui-http';
 
 @Component({
-    selector: 'redaction-rule-sets-listing-screen',
-    templateUrl: './rule-sets-listing-screen.component.html',
-    styleUrls: ['./rule-sets-listing-screen.component.scss']
+    selector: 'redaction-dossier-templates-listing-screen',
+    templateUrl: './dossier-templates-listing-screen.component.html',
+    styleUrls: ['./dossier-templates-listing-screen.component.scss']
 })
 export class DossierTemplatesListingScreenComponent
     extends BaseListingComponent<DossierTemplateModel>
@@ -17,7 +17,7 @@ export class DossierTemplatesListingScreenComponent
 {
     protected readonly _searchKey = 'name';
     protected readonly _selectionKey = 'dossierTemplateId';
-    protected readonly _sortKey = 'rule-sets-listing';
+    protected readonly _sortKey = 'dossier-templates-listing';
 
     constructor(
         private readonly _dialogService: AdminDialogService,

apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html

@@ -3,7 +3,7 @@
         <redaction-admin-breadcrumbs class="flex-1"></redaction-admin-breadcrumbs>
 
         <div class="flex-1 actions">
-            <redaction-rule-set-actions></redaction-rule-set-actions>
+            <redaction-dossier-template-actions></redaction-dossier-template-actions>
 
             <redaction-circle-button
                 [routerLink]="['../..']"

apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts

@@ -15,7 +15,7 @@ import {
 } from '@redaction/red-ui-http';
 import { AddEditFileAttributeDialogComponent } from '../dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component';
 import { AddEditDictionaryDialogComponent } from '../dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component';
-import { AddEditDossierTemplateDialogComponent } from '../dialogs/add-edit-dossier-template-dialog/add-edit-rule-set-dialog.component';
+import { AddEditDossierTemplateDialogComponent } from '../dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component';
 import { NotificationService } from '@services/notification.service';
 import { ConfirmationDialogComponent } from '@shared/dialogs/confirmation-dialog/confirmation-dialog.component';
 import { AppStateService } from '@state/app-state.service';

apps/red-ui/src/app/services/sorting.service.ts

@@ -9,7 +9,7 @@ export type ScreenName =
     | 'dossier-listing'
     | 'dossier-overview'
     | 'dictionary-listing'
-    | 'rule-sets-listing'
+    | 'dossier-templates-listing'
     | 'default-colors'
     | 'file-attributes-listing';
 
@@ -21,7 +21,7 @@ export class SortingService {
         'dossier-listing': { column: 'dossier.dossierName', order: 'asc' },
         'dossier-overview': { column: 'filename', order: 'asc' },
         'dictionary-listing': { column: 'label', order: 'asc' },
-        'rule-sets-listing': { column: 'name', order: 'asc' },
+        'dossier-templates-listing': { column: 'name', order: 'asc' },
         'default-colors': { column: 'key', order: 'asc' },
         'file-attributes-listing': { column: 'label', order: 'asc' }
     };

apps/red-ui/src/assets/icons/general/dictionary.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg height="10px" version="1.1" viewBox="0 0 10 10" width="10px" xmlns="http://www.w3.org/2000/svg">
     <g fill="none" fill-rule="evenodd" id="Settings" stroke="none" stroke-width="1">
-        <g id="01.0-Rule-Sets" transform="translate(-40.000000, -241.000000)">
+        <g id="01.0-dossier-templates" transform="translate(-40.000000, -241.000000)">
             <rect height="705" width="1440" x="0" y="0"></rect>
             <rect height="80" id="Rectangle" width="1440" x="0" y="193"></rect>
             <g fill="currentColor" fill-rule="nonzero" id="Group-16" transform="translate(40.000000, 239.000000)">

libs/red-ui-http/src/lib/api/dossierTemplateController.service.ts

@@ -103,13 +103,17 @@ export class DossierTemplateControllerService {
             headers = headers.set('Content-Type', httpContentTypeSelected);
         }
 
-        return this.httpClient.request<DossierTemplateModel>('post', `${this.basePath}/rule-set`, {
-            body: body,
-            withCredentials: this.configuration.withCredentials,
-            headers: headers,
-            observe: observe,
-            reportProgress: reportProgress
-        });
+        return this.httpClient.request<DossierTemplateModel>(
+            'post',
+            `${this.basePath}/dossier-template`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
     }
 
     /**
@@ -172,7 +176,7 @@ export class DossierTemplateControllerService {
 
         return this.httpClient.request<any>(
             'delete',
-            `${this.basePath}/rule-set/${encodeURIComponent(String(dossierTemplateId))}`,
+            `${this.basePath}/dossier-template/${encodeURIComponent(String(dossierTemplateId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -231,7 +235,7 @@ export class DossierTemplateControllerService {
 
         return this.httpClient.request<Array<DossierTemplateModel>>(
             'get',
-            `${this.basePath}/rule-set`,
+            `${this.basePath}/dossier-template`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
@@ -301,7 +305,7 @@ export class DossierTemplateControllerService {
 
         return this.httpClient.request<DossierTemplateModel>(
             'get',
-            `${this.basePath}/rule-set/${encodeURIComponent(String(dossierTemplateId))}`,
+            `${this.basePath}/dossier-template/${encodeURIComponent(String(dossierTemplateId))}`,
             {
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,