diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts b/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts index 7a8338b74..ce8f3a655 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts +++ b/apps/red-ui/src/app/modules/admin/screens/entities/entities.module.ts @@ -4,7 +4,7 @@ import { RouterModule, Routes } from '@angular/router'; import { SharedModule } from '@shared/shared.module'; import { DictionaryScreenComponent } from './screens/dictionary/dictionary-screen.component'; import { PendingChangesGuard } from '@guards/can-deactivate.guard'; -import { InfoComponent } from './screens/info/info.component'; +import { EntityInfoComponent } from './screens/entity-info/entity-info.component'; import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'; import { SharedAdminModule } from '../../shared/shared-admin.module'; @@ -12,7 +12,7 @@ const routes: Routes = [ { path: '', redirectTo: 'info', pathMatch: 'full' }, { path: 'info', - component: InfoComponent, + component: EntityInfoComponent, canDeactivate: [PendingChangesGuard], }, { @@ -33,7 +33,7 @@ const routes: Routes = [ ]; @NgModule({ - declarations: [DictionaryScreenComponent, InfoComponent], + declarations: [DictionaryScreenComponent, EntityInfoComponent], imports: [RouterModule.forChild(routes), SharedAdminModule, CommonModule, SharedModule, MonacoEditorModule], }) export class EntitiesModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/screens/info/info.component.html b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/entities/screens/info/info.component.html rename to apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/screens/info/info.component.scss b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/admin/screens/entities/screens/info/info.component.scss rename to apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.scss diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/screens/info/info.component.ts b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts similarity index 92% rename from apps/red-ui/src/app/modules/admin/screens/entities/screens/info/info.component.ts rename to apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts index 96fc46421..ae591dfb3 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities/screens/info/info.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.ts @@ -9,12 +9,12 @@ import { IqserEventTarget } from '@iqser/common-ui'; import { Observable } from 'rxjs'; @Component({ - selector: 'redaction-info', - templateUrl: './info.component.html', - styleUrls: ['./info.component.scss'], + selector: 'redaction-entity-info', + templateUrl: './entity-info.component.html', + styleUrls: ['./entity-info.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class InfoComponent { +export class EntityInfoComponent { readonly currentUser = getCurrentUser(); readonly entity$: Observable; readonly dossierTemplateId: string; diff --git a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.scss index ee5df8933..06474c4ab 100644 --- a/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/reports/reports-screen/reports-screen.component.scss @@ -1,7 +1,7 @@ @use 'common-mixins'; :host { - flex-direction: row; + flex-direction: row !important; } .content-container, diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html index 299d49b02..dbcec81d4 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html @@ -20,6 +20,7 @@ ? ('edit-dossier-dialog.dictionary.edit' | translate) : ('edit-dossier-dialog.dictionary.info' | translate) " + class="mt-20" > diff --git a/libs/common-ui b/libs/common-ui index d3e45f5c9..e07149db5 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit d3e45f5c9868f5ada0af084d93b42f9e92d68c5e +Subproject commit e07149db5417a9571723349e45f5b893a53c9801