dtable-utils 4.2.1 → 4.2.3-beta.1

package/lib/filter/filter-row.js

@@ -17,6 +17,7 @@ var multipleSelect = require('./filter-column/multiple-select.js');
 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');
 var index = require('../constants/filter/index.js');
 var date = require('../date.js');
 var cellType = require('../constants/cell-type.js');
@@ -25,7 +26,8 @@ var column = require('../constants/column.js');
 var getFilterResult = function getFilterResult(row, filter, _ref) {
   var formulaRow = _ref.formulaRow,
     username = _ref.username,
-    userId = _ref.userId;
+    userId = _ref.userId,
+    userDepartmentIdsMap = _ref.userDepartmentIdsMap;
   var column_key = filter.column_key,
     column$1 = filter.column;
   var cellValue = row[column_key];
@@ -42,6 +44,10 @@ var getFilterResult = function getFilterResult(row, filter, _ref) {
       {
         return multipleSelect.multipleSelectFilter(cellValue, filter);
       }
+    case cellType.CellType.DEPARTMENT_SINGLE_SELECT:
+      {
+        return departmentSingleSelect.departmentSingleSelectFilter(cellValue, filter, userDepartmentIdsMap);
+      }
     case cellType.CellType.DURATION:
     case cellType.CellType.NUMBER:
     case cellType.CellType.RATE:
@@ -126,6 +132,7 @@ var getFilterResult = function getFilterResult(row, filter, _ref) {
  * @param {object} formulaRow
  * @param {string} username
  * @param {string} userId
+ * @param {object} userDepartmentIdsMap e.g. { current_user_department_ids: [8, 10], current_user_department_and_sub_ids: [8, 10, 12, 34] }
  * @returns filter result, bool
  */
 var filterRow = function filterRow(row, filterConjunction, filters) {
@@ -134,13 +141,16 @@ var filterRow = function filterRow(row, filterConjunction, filters) {
     formulaRow = _ref2$formulaRow === void 0 ? {} : _ref2$formulaRow,
     _ref2$username = _ref2.username,
     username = _ref2$username === void 0 ? '' : _ref2$username,
-    userId = _ref2.userId;
+    userId = _ref2.userId,
+    _ref2$userDepartmentI = _ref2.userDepartmentIdsMap,
+    userDepartmentIdsMap = _ref2$userDepartmentI === void 0 ? {} : _ref2$userDepartmentI;
   if (filterConjunction === index.FILTER_CONJUNCTION_TYPE.AND) {
     return filters.every(function (filter) {
       return getFilterResult(row, filter, {
         formulaRow: formulaRow,
         username: username,
-        userId: userId
+        userId: userId,
+        userDepartmentIdsMap: userDepartmentIdsMap
       });
     });
   }
@@ -149,7 +159,8 @@ var filterRow = function filterRow(row, filterConjunction, filters) {
       return getFilterResult(row, filter, {
         formulaRow: formulaRow,
         username: username,
-        userId: userId
+        userId: userId,
+        userDepartmentIdsMap: userDepartmentIdsMap
       });
     });
   }
@@ -163,13 +174,15 @@ var filterRow = function filterRow(row, filterConjunction, filters) {
  * @param {array} rows e.g. [{ _id, .... }, ...]
  * @param {object} formulaRows
  * @param {string} username
- * @param {userId} username
+ * @param {string} userId
+ * @param {object} userDepartmentIdsMap e.g. { current_user_department_ids: [8, 10], current_user_department_and_sub_ids: [8, 10, 12, 34] }
  * @returns filtered rows ids, array
  */
 var filterRows = function filterRows(filterConjunction, filters, rows, _ref3) {
   var formulaRows = _ref3.formulaRows,
     username = _ref3.username,
-    userId = _ref3.userId;
+    userId = _ref3.userId,
+    userDepartmentIdsMap = _ref3.userDepartmentIdsMap;
   var filteredRows = [];
   var formattedFilters = core.getFormattedFilters(filters);
   rows.forEach(function (row) {
@@ -178,7 +191,8 @@ var filterRows = function filterRows(filterConjunction, filters, rows, _ref3) {
     if (filterRow(row, filterConjunction, formattedFilters, {
       formulaRow: formulaRow,
       username: username,
-      userId: userId
+      userId: userId,
+      userDepartmentIdsMap: userDepartmentIdsMap
     })) {
       filteredRows.push(rowId);
     }
@@ -195,7 +209,8 @@ var filterRows = function filterRows(filterConjunction, filters, rows, _ref3) {
  * @param {object} table e.g. { columns, ... }
  * @param {object} formulaRows
  * @param {string} username
- * @param {userId} username
+ * @param {string} userId
+ * @param {object} userDepartmentIdsMap e.g. { current_user_department_ids: [8, 10], current_user_department_and_sub_ids: [8, 10, 12, 34] }
  * @returns filtered rows: row_ids and error message: error_message, object
  */
 var getFilteredRowsWithoutFormulaCalculation = function getFilteredRowsWithoutFormulaCalculation(filterConjunction, filters, rows, table) {
@@ -205,7 +220,9 @@ var getFilteredRowsWithoutFormulaCalculation = function getFilteredRowsWithoutFo
     _ref4$username = _ref4.username,
     username = _ref4$username === void 0 ? null : _ref4$username,
     _ref4$userId = _ref4.userId,
-    userId = _ref4$userId === void 0 ? null : _ref4$userId;
+    userId = _ref4$userId === void 0 ? null : _ref4$userId,
+    _ref4$userDepartmentI = _ref4.userDepartmentIdsMap,
+    userDepartmentIdsMap = _ref4$userDepartmentI === void 0 ? null : _ref4$userDepartmentI;
   var columns = table.columns;
   var validFilters = [];
   try {
@@ -225,7 +242,8 @@ var getFilteredRowsWithoutFormulaCalculation = function getFilteredRowsWithoutFo
     filteredRows = filterRows(filterConjunction, validFilters, rows, {
       formulaRows: formulaRows,
       username: username,
-      userId: userId
+      userId: userId,
+      userDepartmentIdsMap: userDepartmentIdsMap
     });
   }
   return {

package/lib/index.js

@@ -29,6 +29,7 @@ var number = require('./cell-value-get/number.js');
 var option = require('./cell-value-get/option.js');
 var collaborator = require('./cell-value-get/collaborator.js');
 var geolocation = require('./cell-value-get/geolocation.js');
+var department = require('./cell-value-get/department.js');
 var digitalSign = require('./cell-value-get/digital-sign.js');
 var longText = require('./cell-value-get/long-text.js');
 var cellValue = require('./cell-value-get/cell-value.js');
@@ -58,6 +59,7 @@ var multipleSelect = require('./filter/filter-column/multiple-select.js');
 var number$4 = require('./filter/filter-column/number.js');
 var singleSelect = require('./filter/filter-column/single-select.js');
 var link = require('./filter/filter-column/link.js');
+var filterPredicate = require('./constants/filter/filter-predicate.js');
 var filterRow = require('./filter/filter-row.js');
 var core$5 = require('./sort/core.js');
 var checkbox$1 = require('./sort/sort-column/checkbox.js');
@@ -78,7 +80,6 @@ var columnColor = require('./color/column-color.js');
 var rowColor = require('./color/row-color.js');
 var filterColumnOptions = require('./constants/filter/filter-column-options.js');
 var filterModifier = require('./constants/filter/filter-modifier.js');
-var filterPredicate = require('./constants/filter/filter-predicate.js');
 var filterIsWithin = require('./constants/filter/filter-is-within.js');
 
 
@@ -93,6 +94,7 @@ exports.DATE_FORMAT_MAP = column.DATE_FORMAT_MAP;
 exports.DATE_UNIT = column.DATE_UNIT;
 exports.DEFAULT_DATE_FORMAT = column.DEFAULT_DATE_FORMAT;
 exports.DEFAULT_NUMBER_FORMAT = column.DEFAULT_NUMBER_FORMAT;
+exports.DEPARTMENT_SELECT_RANGE_MAP = column.DEPARTMENT_SELECT_RANGE_MAP;
 exports.DURATION_DECIMAL_DIGITS = column.DURATION_DECIMAL_DIGITS;
 exports.DURATION_FORMATS = column.DURATION_FORMATS;
 exports.DURATION_FORMATS_MAP = column.DURATION_FORMATS_MAP;
@@ -168,6 +170,7 @@ exports.getCollaboratorsName = collaborator.getCollaboratorsName;
 exports.getCollaboratorsNames = collaborator.getCollaboratorsNames;
 exports.getGeolocationByGranularity = geolocation.getGeolocationByGranularity;
 exports.getGeolocationDisplayString = geolocation.getGeolocationDisplayString;
+exports.getDepartmentName = department.getDepartmentName;
 exports.getDigitalSignImageUrl = digitalSign.getDigitalSignImageUrl;
 exports.getLongtextDisplayString = longText.getLongtextDisplayString;
 exports.getCellValueDisplayString = cellValue.getCellValueDisplayString;
@@ -213,6 +216,8 @@ exports.multipleSelectFilter = multipleSelect.multipleSelectFilter;
 exports.numberFilter = number$4.numberFilter;
 exports.singleSelectFilter = singleSelect.singleSelectFilter;
 exports.linkFilter = link.linkFilter;
+exports.FILTER_PREDICATE_SHOW = filterPredicate.FILTER_PREDICATE_SHOW;
+exports.FILTER_PREDICATE_TYPE = filterPredicate.FILTER_PREDICATE_TYPE;
 exports.filterRow = filterRow.filterRow;
 exports.filterRows = filterRow.filterRows;
 exports.getFilteredRowsWithoutFormulaCalculation = filterRow.getFilteredRowsWithoutFormulaCalculation;
@@ -245,7 +250,5 @@ exports.RowColorUtils = rowColor["default"];
 exports.FILTER_COLUMN_OPTIONS = filterColumnOptions.FILTER_COLUMN_OPTIONS;
 exports.FILTER_TERM_MODIFIER_SHOW = filterModifier.FILTER_TERM_MODIFIER_SHOW;
 exports.FILTER_TERM_MODIFIER_TYPE = filterModifier.FILTER_TERM_MODIFIER_TYPE;
-exports.FILTER_PREDICATE_SHOW = filterPredicate.FILTER_PREDICATE_SHOW;
-exports.FILTER_PREDICATE_TYPE = filterPredicate.FILTER_PREDICATE_TYPE;
 exports.filterTermModifierIsWithin = filterIsWithin.filterTermModifierIsWithin;
 exports.filterTermModifierNotWithin = filterIsWithin.filterTermModifierNotWithin;

package/lib/validate/filter.js

@@ -354,6 +354,16 @@ var ValidateFilter = /*#__PURE__*/function () {
           {
             return this.isValidTermType(term, TERM_TYPE_MAP.ARRAY);
           }
+        case cellType.CellType.DEPARTMENT_SINGLE_SELECT:
+          {
+            if (PREDICATES_REQUIRE_ARRAY_TERM.includes(predicate)) {
+              return this.isValidTermType(term, TERM_TYPE_MAP.ARRAY);
+            }
+            if ([column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT, column.DEPARTMENT_SELECT_RANGE_MAP.CURRENT_USER_DEPARTMENT_AND_SUB].includes(term)) {
+              return true;
+            }
+            return this.isValidTermType(term, TERM_TYPE_MAP.NUMBER);
+          }
         case cellType.CellType.MULTIPLE_SELECT:
           {
             if (!this.isValidTermType(term, TERM_TYPE_MAP.ARRAY)) {

package/package.json

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