@singularsystems/neo-react 1.0.0-alpha.2 → 1.0.0-beta.0

package/dist/Views/ViewModelBase.js

@@ -1,118 +1,122 @@
-import { __awaiter, __extends, __generator } from "tslib";
-import { ModelBase, Misc } from '@singularsystems/neo-core';
-import { NeoReactTypes } from '../Modules/Types';
-var ViewModelBase = /** @class */ (function (_super) {
-    __extends(ViewModelBase, _super);
-    function ViewModelBase(taskRunner, disposeHelper) {
-        if (taskRunner === void 0) { taskRunner = Misc.Globals.appService.get(NeoReactTypes.TaskRunner); }
-        if (disposeHelper === void 0) { disposeHelper = Misc.Globals.appService.get(NeoReactTypes.Services.DisposeHelper); }
-        var _this = _super.call(this) || this;
-        _this.taskRunner = taskRunner;
-        _this.disposeHelper = disposeHelper;
-        _this.trackedViewModels = [];
-        return _this;
-    }
-    ViewModelBase.prototype.initialise = function () {
-    };
-    /**
-     * Registers a mobx reaction, which will be disposed in the dispose() method when the view is unmounted.
-     * @param expression Expression to react to.
-     * @param effect Callback to run when the result of the expression changes.
-     */
-    ViewModelBase.prototype.registerReaction = function (expression, effect) {
-        return this.disposeHelper.registerReaction(expression, effect);
-    };
-    ViewModelBase.prototype.registerViewModel = function (viewModel, options) {
-        var viewModelInstance = ViewModelBase.create(viewModel, this.taskRunner);
-        if (options === null || options === void 0 ? void 0 : options.initialise) {
-            viewModelInstance.initialise();
-        }
-        this.trackedViewModels.push(viewModelInstance);
-        return viewModelInstance;
-    };
-    /**
-     * Disposes a child view model and sets the property value to null.
-     * Note: you will need to pass in the VM property like this: (this as MyVM).meta.vmProperty
-     */
-    ViewModelBase.prototype.disposeViewModel = function (vmProperty) {
-        var viewModel = vmProperty.value;
-        vmProperty.value = null;
-        if (viewModel) {
-            this.trackedViewModels.remove(viewModel);
-            viewModel.dispose();
-        }
-    };
-    /**
-     * Uses the task runner to call an api endpoint. The returned data is deserialised into an instance of the provided model type.
-     */
-    ViewModelBase.prototype.waitForModel = function (modelType, task, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            var data;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.taskRunner.waitForData(task, options)];
-                    case 1:
-                        data = _a.sent();
-                        return [2 /*return*/, modelType.fromJSObject(data)];
-                }
-            });
-        });
-    };
-    /**
-     * Registers the object for disposal when this viewmodel is disposed.
-     */
-    ViewModelBase.prototype.autoDispose = function (disposable) {
-        return this.disposeHelper.autoDispose(disposable);
-    };
-    /**
-     * Binds a list of functions to the viewmodel instance.
-     */
-    ViewModelBase.prototype.bindMethods = function () {
-        var fns = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            fns[_i] = arguments[_i];
-        }
-        for (var _a = 0, fns_1 = fns; _a < fns_1.length; _a++) {
-            var fn = fns_1[_a];
-            if (fn.name) {
-                this[fn.name] = fn.bind(this);
-            }
-            else {
-                throw "Cannot bind a function without a name.";
-            }
-        }
-    };
-    ViewModelBase.prototype.dispose = function () {
-        this.disposeHelper.dispose();
-        for (var _i = 0, _a = this.trackedViewModels; _i < _a.length; _i++) {
-            var viewModel = _a[_i];
-            viewModel.dispose();
-        }
-        this.trackedViewModels = [];
-    };
-    /**
-     * Creates a view model instance.
-     * @param viewModel ViewModel instance, callback which returns a ViewModel or ViewModel constructor.
-     * @param taskRunner TaskRunner to set if a constructor is passed in.
-     */
-    ViewModelBase.create = function (viewModel, taskRunner) {
-        if (viewModel.taskRunner) {
-            // Already instantiated
-            return viewModel;
-        }
-        else if (viewModel.neo) {
-            // Constructor
-            var viewModelInstance = new viewModel();
-            if (taskRunner) {
-                viewModelInstance.taskRunner = taskRunner;
-            }
-            return viewModelInstance;
-        }
-        else {
-            // Callback
-            return viewModel();
-        }
-    };
-    return ViewModelBase;
-}(ModelBase));
-export default ViewModelBase;
+import { __awaiter, __extends, __generator } from "tslib";
+import { ModelBase, Misc } from '@singularsystems/neo-core';
+import { NeoReactTypes } from '../Modules/Types';
+var ViewModelBase = /** @class */ (function (_super) {
+    __extends(ViewModelBase, _super);
+    function ViewModelBase(taskRunner, disposeHelper) {
+        if (taskRunner === void 0) { taskRunner = Misc.Globals.appService.get(NeoReactTypes.TaskRunner); }
+        if (disposeHelper === void 0) { disposeHelper = Misc.Globals.appService.get(NeoReactTypes.Services.DisposeHelper); }
+        var _this = _super.call(this) || this;
+        _this.taskRunner = taskRunner;
+        _this.disposeHelper = disposeHelper;
+        _this.trackedViewModels = [];
+        return _this;
+    }
+    ViewModelBase.prototype.initialise = function () {
+    };
+    /**
+     * Registers a mobx reaction, which will be disposed in the dispose() method when the view is unmounted.
+     * @param expression Expression to react to.
+     * @param effect Callback to run when the result of the expression changes.
+     */
+    ViewModelBase.prototype.registerReaction = function (expression, effect) {
+        return this.disposeHelper.registerReaction(expression, effect);
+    };
+    ViewModelBase.prototype.registerViewModel = function (viewModel, options) {
+        var viewModelInstance = ViewModelBase.create(viewModel, this.taskRunner);
+        if (options === null || options === void 0 ? void 0 : options.initialise) {
+            viewModelInstance.initialise();
+        }
+        this.trackedViewModels.push(viewModelInstance);
+        return viewModelInstance;
+    };
+    /**
+     * Disposes a child view model and sets the property value to null.
+     * Note: you will need to pass in the VM property like this: (this as MyVM).meta.vmProperty
+     */
+    ViewModelBase.prototype.disposeViewModel = function (vmProperty) {
+        var viewModel = vmProperty.value;
+        vmProperty.value = null;
+        if (viewModel) {
+            this.trackedViewModels.remove(viewModel);
+            viewModel.dispose();
+        }
+    };
+    /**
+     * Uses the task runner to call an api endpoint. The returned data is deserialised into an instance of the provided model type.
+     */
+    ViewModelBase.prototype.waitForModel = function (modelType, task, options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var data;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.taskRunner.waitForData(task, options)];
+                    case 1:
+                        data = _a.sent();
+                        return [2 /*return*/, modelType.fromJSObject(data)];
+                }
+            });
+        });
+    };
+    /**
+     * Registers the object for disposal when this viewmodel is disposed.
+     */
+    ViewModelBase.prototype.autoDispose = function (disposable) {
+        return this.disposeHelper.autoDispose(disposable);
+    };
+    /**
+     * Binds a list of functions to the viewmodel instance.
+     */
+    ViewModelBase.prototype.bindMethods = function () {
+        var fns = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            fns[_i] = arguments[_i];
+        }
+        var prototype = this.constructor.prototype;
+        var _loop_1 = function (key) {
+            if (key !== "constructor" && prototype[key] instanceof Function && !this_1.hasOwnProperty(key)) {
+                if (fns.find(function (f) { return f === prototype[key]; })) {
+                    this_1[key] = prototype[key].bind(this_1);
+                }
+            }
+        };
+        var this_1 = this;
+        for (var _a = 0, _b = Object.getOwnPropertyNames(prototype); _a < _b.length; _a++) {
+            var key = _b[_a];
+            _loop_1(key);
+        }
+    };
+    ViewModelBase.prototype.dispose = function () {
+        this.disposeHelper.dispose();
+        for (var _i = 0, _a = this.trackedViewModels; _i < _a.length; _i++) {
+            var viewModel = _a[_i];
+            viewModel.dispose();
+        }
+        this.trackedViewModels = [];
+    };
+    /**
+     * Creates a view model instance.
+     * @param viewModel ViewModel instance, callback which returns a ViewModel or ViewModel constructor.
+     * @param taskRunner TaskRunner to set if a constructor is passed in.
+     */
+    ViewModelBase.create = function (viewModel, taskRunner) {
+        if (viewModel.taskRunner) {
+            // Already instantiated
+            return viewModel;
+        }
+        else if (viewModel.neo) {
+            // Constructor
+            var viewModelInstance = new viewModel();
+            if (taskRunner) {
+                viewModelInstance.taskRunner = taskRunner;
+            }
+            return viewModelInstance;
+        }
+        else {
+            // Callback
+            return viewModel();
+        }
+    };
+    return ViewModelBase;
+}(ModelBase));
+export default ViewModelBase;

package/dist/Views/ViewState.d.ts

@@ -1,13 +1,13 @@
-import { RouteParameterObject } from '../Routing/IRouteParameter';
-import { IViewParameterList, ViewParameterList } from '../Routing/ViewParameterList';
-import { IViewModel } from './IViewModel';
-export interface IViewState {
-    viewParams: IViewParameterList;
-    viewModel: IViewModel;
-}
-export declare class ViewState<TViewModel extends IViewModel, TParams extends RouteParameterObject<TParams>> {
-    viewParams: ViewParameterList<TParams>;
-    viewModel: TViewModel;
-    hasSetup: boolean;
-    constructor(viewParams: ViewParameterList<TParams>, viewModel: TViewModel);
-}
+import { RouteParameterObject } from '../Routing/IRouteParameter';
+import { IViewParameterList, ViewParameterList } from '../Routing/ViewParameterList';
+import { IViewModel } from './IViewModel';
+export interface IViewState {
+    viewParams: IViewParameterList;
+    viewModel: IViewModel;
+}
+export declare class ViewState<TViewModel extends IViewModel, TParams extends RouteParameterObject<TParams>> {
+    viewParams: ViewParameterList<TParams>;
+    viewModel: TViewModel;
+    hasSetup: boolean;
+    constructor(viewParams: ViewParameterList<TParams>, viewModel: TViewModel);
+}

package/dist/Views/ViewState.js

@@ -1,9 +1,9 @@
-var ViewState = /** @class */ (function () {
-    function ViewState(viewParams, viewModel) {
-        this.viewParams = viewParams;
-        this.viewModel = viewModel;
-        this.hasSetup = false;
-    }
-    return ViewState;
-}());
-export { ViewState };
+var ViewState = /** @class */ (function () {
+    function ViewState(viewParams, viewModel) {
+        this.viewParams = viewParams;
+        this.viewModel = viewModel;
+        this.hasSetup = false;
+    }
+    return ViewState;
+}());
+export { ViewState };

package/dist/Views/index.d.ts

@@ -1,5 +1,5 @@
-export { default as ViewComponentBase } from './ViewComponentBase';
-export { default as ViewBase } from './ViewBase';
-export { default as PersistentViewBase } from './PersistentViewBase';
-export { default as EmptyViewModel } from './EmptyViewModel';
-export { default as ViewModelBase } from './ViewModelBase';
+export { default as ViewComponentBase } from './ViewComponentBase';
+export { default as ViewBase } from './ViewBase';
+export { default as PersistentViewBase } from './PersistentViewBase';
+export { default as EmptyViewModel } from './EmptyViewModel';
+export { default as ViewModelBase } from './ViewModelBase';

package/dist/Views/index.js

@@ -1,5 +1,5 @@
-export { default as ViewComponentBase } from './ViewComponentBase';
-export { default as ViewBase } from './ViewBase';
-export { default as PersistentViewBase } from './PersistentViewBase';
-export { default as EmptyViewModel } from './EmptyViewModel';
-export { default as ViewModelBase } from './ViewModelBase';
+export { default as ViewComponentBase } from './ViewComponentBase';
+export { default as ViewBase } from './ViewBase';
+export { default as PersistentViewBase } from './PersistentViewBase';
+export { default as EmptyViewModel } from './EmptyViewModel';
+export { default as ViewModelBase } from './ViewModelBase';

package/dist/index.d.ts

@@ -1,10 +1,11 @@
-import NeoReactModule from './Modules/NeoReactModule';
-import { NeoReactTypes } from './Modules/Types';
-import * as Neo from './ReactComponents/_Exports';
-import * as NeoGrid from './ReactComponents/Grid/_Exports';
-import * as Routing from './Routing';
-import * as Views from './Views/';
-import * as Managers from './ReactComponents/_Managers';
-import { TooltipHelper } from './ReactComponents/TooltipHelper';
-export { Managers, NeoReactModule, NeoReactTypes, Neo, NeoGrid, Routing, Views, TooltipHelper, };
-export { ICancellableEvent } from './ReactComponents/Misc';
+import NeoReactModule from './Modules/NeoReactModule';
+import { NeoReactTypes } from './Modules/Types';
+import * as Neo from './ReactComponents/_Exports';
+import * as NeoGrid from './ReactComponents/Grid/_Exports';
+import * as Routing from './Routing';
+import * as Views from './Views/';
+import * as Managers from './ReactComponents/_Managers';
+import * as Icons from './ReactComponents/Icons';
+import { TooltipHelper } from './ReactComponents/TooltipHelper';
+export { Icons, Managers, NeoReactModule, NeoReactTypes, Neo, NeoGrid, Routing, Views, TooltipHelper, };
+export { ICancellableEvent } from './ReactComponents/Misc';

package/dist/index.js

@@ -1,9 +1,10 @@
-import NeoReactModule from './Modules/NeoReactModule';
-import { NeoReactTypes } from './Modules/Types';
-import * as Neo from './ReactComponents/_Exports';
-import * as NeoGrid from './ReactComponents/Grid/_Exports';
-import * as Routing from './Routing';
-import * as Views from './Views/';
-import * as Managers from './ReactComponents/_Managers';
-import { TooltipHelper } from './ReactComponents/TooltipHelper';
-export { Managers, NeoReactModule, NeoReactTypes, Neo, NeoGrid, Routing, Views, TooltipHelper, };
+import NeoReactModule from './Modules/NeoReactModule';
+import { NeoReactTypes } from './Modules/Types';
+import * as Neo from './ReactComponents/_Exports';
+import * as NeoGrid from './ReactComponents/Grid/_Exports';
+import * as Routing from './Routing';
+import * as Views from './Views/';
+import * as Managers from './ReactComponents/_Managers';
+import * as Icons from './ReactComponents/Icons';
+import { TooltipHelper } from './ReactComponents/TooltipHelper';
+export { Icons, Managers, NeoReactModule, NeoReactTypes, Neo, NeoGrid, Routing, Views, TooltipHelper, };

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@singularsystems/neo-react",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-beta.0",
   "description": "React application logic and components for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
-    "test": "react-scripts test --watchAll=false --runInBand"
+    "test": "react-scripts test --watchAll=false --runInBand --transformIgnorePatterns"
   },
   "files": [
     "dist",
@@ -15,50 +15,50 @@
   "author": "Singular Systems",
   "license": "ISC",
   "devDependencies": {
-    "@testing-library/react": "12.1.2",
+    "@testing-library/react": "14.0.0",
     "@types/history": "4.7.4",
-    "@types/jest": "^28.1.1",
+    "@types/jest": "29.5.1",
     "@types/memoize-one": "5.1.2",
-    "@types/node": "17.0.15",
-    "@types/react": "17.0.39",
+    "@types/node": "18.16.3",
+    "@types/react": "18.2.4",
     "@types/react-custom-scrollbars": "^4.0.6",
-    "@types/react-dom": "17.0.11",
-    "@types/react-router": "^5.1.17",
-    "@types/react-router-dom": "^5.3.3",
-    "jest": "28.1.1",
+    "@types/react-dom": "18.2.3",
+    "@types/react-router": "5.1.18",
+    "@types/react-router-dom": "5.3.3",
     "react-scripts": "5.0.1",
-    "ts-jest": "28.0.4",
-    "typescript": "4.7.3"
+    "typescript": "5.0.4"
   },
   "dependencies": {
-    "@singularsystems/neo-core": "^1.0.0-alpha.2",
+    "@singularsystems/neo-core": "^1.0.0-alpha.4",
     "@types/rc-slider": "^8.6.5",
     "@types/react-color": "^3.0.1",
-    "@types/react-select": "3.1.0",
-    "axios": "^0.27.2",
+    "axios": "1.4.0",
     "decimal.js-light": "^2.5.1",
     "history": "4.10.1",
     "inversify": "^6.0.1",
     "memoize-one": "6.0.0",
-    "mobx": "6.6.1",
-    "mobx-react": "7.5.2",
-    "react": "^17.0.2",
+    "mobx": "6.9.0",
+    "mobx-react": "7.6.0",
+    "react": "18.2.0",
     "react-custom-scrollbars": "^4.2.1",
-    "react-dom": "^17.0.2",
-    "react-router": "^5.2.1",
-    "react-router-dom": "^5.3.0",
-    "tslib": "2.3.1"
+    "react-dom": "18.2.0",
+    "react-router": "5.3.3",
+    "react-router-dom": "5.3.3",
+    "react-select": "5.7.3",
+    "tslib": "2.5.0"
   },
   "peerDependencies": {
     "@singularsystems/neo-core": ">=1.0.0",
-    "axios": ">=0.21.1",
+    "axios": "1.4.0",
     "inversify": ">=5.0.1",
-    "react": ">=16.8.0",
-    "react-dom": ">=16.8.0",
+    "mobx": ">=6.9.0",
+    "mobx-react": ">=7.6.0",
+    "react": ">=18.2.0",
+    "react-dom": ">=18.2.0",
     "react-router": "^5.0.0",
     "react-router-dom": "^5.0.0"
   },
-  "packageManager": "yarn@3.2.1",
+  "packageManager": "yarn@3.5.1",
   "resolutions": {
     "@singularsystems/neo-core": "portal:../core"
   }

package/styles/DatePicker.scss

@@ -124,7 +124,7 @@
         margin: 8px 5px;
     
         td {
-          padding: 13px 12px;
+          padding: 13px 0px;
         }
       }
     
@@ -132,7 +132,7 @@
         margin: 5px 8px;
     
         td {
-          padding: 8px 10px;
+          padding: 8px 0px;
         }
       }
     }

package/styles/Forms.scss

@@ -131,6 +131,11 @@ div.neo-form-group-floating {
     }
 }
 
+.react-select-bs {
+    .react-select-bs__menu {
+        z-index: 2; /* Without this, checkboxes appear in front of the drop down menu. */
+    }
+}
 .react-select-row {
     padding: 0.15rem 1rem 0.25rem 1rem;
     display: flex;

package/styles/Validation.scss

@@ -147,15 +147,6 @@ select.form-control.is-invalid {
             color: $validation-color-info;
         }
     }
-    i {
-        width: 1rem;
-        height: 1rem;
-        text-align: center;
-
-        &.spinner-grow {
-            animation: spinner-grow 1s linear infinite;
-        }
-    }
 }
 
 .neo-error-modal-body {