diff --git a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.scss b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.scss index f37816eb9..23bddbc23 100644 --- a/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.scss +++ b/apps/red-ui/src/app/components/downloads-list-screen/downloads-list-screen.component.scss @@ -1,6 +1,4 @@ .content-container { - width: 100vw; - cdk-virtual-scroll-viewport { ::ng-deep.cdk-virtual-scroll-content-wrapper { grid-template-columns: 2fr 1fr 1fr 1fr auto 11px; 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 ffdc7f950..b67417b41 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -15,7 +15,6 @@ import { UserListingScreenComponent } from './screens/user-listing/user-listing- import { WatermarkScreenComponent } from './screens/watermark/watermark-screen.component'; import { AdminBreadcrumbsComponent } from './components/breadcrumbs/admin-breadcrumbs.component'; import { RuleSetActionsComponent } from './components/rule-set-actions/rule-set-actions.component'; -import { TabsComponent } from './components/tabs/tabs.component'; import { AceEditorModule } from 'ng2-ace-editor'; import { ColorPickerModule } from 'ngx-color-picker'; import { AddEditFileAttributeDialogComponent } from './dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component'; @@ -65,7 +64,6 @@ const screens = [ const components = [ AdminBreadcrumbsComponent, RuleSetActionsComponent, - TabsComponent, ComboChartComponent, ComboSeriesVerticalComponent, UsersStatsComponent, diff --git a/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.html b/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.html index 3bccf3166..dd49f134e 100644 --- a/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.html +++ b/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.html @@ -8,8 +8,8 @@ (!item.onlyDevMode || userPreferenceService.areDevFeaturesEnabled) && (!item.userManagerOnly || permissionsService.canManageUsers()) " - [routerLink]="'../' + item.screen" - [routerLinkActiveOptions]="{ exact: true }" + [routerLink]="prefix + item.screen" + [routerLinkActiveOptions]="{ exact: false }" routerLinkActive="active" > {{ item.label || item.screen | translate }} diff --git a/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.ts b/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.ts index 09d3ef4d3..c8ac63e79 100644 --- a/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.ts +++ b/apps/red-ui/src/app/modules/admin/components/side-nav/side-nav.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { PermissionsService } from '../../../../services/permissions.service'; -import { Router } from '@angular/router'; import { UserPreferenceService } from '../../../../services/user-preference.service'; +import { AppStateService } from '../../../../state/app-state.service'; @Component({ selector: 'redaction-side-nav', @@ -30,16 +30,18 @@ export class SideNavComponent implements OnInit { }; constructor( - private readonly _router: Router, + private readonly _appStateService: AppStateService, public readonly userPreferenceService: UserPreferenceService, public readonly permissionsService: PermissionsService ) {} ngOnInit(): void {} - // - // public navigate(screen: string) { - // if (this.type === '') - // this._router.navigate(['main/admin/project-templates/' + this._appStateService.activeRuleSetId + '/' + screen]); - // } + public get prefix() { + if (!!this._appStateService.activeDictionaryType) { + return '../../'; + } + + return '../'; + } } diff --git a/apps/red-ui/src/app/modules/admin/components/tabs/tabs.component.html b/apps/red-ui/src/app/modules/admin/components/tabs/tabs.component.html deleted file mode 100644 index c93576d79..000000000 --- a/apps/red-ui/src/app/modules/admin/components/tabs/tabs.component.html +++ /dev/null @@ -1,10 +0,0 @@ - -
- {{ tab.label || tab.screen | translate }} -
-
diff --git a/apps/red-ui/src/app/modules/admin/components/tabs/tabs.component.scss b/apps/red-ui/src/app/modules/admin/components/tabs/tabs.component.scss deleted file mode 100644 index e7a72018d..000000000 --- a/apps/red-ui/src/app/modules/admin/components/tabs/tabs.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -:host { - display: flex; -} diff --git a/apps/red-ui/src/app/modules/admin/components/tabs/tabs.component.ts b/apps/red-ui/src/app/modules/admin/components/tabs/tabs.component.ts deleted file mode 100644 index 67ff06292..000000000 --- a/apps/red-ui/src/app/modules/admin/components/tabs/tabs.component.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; -import { AppStateService } from '../../../../state/app-state.service'; -import { UserPreferenceService } from '../../../../services/user-preference.service'; -import { PermissionsService } from '../../../../services/permissions.service'; - -@Component({ - selector: 'redaction-tabs', - templateUrl: './tabs.component.html', - styleUrls: ['./tabs.component.scss'] -}) -export class TabsComponent implements OnInit { - @Input() public screen: 'rules' | 'dictionaries' | 'watermark' | 'default-colors' | 'file-attributes'; - - public tabs: { screen: string; onlyDevMode?: boolean; onlyAdmin?: boolean; label?: string }[] = [ - { screen: 'dictionaries' }, - { screen: 'rules', onlyDevMode: true, label: 'rule-editor' }, - { screen: 'default-colors' }, - { screen: 'watermark' }, - { screen: 'file-attributes', onlyAdmin: true } - ]; - - constructor( - public readonly userPreferenceService: UserPreferenceService, - public readonly permissionsService: PermissionsService, - private readonly _router: Router, - private readonly _appStateService: AppStateService - ) {} - - ngOnInit(): void {} - - public switchView(screen: string) { - this._router.navigate(['main/admin/project-templates/' + this._appStateService.activeRuleSetId + '/' + screen]); - } -} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss index f3114a403..fa5bc1e46 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss +++ b/apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.scss @@ -198,8 +198,4 @@ } } } - - > .content-container { - width: 100%; - } } diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html index a40ad07ed..62a0e63a7 100644 --- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html @@ -1,113 +1,119 @@ -
-