dtable-utils - npm Package Compare versions

Comparing version 4.4.4 to 4.4.5-beta.1

es/archive/sql-generator/filter-condition.js

@@ -381,3 +381,47 @@ import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 };
+var departmentMultipleSelectSqlCondition = function departmentMultipleSelectSqlCondition(column, filterItem) {
+  var _ref2;
+  var patchedUserDepartmentIdsMap = PatchUtils.getUserDepartmentIdsMap(userDepartmentIdsMap);
+  var filterPredicate = filterItem.filter_predicate,
+    filterTerm = filterItem.filter_term;
+  var name = column.name;
+  if (filterPredicate === FILTER_PREDICATE_TYPE.NOT_EMPTY) {
+    return "`".concat(name, "` is not null");
+  }
+  if (filterPredicate === FILTER_PREDICATE_TYPE.EMPTY) {
+    return "`".concat(name, "` is null");
+  }
 
+  // filter_term is invalid
+  if (!Array.isArray(filterTerm) || filterTerm.length === 0) {
+    return '';
+  }
+  var _ref = patchedUserDepartmentIdsMap || {},
+    current_user_department_ids = _ref.current_user_department_ids,
+    current_user_department_and_sub_ids = _ref.current_user_department_and_sub_ids;
+  var normalizedFilterTerm = filterTerm;
+  normalizedFilterTerm = (_ref2 = []).concat.apply(_ref2, _toConsumableArray(filterTerm.map(function (value) {
+    if (value === DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT && Array.isArray(current_user_department_ids)) {
+      return current_user_department_ids;
+    }
+    if (value === DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT_AND_SUB && Array.isArray(current_user_department_and_sub_ids)) {
+      return current_user_department_and_sub_ids;
+    }
+    return value;
+  })));
+  if (filterPredicate === FILTER_PREDICATE_TYPE.HAS_ANY_OF) {
+    return "`".concat(name, "` in (").concat(normalizedFilterTerm.join(', '), ")");
+  }
+  if (filterPredicate === FILTER_PREDICATE_TYPE.HAS_ALL_OF) {
+    return "`".concat(name, "` has all of (").concat(normalizedFilterTerm.join(', '), ")");
+  }
+  if (filterPredicate === FILTER_PREDICATE_TYPE.HAS_NONE_OF) {
+    return "`".concat(name, "` has none of (").concat(normalizedFilterTerm.join(', '), ")");
+  }
+  if (filterPredicate === FILTER_PREDICATE_TYPE.IS_EXACTLY) {
+    return "`".concat(name, "` is exactly (").concat(normalizedFilterTerm.join(', '), ")");
+  }
+  return '';
+};
+
 // MULTIPLE_SELECT
@@ -527,5 +571,5 @@ var multipleSelectSqlCondition = function multipleSelectSqlCondition(column, filterItem) {
   }
-  var _ref = column.data || {},
-    array_type = _ref.array_type,
-    array_data = _ref.array_data;
+  var _ref3 = column.data || {},
+    array_type = _ref3.array_type,
+    array_data = _ref3.array_data;
   if (!array_type) return '';
@@ -562,2 +606,5 @@
   }
+  if (array_type === CellType.DEPARTMENT_SINGLE_SELECT) {
+    return departmentMultipleSelectSqlCondition(linkedColumn, filterItem);
+  }
   if ([CellType.CREATOR, CellType.LAST_MODIFIER].includes(array_type)) {
@@ -578,4 +625,4 @@ return collaboratorSqlCondition(linkedColumn, filterItem);
 var formulaSqlCondition = function formulaSqlCondition(column, filterItem) {
-  var _ref2 = column.data || {},
-    result_type = _ref2.result_type;
+  var _ref4 = column.data || {},
+    result_type = _ref4.result_type;
   if (result_type === FORMULA_RESULT_TYPE.STRING) {
@@ -582,0 +629,0 @@ // need to change the type of column to text

es/filter/core.js

@@ -12,2 +12,16 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 var EXACT_DATE_TERM_MODIFIER_TYPES = [FILTER_TERM_MODIFIER_TYPE.TODAY, FILTER_TERM_MODIFIER_TYPE.TOMORROW, FILTER_TERM_MODIFIER_TYPE.YESTERDAY, FILTER_TERM_MODIFIER_TYPE.ONE_WEEK_AGO, FILTER_TERM_MODIFIER_TYPE.ONE_WEEK_FROM_NOW, FILTER_TERM_MODIFIER_TYPE.ONE_MONTH_AGO, FILTER_TERM_MODIFIER_TYPE.ONE_MONTH_FROM_NOW, FILTER_TERM_MODIFIER_TYPE.NUMBER_OF_DAYS_AGO, FILTER_TERM_MODIFIER_TYPE.NUMBER_OF_DAYS_FROM_NOW, FILTER_TERM_MODIFIER_TYPE.EXACT_DATE];
+var isCurrentUserDepartment = function isCurrentUserDepartment(departmentId, userDepartmentIdsMap) {
+  var _ref = userDepartmentIdsMap || {},
+    current_user_department_ids = _ref.current_user_department_ids;
+  return Array.isArray(current_user_department_ids) && current_user_department_ids.includes(departmentId);
+};
+var isCurrentUserDepartmentAndSub = function isCurrentUserDepartmentAndSub(departmentId, userDepartmentIdsMap) {
+  var _ref2 = userDepartmentIdsMap || {},
+    current_user_department_and_sub_ids = _ref2.current_user_department_and_sub_ids;
+  return Array.isArray(current_user_department_and_sub_ids) && current_user_department_and_sub_ids.includes(departmentId);
+};
+var isSpecificDepartment = function isSpecificDepartment(departmentId, filterTerm) {
+  if (typeof departmentId !== 'number') return false;
+  return filterTerm.includes(departmentId);
+};
 
@@ -261,5 +275,5 @@ /**
       {
-        var _ref = columnData || {},
-          _array_type = _ref.array_type,
-          _array_data = _ref.array_data;
+        var _ref3 = columnData || {},
+          _array_type = _ref3.array_type,
+          _array_data = _ref3.array_data;
         var _linkedColumn = {
@@ -327,2 +341,2 @@ type: _array_type,
 
-export { deleteInvalidFilter, getFormattedFilter, getFormattedFilterOtherDate, getFormattedFilters, getValidFilters, getValidFiltersWithoutError, otherDate };
+export { deleteInvalidFilter, getFormattedFilter, getFormattedFilterOtherDate, getFormattedFilters, getValidFilters, getValidFiltersWithoutError, isCurrentUserDepartment, isCurrentUserDepartmentAndSub, isSpecificDepartment, otherDate };

es/filter/filter-column/array.js

@@ -8,2 +8,3 @@ import { getFormulaDisplayString } from '../../cell-value-get/cell-value.js';
 import { multipleSelectFilter } from './multiple-select.js';
+import { departmentMultipleSelectFilter } from './department-multiple-select.js';
 import { numberFilter } from './number.js';
@@ -26,3 +27,4 @@ import { CellType } from '../../constants/cell-type.js';
   var username = _ref.username,
-    userId = _ref.userId;
+    userId = _ref.userId,
+    userDepartmentIdsMap = _ref.userDepartmentIdsMap;
   var column = filter.column,
@@ -61,15 +63,22 @@ linked_column = filter.linked_column;
   }
+  if (linkedColumnType === CellType.DEPARTMENT_SINGLE_SELECT) {
+    var _normalizedArray2 = array;
+    if (array && !Array.isArray(array)) {
+      _normalizedArray2 = [array];
+    }
+    return departmentMultipleSelectFilter(_normalizedArray2, filter, userDepartmentIdsMap);
+  }
   if (isNumericColumn({
     type: linkedColumnType
   })) {
-    var _normalizedArray2 = array;
+    var _normalizedArray3 = array;
     if (Array.isArray(array)) {
       var cellValueLength = array.length;
       if (cellValueLength === 0) {
-        _normalizedArray2 = '';
+        _normalizedArray3 = '';
       } else if (cellValueLength === 1) {
-        _normalizedArray2 = array[0];
+        _normalizedArray3 = array[0];
       }
     }
-    return numberFilter(_normalizedArray2, filter);
+    return numberFilter(_normalizedArray3, filter);
   }
@@ -76,0 +85,0 @@ if (DATE_COLUMN_OPTIONS.includes(linkedColumnType)) {

es/filter/filter-column/department-single-select.js

 import { DEPARTMENT_SELECT_RANGE_MAP } from '../../constants/column.js';
 import { FILTER_PREDICATE_TYPE } from '../../constants/filter/filter-predicate.js';
+import { isCurrentUserDepartmentAndSub, isSpecificDepartment, isCurrentUserDepartment } from '../core.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);
-};
-
 /**
@@ -20,0 +6,0 @@ * Filter department-single-select

es/filter/filter-column/formula.js

@@ -19,3 +19,4 @@ import { numberFilter } from './number.js';
   var username = _ref.username,
-    userId = _ref.userId;
+    userId = _ref.userId,
+    userDepartmentIdsMap = _ref.userDepartmentIdsMap;
   var data = filter.column.data;
@@ -47,3 +48,4 @@ var _ref2 = data || {},
           username: username,
-          userId: userId
+          userId: userId,
+          userDepartmentIdsMap: userDepartmentIdsMap
         });
@@ -50,0 +52,0 @@ }

es/filter/filter-column/link.js

@@ -13,6 +13,8 @@ import { filterByArrayType } from './array.js';
   var username = _ref.username,
-    userId = _ref.userId;
+    userId = _ref.userId,
+    userDepartmentIdsMap = _ref.userDepartmentIdsMap;
   return filterByArrayType(linkedCellValues, filter, {
     username: username,
-    userId: userId
+    userId: userId,
+    userDepartmentIdsMap: userDepartmentIdsMap
   });
@@ -19,0 +21,0 @@ };

es/filter/filter-row.js

@@ -17,6 +17,8 @@ import { getFormattedFilters, deleteInvalidFilter } from './core.js';
 import { departmentSingleSelectFilter } from './filter-column/department-single-select.js';
+import '@babel/runtime/helpers/toConsumableArray';
+import { DATE_FORMAT_MAP } from '../constants/column.js';
+import '../constants/filter/filter-predicate.js';
 import { FILTER_CONJUNCTION_TYPE } from '../constants/filter/index.js';
 import { DateUtils } from '../date.js';
 import { CellType } from '../constants/cell-type.js';
-import { DATE_FORMAT_MAP } from '../constants/column.js';
 
@@ -99,3 +101,4 @@ var getFilterResult = function getFilterResult(row, filter, _ref) {
           username: username,
-          userId: userId
+          userId: userId,
+          userDepartmentIdsMap: userDepartmentIdsMap
         });
@@ -111,3 +114,4 @@ }
           username: username,
-          userId: userId
+          userId: userId,
+          userDepartmentIdsMap: userDepartmentIdsMap
         });
@@ -114,0 +118,0 @@ }

es/index.js

@@ -76,2 +76,3 @@ export { CellType } from './constants/cell-type.js';
 export { FILTER_PREDICATE_SHOW, FILTER_PREDICATE_TYPE } from './constants/filter/filter-predicate.js';
+import '@babel/runtime/helpers/toConsumableArray';
 export { filterRow, filterRows, getFilteredRowsWithoutFormulaCalculation } from './filter/filter-row.js';
@@ -78,0 +79,0 @@ export { deleteInvalidSort, getMultipleIndexesOrderbyOptions, getValidSorts, isValidSort } from './sort/core.js';

es/validate/filter.js

@@ -179,3 +179,3 @@ import _typeof from '@babel/runtime/helpers/typeof';
       }
-      if (array_type === CellType.SINGLE_SELECT) {
+      if (array_type === CellType.SINGLE_SELECT || array_type === CellType.DEPARTMENT_SINGLE_SELECT) {
         return this.validatePredicate(predicate, {
@@ -425,2 +425,5 @@ type: CellType.MULTIPLE_SELECT
       }
+      if (array_type === CellType.DEPARTMENT_SINGLE_SELECT) {
+        return this.isValidTermType(term, TERM_TYPE_MAP.ARRAY);
+      }
       if (COLLABORATOR_COLUMN_TYPES.includes(array_type)) {
@@ -427,0 +430,0 @@ return this.isValidTerm(term, predicate, modifier, {

lib/archive/sql-generator/filter-condition.js

@@ -391,3 +391,47 @@ 'use strict';
 };
+var departmentMultipleSelectSqlCondition = function departmentMultipleSelectSqlCondition(column$1, filterItem) {
+  var _ref2;
+  var patchedUserDepartmentIdsMap = patchUtils["default"].getUserDepartmentIdsMap(userDepartmentIdsMap);
+  var filterPredicate$1 = filterItem.filter_predicate,
+    filterTerm = filterItem.filter_term;
+  var name = column$1.name;
+  if (filterPredicate$1 === filterPredicate.FILTER_PREDICATE_TYPE.NOT_EMPTY) {
+    return "`".concat(name, "` is not null");
+  }
+  if (filterPredicate$1 === filterPredicate.FILTER_PREDICATE_TYPE.EMPTY) {
+    return "`".concat(name, "` is null");
+  }
 
+  // filter_term is invalid
+  if (!Array.isArray(filterTerm) || filterTerm.length === 0) {
+    return '';
+  }
+  var _ref = patchedUserDepartmentIdsMap || {},
+    current_user_department_ids = _ref.current_user_department_ids,
+    current_user_department_and_sub_ids = _ref.current_user_department_and_sub_ids;
+  var normalizedFilterTerm = filterTerm;
+  normalizedFilterTerm = (_ref2 = []).concat.apply(_ref2, _toConsumableArray__default["default"](filterTerm.map(function (value) {
+    if (value === column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT && Array.isArray(current_user_department_ids)) {
+      return current_user_department_ids;
+    }
+    if (value === column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT_AND_SUB && Array.isArray(current_user_department_and_sub_ids)) {
+      return current_user_department_and_sub_ids;
+    }
+    return value;
+  })));
+  if (filterPredicate$1 === filterPredicate.FILTER_PREDICATE_TYPE.HAS_ANY_OF) {
+    return "`".concat(name, "` in (").concat(normalizedFilterTerm.join(', '), ")");
+  }
+  if (filterPredicate$1 === filterPredicate.FILTER_PREDICATE_TYPE.HAS_ALL_OF) {
+    return "`".concat(name, "` has all of (").concat(normalizedFilterTerm.join(', '), ")");
+  }
+  if (filterPredicate$1 === filterPredicate.FILTER_PREDICATE_TYPE.HAS_NONE_OF) {
+    return "`".concat(name, "` has none of (").concat(normalizedFilterTerm.join(', '), ")");
+  }
+  if (filterPredicate$1 === filterPredicate.FILTER_PREDICATE_TYPE.IS_EXACTLY) {
+    return "`".concat(name, "` is exactly (").concat(normalizedFilterTerm.join(', '), ")");
+  }
+  return '';
+};
+
 // MULTIPLE_SELECT
@@ -537,5 +581,5 @@ var multipleSelectSqlCondition = function multipleSelectSqlCondition(column, filterItem) {
   }
-  var _ref = column.data || {},
-    array_type = _ref.array_type,
-    array_data = _ref.array_data;
+  var _ref3 = column.data || {},
+    array_type = _ref3.array_type,
+    array_data = _ref3.array_data;
   if (!array_type) return '';
@@ -572,2 +616,5 @@
   }
+  if (array_type === cellType.CellType.DEPARTMENT_SINGLE_SELECT) {
+    return departmentMultipleSelectSqlCondition(linkedColumn, filterItem);
+  }
   if ([cellType.CellType.CREATOR, cellType.CellType.LAST_MODIFIER].includes(array_type)) {
@@ -588,4 +635,4 @@ return collaboratorSqlCondition(linkedColumn, filterItem);
 var formulaSqlCondition = function formulaSqlCondition(column, filterItem) {
-  var _ref2 = column.data || {},
-    result_type = _ref2.result_type;
+  var _ref4 = column.data || {},
+    result_type = _ref4.result_type;
   if (result_type === formula.FORMULA_RESULT_TYPE.STRING) {
@@ -592,0 +639,0 @@ // need to change the type of column to text

lib/filter/core.js

@@ -20,2 +20,16 @@ 'use strict';
 var EXACT_DATE_TERM_MODIFIER_TYPES = [filterModifier.FILTER_TERM_MODIFIER_TYPE.TODAY, filterModifier.FILTER_TERM_MODIFIER_TYPE.TOMORROW, filterModifier.FILTER_TERM_MODIFIER_TYPE.YESTERDAY, filterModifier.FILTER_TERM_MODIFIER_TYPE.ONE_WEEK_AGO, filterModifier.FILTER_TERM_MODIFIER_TYPE.ONE_WEEK_FROM_NOW, filterModifier.FILTER_TERM_MODIFIER_TYPE.ONE_MONTH_AGO, filterModifier.FILTER_TERM_MODIFIER_TYPE.ONE_MONTH_FROM_NOW, filterModifier.FILTER_TERM_MODIFIER_TYPE.NUMBER_OF_DAYS_AGO, filterModifier.FILTER_TERM_MODIFIER_TYPE.NUMBER_OF_DAYS_FROM_NOW, filterModifier.FILTER_TERM_MODIFIER_TYPE.EXACT_DATE];
+var isCurrentUserDepartment = function isCurrentUserDepartment(departmentId, userDepartmentIdsMap) {
+  var _ref = userDepartmentIdsMap || {},
+    current_user_department_ids = _ref.current_user_department_ids;
+  return Array.isArray(current_user_department_ids) && current_user_department_ids.includes(departmentId);
+};
+var isCurrentUserDepartmentAndSub = function isCurrentUserDepartmentAndSub(departmentId, userDepartmentIdsMap) {
+  var _ref2 = userDepartmentIdsMap || {},
+    current_user_department_and_sub_ids = _ref2.current_user_department_and_sub_ids;
+  return Array.isArray(current_user_department_and_sub_ids) && current_user_department_and_sub_ids.includes(departmentId);
+};
+var isSpecificDepartment = function isSpecificDepartment(departmentId, filterTerm) {
+  if (typeof departmentId !== 'number') return false;
+  return filterTerm.includes(departmentId);
+};
 
@@ -269,5 +283,5 @@ /**
       {
-        var _ref = columnData || {},
-          _array_type = _ref.array_type,
-          _array_data = _ref.array_data;
+        var _ref3 = columnData || {},
+          _array_type = _ref3.array_type,
+          _array_data = _ref3.array_data;
         var _linkedColumn = {
@@ -341,2 +355,5 @@ type: _array_type,
 exports.getValidFiltersWithoutError = getValidFiltersWithoutError;
+exports.isCurrentUserDepartment = isCurrentUserDepartment;
+exports.isCurrentUserDepartmentAndSub = isCurrentUserDepartmentAndSub;
+exports.isSpecificDepartment = isSpecificDepartment;
 exports.otherDate = otherDate;

lib/filter/filter-column/array.js

@@ -12,2 +12,3 @@ 'use strict';
 var multipleSelect = require('./multiple-select.js');
+var departmentMultipleSelect = require('./department-multiple-select.js');
 var number$1 = require('./number.js');
@@ -30,3 +31,4 @@ var cellType = require('../../constants/cell-type.js');
   var username = _ref.username,
-    userId = _ref.userId;
+    userId = _ref.userId,
+    userDepartmentIdsMap = _ref.userDepartmentIdsMap;
   var column$1 = filter.column,
@@ -65,15 +67,22 @@ linked_column = filter.linked_column;
   }
+  if (linkedColumnType === cellType.CellType.DEPARTMENT_SINGLE_SELECT) {
+    var _normalizedArray2 = array;
+    if (array && !Array.isArray(array)) {
+      _normalizedArray2 = [array];
+    }
+    return departmentMultipleSelect.departmentMultipleSelectFilter(_normalizedArray2, filter, userDepartmentIdsMap);
+  }
   if (number.isNumericColumn({
     type: linkedColumnType
   })) {
-    var _normalizedArray2 = array;
+    var _normalizedArray3 = array;
     if (Array.isArray(array)) {
       var cellValueLength = array.length;
       if (cellValueLength === 0) {
-        _normalizedArray2 = '';
+        _normalizedArray3 = '';
       } else if (cellValueLength === 1) {
-        _normalizedArray2 = array[0];
+        _normalizedArray3 = array[0];
       }
     }
-    return number$1.numberFilter(_normalizedArray2, filter);
+    return number$1.numberFilter(_normalizedArray3, filter);
   }
@@ -80,0 +89,0 @@ if (column.DATE_COLUMN_OPTIONS.includes(linkedColumnType)) {

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

@@ -7,18 +7,4 @@ 'use strict';
 var filterPredicate = require('../../constants/filter/filter-predicate.js');
+var core = require('../core.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);
-};
-
 /**
@@ -40,6 +26,6 @@ * Filter department-single-select
         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);
         }
@@ -52,6 +38,6 @@ return departmentId === filter_term;
         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);
         }
@@ -64,8 +50,8 @@ return departmentId !== filter_term;
         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);
       }
@@ -76,8 +62,8 @@ case filterPredicate.FILTER_PREDICATE_TYPE.IS_NONE_OF:
         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);
       }
@@ -84,0 +70,0 @@ case filterPredicate.FILTER_PREDICATE_TYPE.EMPTY:

lib/filter/filter-column/formula.js

@@ -23,3 +23,4 @@ 'use strict';
   var username = _ref.username,
-    userId = _ref.userId;
+    userId = _ref.userId,
+    userDepartmentIdsMap = _ref.userDepartmentIdsMap;
   var data = filter.column.data;
@@ -51,3 +52,4 @@ var _ref2 = data || {},
           username: username,
-          userId: userId
+          userId: userId,
+          userDepartmentIdsMap: userDepartmentIdsMap
         });
@@ -54,0 +56,0 @@ }

lib/filter/filter-column/link.js

@@ -17,6 +17,8 @@ 'use strict';
   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
   });
@@ -23,0 +25,0 @@ };

lib/filter/filter-row.js

@@ -21,6 +21,8 @@ 'use strict';
 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');
 
@@ -103,3 +105,4 @@ var getFilterResult = function getFilterResult(row, filter, _ref) {
           username: username,
-          userId: userId
+          userId: userId,
+          userDepartmentIdsMap: userDepartmentIdsMap
         });
@@ -115,3 +118,4 @@ }
           username: username,
-          userId: userId
+          userId: userId,
+          userDepartmentIdsMap: userDepartmentIdsMap
         });
@@ -118,0 +122,0 @@ }

lib/index.js

@@ -80,2 +80,3 @@ 'use strict';
 var filterPredicate = require('./constants/filter/filter-predicate.js');
+require('@babel/runtime/helpers/toConsumableArray');
 var filterRow = require('./filter/filter-row.js');
@@ -82,0 +83,0 @@ var core$6 = require('./sort/core.js');

lib/validate/filter.js

@@ -189,3 +189,3 @@ 'use strict';
       }
-      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, {
@@ -435,2 +435,5 @@ type: cellType.CellType.MULTIPLE_SELECT
       }
+      if (array_type === cellType.CellType.DEPARTMENT_SINGLE_SELECT) {
+        return this.isValidTermType(term, TERM_TYPE_MAP.ARRAY);
+      }
       if (column.COLLABORATOR_COLUMN_TYPES.includes(array_type)) {
@@ -437,0 +440,0 @@ return this.isValidTerm(term, predicate, modifier, {

package.json

 {
   "name": "dtable-utils",
-  "version": "4.4.4",
+  "version": "4.4.5-beta.1",
   "description": "dtable common utils",
@@ -5,0 +5,0 @@ "main": "./lib/index.js",

New alerts

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

896783

increased by2.58%

Number of package files

219

increased by0.92%

Lines of code

19652

increased by1.99%

Worsened metrics

Number of low quality alerts

3

increased by50%

No dependency changes