Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Pull request #398: RED-6037

Browse Source 
Merge in RED/ui from RED-6037 to master

* commit '53451609c422caa2d0ca76605074cb1081336759':
  RED-6037: Update common-ui
  RED-6037: Disable-ish shift click text selection
  RED-6037: Shift click selection
  RED-6037: sortedDisplayedEntities moved to ListingService
This commit is contained in:
Adina Teudan 2023-02-08 20:22:45 +01:00
commit 05ce5e13d0
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/admin/dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html
View File

@ -98,7 +98,7 @@
width="full"
></iqser-input-with-action>
</div>
<div *ngIf="sortedDisplayedEntities$ | async as fields" class="csv-header-pill-content">
<div *ngIf="listingService.sortedDisplayedEntities$ | async as fields" class="csv-header-pill-content">
<div
(click)="toggleFieldActive(field)"
(mouseenter)="setHoveredColumn(field.csvColumn)"

3
apps/red-ui/src/app/modules/file-preview/file-preview-providers.ts
View File

@ -7,7 +7,7 @@ import { SkippedService } from './services/skipped.service';
import { AnnotationActionsService } from './services/annotation-actions.service';
import { FilePreviewStateService } from './services/file-preview-state.service';
import { AnnotationReferencesService } from './services/annotation-references.service';
import { EntitiesService, FilterService, ListingService, SearchService } from '@iqser/common-ui';
import { EntitiesService, FilterService, ListingService, SearchService, SortingService } from '@iqser/common-ui';
import { AnnotationProcessingService } from './services/annotation-processing.service';
import { dossiersServiceProvider } from '@services/entity-services/dossiers.service.provider';
import { FileDataService } from './services/file-data.service';
@ -34,6 +34,7 @@ export const filePreviewScreenProviders = [
dossiersServiceProvider,
AnnotationsListingService,
{ provide: ListingService, useExisting: AnnotationsListingService },
SortingService,
SearchService,
StampService,
PdfProxyService,

5
apps/red-ui/src/app/modules/file-preview/services/annotations-listing.service.ts
View File

@ -1,6 +1,6 @@
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
import { Injectable } from '@angular/core';
import { EntitiesService, FilterService, ListingService, SearchService } from '@iqser/common-ui';
import { EntitiesService, FilterService, ListingService, SearchService, SortingService } from '@iqser/common-ui';
import { filter, tap } from 'rxjs/operators';
import { MultiSelectService } from './multi-select.service';
import { PdfViewer } from '../../pdf-viewer/services/pdf-viewer.service';
@ -12,11 +12,12 @@ export class AnnotationsListingService extends ListingService<AnnotationWrapper>
protected readonly _filterService: FilterService,
protected readonly _searchService: SearchService<AnnotationWrapper>,
protected readonly _entitiesService: EntitiesService<AnnotationWrapper, AnnotationWrapper>,
protected readonly _sortingService: SortingService<AnnotationWrapper>,
private readonly _multiSelectService: MultiSelectService,
private readonly _pdf: PdfViewer,
private readonly _annotationManager: REDAnnotationManager,
) {
super(_filterService, _searchService, _entitiesService);
super(_filterService, _searchService, _entitiesService, _sortingService);
this.selectedLength$
.pipe(

2
apps/red-ui/src/app/utils/functions.ts
View File

@ -1,7 +1,7 @@
import type { List } from '@iqser/common-ui';
import { ITrackable } from '@iqser/common-ui';
import type { AnnotationWrapper } from '@models/file/annotation.wrapper';
import { Dayjs } from 'dayjs';
import { ITrackable } from '../../../../../libs/common-ui/src/lib/listing/models/trackable';
export function hexToRgb(hex: string) {
const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);

2
libs/common-ui

@ -1 +1 @@
Subproject commit 2cd389c73da458c7cc93c721f72a63a9951b9432
Subproject commit 36e5f65bebbdeed48239a72baae9325ff02252d6