diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html index 46054815e..589002dfd 100644 --- a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html +++ b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html @@ -15,7 +15,7 @@ -
+
{{ 'preferences-screen.form.open-structured-view-by-default' | translate }} diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts index 374513f11..80b8cddd5 100644 --- a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts @@ -1,10 +1,10 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core'; -import { PreferencesKeys, UserPreferenceService } from '@users/user-preference.service'; import { FormBuilder, FormGroup } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; -import { BaseFormComponent, IqserPermissionsService, LoadingService } from '@iqser/common-ui'; -import { Roles } from '@users/roles'; +import { BaseFormComponent, getConfig, IqserPermissionsService, LoadingService } from '@iqser/common-ui'; import { AsControl } from '@iqser/common-ui/lib/utils'; +import { Roles } from '@users/roles'; +import { PreferencesKeys, UserPreferenceService } from '@users/user-preference.service'; interface PreferencesForm { // preferences @@ -38,6 +38,7 @@ export class PreferencesComponent extends BaseFormComponent implements OnInit { readonly screens = Screens; initialFormValue: PreferencesForm; readonly roles = Roles; + readonly config = getConfig(); constructor( route: ActivatedRoute, diff --git a/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts index 894b555fc..a9901e029 100644 --- a/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts +++ b/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts @@ -1,16 +1,16 @@ -import { Component, HostBinding, Input, OnInit } from '@angular/core'; -import { UserPreferenceService } from '@users/user-preference.service'; -import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { adminSideNavTranslations } from '@translations/admin-side-nav-translations'; -import { ActivatedRoute, RouterLink, RouterLinkActive } from '@angular/router'; -import { AdminSideNavType, AdminSideNavTypes, DOSSIER_TEMPLATE_ID, ENTITY_TYPE, User, WATERMARK_ID } from '@red/domain'; -import { Roles } from '@users/roles'; -import { getConfig, IqserHelpModeModule, IqserPermissionsService } from '@iqser/common-ui'; -import { TranslateModule } from '@ngx-translate/core'; import { NgForOf, NgIf } from '@angular/common'; -import { getCurrentUser } from '@iqser/common-ui/lib/users'; +import { Component, HostBinding, Input, OnInit } from '@angular/core'; +import { ActivatedRoute, RouterLink, RouterLinkActive } from '@angular/router'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { getConfig, IqserHelpModeModule, IqserPermissionsService } from '@iqser/common-ui'; import { SideNavComponent } from '@iqser/common-ui/lib/shared'; import { TenantPipe } from '@iqser/common-ui/lib/tenants'; +import { getCurrentUser } from '@iqser/common-ui/lib/users'; +import { TranslateModule } from '@ngx-translate/core'; +import { AdminSideNavType, AdminSideNavTypes, DOSSIER_TEMPLATE_ID, ENTITY_TYPE, User, WATERMARK_ID } from '@red/domain'; +import { adminSideNavTranslations } from '@translations/admin-side-nav-translations'; +import { Roles } from '@users/roles'; +import { UserPreferenceService } from '@users/user-preference.service'; interface NavItem { readonly label: string; @@ -108,7 +108,7 @@ export class AdminSideNavComponent implements OnInit { screen: 'watermarks', label: _('admin-side-nav.watermarks'), helpModeKey: 'watermarks', - show: this._permissionsService.has(Roles.watermarks.read), + show: this._permissionsService.has(Roles.watermarks.read) && !this.isDocumine, }, { screen: 'file-attributes',