[package][s] latest package build

datopian · May 31, 2021 · b043bc2 · b043bc2
1 parent 1b995c3
commit b043bc2
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 26 deletions.
diff --git a/dist/DatastoreSearchSql.js b/dist/DatastoreSearchSql.js
@@ -19,9 +19,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function DatastoreSearchSql(props) {
   var resource = JSON.parse(JSON.stringify(props.resource));
-  var dateField = resource.schema.fields.find(function (field) {
+  var dateFields = resource.schema.fields.filter(function (field) {
     return field.type && field.type.includes('date');
   });
+  var defaultDateFieldName = dateFields.length > 0 ? dateFields[0].name : null;
   var otherFields = resource.schema.fields.filter(function (field) {
     return !(field.type && field.type.includes('date'));
   });
@@ -53,7 +54,7 @@ function DatastoreSearchSql(props) {
     var clonedValues = JSON.parse(JSON.stringify(values));
     var errors = {};
 
-    if (!clonedValues.startDate && !clonedValues.endDate && clonedValues.rules.length === 0) {
+    if (!clonedValues.date.startDate && !clonedValues.date.endDate && clonedValues.rules.length === 0) {
       // No filters given so alert about that
       errors.message = 'Please, provide at least one rule.';
     }
@@ -67,30 +68,30 @@ function DatastoreSearchSql(props) {
 
     var sqlQueryString = "SELECT COUNT(*) OVER () AS _count, * FROM \"".concat(resource.id, "\" WHERE ");
 
-    if (clonedValues.startDate) {
+    if (clonedValues.date.startDate) {
       var rule = {
         combinator: 'AND',
-        field: dateField.name,
+        field: clonedValues.date.fieldName,
         operator: '>=',
-        value: clonedValues.startDate
+        value: clonedValues.date.startDate
       };
-      var localDateTime = new Date(clonedValues.startDate); // Now, convert it into GMT considering offset
+      var localDateTime = new Date(clonedValues.date.startDate); // Now, convert it into GMT considering offset
 
       var offset = localDateTime.getTimezoneOffset();
       localDateTime = new Date(localDateTime.getTime() - offset * 60 * 1000);
       rule.value = localDateTime.toISOString();
       clonedValues.rules.push(rule);
     }
 
-    if (clonedValues.endDate) {
+    if (clonedValues.date.endDate) {
       var _rule = {
         combinator: 'AND',
-        field: dateField.name,
+        field: clonedValues.date.fieldName,
         operator: '<=',
-        value: clonedValues.endDate
+        value: clonedValues.date.endDate
       };
 
-      var _localDateTime = new Date(clonedValues.endDate); // Now, convert it into GMT considering offset
+      var _localDateTime = new Date(clonedValues.date.endDate); // Now, convert it into GMT considering offset
 
 
       var _offset = _localDateTime.getTimezoneOffset();
@@ -130,8 +131,11 @@ function DatastoreSearchSql(props) {
   return _react.default.createElement(_formik.Formik, {
     initialValues: {
       rules: [],
-      startDate: null,
-      endDate: null
+      date: {
+        startDate: null,
+        endDate: null,
+        fieldName: defaultDateFieldName
+      }
     },
     validate: function validate(values) {
       return _validate(values);
@@ -150,41 +154,45 @@ function DatastoreSearchSql(props) {
         className: "form-inline dq-main-container"
       }, _react.default.createElement("div", {
         className: "dq-heading"
-      }), dateField ? _react.default.createElement("div", {
+      }), defaultDateFieldName ? _react.default.createElement("div", {
         className: "dq-date-picker"
-      }, _react.default.createElement(_reactDatePicker.default, {
-        value: values.startDate,
+      }, _react.default.createElement(_formik.Field, {
+        name: "date.fieldName",
+        component: "select",
+        className: "form-control"
+      }, dateFields.map(function (field, index) {
+        return _react.default.createElement("option", {
+          value: field.name,
+          key: "dateField".concat(index)
+        }, field.title || field.name);
+      })), _react.default.createElement(_reactDatePicker.default, {
+        value: values.date.startDate,
         clearIcon: "X",
         nativeInputAriaLabel: "Start date input box",
         dayAriaLabel: "Start day",
         monthAriaLabel: "Start month",
         yearAriaLabel: "Start year",
         onChange: function onChange(val) {
-          return setFieldValue("startDate", val);
+          return setFieldValue("date.startDate", val);
         },
         format: "yyyy-MM-dd"
       }), _react.default.createElement("span", {
         className: "fa fa-long-arrow-right",
         "aria-hidden": "true"
       }), _react.default.createElement(_reactDatePicker.default, {
-        value: values.endDate,
+        value: values.date.endDate,
         clearIcon: "X",
         nativeInputAriaLabel: "End date input box",
         dayAriaLabel: "End day",
         monthAriaLabel: "End month",
         yearAriaLabel: "End year",
         onChange: function onChange(val) {
-          return setFieldValue("endDate", val);
+          return setFieldValue("date.endDate", val);
         },
         returnValue: "end",
         format: "yyyy-MM-dd",
-        minDate: values.startDate
-      }), _react.default.createElement("div", {
-        className: "datetime-field-name",
-        style: {
-          display: 'none'
-        }
-      }, dateField.title || dateField.name)) : '', _react.default.createElement(_formik.FieldArray, {
+        minDate: values.date.startDate
+      })) : '', _react.default.createElement(_formik.FieldArray, {
         name: "rules",
         render: function render(arrayHelpers) {
           return _react.default.createElement("div", {

diff --git a/dist/i18n/i18n.js b/dist/i18n/i18n.js
@@ -17,6 +17,8 @@ var _translation2 = _interopRequireDefault(require("./locales/da/translation.jso
 
 var _translation3 = _interopRequireDefault(require("./locales/fr/translation.json"));
 
+var _translation4 = _interopRequireDefault(require("./locales/pt_BR/translation.json"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 _i18next.default.use(_i18nextBrowserLanguagedetector.default).use(_reactI18next.initReactI18next) // init i18next
@@ -41,6 +43,9 @@ _i18next.default.use(_i18nextBrowserLanguagedetector.default).use(_reactI18next.
     },
     fr: {
       translation: _translation3.default
+    },
+    pt_BR: {
+      translation: _translation4.default
     }
   },
   react: {

diff --git a/dist/i18n/locales/pt_BR/translation.json b/dist/i18n/locales/pt_BR/translation.json
@@ -0,0 +1,5 @@
+{
+  "Add a rule": "Adicionar uma regra",
+  "Submit": "Enviar",
+  "Reset": "Reiniciar"
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datopian/datastore-query-builder",
-  "version": "0.4.14",
+  "version": "0.4.15",
   "private": false,
   "module": "dist/index.js",
   "main": "dist/index.js",