Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/common/utilities/GeneralHelper.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import '../extensions/String.extensions';
import { parseISO, isValid } from 'date-fns';

import * as strings from 'ControlStrings';

Expand Down Expand Up @@ -405,3 +406,7 @@ export function dateToNumber(date: string | number | Date): number {

return dateObj.getTime();
}

export function isValidISODateString(dateString: string): boolean {
return isValid(parseISO(dateString));
}
34 changes: 10 additions & 24 deletions src/services/SPService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ISPHttpClientOptions, SPHttpClient } from "@microsoft/sp-http";
import filter from 'lodash/filter';
import find from 'lodash/find';
import { ISPContentType, ISPField, ISPList, ISPLists, IUploadImageResult, ISPViews } from "../common/SPEntities";
import { SPHelper, urlCombine } from "../common/utilities";
import { isValidISODateString, SPHelper, urlCombine } from "../common/utilities";
import { IContentTypesOptions, IFieldsOptions, ILibsOptions, IRenderListDataAsStreamClientFormResult, ISPService, LibsOrderBy } from "./ISPService";
import {orderBy } from '../controls/viewPicker/IViewPicker';

Expand Down Expand Up @@ -578,29 +578,15 @@ export default class SPService implements ISPService {
if (data.ok) {
const result = await data.json();
if (result && result[fieldName]) {
const lookups = [];
const isArray = Array.isArray(result[fieldName]);
//multiselect lookups are arrays
if (isArray) {
result[fieldName].forEach((element: any) => { // eslint-disable-line @typescript-eslint/no-explicit-any
let value = element[lookupFieldName || 'Title'];
const dateVal = Date.parse(value);
if (!Number.isNaN(dateVal)) {
value = new Date(value).toLocaleDateString();
}
lookups.push({ key: element.ID, name: value });
});
}
//single select lookups are objects
else {
const singleItem = result[fieldName];
let value = singleItem[lookupFieldName || 'Title'];
const dateVal = Date.parse(value);
if (!Number.isNaN(dateVal)) {
value = new Date(value).toLocaleDateString();
}
lookups.push({ key: singleItem.ID, name: value });
}
const lookups: { key: number; name: string }[] = [];
const items = Array.isArray(result[fieldName]) ? result[fieldName] : Array.of(result[fieldName]);
items.forEach((element: any) => { // eslint-disable-line @typescript-eslint/no-explicit-any
let value = element[lookupFieldName || 'Title'];
if (isValidISODateString(value)) {
value = new Date(value).toLocaleDateString();
}
lookups.push({ key: element.ID, name: value });
});
return lookups;
}
}
Expand Down