@ianua/ianus-dataverse-react-fluentui8 1.0.8 → 1.0.10

package/dist/index.d.ts

@@ -110,10 +110,14 @@ type Action = {
 } | {
     type: "setLicenseDialogVisible";
     payload: boolean;
+} | {
+    type: "setDebugDialogVisible";
+    payload: boolean;
 };
 type IanusLicenseStateProps = {
     license?: DataverseLicenseValidationResult;
     licenseDialogVisible?: boolean;
+    debugDialogVisible?: boolean;
 };
 type IanusLicenseDispatch = (action: Action) => void;
 declare const IanusLicenseDispatch: React.Context<IanusLicenseDispatch | undefined>;

package/dist/index.js

@@ -84,7 +84,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/IanusGuard.tsx
-var React3 = __toESM(require("react"));
+var React4 = __toESM(require("react"));
 var import_MessageBar = require("@fluentui/react/lib/MessageBar");
 var import_Button = require("@fluentui/react/lib/Button");
 var import_Spinner = require("@fluentui/react/lib/Spinner");
@@ -242,6 +242,9 @@ function stateReducer(state, action) {
     case "setLicenseDialogVisible": {
       return __spreadProps(__spreadValues({}, state), { licenseDialogVisible: action.payload });
     }
+    case "setDebugDialogVisible": {
+      return __spreadProps(__spreadValues({}, state), { debugDialogVisible: action.payload });
+    }
   }
 }
 var IanusLicenseState = React.createContext(void 0);
@@ -409,6 +412,77 @@ var LicenseDialog = ({ publisherId, productId, dataProvider, offlineDataProvider
   );
 };
 
+// src/DebugDialog.tsx
+var React3 = __toESM(require("react"));
+var import_react2 = require("@fluentui/react");
+var modalProps2 = {
+  isBlocking: false,
+  styles: {
+    main: {
+      width: "80vw !important",
+      maxWidth: "80vw !important",
+      height: "auto",
+      maxHeight: "90vh",
+      overflowY: "auto",
+      overflowX: "auto"
+    }
+  }
+};
+var dialogContentProps2 = {
+  type: import_react2.DialogType.largeHeader,
+  title: "Debug"
+};
+var DebugDialog = ({ publisherId, productId, environmentType, environmentIdentifier, dataProvider, offlineDataProvider, onDismiss }) => {
+  const [licenseState, licenseDispatch] = useLicenseContext();
+  const licenseColumns = [
+    { key: "id", name: "Id", fieldName: "ian_licenseid", minWidth: 100, maxWidth: 200, isResizable: true },
+    { key: "name", name: "Name", fieldName: "ian_name", minWidth: 100, maxWidth: 200, isResizable: true },
+    { key: "identifier", name: "Identifier", fieldName: "ian_identifier", minWidth: 100, maxWidth: 200, isResizable: true },
+    { key: "key", name: "Key", fieldName: "ian_key", minWidth: 100, maxWidth: 200, isResizable: true }
+  ];
+  const mapRecordsToItems = React3.useCallback(
+    (dataset) => dataset.sortedRecordIds.map((id) => {
+      const record = dataset.records[id];
+      return {
+        ian_licenseid: record.getRecordId(),
+        ian_name: record.getValue("ian_name"),
+        ian_identifier: record.getValue("ian_identifier"),
+        ian_key: record.getValue("ian_key")
+      };
+    }),
+    []
+  );
+  return /* @__PURE__ */ React3.createElement(
+    import_react2.Dialog,
+    {
+      hidden: !(licenseState == null ? void 0 : licenseState.debugDialogVisible),
+      onDismiss,
+      dialogContentProps: dialogContentProps2,
+      modalProps: modalProps2
+    },
+    /* @__PURE__ */ React3.createElement("p", null, /* @__PURE__ */ React3.createElement(import_react2.Text, null, /* @__PURE__ */ React3.createElement("b", null, "Current environment type:"), " ", environmentType), /* @__PURE__ */ React3.createElement(import_react2.Text, null, /* @__PURE__ */ React3.createElement("b", null, "Current environment identifier:"), " ", environmentIdentifier), /* @__PURE__ */ React3.createElement(import_react2.Text, null, /* @__PURE__ */ React3.createElement("b", null, "Target license identifier:"), " ", publisherId, "_", productId), /* @__PURE__ */ React3.createElement("br", null), /* @__PURE__ */ React3.createElement("br", null), isDataset(dataProvider) && /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(import_react2.Text, null, /* @__PURE__ */ React3.createElement("b", null, "Licenses in data provider:"), " ", dataProvider.sortedRecordIds.length), /* @__PURE__ */ React3.createElement("br", null), /* @__PURE__ */ React3.createElement(
+      import_react2.DetailsList,
+      {
+        items: mapRecordsToItems(dataProvider),
+        columns: licenseColumns,
+        setKey: "dataProviderList",
+        layoutMode: import_react2.DetailsListLayoutMode.fixedColumns,
+        selectionMode: 0
+      }
+    ), /* @__PURE__ */ React3.createElement("br", null)), offlineDataProvider && isDataset(offlineDataProvider) && /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(import_react2.Text, null, /* @__PURE__ */ React3.createElement("b", null, "Licenses in offline data provider:"), " ", offlineDataProvider.sortedRecordIds.length), /* @__PURE__ */ React3.createElement("br", null), /* @__PURE__ */ React3.createElement(
+      import_react2.DetailsList,
+      {
+        items: mapRecordsToItems(offlineDataProvider),
+        columns: licenseColumns,
+        setKey: "offlineDataProviderList",
+        layoutMode: import_react2.DetailsListLayoutMode.fixedColumns,
+        selectionMode: 0
+      }
+    ), /* @__PURE__ */ React3.createElement("br", null))),
+    /* @__PURE__ */ React3.createElement(import_react2.DialogFooter, null, /* @__PURE__ */ React3.createElement(import_react2.PrimaryButton, { onClick: onDismiss, text: "Close" }))
+  );
+};
+
 // src/IanusGuard.tsx
 var isWebApi = (dataProvider) => {
   return (dataProvider == null ? void 0 : dataProvider.retrieveMultipleRecords) !== void 0;
@@ -436,17 +510,6 @@ var acquireLicenses = (publisherId, productId, dataProvider) => __async(null, nu
     throw new Error(`The 'dataProvider' prop must be either of type ComponentFramework.WebApi or ComponentFramework.PropertyTypes.Dataset. You passed '${typeof dataProvider}'.`);
   }
 });
-var updateResultIfDefined = (result, onLicenseValidated) => {
-  if (onLicenseValidated) {
-    try {
-      onLicenseValidated(result);
-    } catch (e) {
-      if (e && e instanceof Error) {
-        console.error(`Error while calling onLicenseValidated: '${e.message}'`);
-      }
-    }
-  }
-};
 var fetchOrganizationIdFromWebApi = (webApi) => __async(null, null, function* () {
   const results = yield webApi.retrieveMultipleRecords("organization", "?$top=1&$select=organizationid");
   if (!results.entities.length) {
@@ -456,13 +519,20 @@ var fetchOrganizationIdFromWebApi = (webApi) => __async(null, null, function* ()
   return organization.organizationid;
 });
 var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environmentIdentifier, dataProvider, offlineDataProvider, usagePermission, onLicenseValidated, children }) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const [licenseState, licenseDispatch] = useLicenseContext();
-  const onSettingsFinally = () => {
-    licenseDispatch({ type: "setLicenseDialogVisible", payload: false });
-    initLicenseValidation();
-  };
-  const runValidation = React3.useCallback(() => __async(null, null, function* () {
+  const onLicenseValidatedRef = React4.useRef(onLicenseValidated);
+  React4.useEffect(() => {
+    onLicenseValidatedRef.current = onLicenseValidated;
+  }, [onLicenseValidated]);
+  const publicKeysRef = React4.useRef(publicKeys);
+  React4.useEffect(() => {
+    if (JSON.stringify(publicKeys) !== JSON.stringify(publicKeysRef.current)) {
+      publicKeysRef.current = publicKeys;
+    }
+  }, [publicKeys]);
+  const resolvedEnvironmentIdentifierRef = React4.useRef(null);
+  const runValidation = React4.useCallback(() => __async(null, null, function* () {
     try {
       if (!productId) {
         return {
@@ -471,7 +541,7 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
           reason: "No productId found, pass a productId as prop!"
         };
       }
-      if (!publicKeys || !publicKeys.length) {
+      if (!publicKeysRef.current || !publicKeysRef.current.length) {
         return {
           isValid: false,
           isTerminalError: true,
@@ -496,8 +566,17 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
         };
       }
       const licenseRecord = licenses[0];
-      const resolvedEnvironmentIdentifier = isWebApi(environmentIdentifier) ? yield fetchOrganizationIdFromWebApi(environmentIdentifier) : environmentIdentifier;
-      const validationResult = yield validateLicense(publisherId, productId, environmentType, resolvedEnvironmentIdentifier, publicKeys, licenseRecord.ian_key);
+      if (resolvedEnvironmentIdentifierRef.current === null) {
+        resolvedEnvironmentIdentifierRef.current = isWebApi(environmentIdentifier) ? yield fetchOrganizationIdFromWebApi(environmentIdentifier) : environmentIdentifier;
+      }
+      if (!resolvedEnvironmentIdentifierRef.current) {
+        return {
+          isValid: false,
+          isTerminalError: true,
+          reason: `Failed to determine current environment identifier!`
+        };
+      }
+      const validationResult = yield validateLicense(publisherId, productId, environmentType, resolvedEnvironmentIdentifierRef.current, publicKeysRef.current, licenseRecord.ian_key);
       return __spreadProps(__spreadValues({}, validationResult), {
         licenseId: licenseRecord.ian_licenseid,
         licenseKey: licenseRecord.ian_key
@@ -509,16 +588,31 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
         reason: e == null ? void 0 : e.message
       };
     }
-  }), [dataProvider, environmentIdentifier, environmentType, offlineDataProvider, productId, publicKeys, publisherId]);
-  const initLicenseValidation = React3.useCallback(() => __async(null, null, function* () {
+  }), [dataProvider, environmentIdentifier, environmentType, offlineDataProvider, productId, publisherId]);
+  const initLicenseValidation = React4.useCallback(() => __async(null, null, function* () {
     const result = yield runValidation();
     licenseDispatch({ type: "setLicense", payload: result });
-    updateResultIfDefined(result, onLicenseValidated);
-  }), [licenseDispatch, onLicenseValidated, runValidation]);
+    if (onLicenseValidatedRef.current) {
+      try {
+        onLicenseValidatedRef.current(result);
+      } catch (e) {
+        if (e && e instanceof Error) {
+          console.error(`Error while calling onLicenseValidated: '${e.message}'`);
+        }
+      }
+    }
+  }), [licenseDispatch, runValidation]);
+  const onSettingsFinally = React4.useCallback(() => {
+    licenseDispatch({ type: "setLicenseDialogVisible", payload: false });
+    initLicenseValidation();
+  }, [initLicenseValidation, licenseDispatch]);
+  const onDebugFinally = React4.useCallback(() => {
+    licenseDispatch({ type: "setDebugDialogVisible", payload: false });
+  }, [licenseDispatch]);
   const dataTotalResultCount = isDataset(dataProvider) ? dataProvider.paging.totalResultCount : void 0;
   const dataIsLoading = isDataset(dataProvider) ? dataProvider.loading : void 0;
   const dataHasError = isDataset(dataProvider) ? dataProvider.error : void 0;
-  const dataProviderState = React3.useMemo(() => {
+  const dataProviderState = React4.useMemo(() => {
     if (!isDataset(dataProvider)) {
       return "webapi";
     } else {
@@ -528,26 +622,26 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
   const offlineDataTotalResultCount = offlineDataProvider != null ? offlineDataProvider.paging.totalResultCount : void 0;
   const offlineDataIsLoading = offlineDataProvider != null ? offlineDataProvider.loading : void 0;
   const offlineDataHasError = offlineDataProvider != null ? offlineDataProvider.error : void 0;
-  const offlineDataProviderState = React3.useMemo(() => {
+  const offlineDataProviderState = React4.useMemo(() => {
     if (offlineDataProvider == null) {
       return "unused";
     } else {
       return `dataset-${offlineDataTotalResultCount}-${offlineDataIsLoading}-${offlineDataHasError}`;
     }
   }, [offlineDataHasError, offlineDataIsLoading, offlineDataProvider, offlineDataTotalResultCount]);
-  const dataProviderSignature = React3.useMemo(() => {
+  const dataProviderSignature = React4.useMemo(() => {
     if (isDataset(dataProvider) && dataProvider.records) {
       return Object.values(dataProvider.records).map((r) => `${r.getRecordId()}-${r.getValue("ian_identifier")}-${r.getValue("ian_key")}`).join("|");
     }
     return "";
   }, [dataProvider]);
-  const offlineDataProviderSignature = React3.useMemo(() => {
+  const offlineDataProviderSignature = React4.useMemo(() => {
     if (offlineDataProvider && offlineDataProvider.records) {
       return Object.values(offlineDataProvider.records).map((r) => `${r.getRecordId()}-${r.getValue("ian_identifier")}-${r.getValue("ian_key")}`).join("|");
     }
     return "";
   }, [offlineDataProvider]);
-  React3.useEffect(() => {
+  React4.useEffect(() => {
     console.log(`Starting license evaluation at ${(/* @__PURE__ */ new Date()).toISOString()}`);
     console.log(`DataProvider state: ${dataProviderState}`);
     console.log(`DataProvider signature: ${dataProviderSignature}`);
@@ -560,7 +654,15 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
         reason: "Your user is not enabled for using this product"
       };
       licenseDispatch({ type: "setLicense", payload: result });
-      updateResultIfDefined(result, onLicenseValidated);
+      if (onLicenseValidatedRef.current) {
+        try {
+          onLicenseValidatedRef.current(result);
+        } catch (e) {
+          if (e && e instanceof Error) {
+            console.error(`Error while calling onLicenseValidated: '${e.message}'`);
+          }
+        }
+      }
     } else if (!isDataset(dataProvider) || !dataProvider.error && !dataProvider.loading && dataProvider.paging.totalResultCount >= 0 || offlineDataProvider != null && !offlineDataProvider.error && !offlineDataProvider.loading && offlineDataProvider.paging.totalResultCount >= 0) {
       initLicenseValidation();
     } else if (dataProvider.error) {
@@ -570,10 +672,18 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
         reason: `Dataset error: ${dataProvider.errorMessage}`
       };
       licenseDispatch({ type: "setLicense", payload: result });
-      updateResultIfDefined(result, onLicenseValidated);
+      if (onLicenseValidatedRef.current) {
+        try {
+          onLicenseValidatedRef.current(result);
+        } catch (e) {
+          if (e && e instanceof Error) {
+            console.error(`Error while calling onLicenseValidated: '${e.message}'`);
+          }
+        }
+      }
     }
-  }, [dataProvider, dataProviderState, dataProviderSignature, initLicenseValidation, licenseDispatch, usagePermission, onLicenseValidated, offlineDataProvider, offlineDataProviderState, offlineDataProviderSignature]);
-  return ((_a = licenseState.license) == null ? void 0 : _a.isValid) ? /* @__PURE__ */ React3.createElement(React3.Fragment, null, licenseState.licenseDialogVisible && /* @__PURE__ */ React3.createElement(LicenseDialog, { publisherId, productId, dataProvider, offlineDataProvider, onSubmit: onSettingsFinally, onCancel: onSettingsFinally }), children) : /* @__PURE__ */ React3.createElement("div", { style: { display: "flex", width: "100%", height: "100%", flex: "1" } }, licenseState.licenseDialogVisible && /* @__PURE__ */ React3.createElement(LicenseDialog, { publisherId, productId, dataProvider, offlineDataProvider, onSubmit: onSettingsFinally, onCancel: onSettingsFinally }), /* @__PURE__ */ React3.createElement("div", { style: { display: "flex", flexDirection: "column", alignItems: "center", justifyContent: "center", flex: 1 } }, ((_b = licenseState.license) == null ? void 0 : _b.isValid) === false && /* @__PURE__ */ React3.createElement(
+  }, [dataProvider, dataProviderState, dataProviderSignature, initLicenseValidation, licenseDispatch, usagePermission, offlineDataProvider, offlineDataProviderState, offlineDataProviderSignature]);
+  return ((_a = licenseState.license) == null ? void 0 : _a.isValid) ? /* @__PURE__ */ React4.createElement(React4.Fragment, null, licenseState.licenseDialogVisible && /* @__PURE__ */ React4.createElement(LicenseDialog, { publisherId, productId, dataProvider, offlineDataProvider, onSubmit: onSettingsFinally, onCancel: onSettingsFinally }), children) : /* @__PURE__ */ React4.createElement("div", { style: { display: "flex", width: "100%", height: "100%", flex: "1" } }, licenseState.licenseDialogVisible && /* @__PURE__ */ React4.createElement(LicenseDialog, { publisherId, productId, dataProvider, offlineDataProvider, onSubmit: onSettingsFinally, onCancel: onSettingsFinally }), licenseState.debugDialogVisible && /* @__PURE__ */ React4.createElement(DebugDialog, { publisherId, productId, environmentType, environmentIdentifier: resolvedEnvironmentIdentifierRef.current || "", dataProvider, offlineDataProvider, onDismiss: onDebugFinally }), /* @__PURE__ */ React4.createElement("div", { style: { display: "flex", flexDirection: "column", alignItems: "center", justifyContent: "center", flex: 1 } }, ((_b = licenseState.license) == null ? void 0 : _b.isValid) === false && /* @__PURE__ */ React4.createElement(
     import_MessageBar.MessageBar,
     {
       messageBarType: import_MessageBar.MessageBarType.error,
@@ -583,17 +693,17 @@ var IanusGuard = ({ publisherId, productId, publicKeys, environmentType, environ
         licenseDispatch({ type: "setLicense", payload: void 0 });
         initLicenseValidation();
       },
-      actions: /* @__PURE__ */ React3.createElement("div", null, !((_c = licenseState.license) == null ? void 0 : _c.isTerminalError) && /* @__PURE__ */ React3.createElement(import_Button.MessageBarButton, { onClick: () => licenseDispatch({ type: "setLicenseDialogVisible", payload: true }) }, "Set License"))
+      actions: /* @__PURE__ */ React4.createElement("div", null, !((_c = licenseState.license) == null ? void 0 : _c.isTerminalError) && /* @__PURE__ */ React4.createElement(import_Button.MessageBarButton, { onClick: () => licenseDispatch({ type: "setLicenseDialogVisible", payload: true }) }, "Set License"), !((_d = licenseState.license) == null ? void 0 : _d.isTerminalError) && /* @__PURE__ */ React4.createElement(import_Button.MessageBarButton, { onClick: () => licenseDispatch({ type: "setDebugDialogVisible", payload: true }) }, "Debug"))
     },
     "An error occured, please try again. Error information: ",
-    (_d = licenseState.license) == null ? void 0 : _d.reason
-  ), !licenseState.license && /* @__PURE__ */ React3.createElement(import_Spinner.Spinner, { styles: { root: { width: "auto" } }, label: "Loading..." })));
+    (_e = licenseState.license) == null ? void 0 : _e.reason
+  ), !licenseState.license && /* @__PURE__ */ React4.createElement(import_Spinner.Spinner, { styles: { root: { width: "auto" } }, label: "Loading..." })));
 };
 
 // src/IanusProvider.tsx
-var React4 = __toESM(require("react"));
+var React5 = __toESM(require("react"));
 var IanusProvider = (props) => {
-  return /* @__PURE__ */ React4.createElement(IanusLicenseStateProvider, null, /* @__PURE__ */ React4.createElement(IanusGuard, __spreadValues({}, props)));
+  return /* @__PURE__ */ React5.createElement(IanusLicenseStateProvider, null, /* @__PURE__ */ React5.createElement(IanusGuard, __spreadValues({}, props)));
 };
 
 // ../../../../ianus-core/GuidTools.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ianua/ianus-dataverse-react-fluentui8",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Client-side validation for Ianus Guard licenses in Dataverse using react and FluentUi v8",
   "scripts": {
     "build": "tsup"