diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.scss b/apps/red-ui/src/app/components/notifications/notifications.component.scss index ae5488b69..41d696e1c 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.scss +++ b/apps/red-ui/src/app/components/notifications/notifications.component.scss @@ -1,9 +1,5 @@ @use 'variables'; -.mt-2 { - margin-top: 2px; -} - ::ng-deep .notifications-backdrop + .cdk-overlay-connected-position-bounding-box { right: 0 !important; @@ -20,6 +16,7 @@ .view-all { cursor: pointer; + &:hover { color: var(--iqser-primary); } diff --git a/apps/red-ui/src/app/i18n/language.service.ts b/apps/red-ui/src/app/i18n/language.service.ts index d7a5b0c98..3a48ca225 100644 --- a/apps/red-ui/src/app/i18n/language.service.ts +++ b/apps/red-ui/src/app/i18n/language.service.ts @@ -8,6 +8,7 @@ import { UserPreferenceService } from '@services/user-preference.service'; export class LanguageService { constructor(private readonly _translateService: TranslateService, private readonly _userPreferenceService: UserPreferenceService) { _translateService.addLangs(['en', 'de']); + _translateService.setDefaultLang('en'); } get currentLanguage() { diff --git a/apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.scss b/apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.scss index 11153dd15..baf2e798b 100644 --- a/apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.scss +++ b/apps/red-ui/src/app/modules/admin/components/users-stats/users-stats.component.scss @@ -13,7 +13,3 @@ left: 270px; } } - -.mt-44 { - margin-top: 44px; -} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.scss index d630c483b..b057ad746 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.scss +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.scss @@ -10,10 +10,6 @@ } } -.mb-14 { - margin-bottom: 14px; -} - .technical-name { font-weight: 600; } 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 296eb49c8..0d7278f2d 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 @@ -60,7 +60,6 @@ *ngIf="form.get('userId').value !== ALL_USERS" [user]="form.get('userId').value" [withName]="true" - size="small" >
@@ -69,7 +68,6 @@ *ngIf="userId !== ALL_USERS" [user]="userId" [withName]="true" - size="small" >
@@ -109,7 +107,7 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.scss index 010d52fd9..fee44202a 100644 --- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.scss @@ -17,11 +17,3 @@ form { font-size: 16px; opacity: 0.7; } - -.mr-0 { - margin-right: 0; -} - -.mr-20 { - margin-right: 20px; -} diff --git a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.scss index a6a1f2223..9e316aa55 100644 --- a/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen.component.scss @@ -84,7 +84,3 @@ } } } - -.mb-5 { - margin-bottom: 5px; -} diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html index 7319b9040..ce1c54ddc 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html @@ -28,7 +28,7 @@ +
+ +
+ +
+ +
+
{{ file.softDeleted | date: 'exactDate' }}
@@ -65,6 +83,7 @@ implements EditDossierSectionInterface, OnInit { + readonly fileStatusTranslations = workflowFileStatusTranslations; @Input() dossier: Dossier; readonly changed = false; readonly valid = false; readonly canRestoreSelected$ = this._canRestoreSelected$; + readonly canDeleteSelected$ = this._canDeleteSelected$; disabled: boolean; readonly tableColumnConfigs: TableColumnConfig[] = [ { label: _('edit-dossier-dialog.deleted-documents.table-col-names.name'), width: '3fr' }, { label: _('edit-dossier-dialog.deleted-documents.table-col-names.pages') }, + { label: _('edit-dossier-dialog.deleted-documents.table-col-names.assignee'), class: 'user-column' }, + { label: _('edit-dossier-dialog.deleted-documents.table-col-names.status') }, { label: _('edit-dossier-dialog.deleted-documents.table-col-names.deleted-on'), sortByKey: 'softDeleted', width: '2fr' }, { label: _('edit-dossier-dialog.deleted-documents.table-col-names.time-to-restore'), sortByKey: 'softDeleted', width: '2fr' }, ]; @@ -59,6 +67,8 @@ export class EditDossierDeletedDocumentsComponent extends ListingComponent { + return this.listingService.selectedEntities$.pipe( + map(entities => entities.length && !entities.find(file => !file.canHardDelete)), + distinctUntilChanged(), + ); + } + hardDelete(files = this.listingService.selected) { const data = new ConfirmationDialogInput({ title: _('confirmation-dialog.permanently-delete-file.title'), @@ -133,21 +150,26 @@ export class EditDossierDeletedDocumentsComponent extends ListingComponent this._toListItem(file)); } - private _toListItem(file: IFile): FileListItem { - const restoreDate = this._getRestoreDate(file.softDeleted); + private _toListItem(_file: IFile): FileListItem { + const file = new File(_file, this._userService.getNameForId(_file.assignee)); + const restoreDate = this._getRestoreDate(_file.softDeleted); return { id: file.fileId, ...file, restoreDate, searchKey: file.filename, - canRestore: this._canRestoreFile(restoreDate), + canRestore: this._canRestore(file, restoreDate), + canHardDelete: this._canPerformActions(file), }; } - private _canRestoreFile(restoreDate: string): boolean { - const { daysLeft, hoursLeft, minutesLeft } = getLeftDateTime(restoreDate); + private _canPerformActions(file: File): boolean { + return this._userService.currentUser.isManager || this._permissionsService.canDeleteFile(file); + } - return daysLeft >= 0 && hoursLeft >= 0 && minutesLeft >= 0; + private _canRestore(file: File, restoreDate: string): boolean { + const { daysLeft, hoursLeft, minutesLeft } = getLeftDateTime(restoreDate); + return this._canPerformActions(file) && daysLeft + hoursLeft + minutesLeft > 0; } private _getRestoreDate(softDeletedTime: string): string { diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html index 26d46072e..eb2b33bdc 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html @@ -13,7 +13,7 @@ - 

-
     

     
 
-    

+    
+        
{{ 'assign-dossier-owner.dialog.no-reviewers' | translate }}

+        
{{ 'assign-dossier-owner.dialog.select-below' | translate }}

+    
 
-    
+    
+        
 
-    

-        

-            
-            

-                

-                    
-                    
+        

+            

+                
+                

+                    

+                        
+                        
+                    

+                    
                 

-                
             

         

-    

+    
 
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss
index fad35d935..8dcbfe2fc 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.scss
@@ -60,7 +60,3 @@ redaction-team-members {
         }
     }
 }
-
-.info {
-    margin-top: 4px;
-}
diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts
index 0d9f1a7cc..89c2697ca 100644
--- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { UserService } from '@services/user.service';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup } from '@angular/forms';
 import { DossiersService } from '@services/entity-services/dossiers.service';
 import { Dossier, IDossierRequest } from '@red/domain';
 import { AutoUnsubscribe } from '@iqser/common-ui';
@@ -146,7 +146,10 @@ export class EditDossierTeamComponent extends AutoUnsubscribe implements EditDos
 
     private _loadData() {
         this.form = this._formBuilder.group({
-            owner: [this.dossier?.ownerId, Validators.required],
+            owner: {
+                value: this.dossier?.ownerId,
+                disabled: this.disabled,
+            },
             approvers: [[...this.dossier?.approverIds]],
             members: [[...this.dossier?.memberIds]],
         });
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/workflow-item/workflow-item.component.scss b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/workflow-item/workflow-item.component.scss
index 9468a2610..3f2e7cc60 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/workflow-item/workflow-item.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/workflow-item/workflow-item.component.scss
@@ -54,7 +54,3 @@ redaction-file-workload {
 redaction-file-actions:not(.keep-visible) {
     display: none;
 }
-
-.mt-4 {
-    margin-top: 4px;
-}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss
index bfbe391d2..49b83de09 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.scss
@@ -53,10 +53,6 @@
     margin-right: 8px;
 }
 
-.ml-2 {
-    margin-left: 2px;
-}
-
 .analysis-progress {
     padding: 12px 20px;
     max-width: 400px;
diff --git a/apps/red-ui/src/app/modules/shared/components/assign-user-dropdown/assign-user-dropdown.component.html b/apps/red-ui/src/app/modules/shared/components/assign-user-dropdown/assign-user-dropdown.component.html
index 50fd141f2..4db38fa1d 100644
--- a/apps/red-ui/src/app/modules/shared/components/assign-user-dropdown/assign-user-dropdown.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/assign-user-dropdown/assign-user-dropdown.component.html
@@ -28,5 +28,5 @@
 

 
 
-    
+    
 
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html
index d336757c6..f06bc81c8 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.html
@@ -1,5 +1,5 @@
 
 

diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.scss b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.scss
index 76c347ec3..eb363230f 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.scss
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/user-button/user-button.component.scss
@@ -3,6 +3,7 @@
 
 :host {
     @extend .user-button;
+    min-width: fit-content;
 
     button {
         padding: 0 10px 0 5px;
diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss
index c753d664f..f9b6d62e8 100644
--- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss
+++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss
@@ -50,10 +50,6 @@ form {
             align-items: center;
         }
 
-        .mr-32 {
-            margin-right: 32px;
-        }
-
         .w-450 {
             width: 100%;
             max-width: 450px;
diff --git a/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts b/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts
index 30f8d45d4..f2cdbe2f2 100644
--- a/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/editor/editor.component.ts
@@ -68,6 +68,7 @@ export class EditorComponent implements OnInit, OnChanges {
             glyphMargin: true,
             automaticLayout: true,
             readOnly: !this.canEdit,
+            extraEditorClassName: this.canEdit ? '' : 'disabled',
         };
     }
 
@@ -79,19 +80,12 @@ export class EditorComponent implements OnInit, OnChanges {
         this._diffEditor.getModifiedEditor().onDidChangeModelContent(() => {
             this.value = this._diffEditor.getModel().modified.getValue();
         });
+        this._setTheme();
     }
 
     onCodeEditorInit(editor: ICodeEditor): void {
         this.codeEditor = editor;
-        (window as any).monaco.editor.defineTheme('redaction', {
-            base: 'vs',
-            inherit: true,
-            rules: [],
-            colors: {
-                'editor.lineHighlightBackground': '#f4f5f7',
-            },
-        });
-        (window as any).monaco.editor.setTheme('redaction');
+        this._setTheme();
     }
 
     @Debounce()
@@ -107,6 +101,34 @@ export class EditorComponent implements OnInit, OnChanges {
         this._diffEditor?.getModifiedEditor().setValue(this.diffValue);
     }
 
+    private _defineThemes(): void {
+        (window as any).monaco.editor.defineTheme('redaction', {
+            base: 'vs',
+            inherit: true,
+            rules: [],
+            colors: {
+                'editor.lineHighlightBackground': '#f4f5f7',
+            },
+        });
+        (window as any).monaco.editor.defineTheme('redaction-disabled', {
+            base: 'vs',
+            inherit: true,
+            rules: [],
+            colors: {
+                'editor.background': '#f4f5f7',
+                'editor.foreground': '#9398a0',
+                'editor.lineHighlightBackground': '#f4f5f7',
+                'editorLineNumber.foreground': '#9398a0',
+                'editorActiveLineNumber.foreground': '#9398a0',
+            },
+        });
+    }
+
+    private _setTheme(): void {
+        this._defineThemes();
+        (window as any).monaco.editor.setTheme(this.canEdit ? 'redaction' : 'redaction-disabled');
+    }
+
     private _handleMarginButtonClick(event: IEditorMouseEvent) {
         const isMarginButtonClick = event.target.detail.glyphMarginWidth && event.target.detail.glyphMarginWidth !== 0;
         if (isMarginButtonClick) {
diff --git a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.scss b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.scss
index 0bc36396d..822b7dc96 100644
--- a/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.scss
+++ b/apps/red-ui/src/app/modules/shared/components/expandable-file-actions/expandable-file-actions.component.scss
@@ -21,7 +21,3 @@ mat-slide-toggle {
         color: rgba(var(--iqser-accent-rgb), 0.3);
     }
 }
-
-.ml-0 {
-    margin-left: 0;
-}
diff --git a/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.html b/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.html
index 538181b7c..027c9a0dd 100644
--- a/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/initials-avatar/initials-avatar.component.html
@@ -6,7 +6,7 @@
     >
         {{ _user | name: { showInitials: true } }}
     

-    

+    

         {{ userName }}
     

 

diff --git a/apps/red-ui/src/app/services/general-settings.service.ts b/apps/red-ui/src/app/services/general-settings.service.ts
index 10353d8c2..2f5b18de8 100644
--- a/apps/red-ui/src/app/services/general-settings.service.ts
+++ b/apps/red-ui/src/app/services/general-settings.service.ts
@@ -1,17 +1,17 @@
 import { Injectable, Injector } from '@angular/core';
 import { GenericService, RequiredParam, Validate } from '@iqser/common-ui';
 import { IGeneralConfiguration } from '@red/domain';
-import { UserService } from '@services/user.service';
+import { Observable } from 'rxjs';
 
 @Injectable({
     providedIn: 'root',
 })
 export class GeneralSettingsService extends GenericService {
-    constructor(protected readonly _injector: Injector, private readonly _userService: UserService) {
+    constructor(protected readonly _injector: Injector) {
         super(_injector, 'configuration');
     }
 
-    getGeneralConfigurations() {
+    getGeneralConfigurations(): Observable {
         return this._getOne(['general']);
     }
 
diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts
index e40be51ac..88b9afe77 100644
--- a/apps/red-ui/src/app/services/permissions.service.ts
+++ b/apps/red-ui/src/app/services/permissions.service.ts
@@ -135,7 +135,7 @@ export class PermissionsService {
     }
 
     canExcludePages(file: File): boolean {
-        return this.isFileAssignee(file);
+        return this.canPerformAnnotationActions(file);
     }
 
     canDeleteComment(comment: IComment, file: File) {
diff --git a/apps/red-ui/src/app/utils/configuration.initializer.ts b/apps/red-ui/src/app/utils/configuration.initializer.ts
index 2f4bc4faf..8dab62065 100644
--- a/apps/red-ui/src/app/utils/configuration.initializer.ts
+++ b/apps/red-ui/src/app/utils/configuration.initializer.ts
@@ -1,11 +1,11 @@
-import { catchError, filter, mergeMap, switchMap, take, tap } from 'rxjs/operators';
+import { catchError, filter, mapTo, switchMap, take, tap } from 'rxjs/operators';
 import { ConfigService } from '@services/config.service';
 import { Title } from '@angular/platform-browser';
-import { from, of, throwError } from 'rxjs';
 import { KeycloakEventType, KeycloakService } from 'keycloak-angular';
 import { GeneralSettingsService } from '@services/general-settings.service';
 import { LanguageService } from '@i18n/language.service';
 import { UserPreferenceService } from '@services/user-preference.service';
+import { from, iif, of, throwError } from 'rxjs';
 
 export function configurationInitializer(
     keycloakService: KeycloakService,
@@ -15,16 +15,22 @@ export function configurationInitializer(
     languageService: LanguageService,
     userPreferenceService: UserPreferenceService,
 ) {
+    const userConfig$ = generalSettingsService.getGeneralConfigurations().pipe(
+        switchMap(config => from(userPreferenceService.reload()).pipe(mapTo(config))),
+        tap(() => languageService.chooseAndSetInitialLanguage()),
+    );
+
     return () =>
         keycloakService.keycloakEvents$
             .pipe(
                 filter(event => event.type === KeycloakEventType.OnReady),
                 switchMap(() => from(keycloakService.isLoggedIn())),
-                switchMap(loggedIn => (!loggedIn ? throwError('Not Logged In') : of({}))),
-                mergeMap(() => generalSettingsService.getGeneralConfigurations()),
+                switchMap(loggedIn => {
+                    const hasAnyRedRoles = !!keycloakService.getUserRoles().find(role => role.startsWith('RED_'));
+                    return !loggedIn ? throwError('Not Logged In') : of(hasAnyRedRoles);
+                }),
+                switchMap(hasRoles => iif(() => !!hasRoles, userConfig$, of({ displayName: 'RedactManager' }))),
                 tap(configuration => configService.updateDisplayName(configuration.displayName)),
-                switchMap(() => userPreferenceService.reload()),
-                tap(() => languageService.chooseAndSetInitialLanguage()),
                 catchError(() => {
                     title.setTitle('RedactManager');
                     return of({});
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index a24cca958..93642ab72 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -296,10 +296,10 @@
     "dialog": {
       "approvers": "Approvers",
       "make-approver": "Make Approver",
-      "no-approvers": "No approvers yet.\nSelect from the list below.",
-      "no-reviewers": "No reviewers yet.\nSelect from the list below.",
+      "no-reviewers": "No members with \"review only\" permission.",
       "reviewers": "Reviewers",
       "search": "Search...",
+      "select-below": "Select from the list below.",
       "single-user": "Owner"
     }
   },
@@ -878,9 +878,11 @@
         "title": "There are no deleted documents."
       },
       "table-col-names": {
+        "assignee": "Assignee",
         "deleted-on": "Deleted On",
         "name": "Name",
         "pages": "Pages",
+        "status": "Status",
         "time-to-restore": "Time To Restore"
       },
       "table-header": {
@@ -1309,7 +1311,7 @@
     "dossier-deleted": "Dossier: {dossierName} has been deleted!",
     "dossier-owner-removed": "{dossierName} owner removed!",
     "dossier-owner-set": " {dossierName} owner changed to {user}!",
-    "download-ready": "Your download is ready!",
+    "download-ready": "Your download is ready!",
     "no-data": "You currently have no notifications",
     "unassigned-from-file": "You have been unassigned from {fileName} in dossier: {dossierName}!",
     "user-becomes-dossier-member": "You have been added to dossier: {dossierName}!",
diff --git a/apps/red-ui/src/assets/styles/red-editor.scss b/apps/red-ui/src/assets/styles/red-editor.scss
index 1150600de..447ecdc50 100644
--- a/apps/red-ui/src/assets/styles/red-editor.scss
+++ b/apps/red-ui/src/assets/styles/red-editor.scss
@@ -1,5 +1,39 @@
 @use 'variables';
 
+.monaco-diff-editor {
+    .editor.original {
+        right: 30px !important; // diffOverviewRuler size
+        left: unset !important;
+    }
+
+    .editor.modified {
+        left: 0 !important;
+        width: unset !important;
+    }
+
+    .diffOverview {
+        .diffOverviewRuler.original {
+            left: 15px !important;
+        }
+
+        .diffOverviewRuler.modified {
+            right: 15px !important;
+        }
+    }
+}
+
+.monaco-editor.disabled {
+    cursor: default;
+
+    .monaco-mouse-cursor-text {
+        cursor: default;
+    }
+
+    .cursors-layer > .cursor {
+        display: none !important;
+    }
+}
+
 .changed-row-marker {
     background: rgba(variables.$primary, 0.1);
 }
diff --git a/apps/red-ui/src/styles.scss b/apps/red-ui/src/styles.scss
index 91c598cbb..4b83d585b 100644
--- a/apps/red-ui/src/styles.scss
+++ b/apps/red-ui/src/styles.scss
@@ -32,25 +32,3 @@
     $iqser-yellow-2: vars.$yellow-2,
     $iqser-helpmode-primary: vars.$green-2
 );
-
-.monaco-diff-editor {
-    .editor.original {
-        right: 30px !important; // diffOverviewRuler size
-        left: unset !important;
-    }
-
-    .editor.modified {
-        left: 0 !important;
-        width: unset !important;
-    }
-
-    .diffOverview {
-        .diffOverviewRuler.original {
-            left: 15px !important;
-        }
-
-        .diffOverviewRuler.modified {
-            right: 15px !important;
-        }
-    }
-}
diff --git a/bamboo-specs/pom.xml b/bamboo-specs/pom.xml
index b32dbf5f6..5be92c2cb 100644
--- a/bamboo-specs/pom.xml
+++ b/bamboo-specs/pom.xml
@@ -5,7 +5,7 @@
   
     com.atlassian.bamboo
     bamboo-specs-parent
-    8.0.2
+    8.1.1
     
   
 
diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java
index a6d1eb83f..108ccb99e 100644
--- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java
+++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java
@@ -59,7 +59,8 @@ public class PlanSpec {
     public Plan createDockerBuildPlan() {
         return new Plan(project(), "Redaction UI", new BambooKey("UI"))
             .description("Docker build for Redaction UI.")
-            .stages(new Stage("Build Stage").jobs(creatGinCloudPlatformImagesJob("red-ui")))
+            .stages(new Stage("UI Build Stage")
+                .jobs(creatGinCloudPlatformImagesJob("red-ui")))
             .stages(new Stage("Release")
                 .manual(true)
                 .jobs(createRelease()))
@@ -70,14 +71,12 @@ public class PlanSpec {
     }
 
     public Job creatGinCloudPlatformImagesJob(String project) {
-        return new Job("Build Job: " + project, new BambooKey(project.toUpperCase().replaceAll("-", "")))
+        return new Job("Build Job UI" , new BambooKey("UIBUILD"))
             .tasks(
           		new CleanWorkingDirectoryTask().description("My clean working directory task"),
                 // Checkout
                 new VcsCheckoutTask().description("Checkout Default Repository")
                     .checkoutItems(new CheckoutItem().defaultRepository().path("redaction-ui")),
-                new VcsCheckoutTask().description("Checkout UI Shared Lib")
-                    .checkoutItems(new CheckoutItem().repository("Shared Libraries / common-ui").path("common-ui")),
 
                 // Build
                 new ScriptTask().description("Build")
diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh
index d145c55e2..14c9597bc 100755
--- a/bamboo-specs/src/main/resources/scripts/build.sh
+++ b/bamboo-specs/src/main/resources/scripts/build.sh
@@ -5,13 +5,8 @@ set -e
 imageName="nexus.iqser.com:5001/red/$PROJECT"
 dockerfileLocation="docker/$PROJECT/Dockerfile"
 
+echo "submodule status"
 git submodule status
-commonUIVersion=$(git submodule status | awk '{ print $1 }' | sed 's|-||g')
-echo $commonUIVersion
-cd ../common-ui
-git checkout $commonUIVersion
-cd ../redaction-ui
-mv ../common-ui ./libs/
 
 echo "On branch $bamboo_planRepository_branchName building project $PROJECT"
 # shellcheck disable=SC2154
diff --git a/libs/common-ui b/libs/common-ui
index 45a12070b..6527ccd30 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 45a12070bfe5c9aa36f24c4e08da157796e881ab
+Subproject commit 6527ccd3077bfcb4bedf729bf09edc5bd1449502
diff --git a/package.json b/package.json
index 63e4bbe64..2870cb5d8 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "redaction",
-  "version": "3.115.0",
+  "version": "3.132.0",
   "private": true,
   "license": "MIT",
   "scripts": {
     "build": "nx build",
-    "build-lint-all": "ng lint --project=red-ui --fix && ng lint --project=common-ui --fix  && ng build --project=red-ui --configuration production --base-href /ui/",
+    "build-lint-all": "ng build --project=red-ui --configuration production --base-href /ui/",
     "build-paligo-styles": "mkdir -p dist/paligo-styles && sass --load-path=. paligo-styles/style.scss > dist/paligo-styles/redacto-theme.css",
     "i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src ./libs/common-ui/src --output apps/red-ui/src/assets/i18n/en.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*.json --write",
     "postinstall": "ngcc --properties es2015 browser module main",
diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz
index 99fc58a10..bbc96829c 100644
Binary files a/paligo-theme.tar.gz and b/paligo-theme.tar.gz differ