From 05b288c8d0d89f6943d515f5a138bcc85fb39e4d Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 15 Oct 2021 14:58:34 +0200 Subject: [PATCH] [CST-4504] Fix LGTM issues --- .../edit-relationship-list.component.ts | 28 ++++--------------- .../item-relationships.component.ts | 10 ++----- ...ic-lookup-relation-search-tab.component.ts | 7 ----- ...lookup-relation-selection-tab.component.ts | 7 ++--- 4 files changed, 11 insertions(+), 41 deletions(-) diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts index c6cd7f93e5..e167e1c1d5 100644 --- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts +++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts @@ -1,14 +1,9 @@ -import { Component, Input, OnInit, OnDestroy, Output, EventEmitter } from '@angular/core'; +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { LinkService } from '../../../../core/cache/builders/link.service'; import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions'; import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service'; -import { - combineLatest as observableCombineLatest, - Observable, - of as observableOf, - from as observableFrom -} from 'rxjs'; +import { combineLatest as observableCombineLatest, from as observableFrom, Observable } from 'rxjs'; import { FieldUpdate, FieldUpdates, @@ -16,29 +11,19 @@ import { } from '../../../../core/data/object-updates/object-updates.reducer'; import { RelationshipService } from '../../../../core/data/relationship.service'; import { Item } from '../../../../core/shared/item.model'; -import { - defaultIfEmpty, - map, - mergeMap, - switchMap, - take, - startWith, - toArray, - tap -} from 'rxjs/operators'; -import { hasValue, hasValueOperator, hasNoValue } from '../../../../shared/empty.util'; +import { defaultIfEmpty, map, mergeMap, startWith, switchMap, take, tap, toArray } from 'rxjs/operators'; +import { hasNoValue, hasValue, hasValueOperator } from '../../../../shared/empty.util'; import { Relationship } from '../../../../core/shared/item-relationships/relationship.model'; import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model'; import { - getRemoteDataPayload, + getAllSucceededRemoteData, getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload, - getAllSucceededRemoteData, + getRemoteDataPayload, } from '../../../../core/shared/operators'; import { ItemType } from '../../../../core/shared/item-relationships/item-type.model'; import { DsDynamicLookupRelationModalComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component'; import { RelationshipOptions } from '../../../../shared/form/builder/models/relationship-options.model'; -import { ItemSearchResult } from '../../../../shared/object-collection/shared/item-search-result.model'; import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service'; import { SearchResult } from '../../../../shared/search/search-result.model'; import { followLink } from '../../../../shared/utils/follow-link-config.model'; @@ -51,7 +36,6 @@ import { PaginationComponentOptions } from '../../../../shared/pagination/pagina import { PaginationService } from '../../../../core/pagination/pagination.service'; import { RelationshipTypeService } from '../../../../core/data/relationship-type.service'; - @Component({ selector: 'ds-edit-relationship-list', styleUrls: ['./edit-relationship-list.component.scss'], diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts index 64af712d74..78c478fefb 100644 --- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts +++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts @@ -7,12 +7,8 @@ import { RelationshipIdentifiable, } from '../../../core/data/object-updates/object-updates.reducer'; import { Observable } from 'rxjs/internal/Observable'; -import { map, startWith, switchMap, take, tap } from 'rxjs/operators'; -import { - combineLatest as observableCombineLatest, - of as observableOf, - zip as observableZip -} from 'rxjs'; +import { map, startWith, switchMap, take } from 'rxjs/operators'; +import { combineLatest as observableCombineLatest, of as observableOf, zip as observableZip } from 'rxjs'; import { followLink } from '../../../shared/utils/follow-link-config.model'; import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component'; import { ItemDataService } from '../../../core/data/item-data.service'; @@ -34,7 +30,7 @@ import { NoContent } from '../../../core/shared/NoContent.model'; import { hasValue } from '../../../shared/empty.util'; import { RelationshipTypeService } from '../../../core/data/relationship-type.service'; import { PaginatedList } from '../../../core/data/paginated-list.model'; -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @Component({ selector: 'ds-item-relationships', diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts index 9d376fa72d..c0ca430c89 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts @@ -24,13 +24,6 @@ import { RelationshipService } from '../../../../../../core/data/relationship.se import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model'; import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model'; -import { result } from 'lodash'; - -import { - FieldUpdate, - FieldUpdates, - RelationshipIdentifiable -} from '../../../../../../core/data/object-updates/object-updates.reducer'; @Component({ diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts index ef85b09d60..9ba0ee2413 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts @@ -4,12 +4,9 @@ import { SearchConfigurationService } from '../../../../../../core/shared/search import { Observable } from 'rxjs'; import { ListableObject } from '../../../../../object-collection/shared/listable-object.model'; import { RemoteData } from '../../../../../../core/data/remote-data'; -import { map, switchMap, take, tap } from 'rxjs/operators'; +import { map, switchMap, take } from 'rxjs/operators'; import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model'; -import { - PaginatedList, - buildPaginatedList -} from '../../../../../../core/data/paginated-list.model'; +import { buildPaginatedList, PaginatedList } from '../../../../../../core/data/paginated-list.model'; import { Router } from '@angular/router'; import { PaginatedSearchOptions } from '../../../../../search/paginated-search-options.model'; import { PageInfo } from '../../../../../../core/shared/page-info.model';