diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html index 9e6fac31b..e6efce1ce 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.html @@ -1,243 +1,219 @@ - -
+
+
+ +
+
+ + +
+ {{ title() | translate }}
- +
+ +
+
- -
- {{ title() | translate }} -
-
- - -
-
+
+ + + - -@if (displayedAnnotations$ | async; as annotations) { -
- - - - - - +
+
+ -
-
- + {{ listingService.selectedLength$ | async }} selected - {{ listingService.selectedLength$ | async }} selected - - -
- - +
-
-
-
-
- -
+ +
- +
+
+
+ +
+ + +
+ +
+
+ +
+
+ + + + + + +
- -
+ (click)="selectAllOnActivePage()" + class="all-caps-label primary pointer" + translate="file-preview.tabs.annotations.select-all" + >
+
-
- @if (state.file().excluded && documentInfoService.hidden()) { +
+ - } @else { -
- - - - - - - - -
-
-
-
-
- -
- - - - {{ 'file-preview.tabs.annotations.page-is' | translate }} - . - - - - {{ 'file-preview.tabs.annotations.no-annotations' | translate }} - - - {{ 'file-preview.tabs.annotations.wrong-filters' | translate }} - - {{ 'file-preview.tabs.annotations.the-filters' | translate }} - - - -
- - - -
+ + {{ 'file-preview.tabs.annotations.page-is' | translate }} + . - + + {{ 'file-preview.tabs.annotations.no-annotations' | translate }} + + + {{ 'file-preview.tabs.annotations.wrong-filters' | translate }} + + {{ 'file-preview.tabs.annotations.the-filters' | translate }} + + + +
+ + +
- } - +
+ +
+ +
-} +
- - - - - - - - - - - - - diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.scss b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.scss index 9d8652eb3..5ca2bfd51 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.scss @@ -27,43 +27,11 @@ flex: 1; overflow: hidden; - &.documine-direction { - flex-direction: row-reverse; - justify-content: space-between; - } - - .border-left { - border-left: 1px solid var(--iqser-separator); - } - .content { overflow: hidden; width: 100%; display: flex; flex-direction: column; - - &.documine-width { - width: calc(var(--documine-workload-content-width)); - border-right: 1px solid var(--iqser-separator); - z-index: 1; - - .workload-separator { - min-height: 37px; - background: var(--iqser-grey-8); - - .flex-align-items-center { - width: 100%; - justify-content: space-between; - - ::ng-deep span { - color: var(--iqser-text); - font-size: var(--iqser-font-size); - line-height: 20px; - font-weight: 600; - } - } - } - } } } @@ -77,9 +45,8 @@ } .quick-navigation { - height: 100%; border-right: 1px solid var(--iqser-separator); - min-width: var(--qiuck-navigation-width); + min-width: 61px; overflow: hidden; display: flex; flex-direction: column; @@ -92,10 +59,6 @@ cursor: pointer; transition: background-color 0.25s; - &.documine-height { - min-height: 37px; - } - &:not(.disabled):hover { background-color: var(--iqser-tab-hover); } @@ -129,7 +92,3 @@ [hidden] { display: none !important; } - -redaction-document-info { - width: var(--workload-width); -} diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts index 4cb63a58d..e88883107 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts @@ -25,7 +25,7 @@ import { workloadTranslations } from '@translations/workload-translations'; import { UserPreferenceService } from '@users/user-preference.service'; import { getLocalStorageDataByFileId } from '@utils/local-storage'; import { combineLatest, delay, Observable } from 'rxjs'; -import { map, tap } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import scrollIntoView from 'scroll-into-view-if-needed'; import { REDAnnotationManager } from '../../../pdf-viewer/services/annotation-manager.service'; import { REDDocumentViewer } from '../../../pdf-viewer/services/document-viewer.service'; @@ -182,7 +182,6 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On delay(0), map(([annotations, primary, secondary]) => this.#filterAnnotations(annotations, primary, secondary)), map(annotations => this.#mapListItemsFromAnnotationWrapperArray(annotations)), - tap(annotations => this.#scrollToFirstAnnotationPage(annotations)), ); } @@ -521,11 +520,4 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On }); return listItemsMap; } - - #scrollToFirstAnnotationPage(annotations: Map[]>) { - if (this.isDocumine && annotations.size && !this.displayedPages.includes(this.pdf.currentPage())) { - const page = annotations.keys().next().value; - this.pdf.navigateTo(page); - } - } } diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 5f6c0ce6e..2ccc6f6d1 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,9 +1,9 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://dan2.iqser.cloud", + "API_URL": "https://frontend2.iqser.cloud", "APP_NAME": "RedactManager", - "IS_DOCUMINE": false, + "IS_DOCUMINE": true, "RULE_EDITOR_DEV_ONLY": false, "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -13,13 +13,13 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://dan2.iqser.cloud/auth", + "OAUTH_URL": "https://frontend2.iqser.cloud/auth", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview", "ANNOTATIONS_THRESHOLD": 1000, - "THEME": "redact", - "BASE_TRANSLATIONS_DIRECTORY": "/assets/i18n/redact/", + "THEME": "scm", + "BASE_TRANSLATIONS_DIRECTORY": "/assets/i18n/scm/", "AVAILABLE_NOTIFICATIONS_DAYS": 30, "AVAILABLE_OLD_NOTIFICATIONS_MINUTES": 60, "NOTIFICATIONS_THRESHOLD": 1000,