datasync-dynamic-form 1.0.3 → 1.0.4

package/dist/components/DsDynamicForm.js

@@ -3,9 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DsDynamicForm = exports.CGUID = void 0;
+Object.defineProperty(exports, "CGUID", {
+  enumerable: true,
+  get: function () {
+    return _datasyncCommonLibrary.CGUID;
+  }
+});
+exports.DsDynamicForm = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _multiselectReactDropdown = _interopRequireDefault(require("multiselect-react-dropdown"));
+var _datasyncCore = require("datasync-core");
+var _datasyncCommonLibrary = require("datasync-common-library");
 var _reactstrap = require("reactstrap");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
@@ -15,9 +23,6 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
                   <Blob
  import Blob from "components/Blob/Blob";*/}
 
-//Defined as const import {saveDataTierToDatasync} from '../DataSync3/DataSync3.jsx'
-//2DO disabled import "./DynamicForm3Tiers2.css"
-
 // reactstrap components
 
 const debugging = true;
@@ -25,189 +30,13 @@ const local = true;
 const production = !local;
 const globals = {
   parameters: {
-    root_url: "/topics-page",
-    admin_url: "/authent",
     debugging: debugging,
-    cookie_debugging: true,
-    master_detail_debugging: true,
     local: true,
     production: false,
     use_navigate: false,
     save_failed_alert: false,
     form_version: "1.0",
     form_modified_version: 2
-  },
-  home: {
-    ...(local && {
-      url: 'http://localhost:3000'
-    }),
-    ...(production && {
-      url: 'https://www.chainedeprieres.com'
-    })
-  },
-  datasync: {
-    /*DATASYNC*/
-    praychain_company_guid: local ? "36178327-E810-3A73-A833-8417F639295E" : "2EA619F2-2A23-7905-69C7-6ABA65BDF585",
-    praychain_time_table_guid: local ? "CA09A7FB-431C-29A6-A974-72E4F949EC81" : "566062CD-30F8-B1E2-DF80-6AB667F466C4",
-    invitation_table_guid: local ? "AE99F45B-9D22-D280-13DA-29B4860C7FEE" : "3F92D25C-4223-E5D2-8484-4880B6B83E9A",
-    praychain_contact_table_guid: local ? "E2AEE1AB-838F-A68A-355C-C1A912698002" : "0458D1BE-3E8D-049D-09FB-5A8E14F76A53",
-    praychain_authent_table_guid: local ? "B5A0C0AA-200F-B88B-67DE-355D222A6E52" : "21A2464D-B413-6A0C-0848-EDA45266DAC0",
-    praychain_user_table_guid: local ? "7841F7FF-1BF9-8716-7C66-BD8C5634E1F6" : "1D65037E-9A04-51EB-5CAE-06BCB7BE30AF",
-    praychain_topics_table_guid: local ? "E25E87B5-5E0C-7446-AF58-ECAE4301AE40" : "CE2A92BE-47A5-8AAE-7014-64FF5986A2BD",
-    /*  MAC local */
-    ...(local && {
-      syncTestUrl: "http://localhost:8888/datasync-service/test.php",
-      syncPushUrl: "http://localhost:8888/datasync-service/Sync.php",
-      syncPushSerializedUrl: "http://localhost:8888/datasync-service/Sync.php",
-      syncStartUrl: "http://localhost:8888/datasync-service/Sync.php?action=syncStart",
-      syncDeleteUrl: "http://localhost:8888/datasync-service/Sync.php?action=syncDelete",
-      syncSeekUrl: "http://localhost:8888/datasync-service/Sync.php?action=syncSeek",
-      syncStopUrl: "http://localhost:8888/datasync-service/Sync.php?action=syncStop",
-      syncPullUrl: "http://localhost:8888/datasync-service/Sync.php?action=syncPull",
-      syncPullSerializedUrl: "http://localhost:8888/datasync-service/Sync.php?action=syncPullSerialized",
-      syncMobilePullUrl: "http://localhost:8888/datasync-service/Sync.php?action=syncMobilePull",
-      syncPassThruUrl: "http://localhost:8888/datasync-service/Sync.php?action=syncPassThru"
-    }),
-    /* chainedeprieres.com Production Server */
-    ...(production && {
-      syncTestUrl: "https://rest.datasync.ovh/test.php",
-      syncPushUrl: "https://rest.datasync.ovh/Sync.php",
-      syncPushSerializedUrl: "https://rest.datasync.ovh/Sync.php",
-      syncStartUrl: "https://rest.datasync.ovh/Sync.php?action=syncStart",
-      syncDeleteUrl: "http://rest.datasync.ovh/Sync.php?action=syncDelete",
-      syncSeekUrl: "https://rest.datasync.ovh/Sync.php?action=syncSeek",
-      syncStopUrl: "https://rest.datasync.ovh/Sync.php?action=syncStop",
-      syncPullUrl: "https://rest.datasync.ovh/Sync.php?action=syncPull",
-      syncPullSerializedUrl: "https://rest.datasync.ovh/Sync.php?action=syncPullSerialized",
-      syncMobilePullUrl: "https://rest.datasync.ovh/Sync.php?action=syncMobilePull",
-      syncPassThruUrl: "https://rest.datasync.ovh/Sync.php?action=syncPassThru"
-    })
-  }
-};
-const randomize = (min, max) => {
-  return Math.floor(min + Math.random() * (max - min));
-};
-const cTimeStamp = () => {
-  let lDate = new Date();
-  let l_sTimeStamp = '';
-  l_sTimeStamp = 1900 + lDate.getYear();
-  l_sTimeStamp += '-';
-  l_sTimeStamp += ('0' + (lDate.getMonth() + 1)).slice(-2);
-  l_sTimeStamp += '-';
-  l_sTimeStamp += ('0' + lDate.getDate()).slice(-2);
-  l_sTimeStamp += ' ';
-  l_sTimeStamp += ('0' + lDate.getHours()).slice(-2);
-  l_sTimeStamp += ('0' + lDate.getMinutes()).slice(-2);
-  l_sTimeStamp += ('0' + lDate.getSeconds()).slice(-2);
-  return l_sTimeStamp;
-};
-
-/* Prototype 	: cGUID
-* Purpose 		: Generates a Global Unique ID
-* Return		  :	Return GUID
-* History   	: Created on 2015-02-06
-*
-**/
-const CGUID = () => {
-  let d = new Date().getTime();
-  let uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    var r = (d + Math.random() * 16) % 16 | 0;
-    d = Math.floor(d / 16);
-    return (c === 'x' ? r : r & 0x3 | 0x8).toString(16);
-  });
-  return uuid;
-};
-
-/**
- * Write data_tier form to data blob
- */
-exports.CGUID = CGUID;
-const saveDataTierToDatasync = async (p_data_guid, p_o_data_blob, p_s_company_guid, p_s_table_guid, p_dt_createstamp, p_dt_updatestamp, p_dt_deletestamp, on_save_handler, on_update_handler, on_failed_handler, p_extra_data) => {
-  if (globals.parameters.debugging_data_tier) console.log(`10/07:this.data_tier:${JSON.stringify(p_o_data_blob)}`);
-
-  //Post object using DataSyncLayer
-  //Copy datasync compliant object data from state structure
-  let formBlobObject = {
-    data_guid: p_data_guid ? p_data_guid : CGUID(),
-    data_blob: {
-      data_tier: p_o_data_blob.data_tier
-    }
-  };
-  if (p_dt_createstamp) {
-    formBlobObject.createstamp = p_dt_createstamp;
-  }
-  if (p_dt_updatestamp) {
-    formBlobObject.updatestamp = p_dt_updatestamp;
-  }
-  if (p_dt_deletestamp) {
-    formBlobObject.deletestamp = p_dt_deletestamp;
-  }
-  let l_o_datasync = Object.assign({}, formBlobObject);
-  if (globals.parameters.debugging) {
-    console.log("l_o_datasync to be stored => ", l_o_datasync);
-  }
-
-  //Set datasync container sytem properties values
-  //Set user custom data_blob properties values
-  l_o_datasync.data_blob.modified = globals.parameters.form_modified_version; //ReUse moidified flag as modified version
-  //and so on...
-
-  //Stringify whole datasync object one more time
-  let l_s_sync_object_stringified;
-  try {
-    l_s_sync_object_stringified = JSON.stringify(l_o_datasync).replace(/'/g, "'").replace(/\\n/g, '\\\\n');
-    if (globals.parameters.debugging) console.log(`l_s_sync_object_stringified succedeed :${l_s_sync_object_stringified}`);
-  } catch (err) {
-    console.error(`l_s_sync_object_stringified:${l_s_sync_object_stringified}`);
-    alert(`l_s_sync_object_stringified StringiFy failed with error:${err}`);
-  }
-
-  //Prepare datasync syncPush POST request
-  const POSTform = new FormData();
-  POSTform.append("action", "syncPushSerialized"); //
-  POSTform.append("company_guid", p_s_company_guid);
-  POSTform.append("table_guid", p_s_table_guid);
-  POSTform.append("data_sync", l_s_sync_object_stringified);
-
-  //SyncPush Data
-  fetch(`${globals.datasync.syncPushSerializedUrl}`, {
-    method: "POST",
-    body: POSTform
-  }).then(results => {
-    return results.text();
-  }).then(sync_server_response => {
-    let json_response = JSON.parse(sync_server_response);
-    if (globals.parameters.debugging) console.log("json_response ->", json_response);
-    if (json_response.data_blob) {
-      //Save succedeed
-      if (p_data_guid == null && on_save_handler) on_save_handler(json_response, p_extra_data);
-      //Update succedeed
-      if (p_data_guid != null && on_update_handler) on_update_handler(json_response, p_extra_data);
-
-      //debugging
-      if (globals.parameters.debugging) {
-        let data_blob = json_response.data_blob;
-        console.log("data_blob", data_blob);
-      }
-    } else {
-      //Save or update failed
-      console.error("DataSync::saveFormToDatasync => Save or update failed");
-      if (on_failed_handler) on_failed_handler("Internal DataSync save error", p_extra_data);
-    }
-  }).catch(err => {
-    alert(`Erreur de sauvegarde ${err}`);
-  });
-};
-const wScrollTo = pStargetAnchorId => {
-  let targetDomAnchor = document.getElementById(pStargetAnchorId);
-  if (targetDomAnchor) targetDomAnchor.scrollIntoView({
-    behavior: "smooth",
-    block: "start",
-    inline: "nearest"
-  });else {
-    if (globals.parameters.debugging) {
-      console.log(`wScrollTo failed => ${pStargetAnchorId} not found in DOM !`);
-    }
   }
 };
 class DsDynamicForm extends _react.Component {
@@ -274,8 +103,8 @@ class DsDynamicForm extends _react.Component {
     this.setState({
       fieldError: [],
       form: {},
-      captcha1: randomize(0, 5),
-      captcha2: randomize(0, 5)
+      captcha1: (0, _datasyncCommonLibrary.Randomize)(0, 5),
+      captcha2: (0, _datasyncCommonLibrary.Randomize)(0, 5)
     },
     //Clear forced
     () => {
@@ -310,7 +139,7 @@ class DsDynamicForm extends _react.Component {
         fieldError: nextFieldError
       });
       //Scroll form to first erroneous field
-      wScrollTo(pFieldObject.name);
+      (0, _datasyncCommonLibrary.WScrollTo)(pFieldObject.name);
     } catch (e) {
       console.log(`Error caught on ${e}`);
     }
@@ -488,7 +317,7 @@ class DsDynamicForm extends _react.Component {
   saveFormToDatasyncProcess = () => {
     //Everything sounds ok in Form, Go ahead
     let hasDataGuid = this.props.datasync_object && this.props.datasync_object.data_guid;
-    saveDataTierToDatasync(hasDataGuid ? this.props.datasync_object.data_guid : null,
+    (0, _datasyncCore.SaveDataTierToDatasync)(hasDataGuid ? this.props.datasync_object.data_guid : null,
     //data_guid
     this.data_blob,
     //p_o_data_blob,
@@ -496,9 +325,9 @@ class DsDynamicForm extends _react.Component {
     //p_s_company_guid,
     this.props.table_guid,
     //p_s_table_guid,
-    hasDataGuid ? this.props.datasync_object.createstamp : cTimeStamp(),
+    hasDataGuid ? this.props.datasync_object.createstamp : (0, _datasyncCommonLibrary.CTimeStamp)(),
     //p_dt_createstamp,
-    hasDataGuid ? cTimeStamp() : null,
+    hasDataGuid ? (0, _datasyncCommonLibrary.CTimeStamp)() : null,
     //p_dt_updatestamp,
     null,
     //p_dt_deletestamp,
@@ -541,8 +370,6 @@ class DsDynamicForm extends _react.Component {
       //Call save anyway
       this.saveFormToDatasyncProcess();
     }
-
-    //this.saveFormToDatasync_OLD((this.props.datasync_object && this.props.datasync_object.data_guid)?this.props.datasync_object.data_guid:null);
   };
   onFormSavedLocalHandler = blob => {
     if (this.props.onFormSaved) this.props.onFormSaved(blob);else console.error("DynamicForm3Tiers2.onFormSaved props is not defined !");

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "datasync-dynamic-form",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Datasync Dynamic Form component",
   "main": "./dist/components/DsDynamicForm",
   "types": "./dist/components/DsDynamicForm",
-  "files":["./dist"],
+  "files": [
+    "./dist"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/pmabiala/datasync-dynamic-form.git"
@@ -27,8 +29,8 @@
     "reactstrap": "^9.2.2"
   },
   "peerDependencies": {
-    "react": "^ 18.2.0",
-    "multiselect-react-dropdown": "^2.0.25"
+    "multiselect-react-dropdown": "^2.0.25",
+    "react": "^ 18.2.0"
   },
   "scripts": {
     "build": "rm -r dist && babel src -d dist --ignore src/**/*.test.jsx && npm run copy-files",
@@ -37,5 +39,10 @@
   },
   "keywords": [],
   "author": "",
-  "license": "ISC"
+  "license": "ISC",
+  "dependencies": {
+    "axios": "^1.7.2",
+    "datasync-common-library": "^1.0.5",
+    "datasync-core": "^1.0.8"
+  }
 }