44024: scss import fixes

src/app/app.component.scss

@@ -1,4 +1,7 @@
-@import '../styles/shared_imports';
+@import '../styles/variables.scss';
+@import '../../node_modules/bootstrap/scss/bootstrap.scss';
+@import "../../node_modules/font-awesome/scss/font-awesome.scss";
+
 html {
   position: relative;
   min-height: 100%;

src/app/collection-page/collection-page.component.scss

@@ -1 +1 @@
-@import '../../styles/shared_imports';
+@import '../../styles/variables.scss';

src/app/collection-page/collection-page.component.ts

@@ -64,22 +64,7 @@ export class CollectionPageComponent implements OnInit, OnDestroy {
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
 
-  onPageChange(currentPage: number): void {
-    this.config.currentPage = currentPage;
-    this.updateResults();
-  }
-
-  onPageSizeChange(elementsPerPage: number): void {
-    this.config.pageSize = elementsPerPage;
-    this.updateResults();
-  }
-
-  onSortDirectionChange(sortDirection: SortDirection): void {
-    this.sortConfig = new SortOptions(this.sortConfig.field, sortDirection);
-    this.updateResults();
-  }
-
-  onSortFieldChange(field: string): void {
+  onPaginationChange(field: string): void {
     this.sortConfig = new SortOptions(field, this.sortConfig.direction);
     this.updateResults();
   }

src/app/community-page/community-page.component.scss

@@ -1 +1 @@
-@import '../../styles/shared_imports';
+@import '../../styles/variables.scss';

src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss

@@ -1 +1 @@
-@import '../../../styles/shared_imports';
+@import '../../../styles/variables.scss';

src/app/core/footer/footer.component.scss

@@ -1,4 +1,4 @@
-@import '../../../styles/shared_imports';
+@import '../../../styles/variables.scss';
 $footer-bg: $gray-100;
 $footer-border: 1px solid darken($footer-bg, 10%);
 $footer-padding: $spacer * 1.5;

src/app/header/header.component.scss

@@ -1,4 +1,4 @@
-@import '../../styles/shared_imports';
+@import '../../styles/variables.scss';
 
 header nav.navbar {
   border-radius: 0;

src/app/home/home-news/home-news.component.scss

@@ -1,4 +1,4 @@
-@import '../../../styles/shared_imports';
+@import '../../../styles/variables.scss';
 :host {
   display: block;
   margin-right: ($grid-gutter-width / -2);

src/app/home/home.component.scss

@@ -1 +1 @@
-@import '../../styles/shared_imports';
+@import '../../styles/variables.scss';

src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss

@@ -1,4 +1,4 @@
-@import '../../../../styles/shared_imports';
+@import '../../../../styles/variables.scss';
 
 :host {
   .simple-view-element {

src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.scss

@@ -1 +1 @@
-@import '../../../../styles/shared_imports';
+@import '../../../../styles/variables.scss';

src/app/item-page/field-components/metadata-values/metadata-values.component.scss

@@ -1 +1 @@
-@import '../../../../styles/shared_imports';
+@import '../../../../styles/variables.scss';

src/app/item-page/full/field-components/file-section/full-file-section.component.scss

@@ -1,4 +1,5 @@
-@import '../../../../../styles/shared_imports';
+@import '../../../../../styles/variables';
+@import '../../../../../styles/mixins';
 @media screen and (min-width: map-get($grid-breakpoints, md)) {
     dt {
         text-align: right;

src/app/item-page/full/full-item-page.component.scss

@@ -1,4 +1,4 @@
-@import '../../../styles/shared_imports';
+@import '../../../styles/variables.scss';
 :host {
     div.simple-view-link {
         text-align: center;

src/app/item-page/simple/item-page.component.scss

@@ -1 +1 @@
-@import '../../../styles/shared_imports';
+@import '../../../styles/variables.scss';

src/app/object-list/collection-list-element/collection-list-element.component.scss

@@ -1 +1 @@
-@import '../../../styles/shared_imports';
+@import '../../../styles/variables.scss';

src/app/object-list/community-list-element/community-list-element.component.scss

@@ -1 +1 @@
-@import '../../../styles/shared_imports';
+@import '../../../styles/variables.scss';

src/app/object-list/item-list-element/item-list-element.component.scss

@@ -1 +1 @@
-@import '../../../styles/shared_imports';
+@import '../../../styles/variables.scss';

src/app/object-list/object-list-element/object-list-element.component.scss

@@ -1,4 +1,4 @@
-@import '../../../styles/shared_imports';
+@import '../../../styles/variables.scss';
 
 :host {
   display: block;

src/app/object-list/object-list.component.scss

@@ -1 +1 @@
-@import '../../styles/shared_imports';
+@import '../../styles/variables.scss';

src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.scss

@@ -1 +1 @@
-@import '../../../../styles/shared_imports.scss';
+@import '../../../../styles/variables.scss';

src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.scss

@@ -1 +1 @@
-@import '../../../../styles/shared_imports.scss';
+@import '../../../../styles/variables.scss';

src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss

@@ -1 +1 @@
-@import '../../../../styles/shared_imports.scss';
+@import '../../../../styles/variables.scss';

src/app/object-list/search-result-list-element/search-result-list-element.component.scss

@@ -1,4 +1,4 @@
-@import '../../../styles/shared_imports.scss';
+@import '../../../styles/variables.scss';
 :host {
     /deep/ em {
         font-weight: bold;

src/app/object-list/wrapper-list-element/wrapper-list-element.component.scss

@@ -1,2 +1,2 @@
-@import '../../../styles/shared_imports.scss';
+@import '../../../styles/variables.scss';
 

src/app/pagenotfound/pagenotfound.component.scss

@@ -1 +1 @@
-@import '../../styles/shared_imports';
+@import '../../styles/variables.scss';

src/app/search-page/search-page.component.scss

@@ -1 +1 @@
-@import '../../styles/shared_imports.scss';
+@import '../../styles/variables.scss';

src/app/search/search.service.ts

@@ -11,6 +11,20 @@ import { Metadatum } from '../core/shared/metadatum.model';
 import { Item } from '../core/shared/item.model';
 import { ItemSearchResult } from '../object-list/search-result-list-element/item-search-result/item-search-result.model';
 
+function shuffle(array: any[]) {
+  let i = 0;
+  let j = 0;
+  let temp = null;
+
+  for (i = array.length - 1; i > 0; i -= 1) {
+    j = Math.floor(Math.random() * (i + 1));
+    temp = array[i];
+    array[i] = array[j];
+    array[j] = temp;
+  }
+  return array;
+}
+
 @Injectable()
 export class SearchService {
 
@@ -53,19 +67,12 @@ export class SearchService {
       returningPageInfo.currentPage = 1;
     }
     returningPageInfo.totalPages = this.totalPages;
-    returningPageInfo.totalElements = 10 * this.totalPages;
+    returningPageInfo.totalElements = returningPageInfo.elementsPerPage * returningPageInfo.totalPages;
     const pageInfo = Observable.of(returningPageInfo);
 
-    const itemsRD = this.itemDataService.findAll({
-      scopeID: '8e0928a0-047a-4369-8883-12669f32dd64',
-      currentPage: returningPageInfo.currentPage,
-      elementsPerPage: returningPageInfo.elementsPerPage
-    });
+    const itemsRD = this.itemDataService.findAll({ elementsPerPage: 10 });
     const payload = itemsRD.payload.map((items: Item[]) => {
-      return items.sort(() => {
-        const values = [-1, 0, 1];
-        return values[Math.floor(Math.random() * values.length)];
-      })
+      return shuffle(items)
       .map((item: Item, index: number) => {
         const mockResult: SearchResult<DSpaceObject> = new ItemSearchResult();
         mockResult.dspaceObject = item;

src/app/shared/comcol-page-content/comcol-page-content.component.scss

@@ -1 +1 @@
-@import '../../../styles/shared_imports';
+@import '../../../styles/variables.scss';

src/app/shared/comcol-page-header/comcol-page-header.component.scss

@@ -1 +1 @@
-@import '../../../styles/shared_imports';
+@import '../../../styles/variables.scss';

src/app/shared/comcol-page-logo/comcol-page-logo.component.scss

@@ -1 +1 @@
-@import '../../../styles/shared_imports';
+@import '../../../styles/variables.scss';

src/app/shared/search-form/search-form.component.scss

@@ -1,4 +1,4 @@
-@import '../../../styles/shared_imports.scss';
+@import '../../../styles/variables.scss';
 
 // temporary fix for bootstrap 4 beta btn color issue
 .btn-secondary {

src/app/thumbnail/thumbnail.component.scss

@@ -1 +1 @@
-@import '../../styles/shared_imports';
+@import '../../styles/variables.scss';

src/styles/_mixins.scss

@@ -1 +1,4 @@
+@import '../../node_modules/bootstrap/scss/functions.scss';
+@import '../../node_modules/bootstrap/scss/mixins.scss';
+
 /* Custom mixins go here */

src/styles/_shared_imports.scss

@@ -1,5 +0,0 @@
-@import 'bootstrap_variables.scss';
-@import '../../node_modules/bootstrap/scss/bootstrap.scss';
-@import "../../node_modules/font-awesome/scss/font-awesome.scss";
-@import 'mixins.scss';
-@import 'custom_variables.scss';

src/styles/_variables.scss

@@ -0,0 +1,5 @@
+@import 'bootstrap_variables.scss';
+@import '../../node_modules/font-awesome/scss/variables.scss';
+@import '../../node_modules/bootstrap/scss/functions.scss';
+@import '../../node_modules/bootstrap/scss/variables.scss';
+@import 'custom_variables.scss';