From 9222deed7b1a39d21284dd1c3121a31909767d3a Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 25 Feb 2022 14:52:36 +0200 Subject: [PATCH] initial linking changes --- .../claimProjectSearchForm.component.html | 108 +++++------------- .../claimResultSearchForm.component.html | 75 ++++++------ claims/claim-utils/claimResults.component.ts | 4 +- claims/linking/linkingGeneric.component.html | 107 +++++++++-------- claims/linking/linkingGeneric.component.ts | 7 +- claims/linking/linkingGeneric.module.ts | 5 +- 6 files changed, 135 insertions(+), 171 deletions(-) diff --git a/claims/claim-utils/claimProjectSearchForm.component.html b/claims/claim-utils/claimProjectSearchForm.component.html index 66696d58..5949ad7d 100644 --- a/claims/claim-utils/claimProjectSearchForm.component.html +++ b/claims/claim-utils/claimProjectSearchForm.component.html @@ -34,39 +34,8 @@
-
- +
+
Filters
@@ -117,57 +86,38 @@
- - -
  • - -
    • + + +     + + +
    + +
    + +
    +
    +     -
    -
    diff --git a/claims/claim-utils/claimResultSearchForm.component.html b/claims/claim-utils/claimResultSearchForm.component.html index c94656fd..3b47553e 100644 --- a/claims/claim-utils/claimResultSearchForm.component.html +++ b/claims/claim-utils/claimResultSearchForm.component.html @@ -1,10 +1,9 @@
    -
    Start searching Research Outcomes and add them to the Basket to Link - -
    + + - -
    - + @@ -22,7 +21,7 @@
    - No research outcomes yet...
    Start searching for research outcomes to add them in the Basket + No sources yet...
    Use the searchbar and find linking sources.
    @@ -88,7 +87,7 @@
    -
    +
    Filters
    @@ -138,42 +137,36 @@
    - -
      - - - -
    • - -
      • -       - -
    - - +
    + +
    + + [showResultCount]=true + (onFilterChange)="filterChanged($event)" [actionRoute]="false"> +
    +
    + +
    diff --git a/claims/claim-utils/claimResults.component.ts b/claims/claim-utils/claimResults.component.ts index 17ba2af1..e687fab3 100644 --- a/claims/claim-utils/claimResults.component.ts +++ b/claims/claim-utils/claimResults.component.ts @@ -20,7 +20,7 @@ declare var UIkit: any;
    - - + diff --git a/claims/linking/linkingGeneric.component.html b/claims/linking/linkingGeneric.component.html index a2d9b3f4..02c483cd 100644 --- a/claims/linking/linkingGeneric.component.html +++ b/claims/linking/linkingGeneric.component.html @@ -1,3 +1,24 @@ + +
    +
    +
    +
    Find Sources
    + 1 +
    +
    +
    Link Sources to Entities
    + 2 +
    +
    Summarize and finish
    + 3 +
    + + +
    +
    - - - - - - - - - - - - - - - - - LINK TO @@ -71,9 +75,9 @@ - +
    @@ -103,12 +107,19 @@
    -
    - LINKS BASKET -
    +
    -
    +
  • Sources to link ({{(sources.length) | number}})
    • +
  • Link to ( + {{(results.length) | number}})
    • + +
      + + +
    • + +
      -
      -
      +
      + + <!–span class="uk-icon"> -
      +
      -->
      -
      +
      No Sources added yet. Start adding sources from the left panel. Or upload a DOI's CSV file.
      + [enableRemove]="true">
      -
      -
      + + + <!– {{inlineEntity.type}}–>
      -
      -
      -
      -
      +
      <!–Enable toggle –> LINK TO ({{(results.length) | number}})
      -
      +
      <!–Inline Entity - no toggle –> LINK TO ({{(results.length) | number}}) @@ -226,11 +240,11 @@
      Entities to link with the sources
      -
      -
      --> +
      + class=" uk-padding-small " style="min-height: 17px;"> -
      +
      No entities to link with the sources. Start adding entities from the left panel.
      @@ -255,8 +269,9 @@
      - -
      +
      • +
    +
    diff --git a/claims/linking/linkingGeneric.component.ts b/claims/linking/linkingGeneric.component.ts index 1dea9e4e..4cbeb91f 100644 --- a/claims/linking/linkingGeneric.component.ts +++ b/claims/linking/linkingGeneric.component.ts @@ -11,6 +11,7 @@ import {HelperService} from "../../utils/helper/helper.service"; import {PiwikService} from "../../utils/piwik/piwik.service"; import {Subscriber} from "rxjs"; import {properties} from "../../../../environments/environment"; +import {Breadcrumb} from "../../utils/breadcrumbs/breadcrumbs.component"; declare var UIkit:any; @@ -43,7 +44,7 @@ export class LinkingGenericComponent { url=null; @ViewChild(AlertModal) alert; public pageContents = null; - + @Input() breadcrumbs: Breadcrumb[] = []; constructor (private _router: Router, private route: ActivatedRoute, private entitySearch:EntitiesSearchService, private _meta: Meta, private _title: Title, private _piwikService:PiwikService, @@ -52,6 +53,10 @@ export class LinkingGenericComponent { subscriptions = []; ngOnInit() { + if(this.breadcrumbs.length === 0) { + this.breadcrumbs.push({name: 'home', route: '/'}); + this.breadcrumbs.push({name: "Link", route: null}); + } this.showOptions.show = 'source'; if(this.inlineEntity){ this.showOptions.basketShowSources = false; diff --git a/claims/linking/linkingGeneric.module.ts b/claims/linking/linkingGeneric.module.ts index ec5e3b68..25de2f5a 100644 --- a/claims/linking/linkingGeneric.module.ts +++ b/claims/linking/linkingGeneric.module.ts @@ -21,16 +21,17 @@ import {MetadataPreviewModule} from './selected/metadataPreview.module'; import {ClaimEntitiesMetadataModule} from "./selected/ClaimEntitiesMetadata.module"; import {AlertModalModule} from '../../utils/modal/alertModal.module'; import {PiwikServiceModule} from "../../utils/piwik/piwikService.module"; +import {BreadcrumbsModule} from "../../utils/breadcrumbs/breadcrumbs.module"; @NgModule({ imports: [ SharedModule, SelectedProjectsModule, SelectedContextsModule, SelectedPublicationsModule, - StartOverModule, + StartOverModule, ClaimContextSearchFormModule, ClaimProjectsSearchFormModule, BulkClaimModule, ClaimResultSearchFormModule, HelperModule, Schema2jsonldModule, SEOServiceModule, MetadataPreviewModule, ClaimEntitiesMetadataModule, AlertModalModule, PiwikServiceModule, - MatSelectModule + MatSelectModule, BreadcrumbsModule ], providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], declarations: [