From 70d2d456eefb385070336aeeea000a55921effa1 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 29 Jul 2020 18:35:12 +0300 Subject: [PATCH] Fixes bug on sort by label --- .../src/app/core/model/dataset/dataset-listing.ts | 2 +- dmp-frontend/src/app/core/model/dmp/dmp-listing.ts | 2 +- .../core/model/recent-activity/recent-activity.model.ts | 2 +- .../src/app/ui/dashboard/drafts/drafts.component.ts | 6 +++--- .../recent-edited-activity.component.ts | 8 ++++---- .../recent-edited-dataset-activity.component.ts | 8 ++++---- .../recent-edited-dmp-activity.component.ts | 8 ++++---- .../app/ui/dataset/listing/dataset-listing.component.ts | 6 +++--- .../src/app/ui/dmp/listing/dmp-listing.component.ts | 6 +++--- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts index c4aa19530..377c8a2bf 100644 --- a/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts +++ b/dmp-frontend/src/app/core/model/dataset/dataset-listing.ts @@ -2,7 +2,7 @@ import { DatasetProfileModel } from './dataset-profile'; export interface DatasetListingModel { id: string; - label: String; + label: string; dmp: String; dmpId: String; grant: String; diff --git a/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts b/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts index 0461ddeb6..3425e0ce1 100644 --- a/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts +++ b/dmp-frontend/src/app/core/model/dmp/dmp-listing.ts @@ -3,7 +3,7 @@ import { DmpAssociatedProfileModel } from '../dmp-profile/dmp-associated-profile export interface DmpListingModel { id: string; - label: String; + label: string; description: String; status: DmpStatus; grant: String; diff --git a/dmp-frontend/src/app/core/model/recent-activity/recent-activity.model.ts b/dmp-frontend/src/app/core/model/recent-activity/recent-activity.model.ts index b1cf43c60..2102171e2 100644 --- a/dmp-frontend/src/app/core/model/recent-activity/recent-activity.model.ts +++ b/dmp-frontend/src/app/core/model/recent-activity/recent-activity.model.ts @@ -4,7 +4,7 @@ import { DatasetProfileModel } from '../dataset/dataset-profile'; export class RecentActivityModel { id: string; - title: String; + title: string; description: String; created: Date; modified: Date; diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts index 7808892ef..ce54d6306 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts @@ -69,7 +69,7 @@ export class DraftsComponent extends BaseComponent implements OnInit { // const fields: Array = []; // fields.push('-modified'); this.formGroup.get('order').setValue(this.order.MODIFIED); - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, 5, { fields: fields }); dmpDataTableRequest.criteria = new DatasetCriteria(); dmpDataTableRequest.criteria.status = DmpStatus.Draft; @@ -301,7 +301,7 @@ export class DraftsComponent extends BaseComponent implements OnInit { refresh(): void { // const fields: Array = []; // fields.push('-modified'); - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; this.startIndex = 0; const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, 5, { fields: fields }); dmpDataTableRequest.criteria = new DatasetCriteria(); @@ -317,7 +317,7 @@ export class DraftsComponent extends BaseComponent implements OnInit { public loadMore() { this.startIndex = this.startIndex + this.pageSize; // const fields: Array = ["-modified"]; - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; const request = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); request.criteria = new DatasetCriteria(); request.criteria.status = DmpStatus.Draft; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts index 6192039f0..f26f09c27 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts @@ -76,7 +76,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn ngOnInit() { if (this.isAuthenticated()) { this.formGroup.get('order').setValue(this.order.MODIFIED); - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; // const fields: Array = ["-modified"]; const allDataTableRequest: DataTableMultiTypeRequest = new DataTableMultiTypeRequest(0, 0, 5, { fields: fields }); allDataTableRequest.criteria = new RecentActivityCriteria(); @@ -458,7 +458,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn } refresh(): void { - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; // const fields: Array = ["-modified"]; this.startIndex = 0; const allDataTableRequest: DataTableMultiTypeRequest = new DataTableMultiTypeRequest(0, 0, this.pageSize, { fields: fields }); @@ -481,7 +481,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn } public loadMore() { - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; // const fields: Array = ["-modified"]; const request = new DataTableMultiTypeRequest(this.dmpOffset, this.datasetOffset, this.pageSize, { fields: fields }); request.criteria = new RecentActivityCriteria(); @@ -532,7 +532,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn index2++; } } else if (order === 'label') { - if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].title < arr2[index2].title))) { + if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].title.localeCompare(arr2[index2].title)))) { merged[current] = arr1[index1]; index1++; } else { diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts index c6406a645..924f913a0 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts @@ -66,7 +66,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen if (this.isAuthenticated()) { // const fields: Array = ["-modified"]; this.formGroup.get('order').setValue(this.order.MODIFIED); - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; const datasetDataTableRequest: DataTableRequest = new DataTableRequest(0, this.pageSize, { fields: fields }); datasetDataTableRequest.criteria = new DatasetCriteria(); datasetDataTableRequest.criteria.like = ""; @@ -88,7 +88,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen refresh(): void { // const fields: Array = ["-modified"]; - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; this.startIndex = 0; const datasetDataTableRequest: DataTableRequest = new DataTableRequest(0, this.pageSize, { fields: fields }); datasetDataTableRequest.criteria = new DatasetCriteria(); @@ -105,7 +105,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen public loadMore() { this.startIndex = this.startIndex + this.pageSize; // const fields: Array = ["-modified"]; - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; const request = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); request.criteria = new DatasetCriteria(); @@ -366,7 +366,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen index2++; } } else if (order === 'label') { - if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label < arr2[index2].label))) { + if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label.localeCompare(arr2[index2].label)))) { merged[current] = arr1[index1]; index1++; } else { diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts index 670df71fa..519e5ed14 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts @@ -68,7 +68,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O if (this.isAuthenticated()) { // const fields: Array = ["-modified"]; this.formGroup.get('order').setValue(this.order.MODIFIED); - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, 5, { fields: fields }); dmpDataTableRequest.criteria = new DmpCriteria(); dmpDataTableRequest.criteria.like = ""; @@ -345,7 +345,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O refresh(): void { // const fields: Array = ["-modified"]; - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; this.startIndex = 0; const dmpDataTableRequest: DataTableRequest = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); dmpDataTableRequest.criteria = new DmpCriteria(); @@ -362,7 +362,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O public loadMore() { this.startIndex = this.startIndex + this.pageSize; // const fields: Array = ["-modified"]; - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; const request = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); request.criteria = new DmpCriteria(); @@ -405,7 +405,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O index2++; } } else if (order === 'label') { - if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label < arr2[index2].label))) { + if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label.localeCompare(arr2[index2].label)))) { merged[current] = arr1[index1]; index1++; } else { diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts index cbd17941c..6122b3d80 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts @@ -152,7 +152,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB // let fields: Array = new Array(); // fields.push('-modified'); //if (this.sort && this.sort.active) { fields = this.sort.direction === 'asc' ? ['+' + this.sort.active] : ['-' + this.sort.active]; } - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; const request = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); this.criteria.isPublic = this.isPublic; request.criteria = this.criteria; @@ -168,7 +168,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB public loadMore() { this.startIndex = this.startIndex + this.pageSize; // const fields: Array = ["-modified"]; - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; const request = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); this.criteria.isPublic = this.isPublic; request.criteria = this.criteria; @@ -306,7 +306,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB index2++; } } else if (order === 'label') { - if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label < arr2[index2].label))) { + if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label.localeCompare(arr2[index2].label)))) { merged[current] = arr1[index1]; index1++; } else { diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts index 9cbd9283f..b47e12297 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts @@ -185,7 +185,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread // let fields: Array = new Array(); // if (this.sort && this.sort.active) { fields = this.sort.direction === 'asc' ? ['+' + this.sort.active] : ['-' + this.sort.active]; } // fields.push('-modified'); - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; const request = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); this.setPublicCriteria(); @@ -209,7 +209,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread public loadMore() { this.startIndex = this.startIndex + this.pageSize; // const fields: Array = ["-modified"]; - const fields: Array = [(this.formGroup.get('order').value === 'status' ? '+' : "-") + this.formGroup.get('order').value]; + const fields: Array = [((this.formGroup.get('order').value === 'status') || (this.formGroup.get('order').value === 'label') ? '+' : "-") + this.formGroup.get('order').value]; const request = new DataTableRequest(this.startIndex, this.pageSize, { fields: fields }); this.setPublicCriteria(); request.criteria = this.criteria; @@ -406,7 +406,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread index2++; } } else if (order === 'label') { - if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label < arr2[index2].label))) { + if (!isArr1Depleted && (isArr2Depleted || (arr1[index1].label.localeCompare(arr2[index2].label)))) { merged[current] = arr1[index1]; index1++; } else {