identity-admin 1.17.0 → 1.18.0

package/lib/controllers/DashboardController.js

@@ -100,7 +100,8 @@ let DashboardController = DashboardController_1 = class DashboardController {
             for (var i = 0; i < extraActions.length; i++) {
                 const extraAction = extraActions[i];
                 if (!extraAction.isVisible) {
-                    break;
+                    extraActionsArray.push(extraAction.key);
+                    continue;
                 }
                 const isVisible = yield extraAction.isVisible(data);
                 if (isVisible) {

package/lib/controllers/ResourceController.js

@@ -64,17 +64,20 @@ let ResourceController = class ResourceController {
             }
             for (var i = 0; i < this.resourceFiles.length; i++) {
                 const resource = this.resourceFiles[i];
-                const visibiltyCheck = resource.properties.isAllowed ? yield resource.properties.isAllowed(currentUser) : true;
-                if (visibiltyCheck) {
+                const isAllowed = resource.properties.isAllowed ? yield resource.properties.isAllowed(currentUser) : true;
+                const isVisibile = resource.properties.isVisible ? yield resource.properties.isVisible(currentUser) : true;
+                if (isAllowed) {
                     const adaptedResource = ResourceGenerator_1.default.generate(resource, currentUser);
                     const modelName = StringUtils_1.default.lowerCaseFirstLetter(adaptedResource.properties.modelName);
                     modifiedResource[modelName] = adaptedResource;
-                    if (modifiedResource.modelParents[adaptedResource.properties.parent.name]) {
-                        modifiedResource.modelParents[adaptedResource.properties.parent.name].push(modelName);
-                    }
-                    else {
-                        modifiedResource.modelParents[adaptedResource.properties.parent.name] = [];
-                        modifiedResource.modelParents[adaptedResource.properties.parent.name].push(modelName);
+                    if (isVisibile) {
+                        if (modifiedResource.modelParents[adaptedResource.properties.parent.name]) {
+                            modifiedResource.modelParents[adaptedResource.properties.parent.name].push(modelName);
+                        }
+                        else {
+                            modifiedResource.modelParents[adaptedResource.properties.parent.name] = [];
+                            modifiedResource.modelParents[adaptedResource.properties.parent.name].push(modelName);
+                        }
                     }
                 }
             }

package/lib/helpers/ActionsGenerator.js

@@ -27,6 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const i18n_1 = __importStar(require("i18n"));
+const helpers_1 = require("../types/helpers");
 const ResourceHelper_1 = __importDefault(require("./ResourceHelper"));
 var pluralize = require('pluralize');
 class ActionsGenerator {
@@ -50,6 +51,7 @@ class ActionsGenerator {
         extraActions.forEach((action) => {
             action.keys = action.isVisible ? Object.keys(action.isVisible) : [];
             action.name = (0, i18n_1.__)({ phrase: action.name, locale: i18n_1.default.getLocale() });
+            action.handlerStrategy = action.handlerStrategy ? action.handlerStrategy : helpers_1.HandlerStrategy.NORMAL;
             action.actionType ? extraActionsObject[action.actionType][action.key] = action : '';
         });
         return extraActionsObject;

package/lib/types/IResourceFile.d.ts

@@ -1,11 +1,13 @@
-import { Request } from "express";
 import { Document, Model } from "mongoose";
 import { IRequest } from "../middlewares/isAuth";
 import { IRepository } from "../repositories/Repository";
-import { ActionNames, ActionTypes, FieldTypes, FileTypes, Virtuals } from "./helpers";
+import { ActionNames, ActionTypes, FieldTypes, FileTypes, HandlerStrategy, Virtuals } from "./helpers";
 declare type orderTypes = 'asc' | 'desc';
 declare type VirtualFieldTypes = 'password' | 'ref' | 'Array';
 declare type Severity = 'success' | 'info' | 'warning' | 'error';
+declare type ButtonColors = 'inherit' | 'primary' | 'secondary' | 'success' | 'error' | 'info' | 'warning';
+declare type ButtonVariants = 'text' | 'outlined' | 'contained';
+declare type ButtonSizes = 'small' | 'medium' | 'large';
 interface Parent {
     /**
      * Name of the parent
@@ -287,6 +289,22 @@ interface ExtraAction {
      * {@link https://mui.com/material-ui/material-icons/}
      */
     icon: string;
+    /**
+     * Color of the action button
+     * In case of bulk actions it is one of the button colors. @default inherit
+     * In case of record actions it is any color like red, green, ... @default black
+     */
+    color?: string | ButtonColors;
+    /**
+     * Size of the action button. Only used in case of bulk actions
+     * @default small
+     */
+    size?: ButtonSizes;
+    /**
+     * Variant of the action button. Only used in case of bulk actions
+     * @default contained
+     */
+    variant?: ButtonVariants;
     /**
      * Action type if it is record action or resource action.
      */
@@ -315,7 +333,12 @@ interface ExtraAction {
     /**
      * Handler function that is executed after clicking the action.
      */
-    handler: (req: Request, res: any, data: ActionData) => Promise<IActionHandlerResponse>;
+    handler: (req: IRequest, res: any, data: ActionData) => Promise<IActionHandlerResponse>;
+    /**
+     * Icon of this action.
+     * {@link https://mui.com/material-ui/material-icons/}
+     */
+    handlerStrategy?: HandlerStrategy;
 }
 export interface IActionHandlerResponse {
     /**
@@ -332,6 +355,10 @@ export interface IActionHandlerResponse {
      * Id of the record that is used in actions that needs record id like show or edit
      */
     recordId?: string;
+    /**
+     * Path of the uploaded file in case of file download handling strategy
+     */
+    filePath?: string;
 }
 export interface IResourceFile {
     properties: {
@@ -366,6 +393,11 @@ export interface IResourceFile {
          * @default true
          */
         isAllowed?: (currentUser: Document) => Promise<boolean>;
+        /**
+         * The property that controls the visibility of this resource in the nav bar
+         * @default true
+         */
+        isVisible?: (currentUser: Document) => Promise<boolean>;
         /**
          * The default order
          * @default asc

package/lib/types/helpers.d.ts

@@ -43,3 +43,8 @@ export declare enum FileTypes {
     POWER_POINT = "POWER_POINT",
     AUDIO = "AUDIO"
 }
+export declare enum HandlerStrategy {
+    NORMAL = "NORMAL",
+    FILE_DOWNLOAD = "FILE_DOWNLOAD",
+    CUSTOM_COMPONENT = "CUSTOM_COMPONENT"
+}

package/lib/types/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileTypes = exports.FieldTypes = exports.ActionTypes = exports.ActionNames = exports.Virtuals = void 0;
+exports.HandlerStrategy = exports.FileTypes = exports.FieldTypes = exports.ActionTypes = exports.ActionNames = exports.Virtuals = void 0;
 var Virtuals;
 (function (Virtuals) {
     Virtuals["SHOW"] = "SHOW";
@@ -51,3 +51,9 @@ var FileTypes;
     FileTypes["POWER_POINT"] = "POWER_POINT";
     FileTypes["AUDIO"] = "AUDIO";
 })(FileTypes = exports.FileTypes || (exports.FileTypes = {}));
+var HandlerStrategy;
+(function (HandlerStrategy) {
+    HandlerStrategy["NORMAL"] = "NORMAL";
+    HandlerStrategy["FILE_DOWNLOAD"] = "FILE_DOWNLOAD";
+    HandlerStrategy["CUSTOM_COMPONENT"] = "CUSTOM_COMPONENT";
+})(HandlerStrategy = exports.HandlerStrategy || (exports.HandlerStrategy = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "identity-admin",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "description": "",
   "main": "lib/Dashboard.js",
   "types": "lib/Dashbord.d.ts",