RED-4718: update common-ui & imports

This commit is contained in:
Dan Percic 2022-07-28 14:11:17 +03:00
parent 427731b28b
commit a551caef05
7 changed files with 28 additions and 5 deletions

View File

@ -8,6 +8,7 @@ import { EntityInfoComponent } from './screens/entity-info/entity-info.component
import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'; import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor';
import { SharedAdminModule } from '../../shared/shared-admin.module'; import { SharedAdminModule } from '../../shared/shared-admin.module';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { IqserScrollbarModule } from '@iqser/common-ui';
const routes: Routes = [ const routes: Routes = [
{ path: '', redirectTo: 'info', pathMatch: 'full' }, { path: '', redirectTo: 'info', pathMatch: 'full' },
@ -35,6 +36,14 @@ const routes: Routes = [
@NgModule({ @NgModule({
declarations: [DictionaryScreenComponent, EntityInfoComponent], declarations: [DictionaryScreenComponent, EntityInfoComponent],
imports: [RouterModule.forChild(routes), SharedAdminModule, CommonModule, SharedModule, MonacoEditorModule, TranslateModule], imports: [
RouterModule.forChild(routes),
SharedAdminModule,
CommonModule,
SharedModule,
MonacoEditorModule,
TranslateModule,
IqserScrollbarModule,
],
}) })
export class EntitiesModule {} export class EntitiesModule {}

View File

@ -4,7 +4,14 @@ import { RouterModule } from '@angular/router';
import { SharedModule } from '@shared/shared.module'; import { SharedModule } from '@shared/shared.module';
import { WatermarkScreenComponent } from './watermark-screen/watermark-screen.component'; import { WatermarkScreenComponent } from './watermark-screen/watermark-screen.component';
import { WatermarksListingScreenComponent } from './watermarks-listing/watermarks-listing-screen.component'; import { WatermarksListingScreenComponent } from './watermarks-listing/watermarks-listing-screen.component';
import { CompositeRouteGuard, IqserAuthGuard, IqserButtonsModule, IqserListingModule, IqserUsersModule } from '@iqser/common-ui'; import {
CompositeRouteGuard,
IqserAuthGuard,
IqserButtonsModule,
IqserListingModule,
IqserScrollbarModule,
IqserUsersModule,
} from '@iqser/common-ui';
import { RedRoleGuard } from '@users/red-role.guard'; import { RedRoleGuard } from '@users/red-role.guard';
import { WATERMARK_ID } from '@red/domain'; import { WATERMARK_ID } from '@red/domain';
import { WatermarkExistsGuard } from '@guards/watermark-exists.guard'; import { WatermarkExistsGuard } from '@guards/watermark-exists.guard';
@ -47,6 +54,7 @@ const routes = [
TranslateModule, TranslateModule,
IqserButtonsModule, IqserButtonsModule,
IqserListingModule, IqserListingModule,
IqserScrollbarModule,
], ],
}) })
export class WatermarkModule {} export class WatermarkModule {}

View File

@ -6,7 +6,7 @@ import { TableItemComponent } from './components/table-item/table-item.component
import { SharedModule } from '@shared/shared.module'; import { SharedModule } from '@shared/shared.module';
import { ConfigService } from './services/config.service'; import { ConfigService } from './services/config.service';
import { SharedDossiersModule } from '../shared-dossiers/shared-dossiers.module'; import { SharedDossiersModule } from '../shared-dossiers/shared-dossiers.module';
import { IqserHelpModeModule, IqserListingModule, IqserUsersModule } from '@iqser/common-ui'; import { IqserButtonsModule, IqserHelpModeModule, IqserListingModule, IqserUsersModule } from '@iqser/common-ui';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
const components = [TableItemComponent]; const components = [TableItemComponent];
@ -23,6 +23,7 @@ const screens = [ArchivedDossiersScreenComponent];
IqserUsersModule, IqserUsersModule,
TranslateModule, TranslateModule,
IqserListingModule, IqserListingModule,
IqserButtonsModule,
], ],
providers: [ConfigService], providers: [ConfigService],
}) })

View File

@ -8,6 +8,7 @@ import {
IqserIconsModule, IqserIconsModule,
IqserListingModule, IqserListingModule,
IqserLoadingModule, IqserLoadingModule,
IqserScrollbarModule,
IqserSharedModule, IqserSharedModule,
IqserUsersModule, IqserUsersModule,
} from '@iqser/common-ui'; } from '@iqser/common-ui';
@ -59,6 +60,7 @@ const routes: Routes = [
IqserButtonsModule, IqserButtonsModule,
IqserLoadingModule, IqserLoadingModule,
IqserSharedModule, IqserSharedModule,
IqserScrollbarModule,
], ],
}) })
export class DossierOverviewModule {} export class DossierOverviewModule {}

View File

@ -8,6 +8,7 @@ import {
IqserHelpModeModule, IqserHelpModeModule,
IqserIconsModule, IqserIconsModule,
IqserInputsModule, IqserInputsModule,
IqserScrollbarModule,
IqserSharedModule, IqserSharedModule,
IqserUploadFileModule, IqserUploadFileModule,
IqserUsersModule, IqserUsersModule,
@ -113,6 +114,7 @@ const components = [
IqserUploadFileModule, IqserUploadFileModule,
IqserEmptyStatesModule, IqserEmptyStatesModule,
IqserFiltersModule, IqserFiltersModule,
IqserScrollbarModule,
], ],
providers: [FilePreviewDialogService, ManualRedactionService, DocumentUnloadedGuard], providers: [FilePreviewDialogService, ManualRedactionService, DocumentUnloadedGuard],
}) })

View File

@ -8,7 +8,7 @@ import { IconsModule } from '../icons/icons.module';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { AnnotationIconComponent } from './components/annotation-icon/annotation-icon.component'; import { AnnotationIconComponent } from './components/annotation-icon/annotation-icon.component';
import { DonutChartComponent } from './components/donut-chart/donut-chart.component'; import { DonutChartComponent } from './components/donut-chart/donut-chart.component';
import { IqserButtonsModule, IqserHelpModeModule, IqserSharedModule, IqserUsersModule } from '@iqser/common-ui'; import { IqserButtonsModule, IqserHelpModeModule, IqserScrollbarModule, IqserSharedModule, IqserUsersModule } from '@iqser/common-ui';
import { SelectComponent } from './components/select/select.component'; import { SelectComponent } from './components/select/select.component';
import { NavigateLastDossiersScreenDirective } from './directives/navigate-last-dossiers-screen.directive'; import { NavigateLastDossiersScreenDirective } from './directives/navigate-last-dossiers-screen.directive';
import { DictionaryManagerComponent } from './components/dictionary-manager/dictionary-manager.component'; import { DictionaryManagerComponent } from './components/dictionary-manager/dictionary-manager.component';
@ -78,6 +78,7 @@ const modules = [MatConfigModule, ScrollingModule, IconsModule, FormsModule, Rea
IqserUsersModule, IqserUsersModule,
IqserButtonsModule, IqserButtonsModule,
IqserSharedModule, IqserSharedModule,
IqserScrollbarModule,
], ],
exports: [...modules, ...components, ...utils], exports: [...modules, ...components, ...utils],
providers: [ providers: [

@ -1 +1 @@
Subproject commit 9280ea8e525c2f4e2ee6e5b5b81900d02c8fc662 Subproject commit 3117c83d772b950ea36656a266136b5d1612869a