[Library |Trunk]

Apply corrections after initial connect update :
	Search all: remove quick selections as it is inside the search page
	Search results: add option to show advanced search link
	QuickSelections: fix widths and margins 


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58525 d315682c-612b-4755-9ff5-7f18f6832af3

searchPages/find/searchAll.component.html

@@ -67,11 +67,11 @@
       </a>
     </li>
   </ul>
-  <quick-selections *ngIf="activeEntity == 'result' && quickFilter" [resultTypes]="resultTypes"
+<!--  <quick-selections *ngIf="activeEntity == 'result' && quickFilter" [resultTypes]="resultTypes"
                     (typeChange)="quickSelectionsChanged()"  [isDisabled]="disableForms"
                     [quickFilter]="quickFilter" [QFselected]="(quickFilter)?quickFilter.selected:null"
                     [properties]="properties">
-  </quick-selections>
+  </quick-selections>-->
 
 </div>
 

searchPages/find/searchAll.component.ts

@@ -338,6 +338,8 @@ export class SearchAllComponent {
        delete this.parameters['fv0'];
      }
   }
+  /*
+  //quickSelection moved inside the searchpage
   private prepareResultParameters() {
     //quickSelections
     if (this.resultTypes && this.activeEntity == "result") {
@@ -368,7 +370,7 @@ export class SearchAllComponent {
     this.parameters["page"] = 1;
     this.reload[this.activeEntity] = true;
     this.router.navigate([location.pathname], {queryParams: this.parameters});
-  }
+  }*/
 
 
   public keywordChanged($event) {

searchPages/find/searchAll.module.ts

@@ -18,7 +18,6 @@ import { SEOServiceModule } from '../../sharedComponents/SEO/SEOService.module';
 import {SearchAllComponent} from "./searchAll.component";
 import {AdvancedSearchFormModule} from "../searchUtils/advancedSearchForm.module";
 import {SearchResearchResultsModule} from "../searchResearchResults.module";
-import {QuickSelectionsModule} from "../searchUtils/quick-selections.module";
 import {SearchProjectsModule} from "../searchProjects.module";
 import {SearchOrganizationsModule} from "../searchOrganizations.module";
 import {SearchDataProvidersModule} from "../searchDataProviders.module";
@@ -28,7 +27,7 @@ import {SearchDataProvidersModule} from "../searchDataProviders.module";
     CommonModule, FormsModule, RouterModule,
     DataProvidersServiceModule, ProjectsServiceModule,
     SearchResearchResultsServiceModule, OrganizationsServiceModule,
-    BrowseEntitiesModule, SearchResultsModule, PiwikServiceModule, Schema2jsonldModule, SEOServiceModule, AdvancedSearchFormModule, SearchResearchResultsModule, QuickSelectionsModule, SearchProjectsModule, SearchOrganizationsModule, SearchDataProvidersModule
+    BrowseEntitiesModule, SearchResultsModule, PiwikServiceModule, Schema2jsonldModule, SEOServiceModule, AdvancedSearchFormModule, SearchResearchResultsModule,  SearchProjectsModule, SearchOrganizationsModule, SearchDataProvidersModule
   ],
   declarations: [
     SearchAllComponent

searchPages/searchResearchResults.component.ts

@@ -33,7 +33,7 @@ import {RangeFilter} from "../utils/rangeFilter/rangeFilterHelperClasses.class";
       [filters]="filters" [quickFilter]="quickFilter"
       [rangeFilters]="rangeFilters" [rangeFields]="rangeFields"
       [simpleView]="simpleView" formPlaceholderText="Search by title, author, abstract, DOI, orcid..."
-      [includeOnlyResultsAndFilter]="includeOnlyResultsAndFilter" [showBreadcrumb]="showBreadcrumb"
+      [includeOnlyResultsAndFilter]="includeOnlyResultsAndFilter" [showBreadcrumb]="showBreadcrumb" [showAdvancedSearchLink]="showAdvancedSearchLink"
     >
     </new-search-page>
 
@@ -84,6 +84,7 @@ export class SearchResearchResultsComponent {
   @Input() includeOnlyResultsAndFilter: boolean = false;
   @Input() showBreadcrumb:boolean = false;
   @Output() searchPageUpdates = new EventEmitter();
+  @Input() showAdvancedSearchLink:boolean = true;
   subs: any[]=[];
   constructor(private route: ActivatedRoute, private _searchResearchResultsService: SearchResearchResultsService) {
     this.results = [];

searchPages/searchUtils/advancedSearchForm.component.html

@@ -18,7 +18,7 @@
 
     <quick-selections [resultTypes]="resultTypes" (typeChange)="queryChanged()" [isDisabled]="isDisabled"
                       [quickFilter]="quickFilter" [QFselected]="(quickFilter)?quickFilter.selected:null"
-                      [properties]="properties" class="uk-grid uk-margin-small-left"
+                      [properties]="properties" class="uk-grid  "
     ></quick-selections>
     <hr *ngIf="resultTypes || quickFilter" class="uk-margin-small">
     <table class=" uk-table uk-table-responsive uk-table-small uk-margin-remove">
@@ -147,7 +147,7 @@
                  [placeholder]="formPlaceholderText" aria-describedby="sizing-addon2"
                  [(ngModel)]="selectedFields[0].value" name="keyword">
         </div>
-        <div>
+        <div class=" uk-width-xlarge@l uk-width-large@m uk-width-medium">
           <quick-selections [resultTypes]="resultTypes" (typeChange)="queryChanged()" [isDisabled]="isDisabled"
                             [quickFilter]="quickFilter" [QFselected]="(quickFilter)?quickFilter.selected:null"
                             [properties]="properties">

searchPages/searchUtils/newSearchPage.component.html

@@ -112,7 +112,7 @@
     <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first ">
       <!--          TODO add breadcrumb here-->
       <div  *ngIf="showBreadcrumb" class=" uk-margin-large-left">Home > Search</div>
-      <div class="uk-container uk-container-large uk-margin-medium-top">
+      <div class="uk-container uk-container-large">
         <div>
 
           <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" [texts]="pageContents['top']"></helper>
@@ -249,8 +249,9 @@
 
             </div>
           </div>
-          <div *ngIf="includeOnlyResultsAndFilter" class="uk-margin-medium-top uk-margin-medium-bottom">
+          <div *ngIf="includeOnlyResultsAndFilter && (resultTypes || quickFilter)"
-            <a *ngIf ="advancedSearchLink" routerLinkActive="router-link-active"
+               class="uk-margin-medium-top uk-margin-medium-bottom">
+            <a *ngIf ="showAdvancedSearchLink && advancedSearchLink" routerLinkActive="router-link-active"
                [routerLink]="advancedSearchLink" style="z-index:1;" [queryParams]="this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)"
                [class]="(disableForms?'  uk-disabled uk-link-muted  ':'') +' portal-link   uk-float-right '">Advanced search
             </a>

searchPages/searchUtils/quick-selections.component.ts

@@ -9,14 +9,14 @@ import {debounceTime} from "rxjs/operators";
 @Component({
   selector: 'quick-selections',
   template: `
-    <form *ngIf="resultTypes || quickFilter" [formGroup]="control" class="uk-text-small uk-margin-small-bottom uk-grid">
+    <form *ngIf="resultTypes || quickFilter" [formGroup]="control" class="uk-text-small uk-margin-small-bottom uk-grid uk-inline uk-flex uk-margin-small-left">
-      <div  *ngIf="quickFilter" class="uk-margin-small-top uk-padding-remove-left ">
+      <div  *ngIf="quickFilter" class="uk-margin-small-top uk-padding-remove-left uk-margin-right ">
         <span class="uk-text-bold">{{quickFilter.value}}</span>
         <mat-slide-toggle
                           class="uk-margin-small-left" formControlName="QFselected" (change)="quickFilterChanged()">
         </mat-slide-toggle>
       </div>
-      <div *ngIf="resultTypes && showEntities" class="uk-margin-small-top">
+      <div *ngIf="resultTypes && showEntities" class="uk-margin-small-top uk-padding-remove-left">
         <span class="uk-text-muted">Include: </span>
         <span>
           <span *ngIf="showPublications" class="uk-margin-small-left"> <input type="checkbox" id="publ" name="Publications" formControlName="publication" (change)="changed()"> Publications </span>