@singularsystems/neo-core 0.10.62 → 0.10.64

package/dist/Components/DatePicker/DatePicker.d.ts

@@ -27,10 +27,11 @@ export default class DatePicker {
     constructor(container: HTMLDivElement, options?: IPartialDateProps);
     inputFocused(e: FocusEvent): void;
     inputBlurred(): void;
+    onInputBlurred(closePopup: boolean): void;
     inputChanged(): void;
     inputKeyDown(e: KeyboardEvent): void;
     private removePopup;
-    private setBindValueAndClose;
+    private setBindValue;
     private setBindProperty;
     private setInputValue;
     private show;

package/dist/Components/DatePicker/DatePicker.js

@@ -47,24 +47,27 @@ var DatePicker = /** @class */ (function () {
         }
     };
     DatePicker.prototype.inputBlurred = function () {
+        this.onInputBlurred(true);
+    };
+    DatePicker.prototype.onInputBlurred = function (closePopup) {
         if (this.inputHasChanged) {
             if (this.input.value) {
                 // if this is time only, use the existing value to preserve the date.
                 var refDate = this.options.timeOnly && this.bindProperty.value;
                 var parsedDate = DateUtils.tryParse(this.input.value, this.options.formatString, false, refDate || new Date());
                 if (parsedDate) {
-                    this.setBindValueAndClose(parsedDate, false);
+                    this.setBindValue(parsedDate, { preserveTime: false, close: closePopup });
                 }
                 else {
-                    this.setBindValueAndClose(this.bindProperty.value, false);
+                    this.setBindValue(this.bindProperty.value, { preserveTime: false, close: closePopup });
                 }
             }
             else {
-                this.setBindValueAndClose(null, true);
+                this.setBindValue(null, { preserveTime: true, close: closePopup });
             }
         }
         else {
-            if (this.options.autoClose)
+            if (this.options.autoClose && closePopup)
                 this.removePopup(true);
         }
         this.input.readOnly = this.isReadOnly;
@@ -78,6 +81,9 @@ var DatePicker = /** @class */ (function () {
                 this.setCurrentViewDate(parsedDate);
                 this.populateContentContainer(true);
             }
+            if (!this.popup) {
+                this.show();
+            }
         }
     };
     DatePicker.prototype.inputKeyDown = function (e) {
@@ -85,13 +91,22 @@ var DatePicker = /** @class */ (function () {
         if (e.key === "Escape") {
             // Revert to previous value
             e.preventDefault();
-            this.setBindValueAndClose(this.bindProperty.value, false);
+            this.setBindValue(this.bindProperty.value, { preserveTime: false, close: false });
         }
         else if (e.key === "Enter") {
-            // Set date to today if the current value is null
-            e.preventDefault();
-            if (!this.bindProperty.value) {
-                this.setBindValueAndClose(new Date(), true);
+            var prevValue = this.input.value;
+            if (!this.bindProperty.value && !this.input.value) {
+                // Set date to today if the current value is null
+                this.setBindValue(new Date(), { preserveTime: true, close: false });
+            }
+            else {
+                this.onInputBlurred(false);
+            }
+            if (this.input.value !== prevValue) {
+                e.preventDefault();
+            }
+            else {
+                this.removePopup(true);
             }
         }
     };
@@ -109,17 +124,17 @@ var DatePicker = /** @class */ (function () {
             this.popup = null;
         }
     };
-    DatePicker.prototype.setBindValueAndClose = function (dateValue, preserveTime) {
+    DatePicker.prototype.setBindValue = function (dateValue, options) {
         this.inputHasChanged = false;
         var oldValue = this.bindProperty.value;
-        if (oldValue && dateValue && preserveTime) {
+        if (oldValue && dateValue && options.preserveTime) {
             // preserve the time component of the original date.
             dateValue.setHours(oldValue.getHours(), oldValue.getMinutes(), oldValue.getSeconds(), oldValue.getMilliseconds());
         }
         // Note: this may have the side effect of calling update().
         this.setBindProperty(dateValue, false);
         this.setInputValue();
-        if (!this.options.alwaysShow) {
+        if (!this.options.alwaysShow && options.close) {
             this.removePopup(true);
         }
     };
@@ -156,7 +171,7 @@ var DatePicker = /** @class */ (function () {
     };
     DatePicker.prototype.positionPopup = function (fromBottom) {
         if (this.popup) {
-            PositionHelper.checkScreenBounds(this.container, this.popup, fromBottom);
+            PositionHelper.checkScreenBounds(this.container, this.popup, fromBottom, this.options.popupAlignRight);
         }
     };
     /**
@@ -319,8 +334,7 @@ var DatePicker = /** @class */ (function () {
                 var cell = this.createAndAppend(trBody, "td");
                 var date = currentDate.getDate();
                 var month = currentDate.getMonth();
-                cell.innerText = date.toString();
-                this.setupCell(cell, currentDate.getFullYear() + "," + month + "," + date, currentDate.getTime() >= this.options.minDateNoTime.getTime() && currentDate.getTime() <= this.options.maxDateNoTime.getTime(), currentDate.getTime() == this.today.getTime(), this.boundDateNoTime != null && currentDate.getTime() == this.boundDateNoTime.getTime());
+                this.setupCell(cell, date.toString(), currentDate.getFullYear() + "," + month + "," + date, currentDate.getTime() >= this.options.minDateNoTime.getTime() && currentDate.getTime() <= this.options.maxDateNoTime.getTime(), currentDate.getTime() == this.today.getTime(), this.boundDateNoTime != null && currentDate.getTime() == this.boundDateNoTime.getTime());
                 if (month != this.currentViewDate.getMonth()) {
                     cell.classList.add("outside-month");
                 }
@@ -345,8 +359,7 @@ var DatePicker = /** @class */ (function () {
                 trBody = this.createAndAppend(tBody, "tr");
             }
             var cell = this.createAndAppend(trBody, "td");
-            cell.innerText = DateUtils.i18n.monthNames[i];
-            this.setupCell(cell, i, monthEndDate > this.options.minDateNoTime.getTime() && monthStartDate <= this.options.maxDateNoTime.getTime(), this.today.getFullYear() == year && this.today.getMonth() == i, this.boundDateNoTime != null && this.boundDateNoTime.getFullYear() == year && this.boundDateNoTime.getMonth() == i);
+            this.setupCell(cell, DateUtils.i18n.monthNames[i], i, monthEndDate > this.options.minDateNoTime.getTime() && monthStartDate <= this.options.maxDateNoTime.getTime(), this.today.getFullYear() == year && this.today.getMonth() == i, this.boundDateNoTime != null && this.boundDateNoTime.getFullYear() == year && this.boundDateNoTime.getMonth() == i);
         }
         this.prevButton.disabled = this.options.minDateNoTime.getFullYear() >= year;
         this.nextButton.disabled = this.options.maxDateNoTime.getFullYear() <= year;
@@ -361,13 +374,12 @@ var DatePicker = /** @class */ (function () {
                 trBody = this.createAndAppend(tBody, "tr");
             }
             var cell = this.createAndAppend(trBody, "td");
-            cell.innerText = (year + i).toString();
-            this.setupCell(cell, cell.innerText, year + i >= this.options.minDateNoTime.getFullYear() && year + i <= this.options.maxDateNoTime.getFullYear(), this.today.getFullYear() == year + i, this.boundDateNoTime != null && this.boundDateNoTime.getFullYear() == year + i);
+            this.setupCell(cell, (year + i).toString(), (year + i).toString(), year + i >= this.options.minDateNoTime.getFullYear() && year + i <= this.options.maxDateNoTime.getFullYear(), this.today.getFullYear() == year + i, this.boundDateNoTime != null && this.boundDateNoTime.getFullYear() == year + i);
         }
         this.prevButton.disabled = this.options.minDateNoTime.getFullYear() >= year;
         this.nextButton.disabled = this.options.maxDateNoTime.getFullYear() < year + YearsInYearView;
     };
-    DatePicker.prototype.setupCell = function (cell, data, selectable, current, isSelected) {
+    DatePicker.prototype.setupCell = function (cell, innerText, data, selectable, current, isSelected) {
         if (selectable) {
             cell.classList.add("selectable");
             cell.dataset["date"] = data;
@@ -381,55 +393,56 @@ var DatePicker = /** @class */ (function () {
         if (isSelected) {
             cell.classList.add("selected");
         }
+        var cellContent = this.createAndAppend(cell, "span");
+        cellContent.innerText = innerText;
     };
     DatePicker.prototype.contentClick = function (e) {
+        var _a;
         e.preventDefault();
         if (e.target) {
-            if (this.currentViewType == ViewType.Days) {
-                this.dayClicked(e.target);
-            }
-            else if (this.currentViewType == ViewType.Months) {
-                this.monthClicked(e.target);
+            var element = e.target;
+            if (!element.dataset["date"]) {
+                element = element.parentElement;
             }
-            else {
-                this.yearClicked(e.target);
+            var dateString = (_a = element) === null || _a === void 0 ? void 0 : _a.dataset["date"];
+            if (dateString) {
+                if (this.currentViewType == ViewType.Days) {
+                    this.dayClicked(dateString);
+                }
+                else if (this.currentViewType == ViewType.Months) {
+                    this.monthClicked(dateString);
+                }
+                else {
+                    this.yearClicked(dateString);
+                }
             }
         }
     };
-    DatePicker.prototype.dayClicked = function (element) {
-        var datePartsString = element.dataset["date"];
-        if (datePartsString) {
-            var dateParts = datePartsString.split(",");
-            this.setBindValueAndClose(new Date(parseInt(dateParts[0]), parseInt(dateParts[1]), parseInt(dateParts[2])), true);
-        }
+    DatePicker.prototype.dayClicked = function (datePartsString) {
+        var dateParts = datePartsString.split(",");
+        this.setBindValue(new Date(parseInt(dateParts[0]), parseInt(dateParts[1]), parseInt(dateParts[2])), { preserveTime: true, close: true });
     };
-    DatePicker.prototype.monthClicked = function (element) {
-        var monthString = element.dataset["date"];
-        if (monthString) {
-            this.currentViewDate.setMonth(parseInt(monthString));
-            if (this.options.monthView) {
-                this.setBindValueAndClose(this.currentViewDate, true);
-            }
-            else {
-                this.currentViewType = ViewType.Days;
-                this.canAutoSetDate = true;
-                this.populateContentContainer(false);
-                this.contentAnimationHelper.fadeAndScale(true);
-            }
+    DatePicker.prototype.monthClicked = function (monthString) {
+        this.currentViewDate.setMonth(parseInt(monthString));
+        if (this.options.monthView) {
+            this.setBindValue(this.currentViewDate, { preserveTime: true, close: true });
+        }
+        else {
+            this.currentViewType = ViewType.Days;
+            this.canAutoSetDate = true;
+            this.populateContentContainer(false);
+            this.contentAnimationHelper.fadeAndScale(true);
         }
     };
-    DatePicker.prototype.yearClicked = function (element) {
-        var yearString = element.dataset["date"];
-        if (yearString) {
-            this.currentViewDate.setFullYear(parseInt(yearString));
-            if (this.options.yearView) {
-                this.setBindValueAndClose(this.currentViewDate, true);
-            }
-            else {
-                this.currentViewType = ViewType.Months;
-                this.populateContentContainer(false);
-                this.contentAnimationHelper.fadeAndScale(true);
-            }
+    DatePicker.prototype.yearClicked = function (yearString) {
+        this.currentViewDate.setFullYear(parseInt(yearString));
+        if (this.options.yearView) {
+            this.setBindValue(this.currentViewDate, { preserveTime: true, close: true });
+        }
+        else {
+            this.currentViewType = ViewType.Months;
+            this.populateContentContainer(false);
+            this.contentAnimationHelper.fadeAndScale(true);
         }
     };
     DatePicker.prototype.headerClick = function (e) {

package/dist/Components/DatePicker/DatePickerOptions.d.ts

@@ -26,6 +26,10 @@ export default class DatePickerOptions {
      * `isClosing` will be false during scrolling with `autoChangeDate` set.
      * */
     onDateSelected?: (isClosing: boolean) => void;
+    /**
+     * If the datepicker popup should be aligned to the right of the input.
+     */
+    popupAlignRight?: boolean;
 }
 export declare class ProcessedDatePickerOptions extends DatePickerOptions {
     minDateNoTime: Date;

package/dist/Model/BaseModels/CriteriaBase.d.ts

@@ -1,6 +1,7 @@
-import { ModelFieldInfo } from "../ModelFieldInfo";
+import { IModelFieldInfoContainer, ModelFieldInfo } from "../ModelFieldInfo";
+import PropertyInfo from "../PropertyInfo";
 import ValueObject from "../ValueObject";
-export declare abstract class CriteriaBase extends ValueObject {
+export declare abstract class CriteriaBase extends ValueObject implements IModelFieldInfoContainer {
     /**
      * Extra information about lookup fields in this object.
      */
@@ -13,4 +14,5 @@ export declare abstract class CriteriaBase extends ValueObject {
      * You must also call this.makeObservable(); instead of using the @NeoModel decorator.
      */
     protected initialiseFieldInfo(fields: (keyof this)[]): void;
+    setModelFieldInfo(property: PropertyInfo, displayValue: string): any;
 }

package/dist/Model/BaseModels/CriteriaBase.js

@@ -25,6 +25,17 @@ var CriteriaBase = /** @class */ (function (_super) {
             }
         }
     };
+    CriteriaBase.prototype.setModelFieldInfo = function (property, displayValue) {
+        var fieldInfo = this.fieldInfo[property.propertyName];
+        if (!fieldInfo) {
+            fieldInfo = new ModelFieldInfo(property.readableName, displayValue);
+            this.fieldInfo[property.propertyName] = fieldInfo;
+        }
+        else {
+            fieldInfo.valueString = displayValue;
+        }
+        return fieldInfo;
+    };
     __decorate([
         Dictionary(ModelFieldInfo),
         __metadata("design:type", Object)

package/dist/Model/ModelFieldInfo.d.ts

@@ -1,4 +1,17 @@
 import ValueObject from "./ValueObject";
+import PropertyInfo from "./PropertyInfo";
+export interface IModelFieldInfoContainer {
+    /**
+     * Extra information about lookup fields in this object.
+     */
+    fieldInfo: {
+        [K in keyof this]?: ModelFieldInfo;
+    };
+    /**
+     * Sets the model field info for a property.
+     */
+    setModelFieldInfo(property: PropertyInfo, displayValue: string): ModelFieldInfo;
+}
 export declare class ModelFieldInfo extends ValueObject {
     constructor(displayName: string, valueString: string);
     /**
@@ -9,4 +22,8 @@ export declare class ModelFieldInfo extends ValueObject {
      * Lookup of the field value
      */
     valueString: string;
+    /**
+     * If the instance is a container of ModelFieldInfo, the instance is returned, otherwise null is returned.
+     */
+    static asModelFieldInfoContainer(instance: any): IModelFieldInfoContainer | null;
 }

package/dist/Model/ModelFieldInfo.js

@@ -17,6 +17,16 @@ var ModelFieldInfo = /** @class */ (function (_super) {
         _this.valueString = valueString;
         return _this;
     }
+    /**
+     * If the instance is a container of ModelFieldInfo, the instance is returned, otherwise null is returned.
+     */
+    ModelFieldInfo.asModelFieldInfoContainer = function (instance) {
+        if (instance.fieldInfo &&
+            instance.setModelFieldInfo) {
+            return instance;
+        }
+        return null;
+    };
     ModelFieldInfo = __decorate([
         NeoModel,
         __metadata("design:paramtypes", [String, String])

package/dist/Model/NeoTypeInfo.d.ts

@@ -34,6 +34,7 @@ export declare class NeoTypeInfo {
     /** Copy the property info list from each base type into the current type. */
     merge(baseConstructor: NeoModelConstructor): void;
     ensureInitialised(): void;
+    createInstance(...args: any): any;
     /** Gets the override constructor which can setup a neo model. */
     getOverrideConstructor(): Function;
     private createWrapperConstructor;

package/dist/Model/NeoTypeInfo.js

@@ -165,12 +165,19 @@ var NeoTypeInfo = /** @class */ (function () {
     NeoTypeInfo.prototype.ensureInitialised = function () {
         if (!this.modelCreator) {
             // create a new instance which will cause the type to be setup.
-            if (this.wrapperConstructor) {
-                this.wrapperConstructor();
-            }
-            else {
-                void new this.objectConstructor();
-            }
+            this.createInstance();
+        }
+    };
+    NeoTypeInfo.prototype.createInstance = function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        if (this.wrapperConstructor) {
+            return this.wrapperConstructor(args);
+        }
+        else {
+            return new this.objectConstructor(args);
         }
     };
     /** Gets the override constructor which can setup a neo model. */

package/dist/Model/index.d.ts

@@ -4,7 +4,7 @@ export { IPropertyInstance, PropertyAccessor } from './PropertyInstance';
 export { IObservableValue, ObservableValue } from './ObservableValue';
 export { ObservableProperty } from './ObservableProperty';
 export { ISelectedItem } from './Misc';
-export { ModelFieldInfo } from './ModelFieldInfo';
+export { ModelFieldInfo, IModelFieldInfoContainer } from './ModelFieldInfo';
 import * as GraphTraverser from './ModelGraphTraverser';
 export { GraphTraverser };
 export { AuditValues, AuditValuesBase } from './BaseModels/AuditValues';

package/dist/Settings.d.ts

@@ -16,14 +16,16 @@ export declare const Settings: {
         infoIcon: any;
         expanded: any;
         collapsed: any;
+        sortAsc: any;
+        sortDesc: any;
     };
     /** Grid default settings */
     grid: {
-        /** When specified, the default bootstrap table borders (sides and cells) will be added */
+        /** Causes the table to have a border, cells will also have a left and right border. True by default. */
         isBordered: boolean;
         /** When specified, every alternating row will receive a slightly darker background color. */
         isStriped: boolean;
-        /** When specified, the standard bootstrap table borders (sides and cells) will be removed. */
+        /** Removes the default top and bottom borders from rows. */
         isBorderless: boolean;
         /** When specified, a background color will be applied on a row if it is being hovered over. */
         showHover: boolean;

package/dist/Settings.js

@@ -14,15 +14,17 @@ export var Settings = {
         warningIcon: "fa-exclamation-triangle",
         infoIcon: "fa-exclamation-circle",
         expanded: "far-minus-square",
-        collapsed: "far-plus-square"
+        collapsed: "far-plus-square",
+        sortAsc: "sort-up",
+        sortDesc: "sort-down",
     },
     /** Grid default settings */
     grid: {
-        /** When specified, the default bootstrap table borders (sides and cells) will be added */
+        /** Causes the table to have a border, cells will also have a left and right border. True by default. */
         isBordered: true,
         /** When specified, every alternating row will receive a slightly darker background color. */
         isStriped: false,
-        /** When specified, the standard bootstrap table borders (sides and cells) will be removed. */
+        /** Removes the default top and bottom borders from rows. */
         isBorderless: false,
         /** When specified, a background color will be applied on a row if it is being hovered over. */
         showHover: false,

package/dist/Utils.js

@@ -71,13 +71,12 @@ var Utils = /** @class */ (function () {
      * @param args Constructor args.
      */
     Utils.createInstance = function (type) {
-        var _a;
         var args = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             args[_i - 1] = arguments[_i];
         }
         if (type.prototype.constructor.neo) {
-            return new ((_a = (type.prototype.constructor.neo.getOverrideConstructor())).bind.apply(_a, __spreadArrays([void 0], args)))();
+            return type.prototype.constructor.neo.createInstance(args);
         }
         else {
             throw "Cannot instantiate '" + type.name + "' because it does not have an @NeoModel attribute.";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularsystems/neo-core",
-  "version": "0.10.62",
+  "version": "0.10.64",
   "description": "Core functionality for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",