dtable-utils 4.4.3-alpha2 → 4.4.4-beta.1

package/lib/filter/filter-column/department-multiple-select.js

@@ -0,0 +1,125 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
+var column = require('../../constants/column.js');
+var filterPredicate = require('../../constants/filter/filter-predicate.js');
+var core = require('../core.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
+
+/**
+ * Filter multiple-select
+ * @param {array} departmentIds e.g. [ 14, ... ]
+ * @param {string} filter_predicate
+ * @param {array} filter_term department ids
+ * @param {object} userDepartmentIdsMap
+ * @returns bool
+ */
+var departmentMultipleSelectFilter = function departmentMultipleSelectFilter(departmentIds, _ref, userDepartmentIdsMap) {
+  var filter_predicate = _ref.filter_predicate,
+    filter_term = _ref.filter_term;
+  switch (filter_predicate) {
+    case filterPredicate.FILTER_PREDICATE_TYPE.HAS_ANY_OF:
+      {
+        if (filter_term.length === 0) return true;
+        if (!Array.isArray(departmentIds)) return false;
+        // CURRENT_USER_DEPARTMENT is a subset of CURRENT_USER_DEPARTMENT_AND_SUB, so it is necessary to first determine CURRENT_USER_DEPARTMENT_AND_SUB.
+        if (filter_term.includes(column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT_AND_SUB)) {
+          return departmentIds.some(function (id) {
+            return core.isCurrentUserDepartmentAndSub(id, userDepartmentIdsMap) || core.isSpecificDepartment(id, filter_term);
+          });
+        }
+        if (filter_term.includes(column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT)) {
+          return departmentIds.some(function (id) {
+            return core.isCurrentUserDepartment(id, userDepartmentIdsMap) || core.isSpecificDepartment(id, filter_term);
+          });
+        }
+        return departmentIds.some(function (id) {
+          return core.isSpecificDepartment(id, filter_term);
+        });
+      }
+    case filterPredicate.FILTER_PREDICATE_TYPE.HAS_ALL_OF:
+      {
+        if (filter_term.length === 0) return true;
+        if (!Array.isArray(departmentIds)) return false;
+        var _ref2 = userDepartmentIdsMap || {},
+          current_user_department_and_sub_ids = _ref2.current_user_department_and_sub_ids,
+          current_user_department_ids = _ref2.current_user_department_ids;
+        if (filter_term.includes(column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT_AND_SUB)) {
+          if (Array.isArray(current_user_department_and_sub_ids) && !current_user_department_and_sub_ids.every(function (id) {
+            return departmentIds.includes(id);
+          })) return false;
+        } else if (filter_term.includes(column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT)) {
+          if (Array.isArray(current_user_department_ids) && !current_user_department_ids.every(function (id) {
+            return departmentIds.includes(id);
+          })) return false;
+        }
+        return filter_term.every(function (id) {
+          return id === column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT || id === column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT_AND_SUB || core.isSpecificDepartment(id, departmentIds);
+        });
+      }
+    case filterPredicate.FILTER_PREDICATE_TYPE.HAS_NONE_OF:
+      {
+        if (filter_term.length === 0 || !Array.isArray(departmentIds) || departmentIds.length === 0) {
+          return true;
+        }
+        if (filter_term.includes(column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT_AND_SUB)) {
+          return departmentIds.every(function (id) {
+            return !core.isCurrentUserDepartmentAndSub(id, userDepartmentIdsMap) && !core.isSpecificDepartment(id, filter_term);
+          });
+        }
+        if (filter_term.includes(column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT)) {
+          return departmentIds.every(function (id) {
+            return !core.isCurrentUserDepartment(id, userDepartmentIdsMap) && !core.isSpecificDepartment(id, filter_term);
+          });
+        }
+        return filter_term.every(function (departmentId) {
+          return !core.isSpecificDepartment(departmentId, departmentIds);
+        });
+      }
+    case filterPredicate.FILTER_PREDICATE_TYPE.IS_EXACTLY:
+      {
+        if (filter_term.length === 0) return true;
+        if (!Array.isArray(departmentIds)) return false;
+        var normalizedFilterTerm = filter_term.slice(0);
+        if (filter_term.includes(column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT_AND_SUB)) {
+          var index = normalizedFilterTerm.indexOf(column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT_AND_SUB);
+          var _ref3 = userDepartmentIdsMap || {},
+            _current_user_department_and_sub_ids = _ref3.current_user_department_and_sub_ids;
+          if (Array.isArray(_current_user_department_and_sub_ids)) {
+            normalizedFilterTerm.splice.apply(normalizedFilterTerm, [index, 1].concat(_toConsumableArray__default["default"](_current_user_department_and_sub_ids)));
+          }
+        }
+        if (filter_term.includes(column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT)) {
+          var _index = normalizedFilterTerm.indexOf(column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT);
+          var _ref4 = userDepartmentIdsMap || {},
+            _current_user_department_ids = _ref4.current_user_department_ids;
+          if (Array.isArray(_current_user_department_ids)) {
+            normalizedFilterTerm.splice.apply(normalizedFilterTerm, [_index, 1].concat(_toConsumableArray__default["default"](_current_user_department_ids)));
+          }
+        }
+        var uniqueArr = function uniqueArr(arr) {
+          return _toConsumableArray__default["default"](new Set(arr)).sort();
+        };
+        return uniqueArr(departmentIds).toString() === uniqueArr(normalizedFilterTerm).toString();
+      }
+    case filterPredicate.FILTER_PREDICATE_TYPE.EMPTY:
+      {
+        return !Array.isArray(departmentIds) || departmentIds.length === 0;
+      }
+    case filterPredicate.FILTER_PREDICATE_TYPE.NOT_EMPTY:
+      {
+        return Array.isArray(departmentIds) && departmentIds.length > 0;
+      }
+    default:
+      {
+        return false;
+      }
+  }
+};
+
+exports.departmentMultipleSelectFilter = departmentMultipleSelectFilter;

package/lib/filter/filter-column/department-single-select.js

@@ -4,21 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var column = require('../../constants/column.js');
 var filterPredicate = require('../../constants/filter/filter-predicate.js');
-
-var isCurrentUserDepartment = function isCurrentUserDepartment(id, userDepartmentIdsMap) {
-  var currentUserDepartmentIds = userDepartmentIdsMap && userDepartmentIdsMap.current_user_department_ids;
-  if (!Array.isArray(currentUserDepartmentIds)) return false;
-  return currentUserDepartmentIds.includes(id);
-};
-var isCurrentUserDepartmentAndSub = function isCurrentUserDepartmentAndSub(id, userDepartmentIdsMap) {
-  var currentUserDepartmentAndSubIds = userDepartmentIdsMap && userDepartmentIdsMap.current_user_department_and_sub_ids;
-  if (!Array.isArray(currentUserDepartmentAndSubIds)) return false;
-  return currentUserDepartmentAndSubIds.includes(id);
-};
-var isSpecificDepartment = function isSpecificDepartment(departmentId, filterTerm) {
-  if (typeof departmentId !== 'number') return false;
-  return filterTerm.includes(departmentId);
-};
+var core = require('../core.js');
 
 /**
  * Filter department-single-select
@@ -36,10 +22,10 @@ var departmentSingleSelectFilter = function departmentSingleSelectFilter(departm
       {
         if (!filter_term) return true;
         if (filter_term === column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT) {
-          return isCurrentUserDepartment(departmentId, userDepartmentIdsMap);
+          return core.isCurrentUserDepartment(departmentId, userDepartmentIdsMap);
         }
         if (filter_term === column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT_AND_SUB) {
-          return isCurrentUserDepartmentAndSub(departmentId, userDepartmentIdsMap);
+          return core.isCurrentUserDepartmentAndSub(departmentId, userDepartmentIdsMap);
         }
         return departmentId === filter_term;
       }
@@ -47,10 +33,10 @@ var departmentSingleSelectFilter = function departmentSingleSelectFilter(departm
       {
         if (!filter_term) return true;
         if (filter_term === column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT) {
-          return !isCurrentUserDepartment(departmentId, userDepartmentIdsMap);
+          return !core.isCurrentUserDepartment(departmentId, userDepartmentIdsMap);
         }
         if (filter_term === column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT_AND_SUB) {
-          return !isCurrentUserDepartmentAndSub(departmentId, userDepartmentIdsMap);
+          return !core.isCurrentUserDepartmentAndSub(departmentId, userDepartmentIdsMap);
         }
         return departmentId !== filter_term;
       }
@@ -58,23 +44,23 @@ var departmentSingleSelectFilter = function departmentSingleSelectFilter(departm
       {
         if (filter_term.length === 0) return true;
         if (filter_term.includes(column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT_AND_SUB)) {
-          return isCurrentUserDepartmentAndSub(departmentId, userDepartmentIdsMap) || isSpecificDepartment(departmentId, filter_term);
+          return core.isCurrentUserDepartmentAndSub(departmentId, userDepartmentIdsMap) || core.isSpecificDepartment(departmentId, filter_term);
         }
         if (filter_term.includes(column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT)) {
-          return isCurrentUserDepartment(departmentId, userDepartmentIdsMap) || isSpecificDepartment(departmentId, filter_term);
+          return core.isCurrentUserDepartment(departmentId, userDepartmentIdsMap) || core.isSpecificDepartment(departmentId, filter_term);
         }
-        return isSpecificDepartment(departmentId, filter_term);
+        return core.isSpecificDepartment(departmentId, filter_term);
       }
     case filterPredicate.FILTER_PREDICATE_TYPE.IS_NONE_OF:
       {
         if (filter_term.length === 0) return true;
         if (filter_term.includes(column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT_AND_SUB)) {
-          return !isCurrentUserDepartmentAndSub(departmentId, userDepartmentIdsMap) && !isSpecificDepartment(departmentId, filter_term);
+          return !core.isCurrentUserDepartmentAndSub(departmentId, userDepartmentIdsMap) && !core.isSpecificDepartment(departmentId, filter_term);
         }
         if (filter_term.includes(column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT)) {
-          return !isCurrentUserDepartment(departmentId, userDepartmentIdsMap) && !isSpecificDepartment(departmentId, filter_term);
+          return !core.isCurrentUserDepartment(departmentId, userDepartmentIdsMap) && !core.isSpecificDepartment(departmentId, filter_term);
         }
-        return !isSpecificDepartment(departmentId, filter_term);
+        return !core.isSpecificDepartment(departmentId, filter_term);
       }
     case filterPredicate.FILTER_PREDICATE_TYPE.EMPTY:
       {

package/lib/filter/filter-column/formula.js

@@ -20,7 +20,8 @@ var formula = require('../../constants/formula.js');
  */
 var formulaFilter = function formulaFilter(computedValue, filter, _ref) {
   var username = _ref.username,
-    userId = _ref.userId;
+    userId = _ref.userId,
+    userDepartmentIdsMap = _ref.userDepartmentIdsMap;
   var data = filter.column.data;
   var _ref2 = data || {},
     result_type = _ref2.result_type;
@@ -47,7 +48,8 @@ var formulaFilter = function formulaFilter(computedValue, filter, _ref) {
       {
         return array.filterByArrayType(computedValue, filter, {
           username: username,
-          userId: userId
+          userId: userId,
+          userDepartmentIdsMap: userDepartmentIdsMap
         });
       }
     default:

package/lib/filter/filter-column/link.js

@@ -14,10 +14,12 @@ var array = require('./array.js');
  */
 var linkFilter = function linkFilter(linkedCellValues, filter, _ref) {
   var username = _ref.username,
-    userId = _ref.userId;
+    userId = _ref.userId,
+    userDepartmentIdsMap = _ref.userDepartmentIdsMap;
   return array.filterByArrayType(linkedCellValues, filter, {
     username: username,
-    userId: userId
+    userId: userId,
+    userDepartmentIdsMap: userDepartmentIdsMap
   });
 };
 

package/lib/filter/filter-row.js

@@ -18,10 +18,12 @@ var number = require('./filter-column/number.js');
 var singleSelect = require('./filter-column/single-select.js');
 var link = require('./filter-column/link.js');
 var departmentSingleSelect = require('./filter-column/department-single-select.js');
+require('@babel/runtime/helpers/toConsumableArray');
+var column = require('../constants/column.js');
+require('../constants/filter/filter-predicate.js');
 var index = require('../constants/filter/index.js');
 var date = require('../date.js');
 var cellType = require('../constants/cell-type.js');
-var column = require('../constants/column.js');
 
 var getFilterResult = function getFilterResult(row, filter, _ref) {
   var formulaRow = _ref.formulaRow,
@@ -99,7 +101,8 @@ var getFilterResult = function getFilterResult(row, filter, _ref) {
         cellValue = formulaRow[column_key];
         return formula.formulaFilter(cellValue, filter, {
           username: username,
-          userId: userId
+          userId: userId,
+          userDepartmentIdsMap: userDepartmentIdsMap
         });
       }
     case cellType.CellType.LINK:
@@ -110,7 +113,8 @@ var getFilterResult = function getFilterResult(row, filter, _ref) {
         }) : null;
         return link.linkFilter(cellValue, filter, {
           username: username,
-          userId: userId
+          userId: userId,
+          userDepartmentIdsMap: userDepartmentIdsMap
         });
       }
     case cellType.CellType.DIGITAL_SIGN:

package/lib/index.js

@@ -77,6 +77,7 @@ var number$4 = require('./filter/filter-column/number.js');
 var singleSelect$1 = require('./filter/filter-column/single-select.js');
 var link = require('./filter/filter-column/link.js');
 var filterPredicate = require('./constants/filter/filter-predicate.js');
+require('@babel/runtime/helpers/toConsumableArray');
 var filterRow = require('./filter/filter-row.js');
 var core$6 = require('./sort/core.js');
 var checkbox$2 = require('./sort/sort-column/checkbox.js');

package/lib/validate/filter.js

@@ -186,7 +186,7 @@ var ValidateFilter = /*#__PURE__*/function () {
       if (CHECK_EMPTY_PREDICATES.includes(predicate)) {
         return true;
       }
-      if (array_type === cellType.CellType.SINGLE_SELECT) {
+      if (array_type === cellType.CellType.SINGLE_SELECT || array_type === cellType.CellType.DEPARTMENT_SINGLE_SELECT) {
         return this.validatePredicate(predicate, {
           type: cellType.CellType.MULTIPLE_SELECT
         });
@@ -431,6 +431,9 @@ var ValidateFilter = /*#__PURE__*/function () {
           data: array_data
         });
       }
+      if (array_type === cellType.CellType.DEPARTMENT_SINGLE_SELECT) {
+        return this.isValidTermType(term, TERM_TYPE_MAP.ARRAY);
+      }
       if (column.COLLABORATOR_COLUMN_TYPES.includes(array_type)) {
         return this.isValidTerm(term, predicate, modifier, {
           type: cellType.CellType.COLLABORATOR

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-utils",
-  "version": "4.4.3-alpha2",
+  "version": "4.4.4-beta.1",
   "description": "dtable common utils",
   "main": "./lib/index.js",
   "module": "./es/index.js",