awing-library 2.1.2-dev.50 → 2.1.2-dev.52

package/dist/esm/Features/SYSTEM/Directory/Services.d.ts

@@ -1,12 +1,13 @@
 import { type DirectoryAddOrEditServices } from 'AWING/DirectoryForm';
 import { type DirectoryPermissionServices } from 'AWING/DirectoryPermission';
-import type { PagingQueryInput } from 'Features/types';
+import type { CustomPagingRequestInput } from 'Features/types';
 import type { Directory } from './types';
 export type DirectoryServices = DirectoryAddOrEditServices & DirectoryPermissionServices & {
     /** Get Directories
      * @params PagingQueryInput<Directory> - Không truyền param sẽ lấy tất cả
      */
-    getDirectories: (params?: PagingQueryInput<Directory> & {
+    getDirectories: (params?: {
+        input?: CustomPagingRequestInput;
         parentDirectoryId?: number;
         workspaceId?: number;
         depthFromRoot?: number;

package/dist/esm/Features/SYSTEM/Sharing/Types.d.ts

@@ -1,4 +1,4 @@
-import { CustomPagingRequestInput, PagingQueryInput } from 'Features/types';
+import { CustomPagingRequestInput } from 'Features/types';
 import { Schema, SchemaObjectDefinition } from '../Schema';
 import { Workspace } from '../types';
 import { Atom } from 'jotai';
@@ -170,7 +170,8 @@ export interface SharingProps {
         id: number;
     }) => Promise<void>;
     getObjectFilters: () => Promise<ObjectFilter[]>;
-    getDirectories: (params?: PagingQueryInput<Directory> & {
+    getDirectories: (params?: {
+        input?: CustomPagingRequestInput;
         parentDirectoryId?: number;
         workspaceId?: number;
         depthFromRoot?: number;

package/dist/esm/index.js

@@ -187648,10 +187648,12 @@ function Container$3() {
       depthFromRoot
     };
     await (services === null || services === void 0 ? void 0 : services.getDirectories(Object.assign({
-      where: {
-        isFile: {
-          eq: false
-        }
+      input: {
+        where: Object.assign({}, convertArrayFiltersToCondition([{
+          key: 'isFile',
+          type: FilterOperationType.EQ,
+          value: false
+        }]))
       },
       workspaceId: currentWorkspace === null || currentWorkspace === void 0 ? void 0 : currentWorkspace.id,
       parentDirectoryId: directoryId
@@ -187668,28 +187670,29 @@ function Container$3() {
     let searchKey = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : '';
     let objectTypeCode = arguments.length > 5 ? arguments[5] : undefined;
     setLoadingChildDirectories(true);
-    const queryObjectTypeCode = objectTypeCode ? {
-      objectTypeCode: {
-        eq: objectTypeCode
-      }
-    } : {};
     const queryDepthFromRoot = depthFromRoot === -1 ? {} : {
       depthFromRoot
     };
-    await (services === null || services === void 0 ? void 0 : services.getDirectories(Object.assign(Object.assign({
-      parentDirectoryId: newFocusDirectoryId,
-      where: Object.assign({
-        name: {
-          contains: searchKey
-        },
-        id: {
-          neq: newFocusDirectoryId
-        }
-      }, queryObjectTypeCode)
-    }, queryDepthFromRoot), {
-      skip: newPageIndex * newPageSize,
-      take: newPageSize
-    })).then(data => {
+    await (services === null || services === void 0 ? void 0 : services.getDirectories(Object.assign({
+      input: {
+        where: Object.assign({}, convertArrayFiltersToCondition([{
+          key: 'name',
+          type: FilterOperationType.CONTAINS,
+          value: searchKey
+        }, {
+          key: 'id',
+          type: FilterOperationType.NE,
+          value: newFocusDirectoryId
+        }, {
+          key: 'objectTypeCode',
+          type: FilterOperationType.EQ,
+          value: objectTypeCode
+        }])),
+        skip: newPageIndex * newPageSize,
+        take: newPageSize
+      },
+      parentDirectoryId: newFocusDirectoryId
+    }, queryDepthFromRoot)).then(data => {
       setLoadingChildDirectories(false);
       setChildDirectories(data.items);
       setChildDirectoriesTotal(data.total);
@@ -189331,12 +189334,15 @@ function Create() {
       setObjectFilters(objectFilters || []);
     });
     getDirectories({
-      where: {
-        isFile: {
-          eq: false
-        }
+      input: {
+        where: Object.assign({}, convertArrayFiltersToCondition([{
+          key: 'isFile',
+          type: FilterOperationType.EQ,
+          value: false
+        }]))
       },
-      workspaceId: currentWorkspace === null || currentWorkspace === void 0 ? void 0 : currentWorkspace.id
+      // workspaceId: 1 do ADMIN nó tách ra khỏi storage
+      workspaceId: 1
     }).then(directories => {
       const directoriesSorted = sortByDirectoryPath(directories.items || []);
       const directoriesOptions = directoriesSorted.map(item => {

package/dist/index.d.ts

@@ -2856,7 +2856,8 @@ interface SharingProps {
         id: number;
     }) => Promise<void>;
     getObjectFilters: () => Promise<ObjectFilter[]>;
-    getDirectories: (params?: PagingQueryInput<Directory$3> & {
+    getDirectories: (params?: {
+        input?: CustomPagingRequestInput;
         parentDirectoryId?: number;
         workspaceId?: number;
         depthFromRoot?: number;
@@ -3115,7 +3116,8 @@ type DirectoryServices = DirectoryAddOrEditServices$1 & DirectoryPermissionServi
     /** Get Directories
      * @params PagingQueryInput<Directory> - Không truyền param sẽ lấy tất cả
      */
-    getDirectories: (params?: PagingQueryInput<Directory> & {
+    getDirectories: (params?: {
+        input?: CustomPagingRequestInput;
         parentDirectoryId?: number;
         workspaceId?: number;
         depthFromRoot?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "awing-library",
-    "version": "2.1.2-dev.50",
+    "version": "2.1.2-dev.52",
     "main": "dist/esm/index.js",
     "module": "dist/esm/index.js",
     "types": "dist/index.d.ts",