identity-admin 1.24.3 → 1.25.0

package/lib/controllers/DashboardController.js

@@ -514,18 +514,20 @@ let DashboardController = DashboardController_1 = class DashboardController {
             const sort = modifiedResource.properties.defaultOrder;
             const nextQuery = {};
             const prevQuery = {};
-            const sortQuery = {};
+            const nextSortQuery = {};
+            const previousSortQuery = {};
             const greaterThanQuery = { $gt: record[sortBy] };
             const lessThanQuery = { $lt: record[sortBy] };
             nextQuery[sortBy] = sort === 'asc' ? greaterThanQuery : lessThanQuery;
             prevQuery[sortBy] = sort === 'asc' ? lessThanQuery : greaterThanQuery;
-            sortQuery[sortBy] = sort;
+            nextSortQuery[sortBy] = sort;
+            previousSortQuery[sortBy] = sort === 'asc' ? 'desc' : 'asc';
             var neighbor;
             if (neighborRecordType === helpers_1.NeighborTypes.NEXT) {
-                neighbor = yield (model === null || model === void 0 ? void 0 : model.findOne(nextQuery).sort(sortQuery).limit(1));
+                neighbor = yield (model === null || model === void 0 ? void 0 : model.findOne(nextQuery).sort(nextSortQuery).limit(1));
             }
             else {
-                neighbor = yield (model === null || model === void 0 ? void 0 : model.findOne(prevQuery).sort(sortQuery).limit(1));
+                neighbor = yield (model === null || model === void 0 ? void 0 : model.findOne(prevQuery).sort(previousSortQuery).limit(1));
             }
             const hasNeighbor = record && neighbor && neighbor._id ? true : false;
             const neighborRecordId = hasNeighbor ? neighbor._id : undefined;

package/lib/helpers/ActionsGenerator.js

@@ -53,6 +53,9 @@ 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.guardTitle = action.guardTitle ? (0, i18n_1.__)({ phrase: action.guardTitle, locale: i18n_1.default.getLocale() }) : undefined;
+            action.guard = action.guard ? (0, i18n_1.__)({ phrase: action.guard, locale: i18n_1.default.getLocale() }) : undefined;
+            action.message = action.message ? (0, i18n_1.__)({ phrase: action.message, locale: i18n_1.default.getLocale() }) : undefined;
             action.handlerStrategy = action.handlerStrategy
                 ? action.handlerStrategy
                 : helpers_1.HandlerStrategy.NORMAL;

package/lib/types/IResourceFile.d.ts

@@ -304,7 +304,7 @@ interface ActionOptions {
      */
     extras?: ExtraAction[];
 }
-interface ExtraAction {
+export interface ExtraAction {
     /**
      * Key of this action.
      * Should be unique in the same resource file
@@ -492,6 +492,21 @@ export interface IResourceFile {
          * Override the populated object
          */
         populate?: IPopulate;
+        /**
+         * Disable the display of next and previous buttons in the show page
+         * @default false
+         */
+        disableNextPreviousButtonsInShowPage?: boolean;
+        /**
+         * Disable the display of next and previous buttons in the edit page
+         * @default false
+         */
+        disableNextPreviousButtonsInEditPage?: boolean;
+        /**
+         * The option to display the edit page instead of the show page
+         * @default false
+         */
+        displayEditPageInShowPage?: boolean;
     };
     /**
      * Array of properties that should be appeared in the list action.

package/lib/types/IResourceResponse.d.ts

@@ -25,6 +25,9 @@ interface IMainProperty {
     model: {
         [key: string]: any;
     };
+    disableNextPreviousButtonsInShowPage?: boolean;
+    disableNextPreviousButtonsInEditPage?: boolean;
+    displayEditPageInShowPage?: boolean;
 }
 interface IParent {
     icon: string;
@@ -51,22 +54,8 @@ interface IFilter {
     };
 }
 interface IAction {
-    bulkDelete: {
-        cancelDeleteOption: string;
-        confirmDeleteOption: string;
-        confirmationMessageBody: string;
-        confirmationMessageTitle: string;
-        isAccessible: boolean;
-        value: string;
-    };
-    delete: {
-        cancelDeleteOption: string;
-        confirmDeleteOption: string;
-        confirmationMessageBody: string;
-        confirmationMessageTitle: string;
-        isAccessible: boolean;
-        value: string;
-    };
+    bulkDelete: IDeleteActionMin;
+    delete: IDeleteActionMin;
     edit: IActionMin;
     new: IActionMin;
     show: IActionMin;
@@ -89,11 +78,18 @@ interface IExtarAction {
     name: string;
     severity?: Severity;
     message?: string;
+    guardTitle?: string;
 }
 interface IActionMin {
     isAccessible: boolean;
     value?: string;
 }
-declare type orderTypes = 'asc' | 'desc';
-declare type Severity = 'success' | 'info' | 'warning' | 'error';
+interface IDeleteActionMin extends IActionMin {
+    cancelDeleteOption: string;
+    confirmDeleteOption: string;
+    confirmationMessageBody: string;
+    confirmationMessageTitle: string;
+}
+declare type orderTypes = "asc" | "desc";
+declare type Severity = "success" | "info" | "warning" | "error";
 export {};

package/package.json

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