studiokit-scaffolding-js 7.0.14-alpha.1 → 7.1.1

package/lib/utils/quill.js

@@ -1,26 +1,17 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.checkForNonPublicImages = void 0;
-var quill_1 = __importDefault(require("quill"));
-var uuid_1 = require("uuid");
-var actionCreator_1 = require("../redux/actionCreator");
-var noStoreSaga_1 = require("../redux/sagas/noStoreSaga");
-var fetch_1 = require("./fetch");
-var Delta = quill_1.default.import('delta');
+var _quill = _interopRequireDefault(require("quill"));
+var _uuid = require("uuid");
+var _actionCreator = require("../redux/actionCreator");
+var _noStoreSaga = require("../redux/sagas/noStoreSaga");
+var _fetch = require("./fetch");
+const Delta = _quill.default.import('delta');
+
 /**
  * Check for non-public in the provided quill contents. Update the ImageValue of an op if an image is found to be
  * non-public.
@@ -28,57 +19,55 @@ var Delta = quill_1.default.import('delta');
  * @param checkedImages A list of all images we have already processed in previous calls to this function.
  * list of processed images
  */
-var checkForNonPublicImages = function (quill, checkedImages) {
-    var _a, _b;
-    (_b = (_a = quill
-        .getContents()) === null || _a === void 0 ? void 0 : _a.ops // Is the op an image and have we not seen it before?
-    ) === null || _b === void 0 ? void 0 : _b.filter(function (op) {
-        return op.insert.image &&
-            !checkedImages.find(function (image) { return image.src === op.insert.image.src; }) &&
-            op.insert.image.src.startsWith('http');
-    }).forEach(function (op) {
-        // Check if the image is public. Do not check data:image urls
-        // Use the backend to check if the image is public
-        // Due to CSP and other security measures, we can't check this in the frontend
-        // uuidv5 is a deterministic uuid generator based on a namespace and a name
-        // uuidv5.URL is the namespace for urls
-        var hookId = uuid_1.v5(op.insert.image.src, uuid_1.v5.URL);
-        noStoreSaga_1.noStoreHooks.registerNoStoreActionHook(hookId, function (data) {
-            noStoreSaga_1.noStoreHooks.unregisterNoStoreActionHook(hookId);
-            var contentTypeKey;
-            /**
-             * API fetches the URL, and `noStoreSaga` returns either the result or error
-             * * `data` is `null` when the API could not fetch the URL with a successful status code, and returns `null` => `nonPublic`
-             * * `data` is `FetchErrorData` if the API request itself failed, e.g. from some unknown error, we don't know if the image is public => do not update
-             * * `data` is a dictionary of headers when the API does fetch the URL
-             *   * if there is no `Content-Type` header, we don't know if the image is public => do not update
-             *   * if there is a `Content-Type` header, but is NOT an image type (i.e. it was a 302 that, when followed returned HTML)
-             *     (I'm looking at you, Brightspace) => `nonPublic`
-             *   * if there is a `Content-Type` header, and it is an image type, then the image is public => do not update
-             */
-            if (!data ||
-                (!fetch_1.isFetchErrorData(data) &&
-                    (contentTypeKey = Object.keys(data).find(function (k) { return k.toLowerCase() === 'content-type'; })) &&
-                    !data[contentTypeKey][0].startsWith('image'))) {
-                var contents = quill.getContents();
-                var ops = contents.map(function (o) {
-                    var _a;
-                    return ((_a = o.insert.image) === null || _a === void 0 ? void 0 : _a.src) && op.insert.image.src && o.insert.image.src === op.insert.image.src
-                        ? __assign(__assign({}, o), { insert: __assign(__assign({}, o.insert), { image: __assign(__assign({}, o.insert.image), { nonPublic: true }) }) }) : o;
-                });
-                var updatedContents = contents.diff(new Delta(ops));
-                quill.updateContents(updatedContents);
+const checkForNonPublicImages = (quill, checkedImages) => {
+  quill.getContents().ops // Is the op an image and have we not seen it before?
+  ?.filter(op => op.insert.image && !checkedImages.find(image => image.src === op.insert.image.src) && op.insert.image.src.startsWith('http')).forEach(op => {
+    // Check if the image is public. Do not check data:image urls
+    // Use the backend to check if the image is public
+    // Due to CSP and other security measures, we can't check this in the frontend
+
+    // uuidv5 is a deterministic uuid generator based on a namespace and a name
+    // uuidv5.URL is the namespace for urls
+    const hookId = (0, _uuid.v5)(op.insert.image.src, _uuid.v5.URL);
+    _noStoreSaga.noStoreHooks.registerNoStoreActionHook(hookId, data => {
+      _noStoreSaga.noStoreHooks.unregisterNoStoreActionHook(hookId);
+      let contentTypeKey;
+      /**
+       * API fetches the URL, and `noStoreSaga` returns either the result or error
+       * * `data` is `null` when the API could not fetch the URL with a successful status code, and returns `null` => `nonPublic`
+       * * `data` is `FetchErrorData` if the API request itself failed, e.g. from some unknown error, we don't know if the image is public => do not update
+       * * `data` is a dictionary of headers when the API does fetch the URL
+       *   * if there is no `Content-Type` header, we don't know if the image is public => do not update
+       *   * if there is a `Content-Type` header, but is NOT an image type (i.e. it was a 302 that, when followed returned HTML)
+       *     (I'm looking at you, Brightspace) => `nonPublic`
+       *   * if there is a `Content-Type` header, and it is an image type, then the image is public => do not update
+       */
+      if (!data || !(0, _fetch.isFetchErrorData)(data) && (contentTypeKey = Object.keys(data).find(k => k.toLowerCase() === 'content-type')) && !data[contentTypeKey][0].startsWith('image')) {
+        const contents = quill.getContents();
+        const ops = contents.map(o => o.insert.image?.src && op.insert.image.src && o.insert.image.src === op.insert.image.src ? {
+          ...o,
+          insert: {
+            ...o.insert,
+            image: {
+              ...o.insert.image,
+              nonPublic: true
             }
-        });
-        // This endpoint returns headers for a url. If the url is nonexistent, it will return null
-        actionCreator_1.dispatchModelFetchRequest({
-            modelName: 'urlChecker',
-            guid: hookId,
-            noStore: true,
-            queryParams: {
-                url: op.insert.image.src
-            }
-        });
+          }
+        } : o);
+        const updatedContents = contents.diff(new Delta(ops));
+        quill.updateContents(updatedContents);
+      }
+    });
+    // This endpoint returns headers for a url. If the url is nonexistent, it will return null
+    (0, _actionCreator.dispatchModelFetchRequest)({
+      modelName: 'urlChecker',
+      guid: hookId,
+      noStore: true,
+      queryParams: {
+        url: op.insert.image.src
+      }
     });
+  });
 };
 exports.checkForNonPublicImages = checkForNonPublicImages;
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_quill","_interopRequireDefault","require","_uuid","_actionCreator","_noStoreSaga","_fetch","Delta","Quill","import","checkForNonPublicImages","quill","checkedImages","getContents","ops","filter","op","insert","image","find","src","startsWith","forEach","hookId","uuidv5","URL","noStoreHooks","registerNoStoreActionHook","data","unregisterNoStoreActionHook","contentTypeKey","isFetchErrorData","Object","keys","k","toLowerCase","contents","map","o","nonPublic","updatedContents","diff","updateContents","dispatchModelFetchRequest","modelName","guid","noStore","queryParams","url","exports"],"sources":["../../src/utils/quill.ts"],"sourcesContent":["import Quill, { DeltaOperation } from 'quill'\nimport { v5 as uuidv5 } from 'uuid'\nimport { ImageValue } from '../components/Quill/Formats/Image'\nimport { dispatchModelFetchRequest } from '../redux/actionCreator'\nimport { noStoreHooks } from '../redux/sagas/noStoreSaga'\nimport { FetchErrorData } from '../types'\nimport { isFetchErrorData } from './fetch'\n\nconst Delta = Quill.import('delta')\n\n/**\n * Check for non-public in the provided quill contents. Update the ImageValue of an op if an image is found to be\n * non-public.\n * @param quill The Quill instance\n * @param checkedImages A list of all images we have already processed in previous calls to this function.\n * list of processed images\n */\nexport const checkForNonPublicImages = (quill: Quill, checkedImages: ImageValue[]) => {\n\tquill\n\t\t.getContents()\n\t\t.ops // Is the op an image and have we not seen it before?\n\t\t?.filter(\n\t\t\top =>\n\t\t\t\top.insert.image &&\n\t\t\t\t!checkedImages.find(image => image.src === op.insert.image.src) &&\n\t\t\t\top.insert.image.src.startsWith('http')\n\t\t)\n\t\t.forEach(op => {\n\t\t\t// Check if the image is public. Do not check data:image urls\n\t\t\t// Use the backend to check if the image is public\n\t\t\t// Due to CSP and other security measures, we can't check this in the frontend\n\n\t\t\t// uuidv5 is a deterministic uuid generator based on a namespace and a name\n\t\t\t// uuidv5.URL is the namespace for urls\n\t\t\tconst hookId = uuidv5(op.insert.image.src, uuidv5.URL)\n\t\t\tnoStoreHooks.registerNoStoreActionHook(hookId, (data: Record<string, string[]> | FetchErrorData | null) => {\n\t\t\t\tnoStoreHooks.unregisterNoStoreActionHook(hookId)\n\t\t\t\tlet contentTypeKey: string | undefined\n\t\t\t\t/**\n\t\t\t\t * API fetches the URL, and `noStoreSaga` returns either the result or error\n\t\t\t\t * * `data` is `null` when the API could not fetch the URL with a successful status code, and returns `null` => `nonPublic`\n\t\t\t\t * * `data` is `FetchErrorData` if the API request itself failed, e.g. from some unknown error, we don't know if the image is public => do not update\n\t\t\t\t * * `data` is a dictionary of headers when the API does fetch the URL\n\t\t\t\t *   * if there is no `Content-Type` header, we don't know if the image is public => do not update\n\t\t\t\t *   * if there is a `Content-Type` header, but is NOT an image type (i.e. it was a 302 that, when followed returned HTML)\n\t\t\t\t *     (I'm looking at you, Brightspace) => `nonPublic`\n\t\t\t\t *   * if there is a `Content-Type` header, and it is an image type, then the image is public => do not update\n\t\t\t\t */\n\t\t\t\tif (\n\t\t\t\t\t!data ||\n\t\t\t\t\t(!isFetchErrorData(data) &&\n\t\t\t\t\t\t(contentTypeKey = Object.keys(data).find(k => k.toLowerCase() === 'content-type')) &&\n\t\t\t\t\t\t!data[contentTypeKey][0].startsWith('image'))\n\t\t\t\t) {\n\t\t\t\t\tconst contents = quill.getContents()\n\t\t\t\t\tconst ops = contents.map((o: DeltaOperation) =>\n\t\t\t\t\t\to.insert.image?.src && op.insert.image.src && o.insert.image.src === op.insert.image.src\n\t\t\t\t\t\t\t? {\n\t\t\t\t\t\t\t\t\t...o,\n\t\t\t\t\t\t\t\t\tinsert: {\n\t\t\t\t\t\t\t\t\t\t...o.insert,\n\t\t\t\t\t\t\t\t\t\timage: { ...o.insert.image, nonPublic: true }\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t: o\n\t\t\t\t\t)\n\t\t\t\t\tconst updatedContents = contents.diff(new Delta(ops))\n\t\t\t\t\tquill.updateContents(updatedContents)\n\t\t\t\t}\n\t\t\t})\n\t\t\t// This endpoint returns headers for a url. If the url is nonexistent, it will return null\n\t\t\tdispatchModelFetchRequest({\n\t\t\t\tmodelName: 'urlChecker',\n\t\t\t\tguid: hookId,\n\t\t\t\tnoStore: true,\n\t\t\t\tqueryParams: {\n\t\t\t\t\turl: op.insert.image.src\n\t\t\t\t}\n\t\t\t})\n\t\t})\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/utils/route.d.ts

@@ -1,5 +1,5 @@
 import { Dictionary } from 'lodash';
-export declare const getModelIdFromRouteMatchParams: (routeMatchParams: Dictionary<any>, modelName: string) => string | number | undefined;
-export declare const getPathParamsFromRouteMatchParams: (routeMatchParams: Dictionary<any>, modelName: string) => any[];
+export declare const getModelIdFromRouteMatchParams: (routeMatchParams: Dictionary<string>, modelName: string) => string | number | undefined;
+export declare const getPathParamsFromRouteMatchParams: (routeMatchParams: Dictionary<string>, modelName: string) => any[];
 export declare const getMinRequiredPathParamsCount: (modelName: string) => number;
 export declare const getReduxModelName: (pathParams: any[], modelName: string) => string;

package/lib/utils/route.js

@@ -1,69 +1,70 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReduxModelName = exports.getMinRequiredPathParamsCount = exports.getPathParamsFromRouteMatchParams = exports.getModelIdFromRouteMatchParams = void 0;
-var lodash_1 = __importDefault(require("lodash"));
-var pluralize_1 = __importDefault(require("pluralize"));
-var configuration_1 = require("../constants/configuration");
-var getModelIdFromRouteMatchParams = function (routeMatchParams, modelName) {
-    var singularModelName = pluralize_1.default.singular(modelName);
-    var id = routeMatchParams[singularModelName + "Id"];
-    if (isNaN(id)) {
-        return id;
-    }
-    return parseInt(id, 10);
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getReduxModelName = exports.getPathParamsFromRouteMatchParams = exports.getModelIdFromRouteMatchParams = exports.getMinRequiredPathParamsCount = void 0;
+var _lodash = _interopRequireDefault(require("lodash"));
+var _pluralize = _interopRequireDefault(require("pluralize"));
+var _configuration = require("../constants/configuration");
+const getModelIdFromRouteMatchParams = (routeMatchParams, modelName) => {
+  const singularModelName = _pluralize.default.singular(modelName);
+  const id = routeMatchParams[`${singularModelName}Id`];
+  if (!id || isNaN(Number(id))) {
+    return id;
+  }
+  return parseInt(id, 10);
 };
 exports.getModelIdFromRouteMatchParams = getModelIdFromRouteMatchParams;
-var getPathParamsFromRouteMatchParams = function (routeMatchParams, modelName) {
-    var pathParams = modelName.split('.').reduce(function (retval, levelName) {
-        var levelId = exports.getModelIdFromRouteMatchParams(routeMatchParams, levelName);
-        if (levelId) {
-            retval.push(levelId);
-        }
-        return retval;
-    }, []);
-    return pathParams;
+const getPathParamsFromRouteMatchParams = (routeMatchParams, modelName) => {
+  const pathParams = modelName.split('.').reduce((retval, levelName) => {
+    const levelId = getModelIdFromRouteMatchParams(routeMatchParams, levelName);
+    if (levelId) {
+      retval.push(levelId);
+    }
+    return retval;
+  }, []);
+  return pathParams;
 };
 exports.getPathParamsFromRouteMatchParams = getPathParamsFromRouteMatchParams;
-var getMinRequiredPathParamsCount = function (modelName) {
-    var endpointMappings = configuration_1.getEndpointMappings();
-    var pathParamCount = 0;
-    var modelLevelNames = modelName.split('.');
-    modelLevelNames.forEach(function (levelName, index) {
-        var modelLevelName = modelLevelNames.slice(0, index + 1).join('.');
-        var modelLevel = modelLevelName ? lodash_1.default.get(endpointMappings, modelLevelName) : {};
-        var modelConfig = lodash_1.default.merge({}, modelLevel._config);
-        if (modelConfig.isCollection && index + 1 < modelLevelNames.length) {
-            pathParamCount++;
-        }
-    });
-    return pathParamCount;
+const getMinRequiredPathParamsCount = modelName => {
+  const endpointMappings = (0, _configuration.getEndpointMappings)();
+  let pathParamCount = 0;
+  const modelLevelNames = modelName.split('.');
+  modelLevelNames.forEach((levelName, index) => {
+    const modelLevelName = modelLevelNames.slice(0, index + 1).join('.');
+    const modelLevel = modelLevelName ? _lodash.default.get(endpointMappings, modelLevelName) : {};
+    const modelConfig = _lodash.default.merge({}, modelLevel._config);
+    if (modelConfig.isCollection && index + 1 < modelLevelNames.length) {
+      pathParamCount++;
+    }
+  });
+  return pathParamCount;
 };
 exports.getMinRequiredPathParamsCount = getMinRequiredPathParamsCount;
-var getReduxModelName = function (pathParams, modelName) {
-    var endpointMappings = configuration_1.getEndpointMappings();
-    var reduxModelName = modelName;
-    if (pathParams.length > 0) {
-        var pathParamIndex_1 = 0;
-        var modelLevelNames_1 = modelName.split('.');
-        modelLevelNames_1.forEach(function (levelName, index) {
-            var modelLevelName = modelLevelNames_1.slice(0, index + 1).join('.');
-            var modelLevel = modelLevelName ? lodash_1.default.get(endpointMappings, modelLevelName) : {};
-            var modelConfig = lodash_1.default.merge({}, modelLevel._config);
-            if (index === 0) {
-                reduxModelName = levelName;
-            }
-            else {
-                reduxModelName = reduxModelName + "." + levelName;
-            }
-            if (pathParams.length - 1 >= pathParamIndex_1 && modelConfig.isCollection) {
-                reduxModelName = reduxModelName + "." + pathParams[pathParamIndex_1];
-                pathParamIndex_1++;
-            }
-        });
-    }
-    return reduxModelName;
+const getReduxModelName = (pathParams, modelName) => {
+  const endpointMappings = (0, _configuration.getEndpointMappings)();
+  let reduxModelName = modelName;
+  if (pathParams.length > 0) {
+    let pathParamIndex = 0;
+    const modelLevelNames = modelName.split('.');
+    modelLevelNames.forEach((levelName, index) => {
+      const modelLevelName = modelLevelNames.slice(0, index + 1).join('.');
+      const modelLevel = modelLevelName ? _lodash.default.get(endpointMappings, modelLevelName) : {};
+      const modelConfig = _lodash.default.merge({}, modelLevel._config);
+      if (index === 0) {
+        reduxModelName = levelName;
+      } else {
+        reduxModelName = `${reduxModelName}.${levelName}`;
+      }
+      if (pathParams.length - 1 >= pathParamIndex && modelConfig.isCollection) {
+        reduxModelName = `${reduxModelName}.${pathParams[pathParamIndex]}`;
+        pathParamIndex++;
+      }
+    });
+  }
+  return reduxModelName;
 };
 exports.getReduxModelName = getReduxModelName;
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfbG9kYXNoIiwiX2ludGVyb3BSZXF1aXJlRGVmYXVsdCIsInJlcXVpcmUiLCJfcGx1cmFsaXplIiwiX2NvbmZpZ3VyYXRpb24iLCJnZXRNb2RlbElkRnJvbVJvdXRlTWF0Y2hQYXJhbXMiLCJyb3V0ZU1hdGNoUGFyYW1zIiwibW9kZWxOYW1lIiwic2luZ3VsYXJNb2RlbE5hbWUiLCJwbHVyYWxpemUiLCJzaW5ndWxhciIsImlkIiwiaXNOYU4iLCJOdW1iZXIiLCJwYXJzZUludCIsImV4cG9ydHMiLCJnZXRQYXRoUGFyYW1zRnJvbVJvdXRlTWF0Y2hQYXJhbXMiLCJwYXRoUGFyYW1zIiwic3BsaXQiLCJyZWR1Y2UiLCJyZXR2YWwiLCJsZXZlbE5hbWUiLCJsZXZlbElkIiwicHVzaCIsImdldE1pblJlcXVpcmVkUGF0aFBhcmFtc0NvdW50IiwiZW5kcG9pbnRNYXBwaW5ncyIsImdldEVuZHBvaW50TWFwcGluZ3MiLCJwYXRoUGFyYW1Db3VudCIsIm1vZGVsTGV2ZWxOYW1lcyIsImZvckVhY2giLCJpbmRleCIsIm1vZGVsTGV2ZWxOYW1lIiwic2xpY2UiLCJqb2luIiwibW9kZWxMZXZlbCIsIl8iLCJnZXQiLCJtb2RlbENvbmZpZyIsIm1lcmdlIiwiX2NvbmZpZyIsImlzQ29sbGVjdGlvbiIsImxlbmd0aCIsImdldFJlZHV4TW9kZWxOYW1lIiwicmVkdXhNb2RlbE5hbWUiLCJwYXRoUGFyYW1JbmRleCJdLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9yb3V0ZS50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXywgeyBEaWN0aW9uYXJ5IH0gZnJvbSAnbG9kYXNoJ1xuaW1wb3J0IHBsdXJhbGl6ZSBmcm9tICdwbHVyYWxpemUnXG5pbXBvcnQgeyBnZXRFbmRwb2ludE1hcHBpbmdzIH0gZnJvbSAnLi4vY29uc3RhbnRzL2NvbmZpZ3VyYXRpb24nXG5cbmV4cG9ydCBjb25zdCBnZXRNb2RlbElkRnJvbVJvdXRlTWF0Y2hQYXJhbXMgPSAocm91dGVNYXRjaFBhcmFtczogRGljdGlvbmFyeTxzdHJpbmc+LCBtb2RlbE5hbWU6IHN0cmluZykgPT4ge1xuXHRjb25zdCBzaW5ndWxhck1vZGVsTmFtZSA9IHBsdXJhbGl6ZS5zaW5ndWxhcihtb2RlbE5hbWUpXG5cdGNvbnN0IGlkID0gcm91dGVNYXRjaFBhcmFtc1tgJHtzaW5ndWxhck1vZGVsTmFtZX1JZGBdIGFzIHN0cmluZyB8IHVuZGVmaW5lZFxuXHRpZiAoIWlkIHx8IGlzTmFOKE51bWJlcihpZCkpKSB7XG5cdFx0cmV0dXJuIGlkXG5cdH1cblx0cmV0dXJuIHBhcnNlSW50KGlkLCAxMClcbn1cblxuZXhwb3J0IGNvbnN0IGdldFBhdGhQYXJhbXNGcm9tUm91dGVNYXRjaFBhcmFtcyA9IChyb3V0ZU1hdGNoUGFyYW1zOiBEaWN0aW9uYXJ5PHN0cmluZz4sIG1vZGVsTmFtZTogc3RyaW5nKSA9PiB7XG5cdGNvbnN0IHBhdGhQYXJhbXMgPSBtb2RlbE5hbWUuc3BsaXQoJy4nKS5yZWR1Y2UoKHJldHZhbDogYW55W10sIGxldmVsTmFtZSkgPT4ge1xuXHRcdGNvbnN0IGxldmVsSWQgPSBnZXRNb2RlbElkRnJvbVJvdXRlTWF0Y2hQYXJhbXMocm91dGVNYXRjaFBhcmFtcywgbGV2ZWxOYW1lKVxuXHRcdGlmIChsZXZlbElkKSB7XG5cdFx0XHRyZXR2YWwucHVzaChsZXZlbElkKVxuXHRcdH1cblx0XHRyZXR1cm4gcmV0dmFsXG5cdH0sIFtdKVxuXHRyZXR1cm4gcGF0aFBhcmFtc1xufVxuXG5leHBvcnQgY29uc3QgZ2V0TWluUmVxdWlyZWRQYXRoUGFyYW1zQ291bnQgPSAobW9kZWxOYW1lOiBzdHJpbmcpID0+IHtcblx0Y29uc3QgZW5kcG9pbnRNYXBwaW5ncyA9IGdldEVuZHBvaW50TWFwcGluZ3MoKVxuXHRsZXQgcGF0aFBhcmFtQ291bnQgPSAwXG5cdGNvbnN0IG1vZGVsTGV2ZWxOYW1lcyA9IG1vZGVsTmFtZS5zcGxpdCgnLicpXG5cdG1vZGVsTGV2ZWxOYW1lcy5mb3JFYWNoKChsZXZlbE5hbWUsIGluZGV4KSA9PiB7XG5cdFx0Y29uc3QgbW9kZWxMZXZlbE5hbWUgPSBtb2RlbExldmVsTmFtZXMuc2xpY2UoMCwgaW5kZXggKyAxKS5qb2luKCcuJylcblx0XHRjb25zdCBtb2RlbExldmVsID0gbW9kZWxMZXZlbE5hbWUgPyBfLmdldChlbmRwb2ludE1hcHBpbmdzLCBtb2RlbExldmVsTmFtZSkgOiB7fVxuXHRcdGNvbnN0IG1vZGVsQ29uZmlnID0gXy5tZXJnZSh7fSwgbW9kZWxMZXZlbC5fY29uZmlnKVxuXHRcdGlmIChtb2RlbENvbmZpZy5pc0NvbGxlY3Rpb24gJiYgaW5kZXggKyAxIDwgbW9kZWxMZXZlbE5hbWVzLmxlbmd0aCkge1xuXHRcdFx0cGF0aFBhcmFtQ291bnQrK1xuXHRcdH1cblx0fSlcblx0cmV0dXJuIHBhdGhQYXJhbUNvdW50XG59XG5cbmV4cG9ydCBjb25zdCBnZXRSZWR1eE1vZGVsTmFtZSA9IChwYXRoUGFyYW1zOiBhbnlbXSwgbW9kZWxOYW1lOiBzdHJpbmcpID0+IHtcblx0Y29uc3QgZW5kcG9pbnRNYXBwaW5ncyA9IGdldEVuZHBvaW50TWFwcGluZ3MoKVxuXHRsZXQgcmVkdXhNb2RlbE5hbWUgPSBtb2RlbE5hbWVcblx0aWYgKHBhdGhQYXJhbXMubGVuZ3RoID4gMCkge1xuXHRcdGxldCBwYXRoUGFyYW1JbmRleCA9IDBcblx0XHRjb25zdCBtb2RlbExldmVsTmFtZXMgPSBtb2RlbE5hbWUuc3BsaXQoJy4nKVxuXHRcdG1vZGVsTGV2ZWxOYW1lcy5mb3JFYWNoKChsZXZlbE5hbWUsIGluZGV4KSA9PiB7XG5cdFx0XHRjb25zdCBtb2RlbExldmVsTmFtZSA9IG1vZGVsTGV2ZWxOYW1lcy5zbGljZSgwLCBpbmRleCArIDEpLmpvaW4oJy4nKVxuXHRcdFx0Y29uc3QgbW9kZWxMZXZlbCA9IG1vZGVsTGV2ZWxOYW1lID8gXy5nZXQoZW5kcG9pbnRNYXBwaW5ncywgbW9kZWxMZXZlbE5hbWUpIDoge31cblx0XHRcdGNvbnN0IG1vZGVsQ29uZmlnID0gXy5tZXJnZSh7fSwgbW9kZWxMZXZlbC5fY29uZmlnKVxuXHRcdFx0aWYgKGluZGV4ID09PSAwKSB7XG5cdFx0XHRcdHJlZHV4TW9kZWxOYW1lID0gbGV2ZWxOYW1lXG5cdFx0XHR9IGVsc2Uge1xuXHRcdFx0XHRyZWR1eE1vZGVsTmFtZSA9IGAke3JlZHV4TW9kZWxOYW1lfS4ke2xldmVsTmFtZX1gXG5cdFx0XHR9XG5cdFx0XHRpZiAocGF0aFBhcmFtcy5sZW5ndGggLSAxID49IHBhdGhQYXJhbUluZGV4ICYmIG1vZGVsQ29uZmlnLmlzQ29sbGVjdGlvbikge1xuXHRcdFx0XHRyZWR1eE1vZGVsTmFtZSA9IGAke3JlZHV4TW9kZWxOYW1lfS4ke3BhdGhQYXJhbXNbcGF0aFBhcmFtSW5kZXhdfWBcblx0XHRcdFx0cGF0aFBhcmFtSW5kZXgrK1xuXHRcdFx0fVxuXHRcdH0pXG5cdH1cblx0cmV0dXJuIHJlZHV4TW9kZWxOYW1lXG59XG4iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFBQSxJQUFBQSxPQUFBLEdBQUFDLHNCQUFBLENBQUFDLE9BQUE7QUFDQSxJQUFBQyxVQUFBLEdBQUFGLHNCQUFBLENBQUFDLE9BQUE7QUFDQSxJQUFBRSxjQUFBLEdBQUFGLE9BQUE7QUFFTyxNQUFNRyw4QkFBOEIsR0FBR0EsQ0FBQ0MsZ0JBQW9DLEVBQUVDLFNBQWlCLEtBQUs7RUFDMUcsTUFBTUMsaUJBQWlCLEdBQUdDLGtCQUFTLENBQUNDLFFBQVEsQ0FBQ0gsU0FBUyxDQUFDO0VBQ3ZELE1BQU1JLEVBQUUsR0FBR0wsZ0JBQWdCLENBQUMsR0FBR0UsaUJBQWlCLElBQUksQ0FBdUI7RUFDM0UsSUFBSSxDQUFDRyxFQUFFLElBQUlDLEtBQUssQ0FBQ0MsTUFBTSxDQUFDRixFQUFFLENBQUMsQ0FBQyxFQUFFO0lBQzdCLE9BQU9BLEVBQUU7RUFDVjtFQUNBLE9BQU9HLFFBQVEsQ0FBQ0gsRUFBRSxFQUFFLEVBQUUsQ0FBQztBQUN4QixDQUFDO0FBQUFJLE9BQUEsQ0FBQVYsOEJBQUEsR0FBQUEsOEJBQUE7QUFFTSxNQUFNVyxpQ0FBaUMsR0FBR0EsQ0FBQ1YsZ0JBQW9DLEVBQUVDLFNBQWlCLEtBQUs7RUFDN0csTUFBTVUsVUFBVSxHQUFHVixTQUFTLENBQUNXLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQ0MsTUFBTSxDQUFDLENBQUNDLE1BQWEsRUFBRUMsU0FBUyxLQUFLO0lBQzVFLE1BQU1DLE9BQU8sR0FBR2pCLDhCQUE4QixDQUFDQyxnQkFBZ0IsRUFBRWUsU0FBUyxDQUFDO0lBQzNFLElBQUlDLE9BQU8sRUFBRTtNQUNaRixNQUFNLENBQUNHLElBQUksQ0FBQ0QsT0FBTyxDQUFDO0lBQ3JCO0lBQ0EsT0FBT0YsTUFBTTtFQUNkLENBQUMsRUFBRSxFQUFFLENBQUM7RUFDTixPQUFPSCxVQUFVO0FBQ2xCLENBQUM7QUFBQUYsT0FBQSxDQUFBQyxpQ0FBQSxHQUFBQSxpQ0FBQTtBQUVNLE1BQU1RLDZCQUE2QixHQUFJakIsU0FBaUIsSUFBSztFQUNuRSxNQUFNa0IsZ0JBQWdCLEdBQUcsSUFBQUMsa0NBQW1CLEVBQUMsQ0FBQztFQUM5QyxJQUFJQyxjQUFjLEdBQUcsQ0FBQztFQUN0QixNQUFNQyxlQUFlLEdBQUdyQixTQUFTLENBQUNXLEtBQUssQ0FBQyxHQUFHLENBQUM7RUFDNUNVLGVBQWUsQ0FBQ0MsT0FBTyxDQUFDLENBQUNSLFNBQVMsRUFBRVMsS0FBSyxLQUFLO0lBQzdDLE1BQU1DLGNBQWMsR0FBR0gsZUFBZSxDQUFDSSxLQUFLLENBQUMsQ0FBQyxFQUFFRixLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUNHLElBQUksQ0FBQyxHQUFHLENBQUM7SUFDcEUsTUFBTUMsVUFBVSxHQUFHSCxjQUFjLEdBQUdJLGVBQUMsQ0FBQ0MsR0FBRyxDQUFDWCxnQkFBZ0IsRUFBRU0sY0FBYyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ2hGLE1BQU1NLFdBQVcsR0FBR0YsZUFBQyxDQUFDRyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUVKLFVBQVUsQ0FBQ0ssT0FBTyxDQUFDO0lBQ25ELElBQUlGLFdBQVcsQ0FBQ0csWUFBWSxJQUFJVixLQUFLLEdBQUcsQ0FBQyxHQUFHRixlQUFlLENBQUNhLE1BQU0sRUFBRTtNQUNuRWQsY0FBYyxFQUFFO0lBQ2pCO0VBQ0QsQ0FBQyxDQUFDO0VBQ0YsT0FBT0EsY0FBYztBQUN0QixDQUFDO0FBQUFaLE9BQUEsQ0FBQVMsNkJBQUEsR0FBQUEsNkJBQUE7QUFFTSxNQUFNa0IsaUJBQWlCLEdBQUdBLENBQUN6QixVQUFpQixFQUFFVixTQUFpQixLQUFLO0VBQzFFLE1BQU1rQixnQkFBZ0IsR0FBRyxJQUFBQyxrQ0FBbUIsRUFBQyxDQUFDO0VBQzlDLElBQUlpQixjQUFjLEdBQUdwQyxTQUFTO0VBQzlCLElBQUlVLFVBQVUsQ0FBQ3dCLE1BQU0sR0FBRyxDQUFDLEVBQUU7SUFDMUIsSUFBSUcsY0FBYyxHQUFHLENBQUM7SUFDdEIsTUFBTWhCLGVBQWUsR0FBR3JCLFNBQVMsQ0FBQ1csS0FBSyxDQUFDLEdBQUcsQ0FBQztJQUM1Q1UsZUFBZSxDQUFDQyxPQUFPLENBQUMsQ0FBQ1IsU0FBUyxFQUFFUyxLQUFLLEtBQUs7TUFDN0MsTUFBTUMsY0FBYyxHQUFHSCxlQUFlLENBQUNJLEtBQUssQ0FBQyxDQUFDLEVBQUVGLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQ0csSUFBSSxDQUFDLEdBQUcsQ0FBQztNQUNwRSxNQUFNQyxVQUFVLEdBQUdILGNBQWMsR0FBR0ksZUFBQyxDQUFDQyxHQUFHLENBQUNYLGdCQUFnQixFQUFFTSxjQUFjLENBQUMsR0FBRyxDQUFDLENBQUM7TUFDaEYsTUFBTU0sV0FBVyxHQUFHRixlQUFDLENBQUNHLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRUosVUFBVSxDQUFDSyxPQUFPLENBQUM7TUFDbkQsSUFBSVQsS0FBSyxLQUFLLENBQUMsRUFBRTtRQUNoQmEsY0FBYyxHQUFHdEIsU0FBUztNQUMzQixDQUFDLE1BQU07UUFDTnNCLGNBQWMsR0FBRyxHQUFHQSxjQUFjLElBQUl0QixTQUFTLEVBQUU7TUFDbEQ7TUFDQSxJQUFJSixVQUFVLENBQUN3QixNQUFNLEdBQUcsQ0FBQyxJQUFJRyxjQUFjLElBQUlQLFdBQVcsQ0FBQ0csWUFBWSxFQUFFO1FBQ3hFRyxjQUFjLEdBQUcsR0FBR0EsY0FBYyxJQUFJMUIsVUFBVSxDQUFDMkIsY0FBYyxDQUFDLEVBQUU7UUFDbEVBLGNBQWMsRUFBRTtNQUNqQjtJQUNELENBQUMsQ0FBQztFQUNIO0VBQ0EsT0FBT0QsY0FBYztBQUN0QixDQUFDO0FBQUE1QixPQUFBLENBQUEyQixpQkFBQSxHQUFBQSxpQkFBQSIsImlnbm9yZUxpc3QiOltdfQ==

package/lib/utils/search.d.ts

@@ -14,7 +14,7 @@ export declare const isEntityMatchedByKeywords: (entity: {
 export declare const searchEntities: <T extends {
     isDeleted: boolean;
     activities: string[];
-}>(entityArray: T[], entityMatchFunction: (entity: T, keywordsList: string[]) => boolean, readActivity: string, canReadAnyGlobally?: boolean | undefined, keywords?: string | undefined) => Record<number, T[]>;
+}>(entityArray: T[], entityMatchFunction: (entity: T, keywordsList: string[]) => boolean, readActivity: string, canReadAnyGlobally?: boolean, keywords?: string) => Record<number, T[]>;
 export interface SearchModelArrayParams<TModel> {
     modelArray: TModel[];
     canReadyAnyGlobally?: boolean;

package/lib/utils/search.js

@@ -1,96 +1,89 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchGroups = exports.searchEntities = exports.isEntityMatchedByKeywords = exports.isEntityMatchedByKeyword = exports.isEntityUserMatchedByKeyword = exports.getKeywordsList = void 0;
-var table_1 = require("../constants/table");
-var date_1 = require("./date");
-var groupDates_1 = require("./groupDates");
-var groupRoles_1 = require("./groupRoles");
-var getKeywordsList = function (keywords) {
-    if (!keywords)
-        return [];
-    return keywords
-        .trim()
-        .toLowerCase()
-        .split(' ')
-        .filter(function (k) { return !!k; });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.searchGroups = exports.searchEntities = exports.isEntityUserMatchedByKeyword = exports.isEntityMatchedByKeywords = exports.isEntityMatchedByKeyword = exports.getKeywordsList = void 0;
+var _table = require("../constants/table");
+var _date = require("./date");
+var _groupDates = require("./groupDates");
+var _groupRoles = require("./groupRoles");
+const getKeywordsList = keywords => {
+  if (!keywords) return [];
+  return keywords.trim().toLowerCase().split(' ').filter(k => !!k);
 };
 exports.getKeywordsList = getKeywordsList;
-var isEntityUserMatchedByKeyword = function (owner, keyword) {
-    var _a, _b, _c, _d;
-    return owner.id.toString().toLowerCase().includes(keyword) ||
-        !!((_a = owner.firstName) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes(keyword)) ||
-        !!((_b = owner.lastName) === null || _b === void 0 ? void 0 : _b.toString().toLowerCase().includes(keyword)) ||
-        !!((_c = owner.email) === null || _c === void 0 ? void 0 : _c.toString().toLowerCase().includes(keyword)) ||
-        !!((_d = owner.uid) === null || _d === void 0 ? void 0 : _d.toString().toLowerCase().includes(keyword));
-};
+const isEntityUserMatchedByKeyword = (owner, keyword) => owner.id.toLowerCase().includes(keyword) || !!owner.firstName?.toLowerCase().includes(keyword) || !!owner.lastName?.toString().toLowerCase().includes(keyword) || !!owner.email?.toString().toLowerCase().includes(keyword) || !!owner.uid?.toString().toLowerCase().includes(keyword);
 exports.isEntityUserMatchedByKeyword = isEntityUserMatchedByKeyword;
-var isEntityMatchedByKeyword = function (entity, keyword) {
-    return entity.id.toString().toLowerCase().includes(keyword) ||
-        entity.name.toLowerCase().includes(keyword) ||
-        entity.owners.some(function (owner) { return exports.isEntityUserMatchedByKeyword(owner, keyword); });
-};
+const isEntityMatchedByKeyword = (entity, keyword) => entity.id.toString().toLowerCase().includes(keyword) || entity.name.toLowerCase().includes(keyword) || entity.owners.some(owner => isEntityUserMatchedByKeyword(owner, keyword));
 exports.isEntityMatchedByKeyword = isEntityMatchedByKeyword;
-var isEntityMatchedByKeywords = function (entity, keywordsList) { return !keywordsList || keywordsList.length === 0 || keywordsList.every(function (k) { return exports.isEntityMatchedByKeyword(entity, k); }); };
+const isEntityMatchedByKeywords = (entity, keywordsList) => keywordsList.length === 0 || keywordsList.every(k => isEntityMatchedByKeyword(entity, k));
 exports.isEntityMatchedByKeywords = isEntityMatchedByKeywords;
-var searchEntities = function (entityArray, entityMatchFunction, readActivity, canReadAnyGlobally, keywords) {
-    var _a;
-    var keywordsList = exports.getKeywordsList(keywords);
-    var filteredEntities = entityArray.reduce(function (acc, e) {
-        var _a;
-        // exclude if cannot read any entity and does not have the read activity
-        if (!canReadAnyGlobally && !e.activities.includes(readActivity))
-            return acc;
-        // exclude if does not match, if any
-        if (!entityMatchFunction(e, keywordsList))
-            return acc;
-        // add entity to the corresponding tab filtered array
-        var tab = e.isDeleted ? table_1.MANAGE_TABLE_TAB.DELETED : table_1.MANAGE_TABLE_TAB.AVAILABLE;
-        var tabArray = (_a = acc[tab]) !== null && _a !== void 0 ? _a : [];
-        tabArray.push(e);
-        acc[tab] = tabArray;
-        return acc;
-    }, (_a = {}, _a[table_1.MANAGE_TABLE_TAB.AVAILABLE] = [], _a[table_1.MANAGE_TABLE_TAB.DELETED] = [], _a));
-    return filteredEntities;
+const searchEntities = (entityArray, entityMatchFunction, readActivity, canReadAnyGlobally, keywords) => {
+  const keywordsList = getKeywordsList(keywords);
+  const filteredEntities = entityArray.reduce((acc, e) => {
+    // exclude if cannot read any entity and does not have the read activity
+    if (!canReadAnyGlobally && !e.activities.includes(readActivity)) return acc;
+    // exclude if does not match, if any
+    if (!entityMatchFunction(e, keywordsList)) return acc;
+    // add entity to the corresponding tab filtered array
+    const tab = e.isDeleted ? _table.MANAGE_TABLE_TAB.DELETED : _table.MANAGE_TABLE_TAB.AVAILABLE;
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    const tabArray = acc[tab] ?? [];
+    tabArray.push(e);
+    acc[tab] = tabArray;
+    return acc;
+  }, {
+    [_table.MANAGE_TABLE_TAB.AVAILABLE]: [],
+    [_table.MANAGE_TABLE_TAB.DELETED]: []
+  });
+  return filteredEntities;
 };
+
+//#region Groups
 exports.searchEntities = searchEntities;
-var getGroupTab = function (group, endDate) {
-    if (group.isDeleted) {
-        return table_1.GROUP_MANAGE_TABLE_TAB.DELETED;
-    }
-    else if (!!group.id && date_1.isNowBeforeDate(endDate)) {
-        return table_1.GROUP_MANAGE_TABLE_TAB.CURRENT;
-    }
-    return table_1.GROUP_MANAGE_TABLE_TAB.PAST;
+const getGroupTab = (group, endDate) => {
+  if (group.isDeleted) {
+    return _table.GROUP_MANAGE_TABLE_TAB.DELETED;
+  } else if (!!group.id && (0, _date.isNowBeforeDate)(endDate)) {
+    return _table.GROUP_MANAGE_TABLE_TAB.CURRENT;
+  }
+  return _table.GROUP_MANAGE_TABLE_TAB.PAST;
 };
-var searchGroups = function (_a) {
-    var _b;
-    var groups = _a.groups, groupsArray = _a.modelArray, externalTerms = _a.externalTerms, canReadyAnyGlobally = _a.canReadyAnyGlobally, keywords = _a.keywords, dateString = _a.dateString;
-    var keywordsList = exports.getKeywordsList(keywords);
-    var visibleGroups = canReadyAnyGlobally ? groupsArray : groupRoles_1.groupsAsAnythingButLearner(groups);
-    var filteredGroups = visibleGroups.reduce(function (acc, g) {
-        var _a;
-        // exclude if does not match keywords, if any
-        if (!exports.isEntityMatchedByKeywords(g, keywordsList))
-            return acc;
-        var startDate = groupDates_1.getStartDate(externalTerms, g);
-        var endDate = groupDates_1.getEndDate(externalTerms, g);
-        // exclude if search dateString is not between group start and end dates
-        if (!!dateString &&
-            (date_1.getLocalMomentFromUtc(dateString) < date_1.getLocalMomentFromUtc(startDate) ||
-                date_1.getLocalMomentFromUtc(dateString) > date_1.getLocalMomentFromUtc(endDate))) {
-            return acc;
-        }
-        var tab = getGroupTab(g, endDate);
-        var tabArray = (_a = acc[tab]) !== null && _a !== void 0 ? _a : [];
-        tabArray.push(g);
-        acc[tab] = tabArray;
-        return acc;
-    }, (_b = {},
-        _b[table_1.GROUP_MANAGE_TABLE_TAB.CURRENT] = [],
-        _b[table_1.GROUP_MANAGE_TABLE_TAB.PAST] = [],
-        _b[table_1.GROUP_MANAGE_TABLE_TAB.DELETED] = [],
-        _b));
-    return filteredGroups;
+const searchGroups = _ref => {
+  let {
+    groups,
+    modelArray: groupsArray,
+    externalTerms,
+    canReadyAnyGlobally,
+    keywords,
+    dateString
+  } = _ref;
+  const keywordsList = getKeywordsList(keywords);
+  const visibleGroups = canReadyAnyGlobally ? groupsArray : (0, _groupRoles.groupsAsAnythingButLearner)(groups);
+  const filteredGroups = visibleGroups.reduce((acc, g) => {
+    // exclude if does not match keywords, if any
+    if (!isEntityMatchedByKeywords(g, keywordsList)) return acc;
+    const startDate = (0, _groupDates.getStartDate)(externalTerms, g);
+    const endDate = (0, _groupDates.getEndDate)(externalTerms, g);
+    // exclude if search dateString is not between group start and end dates
+    if (!!dateString && ((0, _date.getLocalMomentFromUtc)(dateString) < (0, _date.getLocalMomentFromUtc)(startDate) || (0, _date.getLocalMomentFromUtc)(dateString) > (0, _date.getLocalMomentFromUtc)(endDate))) {
+      return acc;
+    }
+    const tab = getGroupTab(g, endDate);
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    const tabArray = acc[tab] ?? [];
+    tabArray.push(g);
+    acc[tab] = tabArray;
+    return acc;
+  }, {
+    [_table.GROUP_MANAGE_TABLE_TAB.CURRENT]: [],
+    [_table.GROUP_MANAGE_TABLE_TAB.PAST]: [],
+    [_table.GROUP_MANAGE_TABLE_TAB.DELETED]: []
+  });
+  return filteredGroups;
 };
-exports.searchGroups = searchGroups;
+
 //#endregion Groups
+exports.searchGroups = searchGroups;
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["_table","require","_date","_groupDates","_groupRoles","getKeywordsList","keywords","trim","toLowerCase","split","filter","k","exports","isEntityUserMatchedByKeyword","owner","keyword","id","includes","firstName","lastName","toString","email","uid","isEntityMatchedByKeyword","entity","name","owners","some","isEntityMatchedByKeywords","keywordsList","length","every","searchEntities","entityArray","entityMatchFunction","readActivity","canReadAnyGlobally","filteredEntities","reduce","acc","e","activities","tab","isDeleted","MANAGE_TABLE_TAB","DELETED","AVAILABLE","tabArray","push","getGroupTab","group","endDate","GROUP_MANAGE_TABLE_TAB","isNowBeforeDate","CURRENT","PAST","searchGroups","_ref","groups","modelArray","groupsArray","externalTerms","canReadyAnyGlobally","dateString","visibleGroups","groupsAsAnythingButLearner","filteredGroups","g","startDate","getStartDate","getEndDate","getLocalMomentFromUtc"],"sources":["../../src/utils/search.ts"],"sourcesContent":["import { GROUP_MANAGE_TABLE_TAB, MANAGE_TABLE_TAB } from '../constants/table'\nimport { EntityUser, ExternalTerm, Group, ModelCollection } from '../types'\nimport { getLocalMomentFromUtc, isNowBeforeDate } from './date'\nimport { getEndDate, getStartDate } from './groupDates'\nimport { groupsAsAnythingButLearner } from './groupRoles'\n\nexport const getKeywordsList = (keywords: string | undefined) => {\n\tif (!keywords) return []\n\treturn keywords\n\t\t.trim()\n\t\t.toLowerCase()\n\t\t.split(' ')\n\t\t.filter(k => !!k)\n}\n\nexport const isEntityUserMatchedByKeyword = (owner: EntityUser, keyword: string) =>\n\towner.id.toLowerCase().includes(keyword) ||\n\t!!owner.firstName?.toLowerCase().includes(keyword) ||\n\t!!owner.lastName?.toString().toLowerCase().includes(keyword) ||\n\t!!owner.email?.toString().toLowerCase().includes(keyword) ||\n\t!!owner.uid?.toString().toLowerCase().includes(keyword)\n\nexport const isEntityMatchedByKeyword = (entity: { id: number; name: string; owners: EntityUser[] }, keyword: string) =>\n\tentity.id.toString().toLowerCase().includes(keyword) ||\n\tentity.name.toLowerCase().includes(keyword) ||\n\tentity.owners.some(owner => isEntityUserMatchedByKeyword(owner, keyword))\n\nexport const isEntityMatchedByKeywords = (\n\tentity: { id: number; name: string; owners: EntityUser[] },\n\tkeywordsList: string[]\n) => keywordsList.length === 0 || keywordsList.every(k => isEntityMatchedByKeyword(entity, k))\n\nexport const searchEntities = <T extends { isDeleted: boolean; activities: string[] }>(\n\tentityArray: T[],\n\tentityMatchFunction: (entity: T, keywordsList: string[]) => boolean,\n\treadActivity: string,\n\tcanReadAnyGlobally?: boolean,\n\tkeywords?: string\n) => {\n\tconst keywordsList = getKeywordsList(keywords)\n\tconst filteredEntities = entityArray.reduce<Record<number, T[]>>(\n\t\t(acc, e) => {\n\t\t\t// exclude if cannot read any entity and does not have the read activity\n\t\t\tif (!canReadAnyGlobally && !e.activities.includes(readActivity)) return acc\n\t\t\t// exclude if does not match, if any\n\t\t\tif (!entityMatchFunction(e, keywordsList)) return acc\n\t\t\t// add entity to the corresponding tab filtered array\n\t\t\tconst tab = e.isDeleted ? MANAGE_TABLE_TAB.DELETED : MANAGE_TABLE_TAB.AVAILABLE\n\t\t\t// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n\t\t\tconst tabArray: T[] = acc[tab] ?? []\n\t\t\ttabArray.push(e)\n\t\t\tacc[tab] = tabArray\n\t\t\treturn acc\n\t\t},\n\t\t{ [MANAGE_TABLE_TAB.AVAILABLE]: [], [MANAGE_TABLE_TAB.DELETED]: [] }\n\t)\n\treturn filteredEntities\n}\n\nexport interface SearchModelArrayParams<TModel> {\n\tmodelArray: TModel[]\n\tcanReadyAnyGlobally?: boolean\n\tkeywords?: string\n}\n\n//#region Groups\n\nexport interface SearchGroupsParams extends SearchModelArrayParams<Group> {\n\tgroups: ModelCollection<Group>\n\texternalTerms: ModelCollection<ExternalTerm>\n\tdateString?: string\n}\n\nconst getGroupTab = (group: Group, endDate: string) => {\n\tif (group.isDeleted) {\n\t\treturn GROUP_MANAGE_TABLE_TAB.DELETED\n\t} else if (!!group.id && isNowBeforeDate(endDate)) {\n\t\treturn GROUP_MANAGE_TABLE_TAB.CURRENT\n\t}\n\treturn GROUP_MANAGE_TABLE_TAB.PAST\n}\n\nexport const searchGroups = ({\n\tgroups,\n\tmodelArray: groupsArray,\n\texternalTerms,\n\tcanReadyAnyGlobally,\n\tkeywords,\n\tdateString\n}: SearchGroupsParams) => {\n\tconst keywordsList = getKeywordsList(keywords)\n\tconst visibleGroups = canReadyAnyGlobally ? groupsArray : groupsAsAnythingButLearner(groups)\n\tconst filteredGroups = visibleGroups.reduce<Record<number, Group[]>>(\n\t\t(acc, g) => {\n\t\t\t// exclude if does not match keywords, if any\n\t\t\tif (!isEntityMatchedByKeywords(g, keywordsList)) return acc\n\t\t\tconst startDate = getStartDate(externalTerms, g)\n\t\t\tconst endDate = getEndDate(externalTerms, g)\n\t\t\t// exclude if search dateString is not between group start and end dates\n\t\t\tif (\n\t\t\t\t!!dateString &&\n\t\t\t\t(getLocalMomentFromUtc(dateString) < getLocalMomentFromUtc(startDate) ||\n\t\t\t\t\tgetLocalMomentFromUtc(dateString) > getLocalMomentFromUtc(endDate))\n\t\t\t) {\n\t\t\t\treturn acc\n\t\t\t}\n\t\t\tconst tab = getGroupTab(g, endDate)\n\t\t\t// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n\t\t\tconst tabArray: Group[] = acc[tab] ?? []\n\t\t\ttabArray.push(g)\n\t\t\tacc[tab] = tabArray\n\t\t\treturn acc\n\t\t},\n\t\t{\n\t\t\t[GROUP_MANAGE_TABLE_TAB.CURRENT]: [],\n\t\t\t[GROUP_MANAGE_TABLE_TAB.PAST]: [],\n\t\t\t[GROUP_MANAGE_TABLE_TAB.DELETED]: []\n\t\t}\n\t)\n\treturn filteredGroups\n}\n\n//#endregion Groups\n"],"mappings":"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","ignoreList":[]}