@dhis2/app-service-data 3.11.3 → 3.12.0-alpha.2

package/build/cjs/links/RestAPILink/queryToResourcePath.js

@@ -4,34 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.queryToResourcePath = void 0;
-
 var _path = require("./path");
-
 var _validateQuery = require("./validateQuery");
-
 const encodeQueryParameter = param => {
   if (Array.isArray(param)) {
     return param.map(encodeQueryParameter).join(',');
   }
-
   if (typeof param === 'string') {
     return encodeURIComponent(param);
   }
-
   if (typeof param === 'number' || typeof param === 'boolean') {
     return String(param);
   }
-
   if (typeof param === 'object') {
     throw new Error('Object parameter mappings not yet implemented');
   }
-
   throw new Error('Unknown parameter type');
 };
-
 const queryParametersMapToArray = params => Object.keys(params).reduce((out, key) => {
   const value = params[key];
-
   if (key === 'filter' && Array.isArray(value)) {
     value.forEach(item => {
       out.push({
@@ -45,13 +36,11 @@ const queryParametersMapToArray = params => Object.keys(params).reduce((out, key
       value: params[key]
     });
   }
-
   return out;
 }, []);
-
 const queryParametersToQueryString = params => {
   const expandedParams = queryParametersMapToArray(params);
-  return expandedParams.map((_ref) => {
+  return expandedParams.map(_ref => {
     let {
       key,
       value
@@ -59,30 +48,23 @@ const queryParametersToQueryString = params => {
     return `${encodeURIComponent(key)}=${encodeQueryParameter(value)}`;
   }).join('&');
 };
-
 const actionPrefix = 'action::';
-
 const isAction = resource => resource.startsWith(actionPrefix);
-
 const makeActionPath = resource => (0, _path.joinPath)('dhis-web-commons', `${resource.substr(actionPrefix.length)}.action`);
-
 const skipApiVersion = (resource, config) => {
   if (resource === 'tracker' || resource.startsWith('tracker/')) {
     var _config$serverVersion, _config$serverVersion2;
-
     if (!((_config$serverVersion = config.serverVersion) !== null && _config$serverVersion !== void 0 && _config$serverVersion.minor) || ((_config$serverVersion2 = config.serverVersion) === null || _config$serverVersion2 === void 0 ? void 0 : _config$serverVersion2.minor) < 38) {
       return true;
     }
-  } // The `/api/ping` endpoint is unversioned
-
+  }
 
+  // The `/api/ping` endpoint is unversioned
   if (resource === 'ping') {
     return true;
   }
-
   return false;
 };
-
 const queryToResourcePath = (link, query, type) => {
   const {
     resource,
@@ -92,12 +74,9 @@ const queryToResourcePath = (link, query, type) => {
   const apiBase = skipApiVersion(resource, link.config) ? link.unversionedApiPath : link.versionedApiPath;
   const base = isAction(resource) ? makeActionPath(resource) : (0, _path.joinPath)(apiBase, resource, id);
   (0, _validateQuery.validateResourceQuery)(query, type);
-
   if (Object.keys(params).length) {
     return `${base}?${queryParametersToQueryString(params)}`;
   }
-
   return base;
 };
-
 exports.queryToResourcePath = queryToResourcePath;

package/build/cjs/links/RestAPILink/queryToResourcePath.test.js

@@ -1,11 +1,8 @@
 "use strict";
 
 var _RestAPILink = require("../RestAPILink");
-
 var _queryToResourcePath = require("./queryToResourcePath");
-
 const createLink = config => new _RestAPILink.RestAPILink(config);
-
 const defaultConfig = {
   basePath: '<base>',
   apiVersion: '37',
@@ -163,7 +160,8 @@ describe('queryToResourcePath', () => {
     const query = {
       resource: 'tracker'
     };
-    const v38config = { ...defaultConfig,
+    const v38config = {
+      ...defaultConfig,
       serverVersion: {
         major: 2,
         minor: 38,

package/build/cjs/links/RestAPILink/validateQuery.js

@@ -4,70 +4,56 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.validateResourceQuery = void 0;
-
 var _metadataResources = require("./metadataResources");
-
 const validatePagination = (query, warn) => {
   var _query$params, _query$params2;
-
   if (!_metadataResources.normativeMetadataResources.includes(query.resource)) {
     return true;
   }
-
   if (((_query$params = query.params) === null || _query$params === void 0 ? void 0 : _query$params.paging) === false || ((_query$params2 = query.params) === null || _query$params2 === void 0 ? void 0 : _query$params2.paging) === 'false') {
     warn('Data queries with paging=false are deprecated and should not be used!', query);
     return false;
-  } // TODO: validate sub-resource pagination (i.e. fields=users~paging(1,50)[name] )
+  }
 
+  // TODO: validate sub-resource pagination (i.e. fields=users~paging(1,50)[name] )
 
   return true;
 };
-
 const validateDeclarativeFields = (query, warn) => {
   var _query$params3;
-
   if (!_metadataResources.normativeMetadataResources.includes(query.resource)) {
     return true;
   }
-
   if (!((_query$params3 = query.params) !== null && _query$params3 !== void 0 && _query$params3.fields)) {
     warn('Data queries should always specify fields to return', query);
     return false;
   } else {
     var _fields;
-
     let fields = undefined;
-
     if (typeof query.params.fields === 'string') {
       fields = query.params.fields.split(',').map(field => field.trim());
     } else if (Array.isArray(query.params.fields)) {
       fields = query.params.fields.map(field => String(field).trim());
     }
-
     if ((_fields = fields) !== null && _fields !== void 0 && _fields.find(field => field.match(/(^\*$|^:.+)/))) {
       warn('Data queries should not use wildcard or dynamic field groups', query.params.fields, query);
       return false;
     }
-  } // TODO: validate sub-resource wildcard fields (i.e. fields=users[*])
-
+  }
 
+  // TODO: validate sub-resource wildcard fields (i.e. fields=users[*])
   return true;
 };
-
 const validateResourceQuery = (query, type) => {
   let valid = true;
-
   if (process.env.NODE_ENV === 'development') {
     // Support build-time dead code elimination in production
     const warn = console.warn;
-
     if (type === 'read') {
       valid = validatePagination(query, warn) && valid;
       valid = validateDeclarativeFields(query, warn) && valid;
     }
   }
-
   return valid;
 };
-
 exports.validateResourceQuery = validateResourceQuery;

package/build/cjs/links/RestAPILink/validateQuery.test.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _validateQuery = require("./validateQuery");
-
 describe('validateQuery', () => {
   const originalConsoleWarn = console.warn;
   afterAll(() => {

package/build/cjs/links/RestAPILink.js

@@ -4,41 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RestAPILink = void 0;
-
 var _fetchData = require("./RestAPILink/fetchData");
-
 var _path = require("./RestAPILink/path");
-
 var _queryToRequestOptions = require("./RestAPILink/queryToRequestOptions");
-
 var _queryToResourcePath = require("./RestAPILink/queryToResourcePath");
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 class RestAPILink {
   constructor(config) {
     _defineProperty(this, "config", void 0);
-
     _defineProperty(this, "versionedApiPath", void 0);
-
     _defineProperty(this, "unversionedApiPath", void 0);
-
     this.config = config;
     this.versionedApiPath = (0, _path.joinPath)('api', String(config.apiVersion));
     this.unversionedApiPath = (0, _path.joinPath)('api');
   }
-
   fetch(path, options) {
     return (0, _fetchData.fetchData)((0, _path.joinPath)(this.config.baseUrl, path), options);
   }
-
   executeResourceQuery(type, query, _ref) {
     let {
       signal
     } = _ref;
     return this.fetch((0, _queryToResourcePath.queryToResourcePath)(this, query, type), (0, _queryToRequestOptions.queryToRequestOptions)(type, query, signal));
   }
-
 }
-
 exports.RestAPILink = RestAPILink;

package/build/cjs/links/RestAPILink.test.js

@@ -1,9 +1,7 @@
 "use strict";
 
 var _fetchData = require("./RestAPILink/fetchData");
-
 var _ = require(".");
-
 jest.mock('./RestAPILink/fetchData', () => ({
   fetchData: jest.fn(async () => null)
 }));

package/build/cjs/links/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _CustomDataLink = require("./CustomDataLink");
-
 Object.keys(_CustomDataLink).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _CustomDataLink[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_CustomDataLink).forEach(function (key) {
     }
   });
 });
-
 var _ErrorLink = require("./ErrorLink");
-
 Object.keys(_ErrorLink).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _ErrorLink[key]) return;
@@ -29,9 +25,7 @@ Object.keys(_ErrorLink).forEach(function (key) {
     }
   });
 });
-
 var _RestAPILink = require("./RestAPILink");
-
 Object.keys(_RestAPILink).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _RestAPILink[key]) return;

package/build/cjs/react/components/CustomDataProvider.js

@@ -4,22 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CustomDataProvider = void 0;
-
+var _reactQuery = require("@tanstack/react-query");
 var _react = _interopRequireDefault(require("react"));
-
-var _reactQuery = require("react-query");
-
 var _engine = require("../../engine");
-
 var _links = require("../../links");
-
 var _DataContext = require("../context/DataContext");
-
 var _DataProvider = require("./DataProvider");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const CustomDataProvider = (_ref) => {
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const CustomDataProvider = _ref => {
   let {
     children,
     data,
@@ -38,5 +30,4 @@ const CustomDataProvider = (_ref) => {
     value: context
   }, children));
 };
-
 exports.CustomDataProvider = CustomDataProvider;

package/build/cjs/react/components/DataMutation.js

@@ -4,10 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DataMutation = void 0;
-
 var _useDataMutation = require("../hooks/useDataMutation");
-
-const DataMutation = (_ref) => {
+const DataMutation = _ref => {
   let {
     mutation,
     onComplete,
@@ -22,5 +20,4 @@ const DataMutation = (_ref) => {
   });
   return children(mutationState);
 };
-
 exports.DataMutation = DataMutation;

package/build/cjs/react/components/DataProvider.js

@@ -4,23 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.queryClientOptions = exports.DataProvider = void 0;
-
 var _appServiceConfig = require("@dhis2/app-service-config");
-
+var _reactQuery = require("@tanstack/react-query");
 var _react = _interopRequireDefault(require("react"));
-
-var _reactQuery = require("react-query");
-
 var _engine = require("../../engine");
-
 var _links = require("../../links");
-
 var _DataContext = require("../context/DataContext");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /* eslint-disable react/no-unused-prop-types */
-const queryClientOptions = {
+
+const queryClientOptions = exports.queryClientOptions = {
   defaultOptions: {
     queries: {
       // Disable automatic error retries
@@ -32,15 +25,18 @@ const queryClientOptions = {
       // Don't refetch when the window regains focus
       refetchOnWindowFocus: false,
       // Don't refetch after connection issues
-      refetchOnReconnect: false
+      refetchOnReconnect: false,
+      // RQv4 uses 'online' as the default, which pauses queries without network connection.
+      // 'always' reestablishes behavior from v3, and lets requests fire when offline
+      // https://tanstack.com/query/latest/docs/framework/react/guides/network-mode
+      networkMode: 'always'
     }
   }
 };
-exports.queryClientOptions = queryClientOptions;
 const queryClient = new _reactQuery.QueryClient(queryClientOptions);
-
 const DataProvider = props => {
-  const config = { ...(0, _appServiceConfig.useConfig)(),
+  const config = {
+    ...(0, _appServiceConfig.useConfig)(),
     ...props
   };
   const link = new _links.RestAPILink(config);
@@ -54,5 +50,4 @@ const DataProvider = props => {
     value: context
   }, props.children));
 };
-
 exports.DataProvider = DataProvider;

package/build/cjs/react/components/DataProvider.test.js

@@ -1,23 +1,16 @@
 "use strict";
 
 var _react = require("@testing-library/react");
-
 var _react2 = _interopRequireDefault(require("react"));
-
 var _engine = require("../../engine");
-
 var _links = require("../../links");
-
 var _DataContext = require("../context/DataContext");
-
 var _DataProvider = require("./DataProvider");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 describe('DataProvider', () => {
   it('Should pass a new engine and RestAPILink to consumers', () => {
     const renderFunction = jest.fn();
-    (0, _react.render)( /*#__PURE__*/_react2.default.createElement(_DataProvider.DataProvider, {
+    (0, _react.render)(/*#__PURE__*/_react2.default.createElement(_DataProvider.DataProvider, {
       baseUrl: "test",
       apiVersion: 42
     }, /*#__PURE__*/_react2.default.createElement(_DataContext.DataContext.Consumer, null, renderFunction)));

package/build/cjs/react/components/DataQuery.js

@@ -4,10 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DataQuery = void 0;
-
 var _useDataQuery = require("../hooks/useDataQuery");
-
-const DataQuery = (_ref) => {
+const DataQuery = _ref => {
   let {
     query,
     onComplete,
@@ -24,5 +22,4 @@ const DataQuery = (_ref) => {
   });
   return children(queryState);
 };
-
 exports.DataQuery = DataQuery;

package/build/cjs/react/context/DataContext.js

@@ -4,13 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DataContext = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _defaultContext = require("./defaultContext");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const DataContext = /*#__PURE__*/_react.default.createContext(_defaultContext.defaultContext);
-
-exports.DataContext = DataContext;
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const DataContext = exports.DataContext = /*#__PURE__*/_react.default.createContext(_defaultContext.defaultContext);

package/build/cjs/react/context/defaultContext.js

@@ -4,15 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.defaultContext = void 0;
-
 var _engine = require("../../engine");
-
 var _links = require("../../links");
-
 const errorMessage = 'DHIS2 data context must be initialized, please ensure that you include a <DataProvider> in your application';
 const link = new _links.ErrorLink(errorMessage);
 const engine = new _engine.DataEngine(link);
-const defaultContext = {
+const defaultContext = exports.defaultContext = {
   engine
-};
-exports.defaultContext = defaultContext;
+};

package/build/cjs/react/context/defaultContext.test.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _defaultContext = require("./defaultContext");
-
 describe('defaultContext', () => {
   const originalError = console.error;
   const mockError = jest.fn();

package/build/cjs/react/hooks/mergeAndCompareVariables.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mergeAndCompareVariables = void 0;
-
 var _stableVariablesHash = require("./stableVariablesHash");
-
 const mergeAndCompareVariables = (previousVariables, newVariables, previousHash) => {
   if (!newVariables) {
     return {
@@ -14,11 +12,12 @@ const mergeAndCompareVariables = (previousVariables, newVariables, previousHash)
       mergedVariablesHash: previousHash,
       mergedVariables: previousVariables
     };
-  } // Use cached hash if it exists
-
+  }
 
+  // Use cached hash if it exists
   const currentHash = previousHash || (0, _stableVariablesHash.stableVariablesHash)(previousVariables);
-  const mergedVariables = { ...previousVariables,
+  const mergedVariables = {
+    ...previousVariables,
     ...newVariables
   };
   const mergedVariablesHash = (0, _stableVariablesHash.stableVariablesHash)(mergedVariables);
@@ -29,5 +28,4 @@ const mergeAndCompareVariables = (previousVariables, newVariables, previousHash)
     mergedVariables
   };
 };
-
 exports.mergeAndCompareVariables = mergeAndCompareVariables;

package/build/cjs/react/hooks/mergeAndCompareVariables.test.js

@@ -1,9 +1,7 @@
 "use strict";
 
 var _mergeAndCompareVariables = require("./mergeAndCompareVariables");
-
 var _stableVariablesHash = require("./stableVariablesHash");
-
 jest.mock('./stableVariablesHash', () => ({
   stableVariablesHash: object => JSON.stringify(object)
 }));
@@ -45,7 +43,8 @@ describe('mergeAndCompareVariables', () => {
     const newVariables = {
       answer: 43
     };
-    const expectedMergedVariables = { ...testVariables,
+    const expectedMergedVariables = {
+      ...testVariables,
       ...newVariables
     };
     expect((0, _mergeAndCompareVariables.mergeAndCompareVariables)(testVariables, newVariables, testHash)).toMatchObject({

package/build/cjs/react/hooks/stableVariablesHash.js

@@ -5,47 +5,43 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isPlainObject = isPlainObject;
 exports.stableVariablesHash = stableVariablesHash;
-
 function hasObjectPrototype(o) {
   return Object.prototype.toString.call(o) === '[object Object]';
-} // eslint-disable-next-line @typescript-eslint/ban-types
-
+}
 
+// eslint-disable-next-line @typescript-eslint/ban-types
 function isPlainObject(o) {
   if (!hasObjectPrototype(o)) {
     return false;
-  } // If has modified constructor
-
+  }
 
+  // If has modified constructor
   const ctor = o.constructor;
-
   if (typeof ctor === 'undefined') {
     return true;
-  } // If has modified prototype
-
+  }
 
+  // If has modified prototype
   const prot = ctor.prototype;
-
   if (!hasObjectPrototype(prot)) {
     return false;
-  } // If constructor does not have an Object-specific method
-
+  }
 
+  // If constructor does not have an Object-specific method
   if (!Object.prototype.hasOwnProperty.call(prot, 'isPrototypeOf')) {
     return false;
-  } // Most likely a plain Object
-
+  }
 
+  // Most likely a plain Object
   return true;
 }
+
 /**
  * Hashes the value into a stable hash.
  */
 
-
 function stableVariablesHash(value) {
   let hash;
-
   try {
     hash = JSON.stringify(value, (_, val) => isPlainObject(val) ? Object.keys(val).sort().reduce((result, key) => {
       result[key] = val[key];
@@ -54,6 +50,5 @@ function stableVariablesHash(value) {
   } catch (e) {
     throw new Error('Could not serialize variables. Make sure that the variables do not contain circular references and can be processed by JSON.stringify.');
   }
-
   return hash;
 }

package/build/cjs/react/hooks/stableVariablesHash.test.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _stableVariablesHash = require("./stableVariablesHash");
-
 describe('stableVariablesHash', () => {
   it('sorts objects before hashing', () => {
     const one = {

package/build/cjs/react/hooks/useDataEngine.js

@@ -4,14 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useDataEngine = void 0;
-
 var _react = require("react");
-
 var _DataContext = require("../context/DataContext");
-
 const useDataEngine = () => {
   const context = (0, _react.useContext)(_DataContext.DataContext);
   return context.engine;
 };
-
 exports.useDataEngine = useDataEngine;

package/build/cjs/react/hooks/useDataMutation.js

@@ -4,17 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useDataMutation = void 0;
-
 var _react = require("react");
-
 var _useDataEngine = require("./useDataEngine");
-
 var _useQueryExecutor = require("./useQueryExecutor");
-
 var _useStaticInput = require("./useStaticInput");
-
 const empty = {};
-
 const useDataMutation = function (mutation) {
   let {
     onComplete,
@@ -50,5 +44,4 @@ const useDataMutation = function (mutation) {
     data
   }];
 };
-
 exports.useDataMutation = useDataMutation;