Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,39 @@ describe('Store Provider Helper', () => {

});

it('should correctly manage Date fields', () => {

StoreProviderHelper.clearConfigCache();

let result = StoreProviderHelper.findSpecialFields("creation/entity/b", {
name:"EntityB",
fields: {
"ba": {
name: "_id",
type:"Text"
},
"bb": {
name: "Date",
type:"Date & Time"
}
}
});

expect(result.dateFields).toEqual(["Date"]);

let listToTest:Array<any>=[{
_id:454545,
Date:"2024-12-23T13:18:37.000Z"
}, {
_id:76877,
Date:"2022-12-10T14:51:59.110Z"
}]

StoreProviderHelper.cleanUpLoadedData(listToTest, result);
expect(listToTest[0].Date.valueOf()).not.toBeNaN();
expect(listToTest[1].Date.valueOf()).not.toBeNaN();
});

it('should dynamically manage Id fields', () => {
StoreProviderHelper.clearConfigCache();
const result = StoreProviderHelper.findSpecialFields("creation/entity/d", {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ export class StoreProviderHelper {
}
else {
val[prop]=new Date(timeEpoch);

}
}
})
Expand Down Expand Up @@ -273,7 +274,7 @@ export class StoreProviderHelper {

if ((value!=null) && ((maxValue==null) || (value > maxValue)))
{ counter.maximum = valSrc; counter.maxAsValue = value;}

}

if (value!=null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@ export class TimeFieldsComponent extends AbstractDynamicComponent {
}

localizeLongDate (value:Date): string {
if( (value!=null) && (Number.isNaN(value.valueOf())) ) return "";
return this.longConverter.format(value);
}

localizeShortDate (value:Date): string {
if( (value!=null) && (Number.isNaN(value.valueOf())) ) return "";
return this.shortConverter.format(value);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ export class DontCodeApiStoreProvider<T=never> extends AbstractDontCodeStoreProv
}

const id=(data as any)._id;
// Reconverts dates or Ids
const specialFields = StoreProviderHelper.findSpecialFields(position, entity);
StoreProviderHelper.cleanUpDataBeforeSaving([data], specialFields);

if( id != undefined) {
return lastValueFrom(this.http.put<T>(this.apiUrl+'/'+entity.name+'/'+id, data, {observe:"body", responseType:"json"}));
} else {
Expand All @@ -73,7 +77,12 @@ export class DontCodeApiStoreProvider<T=never> extends AbstractDontCodeStoreProv
}

const obs = this.http.get<T>(this.apiUrl+'/'+entity.name+'/'+key, {observe:"body", responseType:"json"});
return lastValueFrom(obs);
const specialFields = StoreProviderHelper.findSpecialFields(position, entity);

return lastValueFrom(obs).then((value) => {
StoreProviderHelper.cleanUpLoadedData([value], specialFields);
return value;
});
}

deleteEntity(position: string, key: any): Promise<boolean> {
Expand All @@ -82,7 +91,7 @@ export class DontCodeApiStoreProvider<T=never> extends AbstractDontCodeStoreProv
return Promise.reject("No entity found at position "+position);
}

return this.http.delete(this.apiUrl+'/'+entity.name+'/'+key, {observe:"body", responseType:"json"}).toPromise().then(value => {
return lastValueFrom(this.http.delete(this.apiUrl+'/'+entity.name+'/'+key, {observe:"body", responseType:"json"})).then(value => {
return true;
});
}
Expand All @@ -93,10 +102,16 @@ export class DontCodeApiStoreProvider<T=never> extends AbstractDontCodeStoreProv
return throwError(()=> new Error ("No entity found at position "+position));
}

return this.http.get(this.apiUrl+'/'+entity.name, {observe:"body", responseType:"json"}).pipe(map(value => {
return StoreProviderHelper.applyFilters( value as Array<any>, ...criteria);
}
));
const specialFields = StoreProviderHelper.findSpecialFields(position, entity);
return this.http.get(this.apiUrl+'/'+entity.name, {observe:"body", responseType:"json"}).pipe(
map(value => {
StoreProviderHelper.cleanUpLoadedData(value as T [], specialFields);
return value as T[];
}),map(value => {
return StoreProviderHelper.applyFilters( value, ...criteria);
}
)
);
}

canStoreDocument(position?: string): boolean {
Expand Down
Loading