diff --git a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts index 8c8378e90..44ecafc01 100644 --- a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts +++ b/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'; diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index defd8e369..0099a80d0 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/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'; diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts b/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts index 36a3e1496..9c91c0d22 100644 --- a/apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts +++ b/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; diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts index d82e4f2f1..190133776 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.ts +++ b/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; diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html index 9e36328ce..fe270e457 100644 --- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.html @@ -3,7 +3,7 @@
- +
- + - + >
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts index c18769eff..a33b1342f 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts +++ b/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 @@ -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, diff --git a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html index 9d893b189..44fc56498 100644 --- a/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/rules/rules-screen.component.html @@ -3,7 +3,7 @@
- + - + diff --git a/libs/red-ui-http/src/lib/api/dossierTemplateController.service.ts b/libs/red-ui-http/src/lib/api/dossierTemplateController.service.ts index 1776bb8f1..d9014cffb 100644 --- a/libs/red-ui-http/src/lib/api/dossierTemplateController.service.ts +++ b/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('post', `${this.basePath}/rule-set`, { - body: body, - withCredentials: this.configuration.withCredentials, - headers: headers, - observe: observe, - reportProgress: reportProgress - }); + return this.httpClient.request( + '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( '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>( '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( 'get', - `${this.basePath}/rule-set/${encodeURIComponent(String(dossierTemplateId))}`, + `${this.basePath}/dossier-template/${encodeURIComponent(String(dossierTemplateId))}`, { withCredentials: this.configuration.withCredentials, headers: headers,