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 92aa673d4..57a9ea36f 100644
--- a/apps/red-ui/src/app/modules/admin/admin.module.ts
+++ b/apps/red-ui/src/app/modules/admin/admin.module.ts
@@ -8,7 +8,7 @@ import { EntitiesListingScreenComponent } from './screens/entities-listing/entit
import { DigitalSignatureScreenComponent } from './screens/digital-signature/digital-signature-screen.component';
import { FileAttributesListingScreenComponent } from './screens/file-attributes-listing/file-attributes-listing-screen.component';
import { UserListingScreenComponent } from './screens/user-listing/user-listing-screen.component';
-import { DossierTemplateBreadcrumbsComponent } from './components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component';
+import { DossierTemplateBreadcrumbsComponent } from './shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component';
import { AddEditFileAttributeDialogComponent } from './dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component';
import { AddEditCloneDossierTemplateDialogComponent } from './dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component';
import { AddEntityDialogComponent } from './dialogs/add-entity-dialog/add-entity-dialog.component';
@@ -33,14 +33,13 @@ import { UploadDictionaryDialogComponent } from './dialogs/upload-dictionary-dia
import { GeneralConfigFormComponent } from './screens/general-config/general-config-form/general-config-form.component';
import { SmtpFormComponent } from './screens/general-config/smtp-form/smtp-form.component';
import { FileAttributesConfigurationsDialogComponent } from './dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component';
-import { SharedAdminModule } from './shared/shared-admin.module';
import { BaseDossierTemplateScreenComponent } from './base-dossier-templates-screen/base-dossier-template-screen.component';
import { DossierStatesListingScreenComponent } from './screens/dossier-states-listing/dossier-states-listing-screen.component';
import { AddEditDossierStateDialogComponent } from './dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component';
import { A11yModule } from '@angular/cdk/a11y';
import { ConfirmDeleteDossierStateDialogComponent } from './dialogs/confirm-delete-dossier-state-dialog/confirm-delete-dossier-state-dialog.component';
import { BaseEntityScreenComponent } from './base-entity-screen/base-entity-screen.component';
-import { AdminSideNavComponent } from './admin-side-nav/admin-side-nav.component';
+import { AdminSideNavComponent } from './shared/components/admin-side-nav/admin-side-nav.component';
import { SystemPreferencesFormComponent } from './screens/general-config/system-preferences-form/system-preferences-form.component';
import { ConfigureCertificateDialogComponent } from './dialogs/configure-digital-signature-dialog/configure-certificate-dialog.component';
import { PkcsSignatureConfigurationComponent } from './dialogs/configure-digital-signature-dialog/form/pkcs-signature-configuration/pkcs-signature-configuration.component';
@@ -60,6 +59,7 @@ import {
} from '@iqser/common-ui';
import { TranslateModule } from '@ngx-translate/core';
import { AuditInfoDialogComponent } from './dialogs/audit-info-dialog/audit-info-dialog.component';
+import { DossierTemplateActionsComponent } from './shared/components/dossier-template-actions/dossier-template-actions.component';
const dialogs = [
AddEditCloneDossierTemplateDialogComponent,
@@ -91,9 +91,7 @@ const screens = [
];
const components = [
- DossierTemplateBreadcrumbsComponent,
UsersStatsComponent,
- AdminSideNavComponent,
ActiveFieldsListingComponent,
ResetPasswordComponent,
UserDetailsComponent,
@@ -117,7 +115,6 @@ const components = [
CommonModule,
SharedModule,
AdminRoutingModule,
- SharedAdminModule,
A11yModule,
IqserUsersModule,
TranslateModule,
@@ -131,6 +128,9 @@ const components = [
IqserSharedModule,
IqserHelpModeModule,
IqserPermissionsModule,
+ AdminSideNavComponent,
+ DossierTemplateActionsComponent,
+ DossierTemplateBreadcrumbsComponent,
],
})
export class AdminModule {}
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts
index c311876e6..aab8e565e 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing.module.ts
@@ -4,7 +4,6 @@ import { RouterModule } from '@angular/router';
import { SharedModule } from '@shared/shared.module';
import { TableItemComponent } from './table-item/table-item.component';
import { DossierTemplatesListingScreenComponent } from './dossier-templates-listing-screen/dossier-templates-listing-screen.component';
-import { SharedAdminModule } from '../../shared/shared-admin.module';
import {
IqserButtonsModule,
IqserHelpModeModule,
@@ -14,6 +13,7 @@ import {
IqserUsersModule,
} from '@iqser/common-ui';
import { TranslateModule } from '@ngx-translate/core';
+import { DossierTemplateActionsComponent } from '../../shared/components/dossier-template-actions/dossier-template-actions.component';
const routes = [{ path: '', component: DossierTemplatesListingScreenComponent }];
@@ -23,7 +23,6 @@ const routes = [{ path: '', component: DossierTemplatesListingScreenComponent }]
RouterModule.forChild(routes),
CommonModule,
SharedModule,
- SharedAdminModule,
IqserUsersModule,
TranslateModule,
IqserInputsModule,
@@ -31,6 +30,7 @@ const routes = [{ path: '', component: DossierTemplatesListingScreenComponent }]
IqserListingModule,
IqserHelpModeModule,
IqserPermissionsModule,
+ DossierTemplateActionsComponent,
],
})
export class DossierTemplatesListingModule {}
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.html
index 0df08d19a..8d9d1a787 100644
--- a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/table-item/table-item.component.html
@@ -6,7 +6,7 @@
- {{ 'dossier-templates-listing.entities' | translate: { length: stats.numberOfDictionaries } }}
+ {{ 'dossier-templates-listing.entities' | translate : { length: stats.numberOfDictionaries } }}
@@ -22,25 +22,25 @@
- {{ dossierTemplate.dateAdded | date: 'd MMM yyyy' }}
+ {{ dossierTemplate.dateAdded | date : 'd MMM yyyy' }}
- {{ dossierTemplate.dateModified | date: 'd MMM yyyy' }}
+ {{ dossierTemplate.dateModified | date : 'd MMM yyyy' }}
- {{ dossierTemplate.validFrom | date: 'd MMM yyyy' }}
+ {{ dossierTemplate.validFrom | date : 'd MMM yyyy' }}
- {{ dossierTemplate.validTo | date: 'd MMM yyyy' }}
+ {{ dossierTemplate.validTo | date : 'd MMM yyyy' }}
@@ -48,6 +48,7 @@
{{ translations[dossierTemplate.dossierTemplateStatus] | translate }}
+
();
@Input() dossierTemplateId: string;
diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html
similarity index 100%
rename from apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html
rename to apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html
diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.scss b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.scss
similarity index 100%
rename from apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.scss
rename to apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.scss
diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts
similarity index 81%
rename from apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts
rename to apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts
index 44e499a80..9c0c5a773 100644
--- a/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts
+++ b/apps/red-ui/src/app/modules/admin/shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.ts
@@ -2,14 +2,19 @@ import { Component, Input } from '@angular/core';
import { DossierTemplatesService } from '@services/dossier-templates/dossier-templates.service';
import { Observable, of } from 'rxjs';
import { map, switchMap } from 'rxjs/operators';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, RouterLink, RouterLinkActive } from '@angular/router';
import { Dictionary, DOSSIER_TEMPLATE_ID, DossierTemplate, ENTITY_TYPE } from '@red/domain';
import { DictionariesMapService } from '@services/entity-services/dictionaries-map.service';
+import { AsyncPipe, NgIf } from '@angular/common';
+import { MatIconModule } from '@angular/material/icon';
+import { TranslateModule } from '@ngx-translate/core';
@Component({
selector: 'redaction-dossier-template-breadcrumbs',
templateUrl: './dossier-template-breadcrumbs.component.html',
styleUrls: ['./dossier-template-breadcrumbs.component.scss'],
+ standalone: true,
+ imports: [NgIf, AsyncPipe, RouterLink, MatIconModule, TranslateModule, RouterLinkActive],
})
export class DossierTemplateBreadcrumbsComponent {
@Input() root = false;
diff --git a/apps/red-ui/src/app/modules/admin/shared/shared-admin.module.ts b/apps/red-ui/src/app/modules/admin/shared/shared-admin.module.ts
deleted file mode 100644
index 743fb0e9b..000000000
--- a/apps/red-ui/src/app/modules/admin/shared/shared-admin.module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { SharedModule } from '@shared/shared.module';
-import { DossierTemplateActionsComponent } from './components/dossier-template-actions/dossier-template-actions.component';
-import { RouterModule } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
-import { IqserButtonsModule, IqserHelpModeModule } from '@iqser/common-ui';
-
-const components = [DossierTemplateActionsComponent];
-
-const modules = [CommonModule, SharedModule];
-
-@NgModule({
- declarations: [...components],
- exports: [...components, ...modules],
- imports: [...modules, RouterModule, TranslateModule, IqserButtonsModule, IqserHelpModeModule],
-})
-export class SharedAdminModule {}
diff --git a/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.html b/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.html
index ade5095d8..0ae3e26ed 100644
--- a/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.html
@@ -20,6 +20,7 @@
{{ displayedDataTotal }}
{{ subtitles[0] }}
+
1"
@@ -48,8 +49,7 @@
}
]"
[small]="true"
- >
-
+ >
diff --git a/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.ts b/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.ts
index 97fe867bf..128b015ec 100644
--- a/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/donut-chart/donut-chart.component.ts
@@ -1,13 +1,17 @@
import { Component, EventEmitter, Input, OnChanges, OnInit, Optional, Output } from '@angular/core';
import { DonutChartConfig } from '@red/domain';
-import { FilterService, get, INestedFilter, shareLast } from '@iqser/common-ui';
+import { FilterService, get, INestedFilter, IqserHelpModeModule, shareLast, StatusBarComponent } from '@iqser/common-ui';
import { Observable, of } from 'rxjs';
import { map } from 'rxjs/operators';
+import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
+import { MatSelectModule } from '@angular/material/select';
@Component({
selector: 'redaction-donut-chart',
templateUrl: './donut-chart.component.html',
styleUrls: ['./donut-chart.component.scss'],
+ standalone: true,
+ imports: [NgForOf, NgIf, MatSelectModule, IqserHelpModeModule, StatusBarComponent, AsyncPipe],
})
export class DonutChartComponent implements OnChanges, OnInit {
@Input() subtitles: string[];
@@ -45,11 +49,12 @@ export class DonutChartComponent implements OnChanges, OnInit {
}
ngOnInit() {
- this.filters$ =
- this.filterService?.getFilterModels$(this.filterKey).pipe(
- map(filters => filters ?? []),
- shareLast(),
- ) ?? of([]);
+ const filterModels$ = this.filterService?.getFilterModels$(this.filterKey).pipe(
+ map(filters => filters ?? []),
+ shareLast(),
+ );
+
+ this.filters$ = filterModels$ ?? of([]);
}
ngOnChanges(): void {
diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts
index 4589f81f2..c605caf46 100644
--- a/apps/red-ui/src/app/modules/shared/shared.module.ts
+++ b/apps/red-ui/src/app/modules/shared/shared.module.ts
@@ -50,7 +50,6 @@ const buttons = [FileDownloadBtnComponent];
const components = [
PaginationComponent,
AnnotationIconComponent,
- DonutChartComponent,
SelectComponent,
DictionaryManagerComponent,
AssignUserDropdownComponent,
@@ -77,6 +76,8 @@ const services = [SharedDialogService];
const modules = [MatConfigModule, ScrollingModule, IconsModule, FormsModule, IqserButtonsModule, ReactiveFormsModule, ColorPickerModule];
+const deleteThisWhenAllComponentsAreStandalone = [DonutChartComponent];
+
@NgModule({
declarations: [...components, ...utils, EditorComponent, DownloadDialogComponent],
imports: [
@@ -90,8 +91,9 @@ const modules = [MatConfigModule, ScrollingModule, IconsModule, FormsModule, Iqs
IqserSharedModule,
IqserScrollbarModule,
IqserPermissionsModule,
+ ...deleteThisWhenAllComponentsAreStandalone,
],
- exports: [...modules, ...components, ...utils],
+ exports: [...modules, ...components, ...utils, ...deleteThisWhenAllComponentsAreStandalone],
providers: [
...services,
{
diff --git a/libs/common-ui b/libs/common-ui
index 223080763..08d06803e 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 223080763f280c58c50f739d316bfd7f50bdcab1
+Subproject commit 08d06803e023f279fe48eb3fe3c20bacf9d9e538