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 edecbf01c..a1f9839ca 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,6 @@ import { EntitiesListingScreenComponent } from './screens/entities-listing/entit import { DigitalSignatureScreenComponent } from './screens/digital-signature/digital-signature-screen.component'; import { UserListingScreenComponent } from './screens/user-listing/user-listing-screen.component'; import { DossierTemplateBreadcrumbsComponent } from './shared/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component'; -import { AddEditFileAttributeDialogComponent } from './screens/file-attributes-listing/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'; import { EditColorDialogComponent } from './dialogs/edit-color-dialog/edit-color-dialog.component'; @@ -62,7 +61,6 @@ import { DossierTemplateActionsComponent } from './shared/components/dossier-tem const dialogs = [ AddEditCloneDossierTemplateDialogComponent, AddEntityDialogComponent, - AddEditFileAttributeDialogComponent, EditColorDialogComponent, SmtpAuthDialogComponent, AddEditUserDialogComponent, diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts index 6d2a89186..0e61bd806 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts @@ -1,9 +1,16 @@ import { Component, Inject } from '@angular/core'; -import { Validators } from '@angular/forms'; +import { ReactiveFormsModule, Validators } from '@angular/forms'; import { FileAttributeConfigTypes, IFileAttributeConfig } from '@red/domain'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { fileAttributeTypesTranslations } from '@translations/file-attribute-types-translations'; -import { BaseDialogComponent } from '@iqser/common-ui'; +import { BaseDialogComponent, CircleButtonComponent, IconButtonComponent } from '@iqser/common-ui'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; +import { NgForOf } from '@angular/common'; +import { MatLegacySlideToggleModule } from '@angular/material/legacy-slide-toggle'; +import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; +import { MatTooltipModule } from '@angular/material/tooltip'; export interface AddEditFileAttributeDialogData { readonly fileAttribute: IFileAttributeConfig; @@ -15,6 +22,19 @@ export interface AddEditFileAttributeDialogData { @Component({ templateUrl: './add-edit-file-attribute-dialog.component.html', styleUrls: ['./add-edit-file-attribute-dialog.component.scss'], + standalone: true, + imports: [ + ReactiveFormsModule, + TranslateModule, + MatFormFieldModule, + MatSelectModule, + NgForOf, + MatLegacySlideToggleModule, + MatCheckboxModule, + MatTooltipModule, + IconButtonComponent, + CircleButtonComponent, + ], }) export class AddEditFileAttributeDialogComponent extends BaseDialogComponent { readonly DISPLAYED_FILTERABLE_LIMIT = 3; diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts index 97a94b1f2..41db9883c 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component.ts @@ -1,13 +1,30 @@ import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { Validators } from '@angular/forms'; +import { ReactiveFormsModule, Validators } from '@angular/forms'; import { FileAttributeEncodingTypes, IFileAttributesConfig } from '@red/domain'; import { fileAttributeEncodingTypesTranslations } from '@translations/file-attribute-encoding-types-translations'; -import { BaseDialogComponent } from '@iqser/common-ui'; +import { BaseDialogComponent, CircleButtonComponent, IconButtonComponent } from '@iqser/common-ui'; +import { MatLegacySlideToggleModule } from '@angular/material/legacy-slide-toggle'; +import { NgForOf, NgIf } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; @Component({ templateUrl: './file-attributes-configurations-dialog.component.html', changeDetection: ChangeDetectionStrategy.OnPush, + standalone: true, + imports: [ + ReactiveFormsModule, + MatLegacySlideToggleModule, + NgIf, + TranslateModule, + MatFormFieldModule, + MatSelectModule, + NgForOf, + IconButtonComponent, + CircleButtonComponent, + ], }) export class FileAttributesConfigurationsDialogComponent extends BaseDialogComponent { readonly encodingTypeOptions = Object.keys(FileAttributeEncodingTypes); diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/active-fields-listing/active-fields-listing.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/active-fields-listing/active-fields-listing.component.html rename to apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.html diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/active-fields-listing/active-fields-listing.component.scss b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/active-fields-listing/active-fields-listing.component.scss rename to apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.scss diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/active-fields-listing/active-fields-listing.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/active-fields-listing/active-fields-listing.component.ts rename to apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/active-fields-listing/active-fields-listing.component.ts diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.module.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.module.ts new file mode 100644 index 000000000..15dcd8708 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.module.ts @@ -0,0 +1,47 @@ +import { NgModule } from '@angular/core'; +import { FileAttributesCsvImportDialogComponent } from './file-attributes-csv-import-dialog.component'; +import { ActiveFieldsListingComponent } from './active-fields-listing/active-fields-listing.component'; +import { + ChevronButtonComponent, + CircleButtonComponent, + EditableInputComponent, + IconButtonComponent, + InputWithActionComponent, + IqserListingModule, + RoundCheckboxComponent, +} from '@iqser/common-ui'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; +import { MatInputModule } from '@angular/material/input'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatLegacySlideToggleModule } from '@angular/material/legacy-slide-toggle'; + +@NgModule({ + declarations: [FileAttributesCsvImportDialogComponent, ActiveFieldsListingComponent], + imports: [ + CommonModule, + CircleButtonComponent, + TranslateModule, + MatDialogModule, + IconButtonComponent, + InputWithActionComponent, + MatFormFieldModule, + MatSelectModule, + ReactiveFormsModule, + MatAutocompleteModule, + MatInputModule, + IqserListingModule, + MatMenuModule, + ChevronButtonComponent, + EditableInputComponent, + FormsModule, + MatLegacySlideToggleModule, + RoundCheckboxComponent, + ], +}) +export class FileAttributesCsvImportDialogModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html index d563cb36a..aa3fc3f99 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html @@ -30,6 +30,7 @@ > +
+
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing.module.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing.module.ts index 5267ba3a5..07b2937e3 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing.module.ts @@ -2,9 +2,7 @@ import { NgModule } from '@angular/core'; import { FileAttributesListingScreenComponent } from './file-attributes-listing-screen.component'; import { RouterModule } from '@angular/router'; import { - ChevronButtonComponent, CircleButtonComponent, - EditableInputComponent, IconButtonComponent, InputWithActionComponent, IqserAllowDirective, @@ -13,21 +11,10 @@ import { IqserRoutes, RoundCheckboxComponent, } from '@iqser/common-ui'; -import { TranslateModule } from '@ngx-translate/core'; import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { ActiveFieldsListingComponent } from './active-fields-listing/active-fields-listing.component'; -import { FileAttributesCsvImportDialogComponent } from './file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MatInputModule } from '@angular/material/input'; -import { MatSelectModule } from '@angular/material/select'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle'; -import { FileAttributesConfigurationsDialogComponent } from './file-attributes-configurations-dialog/file-attributes-configurations-dialog.component'; const routes: IqserRoutes = [ { @@ -37,12 +24,7 @@ const routes: IqserRoutes = [ ]; @NgModule({ - declarations: [ - FileAttributesListingScreenComponent, - ActiveFieldsListingComponent, - FileAttributesCsvImportDialogComponent, - FileAttributesConfigurationsDialogComponent, - ], + declarations: [FileAttributesListingScreenComponent], imports: [ CommonModule, RouterModule.forChild(routes), @@ -56,17 +38,6 @@ const routes: IqserRoutes = [ MatIconModule, MatTooltipModule, RoundCheckboxComponent, - MatFormFieldModule, - MatAutocompleteModule, - ReactiveFormsModule, - MatInputModule, - MatSelectModule, - MatDialogModule, - MatMenuModule, - ChevronButtonComponent, - EditableInputComponent, - FormsModule, - MatSlideToggleModule, ], }) export class FileAttributesListingModule {} diff --git a/libs/common-ui b/libs/common-ui index a60a9d828..03421b43d 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit a60a9d828e9624b615f2298a52b134f9a1fa27f4 +Subproject commit 03421b43d9eeb0940e7cb7adc9905f0c1beb91e1