phx-uikit 1.0.68 → 1.0.70

package/dist/cjs/components/Func/PHXUseQueryDataV3.d.ts

@@ -1,7 +1,8 @@
-export default function PHXUesQueryDataV3({ dependencies, query, variables, }: {
+export default function PHXUesQueryDataV3({ dependencies, query, variables, requiredFields, }: {
     query: string;
     variables?: any;
     dependencies?: Array<any>;
+    requiredFields?: Array<string>;
 }): {
     isLoading: boolean;
     data: any;

package/dist/cjs/components/Func/PHXUseQueryDataV3.js

@@ -5,31 +5,47 @@ var react_1 = require("react");
 var clientQueryV3_1 = tslib_1.__importDefault(require("./clientQueryV3"));
 function PHXUesQueryDataV3(_a) {
     var _this = this;
-    var dependencies = _a.dependencies, query = _a.query, variables = _a.variables;
+    var dependencies = _a.dependencies, query = _a.query, variables = _a.variables, requiredFields = _a.requiredFields;
     var _b = (0, react_1.useState)(true), isLoading = _b[0], setIsLoading = _b[1];
     var _c = (0, react_1.useState)(), data = _c[0], setData = _c[1];
     var _d = (0, react_1.useState)(null), error = _d[0], setError = _d[1];
+    var isValidVariables = function () {
+        // Nếu không có variables, trả về true
+        if (!variables)
+            return true;
+        // Nếu có requiredFields, kiểm tra chỉ các key trong requiredFields
+        if (requiredFields) {
+            return requiredFields.every(function (key) { return variables[key] !== undefined && variables[key] !== null && variables[key] !== ''; });
+        }
+        // Nếu không có requiredFields, kiểm tra toàn bộ variables
+        return Object.values(variables).every(function (value) { return value !== undefined && value !== null && value !== ''; });
+    };
     (0, react_1.useEffect)(function () {
         var fetchData = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var response, err_1;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, 3, 4]);
-                        return [4 /*yield*/, (0, clientQueryV3_1["default"])(tslib_1.__assign({ query: query }, (variables && { variables: variables })))];
+                        if (!isValidVariables()) {
+                            return [2 /*return*/];
+                        }
+                        _a.label = 1;
                     case 1:
-                        response = _a.sent();
-                        setData(response);
-                        return [3 /*break*/, 4];
+                        _a.trys.push([1, 3, 4, 5]);
+                        return [4 /*yield*/, (0, clientQueryV3_1["default"])(tslib_1.__assign({ query: query }, (variables && { variables: variables })))];
                     case 2:
+                        response = _a.sent();
+                        setData(response.data);
+                        return [3 /*break*/, 5];
+                    case 3:
                         err_1 = _a.sent();
                         setError('An error occurred while fetching data.');
                         console.error(err_1);
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 5];
+                    case 4:
                         setIsLoading(false);
                         return [7 /*endfinally*/];
-                    case 4: return [2 /*return*/];
+                    case 5: return [2 /*return*/];
                 }
             });
         }); };

package/dist/cjs/components/Func/PHXUseQueryDataV3.js.map

@@ -1 +1 @@
-{"version":3,"file":"PHXUseQueryDataV3.js","sourceRoot":"","sources":["../../../../src/components/Func/PHXUseQueryDataV3.ts"],"names":[],"mappings":";;;AAAA,+BAA2C;AAC3C,0EAA8C;AAE9C,SAAwB,iBAAiB,CAAC,EAQzC;IARD,iBAmCC;QAlCC,YAAY,kBAAA,EACZ,KAAK,WAAA,EACL,SAAS,eAAA;IAMH,IAAA,KAA4B,IAAA,gBAAQ,EAAC,IAAI,CAAC,EAAzC,SAAS,QAAA,EAAE,YAAY,QAAkB,CAAA;IAC1C,IAAA,KAAkB,IAAA,gBAAQ,GAAO,EAAhC,IAAI,QAAA,EAAE,OAAO,QAAmB,CAAA;IACjC,IAAA,KAAoB,IAAA,gBAAQ,EAAgB,IAAI,CAAC,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAA;IACvD,IAAA,iBAAS,EACP;QACE,IAAM,SAAS,GAAG;;;;;;wBAEG,qBAAM,IAAA,0BAAgB,qBACrC,KAAK,OAAA,IACF,CAAC,SAAS,IAAI,EAAE,SAAS,WAAA,EAAE,CAAC,EAC/B,EAAA;;wBAHI,QAAQ,GAAG,SAGf;wBACF,OAAO,CAAC,QAAQ,CAAC,CAAA;;;;wBAEjB,QAAQ,CAAC,wCAAwC,CAAC,CAAA;wBAClD,OAAO,CAAC,KAAK,CAAC,KAAG,CAAC,CAAA;;;wBAElB,YAAY,CAAC,KAAK,CAAC,CAAA;;;;;aAEtB,CAAA;QAED,SAAS,EAAE,CAAA;IACb,CAAC,EACD,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,2BAAK,YAAY,QAAE,CAAC,CAAC,EAAE,CACrD,CAAA,CAAC,kCAAkC;IAEpC,OAAO,EAAE,SAAS,WAAA,EAAE,IAAI,MAAA,EAAE,KAAK,OAAA,EAAE,CAAA;AACnC,CAAC;AAnCD,uCAmCC"}
+{"version":3,"file":"PHXUseQueryDataV3.js","sourceRoot":"","sources":["../../../../src/components/Func/PHXUseQueryDataV3.ts"],"names":[],"mappings":";;;AAAA,+BAA2C;AAC3C,0EAA8C;AAE9C,SAAwB,iBAAiB,CAAC,EAUzC;IAVD,iBAyDC;QAxDC,YAAY,kBAAA,EACZ,KAAK,WAAA,EACL,SAAS,eAAA,EACT,cAAc,oBAAA;IAOR,IAAA,KAA4B,IAAA,gBAAQ,EAAC,IAAI,CAAC,EAAzC,SAAS,QAAA,EAAE,YAAY,QAAkB,CAAA;IAC1C,IAAA,KAAkB,IAAA,gBAAQ,GAAO,EAAhC,IAAI,QAAA,EAAE,OAAO,QAAmB,CAAA;IACjC,IAAA,KAAoB,IAAA,gBAAQ,EAAgB,IAAI,CAAC,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAA;IAEvD,IAAM,gBAAgB,GAAG;QACvB,sCAAsC;QACtC,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAA;QAE3B,mEAAmE;QACnE,IAAI,cAAc,EAAE;YAClB,OAAO,cAAc,CAAC,KAAK,CACzB,UAAC,GAAG,IAAK,OAAA,SAAS,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,EAAhF,CAAgF,CAC1F,CAAA;SACF;QAED,0DAA0D;QAC1D,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,EAArD,CAAqD,CAAC,CAAA;IACzG,CAAC,CAAA;IAED,IAAA,iBAAS,EACP;QACE,IAAM,SAAS,GAAG;;;;;wBAChB,IAAI,CAAC,gBAAgB,EAAE,EAAE;4BACvB,sBAAM;yBACP;;;;wBAGkB,qBAAM,IAAA,0BAAgB,qBACrC,KAAK,OAAA,IACF,CAAC,SAAS,IAAI,EAAE,SAAS,WAAA,EAAE,CAAC,EAC/B,EAAA;;wBAHI,QAAQ,GAAG,SAGf;wBACF,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;;;;wBAEtB,QAAQ,CAAC,wCAAwC,CAAC,CAAA;wBAClD,OAAO,CAAC,KAAK,CAAC,KAAG,CAAC,CAAA;;;wBAElB,YAAY,CAAC,KAAK,CAAC,CAAA;;;;;aAEtB,CAAA;QAED,SAAS,EAAE,CAAA;IACb,CAAC,EACD,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,2BAAK,YAAY,QAAE,CAAC,CAAC,EAAE,CACrD,CAAA,CAAC,kCAAkC;IAEpC,OAAO,EAAE,SAAS,WAAA,EAAE,IAAI,MAAA,EAAE,KAAK,OAAA,EAAE,CAAA;AACnC,CAAC;AAzDD,uCAyDC"}

package/dist/esm/components/Func/PHXUseQueryDataV3.d.ts

@@ -1,7 +1,8 @@
-export default function PHXUesQueryDataV3({ dependencies, query, variables, }: {
+export default function PHXUesQueryDataV3({ dependencies, query, variables, requiredFields, }: {
     query: string;
     variables?: any;
     dependencies?: Array<any>;
+    requiredFields?: Array<string>;
 }): {
     isLoading: boolean;
     data: any;

package/dist/esm/components/Func/PHXUseQueryDataV3.js

@@ -3,31 +3,47 @@ import { useState, useEffect } from 'react';
 import PHXClientQueryV3 from './clientQueryV3';
 export default function PHXUesQueryDataV3(_a) {
     var _this = this;
-    var dependencies = _a.dependencies, query = _a.query, variables = _a.variables;
+    var dependencies = _a.dependencies, query = _a.query, variables = _a.variables, requiredFields = _a.requiredFields;
     var _b = useState(true), isLoading = _b[0], setIsLoading = _b[1];
     var _c = useState(), data = _c[0], setData = _c[1];
     var _d = useState(null), error = _d[0], setError = _d[1];
+    var isValidVariables = function () {
+        // Nếu không có variables, trả về true
+        if (!variables)
+            return true;
+        // Nếu có requiredFields, kiểm tra chỉ các key trong requiredFields
+        if (requiredFields) {
+            return requiredFields.every(function (key) { return variables[key] !== undefined && variables[key] !== null && variables[key] !== ''; });
+        }
+        // Nếu không có requiredFields, kiểm tra toàn bộ variables
+        return Object.values(variables).every(function (value) { return value !== undefined && value !== null && value !== ''; });
+    };
     useEffect(function () {
         var fetchData = function () { return __awaiter(_this, void 0, void 0, function () {
             var response, err_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, 3, 4]);
-                        return [4 /*yield*/, PHXClientQueryV3(__assign({ query: query }, (variables && { variables: variables })))];
+                        if (!isValidVariables()) {
+                            return [2 /*return*/];
+                        }
+                        _a.label = 1;
                     case 1:
-                        response = _a.sent();
-                        setData(response);
-                        return [3 /*break*/, 4];
+                        _a.trys.push([1, 3, 4, 5]);
+                        return [4 /*yield*/, PHXClientQueryV3(__assign({ query: query }, (variables && { variables: variables })))];
                     case 2:
+                        response = _a.sent();
+                        setData(response.data);
+                        return [3 /*break*/, 5];
+                    case 3:
                         err_1 = _a.sent();
                         setError('An error occurred while fetching data.');
                         console.error(err_1);
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 5];
+                    case 4:
                         setIsLoading(false);
                         return [7 /*endfinally*/];
-                    case 4: return [2 /*return*/];
+                    case 5: return [2 /*return*/];
                 }
             });
         }); };

package/dist/esm/components/Func/PHXUseQueryDataV3.js.map

@@ -1 +1 @@
-{"version":3,"file":"PHXUseQueryDataV3.js","sourceRoot":"","sources":["../../../../src/components/Func/PHXUseQueryDataV3.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,gBAAgB,MAAM,iBAAiB,CAAA;AAE9C,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EAQzC;IARD,iBAmCC;QAlCC,YAAY,kBAAA,EACZ,KAAK,WAAA,EACL,SAAS,eAAA;IAMH,IAAA,KAA4B,QAAQ,CAAC,IAAI,CAAC,EAAzC,SAAS,QAAA,EAAE,YAAY,QAAkB,CAAA;IAC1C,IAAA,KAAkB,QAAQ,EAAO,EAAhC,IAAI,QAAA,EAAE,OAAO,QAAmB,CAAA;IACjC,IAAA,KAAoB,QAAQ,CAAgB,IAAI,CAAC,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAA;IACvD,SAAS,CACP;QACE,IAAM,SAAS,GAAG;;;;;;wBAEG,qBAAM,gBAAgB,YACrC,KAAK,OAAA,IACF,CAAC,SAAS,IAAI,EAAE,SAAS,WAAA,EAAE,CAAC,EAC/B,EAAA;;wBAHI,QAAQ,GAAG,SAGf;wBACF,OAAO,CAAC,QAAQ,CAAC,CAAA;;;;wBAEjB,QAAQ,CAAC,wCAAwC,CAAC,CAAA;wBAClD,OAAO,CAAC,KAAK,CAAC,KAAG,CAAC,CAAA;;;wBAElB,YAAY,CAAC,KAAK,CAAC,CAAA;;;;;aAEtB,CAAA;QAED,SAAS,EAAE,CAAA;IACb,CAAC,EACD,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,mBAAK,YAAY,QAAE,CAAC,CAAC,EAAE,CACrD,CAAA,CAAC,kCAAkC;IAEpC,OAAO,EAAE,SAAS,WAAA,EAAE,IAAI,MAAA,EAAE,KAAK,OAAA,EAAE,CAAA;AACnC,CAAC"}
+{"version":3,"file":"PHXUseQueryDataV3.js","sourceRoot":"","sources":["../../../../src/components/Func/PHXUseQueryDataV3.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,gBAAgB,MAAM,iBAAiB,CAAA;AAE9C,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EAUzC;IAVD,iBAyDC;QAxDC,YAAY,kBAAA,EACZ,KAAK,WAAA,EACL,SAAS,eAAA,EACT,cAAc,oBAAA;IAOR,IAAA,KAA4B,QAAQ,CAAC,IAAI,CAAC,EAAzC,SAAS,QAAA,EAAE,YAAY,QAAkB,CAAA;IAC1C,IAAA,KAAkB,QAAQ,EAAO,EAAhC,IAAI,QAAA,EAAE,OAAO,QAAmB,CAAA;IACjC,IAAA,KAAoB,QAAQ,CAAgB,IAAI,CAAC,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAA;IAEvD,IAAM,gBAAgB,GAAG;QACvB,sCAAsC;QACtC,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAA;QAE3B,mEAAmE;QACnE,IAAI,cAAc,EAAE;YAClB,OAAO,cAAc,CAAC,KAAK,CACzB,UAAC,GAAG,IAAK,OAAA,SAAS,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,EAAhF,CAAgF,CAC1F,CAAA;SACF;QAED,0DAA0D;QAC1D,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,EAArD,CAAqD,CAAC,CAAA;IACzG,CAAC,CAAA;IAED,SAAS,CACP;QACE,IAAM,SAAS,GAAG;;;;;wBAChB,IAAI,CAAC,gBAAgB,EAAE,EAAE;4BACvB,sBAAM;yBACP;;;;wBAGkB,qBAAM,gBAAgB,YACrC,KAAK,OAAA,IACF,CAAC,SAAS,IAAI,EAAE,SAAS,WAAA,EAAE,CAAC,EAC/B,EAAA;;wBAHI,QAAQ,GAAG,SAGf;wBACF,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;;;;wBAEtB,QAAQ,CAAC,wCAAwC,CAAC,CAAA;wBAClD,OAAO,CAAC,KAAK,CAAC,KAAG,CAAC,CAAA;;;wBAElB,YAAY,CAAC,KAAK,CAAC,CAAA;;;;;aAEtB,CAAA;QAED,SAAS,EAAE,CAAA;IACb,CAAC,EACD,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,mBAAK,YAAY,QAAE,CAAC,CAAC,EAAE,CACrD,CAAA,CAAC,kCAAkC;IAEpC,OAAO,EAAE,SAAS,WAAA,EAAE,IAAI,MAAA,EAAE,KAAK,OAAA,EAAE,CAAA;AACnC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phx-uikit",
-  "version": "1.0.68",
+  "version": "1.0.70",
   "description": "PHX REACT",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -96,7 +96,6 @@
   },
   "dependencies": {
     "axios": "^1.5.0",
-    "crypto": "^1.0.1",
     "date-fns": "^2.30.0",
     "recharts": "^2.12.7"
   },