@singularsystems/neo-core 1.0.0-beta.2 → 1.0.0-beta.4

package/dist/Data/Paging/PageManager.d.ts

@@ -82,7 +82,7 @@ export interface IPageManager {
     /**
      * Refresh the data only if the page manager has initialised.
      */
-    invalidateData(taskRunner?: ITaskRunner): Promise<void>;
+    invalidateData(): void;
     /**
      * Refresh the data by calling the api endpoint with the current criteria.
      * This will not reset the page index, and will not update the total record count, therefore should only be called if your criteria has not changed since the last full fetch using refreshData().
@@ -101,6 +101,7 @@ export declare class PageManager<TCriteria extends ValueObject, TModel extends I
     private _totalRecords;
     private currentData;
     private initialFetchState;
+    private isInvalidated;
     /**
      * Gets or sets the criteria.
      */
@@ -125,6 +126,8 @@ export declare class PageManager<TCriteria extends ValueObject, TModel extends I
      * Called by the pager component on first display. Will fetch data if options.fetchInitial is set to true.
      */
     initialise(): void;
+    /** Called after a bound ui component has rendered. Used to refetch data if invalidateData() was called. */
+    afterRender(): void;
     /**
      * Refresh the data by calling the api endpoint with the current criteria.
      * Note: the page index will be reset to zero. Use this when your criteria has changed
@@ -133,9 +136,9 @@ export declare class PageManager<TCriteria extends ValueObject, TModel extends I
      */
     refreshData(getCount?: boolean, taskRunner?: ITaskRunner): Promise<void>;
     /**
-     * Refresh the data only if the page manager has initialised.
+     * Refresh the data only if the page manager has initialised, and is currently being rendered.
      */
-    invalidateData(taskRunner?: ITaskRunner): Promise<void>;
+    invalidateData(): void;
     /**
      * Refresh the data by calling the api endpoint with the current criteria.
      * This will not reset the page index, and will not update the total record count, therefore should only be called if your criteria has not changed since the last full fetch using refreshData().
@@ -144,6 +147,10 @@ export declare class PageManager<TCriteria extends ValueObject, TModel extends I
     refreshPage(taskRunner?: ITaskRunner): Promise<void>;
     private fetchAndSetData;
     setData(pageRecords: PartialPlainObject<TModel>[], totalRecords?: number): Promise<void>;
+    /**
+     * Adds an item to the current page, and increments the total record count.
+     */
+    addRecord(item: TModel | Model.PlainObject<TModel>): void;
     /**
      * Resets the page manager to its initial state and clears the current data.
      */

package/dist/Data/Paging/PageManager.js

@@ -16,6 +16,7 @@ export var PageManager = /** @class */ (function (_super) {
         _this._totalRecords = -1;
         _this.currentData = new List(_this.modelType);
         _this.initialFetchState = "none";
+        _this.isInvalidated = false;
         _this.options = options || {};
         _this.allowSort = _this.options.allowSort !== false;
         _this.performsRemoteSorting = true;
@@ -59,6 +60,7 @@ export var PageManager = /** @class */ (function (_super) {
             if (this.initialFetchState === "loading") {
                 return null;
             }
+            void this.isInvalidated;
             return this.initialFetchState === "complete";
         },
         enumerable: false,
@@ -126,10 +128,21 @@ export var PageManager = /** @class */ (function (_super) {
     PageManager.prototype.initialise = function () {
         if (!this.hasInitialised) {
             this.hasInitialised = true;
+            this.isInvalidated = false;
             if (this.options.fetchInitial) {
                 this.refreshData(true, this.options.initialTaskRunner);
             }
         }
+        else {
+            this.afterRender();
+        }
+    };
+    /** Called after a bound ui component has rendered. Used to refetch data if invalidateData() was called. */
+    PageManager.prototype.afterRender = function () {
+        if (this.isInvalidated) {
+            this.isInvalidated = false;
+            this.refreshPage();
+        }
     };
     /**
      * Refresh the data by calling the api endpoint with the current criteria.
@@ -167,22 +180,12 @@ export var PageManager = /** @class */ (function (_super) {
         });
     };
     /**
-     * Refresh the data only if the page manager has initialised.
+     * Refresh the data only if the page manager has initialised, and is currently being rendered.
      */
-    PageManager.prototype.invalidateData = function (taskRunner) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.hasInitialised) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.refreshData(true, taskRunner)];
-                    case 1:
-                        _a.sent();
-                        _a.label = 2;
-                    case 2: return [2 /*return*/];
-                }
-            });
-        });
+    PageManager.prototype.invalidateData = function () {
+        if (this.hasInitialised) {
+            this.isInvalidated = true;
+        }
     };
     /**
      * Refresh the data by calling the api endpoint with the current criteria.
@@ -254,6 +257,18 @@ export var PageManager = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * Adds an item to the current page, and increments the total record count.
+     */
+    PageManager.prototype.addRecord = function (item) {
+        this._totalRecords += 1;
+        if (item.meta) {
+            this.data.push(item);
+        }
+        else {
+            this.data.push(this.modelType.fromJSObject(item));
+        }
+    };
     /**
      * Resets the page manager to its initial state and clears the current data.
      */
@@ -345,6 +360,10 @@ export var PageManager = /** @class */ (function (_super) {
         Observable(),
         __metadata("design:type", String)
     ], PageManager.prototype, "initialFetchState", void 0);
+    __decorate([
+        Observable(),
+        __metadata("design:type", Object)
+    ], PageManager.prototype, "isInvalidated", void 0);
     PageManager = __decorate([
         NeoModel,
         __metadata("design:paramtypes", [Object, Function, Function, Object])

package/dist/Extensions.js

@@ -88,7 +88,12 @@ Array.prototype.sortBy = function (valueFnOrKey, direction, dataType) {
             }
         };
     }
-    return this.sort(comparer);
+    var array = this;
+    if (this.addNew) {
+        // Mobx6 doesn't allow the array to be sorted in place, must create a new one.
+        array = this.slice();
+    }
+    return array.sort(comparer);
 };
 Array.prototype.remove = function (item) {
     var index = this.indexOf(item);

package/dist/Model/BaseModels/UserEvent.js

@@ -1,7 +1,8 @@
-import { __decorate, __extends } from "tslib";
+import { __decorate, __extends, __metadata } from "tslib";
 import ValueObject from '../ValueObject';
+import { Date as DateAttribute } from '../Decorators';
 import NeoModel from '../NeoModel';
-var UserEventBase = /** @class */ (function (_super) {
+export var UserEventBase = /** @class */ (function (_super) {
     __extends(UserEventBase, _super);
     function UserEventBase() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
@@ -16,9 +17,12 @@ var UserEventBase = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    __decorate([
+        DateAttribute(),
+        __metadata("design:type", Object)
+    ], UserEventBase.prototype, "on", void 0);
     return UserEventBase;
 }(ValueObject));
-export { UserEventBase };
 export var UserEvent = /** @class */ (function (_super) {
     __extends(UserEvent, _super);
     function UserEvent() {

package/dist/Security/Oidc/OidcAuthService.d.ts

@@ -38,6 +38,7 @@ export default abstract class OidcAuthService<TUser extends OidcUser = OidcUser>
     endSignInSilent(): Promise<any>;
     private onUserLoaded;
     protected afterUserLoaded(): Promise<void> | void;
+    private completeAfterUserLoaded;
     protected createUser(user: IOidcUser): OidcUser;
     private onUserUnloaded;
     private setUser;

package/dist/Security/Oidc/OidcAuthService.js

@@ -37,11 +37,14 @@ var OidcAuthService = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.userManager.getUser()];
                     case 1:
                         user = _a.sent();
-                        if (user) {
-                            // Get user does not raise the onUserLoaded event, so we call it manually.
-                            this.onUserLoaded(user);
-                        }
-                        return [2 /*return*/, this.user];
+                        if (!user) return [3 /*break*/, 3];
+                        // Get user does not raise the onUserLoaded event, so we call it manually.
+                        this.onUserLoaded(user);
+                        return [4 /*yield*/, this.completeAfterUserLoaded()];
+                    case 2:
+                        _a.sent();
+                        _a.label = 3;
+                    case 3: return [2 /*return*/, this.user];
                 }
             });
         });
@@ -102,24 +105,21 @@ var OidcAuthService = /** @class */ (function () {
                         loginErrorHandler = Misc.Globals.appService.get(NeoTypes.Security.LoginErrorHandler);
                         if (!(!stateKey || window.localStorage.getItem("oidc." + stateKey) === null)) return [3 /*break*/, 1];
                         loginErrorHandler.onMissingLoginState();
-                        return [3 /*break*/, 6];
+                        return [3 /*break*/, 5];
                     case 1:
-                        _a.trys.push([1, 5, , 6]);
+                        _a.trys.push([1, 4, , 5]);
                         return [4 /*yield*/, this.endSignIn()];
                     case 2:
                         redirectPath = _a.sent();
-                        if (!this.afterUserLoadedPromise) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.afterUserLoadedPromise];
+                        return [4 /*yield*/, this.completeAfterUserLoaded()];
                     case 3:
                         _a.sent();
-                        this.afterUserLoadedPromise = undefined;
-                        _a.label = 4;
-                    case 4: return [2 /*return*/, new SignInResult(true, redirectPath)];
-                    case 5:
+                        return [2 /*return*/, new SignInResult(true, redirectPath)];
+                    case 4:
                         e_2 = _a.sent();
                         loginErrorHandler.onException(e_2);
-                        return [3 /*break*/, 6];
-                    case 6: return [2 /*return*/, new SignInResult(false, "")];
+                        return [3 /*break*/, 5];
+                    case 5: return [2 /*return*/, new SignInResult(false, "")];
                 }
             });
         });
@@ -133,6 +133,22 @@ var OidcAuthService = /** @class */ (function () {
     };
     OidcAuthService.prototype.afterUserLoaded = function () {
     };
+    OidcAuthService.prototype.completeAfterUserLoaded = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.afterUserLoadedPromise) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.afterUserLoadedPromise];
+                    case 1:
+                        _a.sent();
+                        this.afterUserLoadedPromise = undefined;
+                        _a.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
+        });
+    };
     OidcAuthService.prototype.createUser = function (user) {
         return new OidcUser(user);
     };

package/dist/Settings.d.ts

@@ -20,6 +20,8 @@ export declare const Settings: {
         collapsed: any;
         sortAsc: any;
         sortDesc: any;
+        /** Icon used in back buttons */
+        backIcon: any;
     };
     /** Grid default settings */
     grid: {

package/dist/Settings.js

@@ -19,6 +19,8 @@ export var Settings = {
         collapsed: "far-plus-square",
         sortAsc: "sort-up",
         sortDesc: "sort-down",
+        /** Icon used in back buttons */
+        backIcon: "arrow-left",
     },
     /** Grid default settings */
     grid: {

package/dist/Utils.d.ts

@@ -61,6 +61,10 @@ export declare class Utils {
      * Converts a string like 'user' to 'fa fa-user' or 'fa-user' to 'fa fa-user' or 'far-user' to 'far fa-user'
      */
     static getFontAwesomeClass(faString: string): string;
+    static getFontAwesomeIconProps(faString: string): {
+        name: string;
+        isSolid: boolean | undefined;
+    };
     /** Concatenates an array of strings together, putting spaces in-between them. */
     static joinWithSpaces(arg0?: string, ...args: (string | undefined)[]): string;
     /**

package/dist/Utils.js

@@ -116,15 +116,23 @@ var Utils = /** @class */ (function () {
      * Converts a string like 'user' to 'fa fa-user' or 'fa-user' to 'fa fa-user' or 'far-user' to 'far fa-user'
      */
     Utils.getFontAwesomeClass = function (faString) {
-        var isRegular = false;
+        var props = this.getFontAwesomeIconProps(faString);
+        return (props.isSolid === false ? 'far ' : (props.isSolid === true ? 'fas ' : 'fa ')) + 'fa-' + props.name;
+    };
+    Utils.getFontAwesomeIconProps = function (faString) {
+        var isSolid;
         if (faString.indexOf("fa-") === 0) {
             faString = faString.substring(3);
         }
         else if (faString.indexOf("far-") === 0) {
-            isRegular = true;
+            isSolid = false;
+            faString = faString.substring(4);
+        }
+        else if (faString.indexOf("fas-") === 0) {
+            isSolid = true;
             faString = faString.substring(4);
         }
-        return (isRegular ? 'far ' : 'fa ') + 'fa-' + faString;
+        return { name: faString, isSolid: isSolid };
     };
     /** Concatenates an array of strings together, putting spaces in-between them. */
     Utils.joinWithSpaces = function (arg0) {

package/package.json

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