@agilemotion/oui-react-js 1.8.8 → 1.8.11

package/dist/Utils.js

@@ -324,7 +324,7 @@ class Utils {
     let properties = Object.getOwnPropertyNames(source);
     let result = JSON.parse(JSON.stringify(target));
     for (const property of properties) {
-      result[property] = source[property];
+      result[property] = _ApplicationManager.default.isExpression(source[property]) ? Utils.evaluateBooleanExpression(source[property], property) : source[property];
     }
     return result;
   }

package/dist/assets/jss/views/loginBasicStyle.js

@@ -47,11 +47,11 @@ const styles = {
   },
   loginBtn: {
     float: 'right',
-    background: '#FCB614',
-    color: '#000000'
+    background: window.location.hostname.includes('absa') ? '#dc0137' : '#FCB614',
+    color: window.location.hostname.includes('absa') ? '#ffffff' : '#000000'
   },
   btn: {
-    background: '#FCB614',
+    background: window.location.hostname.includes('absa') ? '#dc0137' : '#FCB614',
     color: _colors.white,
     padding: 7,
     borderRadius: 2,
@@ -59,7 +59,7 @@ const styles = {
     fontSize: 13
   },
   btnFacebook: {
-    background: '#FCB614'
+    background: window.location.hostname.includes('absa') ? '#dc0137' : '#FCB614'
   },
   btnGoogle: {
     background: '#e14441'

package/dist/components/DataGrid.js

@@ -811,7 +811,7 @@ const DataGrid = exports.DataGrid = /*#__PURE__*/_react.default.memo(/*#__PURE__
         height: '100%'
       },
       align: "left",
-      className: isItemSelected && !_Utils.default.isNull(props.form) && !_Utils.default.isNull(column.editor) ? 'editCell' : null,
+      className: !props.disabled && isItemSelected && !_Utils.default.isNull(props.form) && !_Utils.default.isNull(column.editor) ? 'editCell' : null,
       key: index + "_" + column.id
     }, /*#__PURE__*/_react.default.createElement(_Layout.Layout, {
       handle: createColumnLayoutHandle(column, index),
@@ -827,14 +827,14 @@ const DataGrid = exports.DataGrid = /*#__PURE__*/_react.default.memo(/*#__PURE__
         height: '100%'
       },
       align: "left",
-      className: isItemSelected && !_Utils.default.isNull(column.editor) ? 'editCell' : null,
+      className: !props.disabled && isItemSelected && !_Utils.default.isNull(column.editor) ? 'editCell' : null,
       key: index + "_" + column.id,
       onClick: event => handleCellClick(event, row.id, column)
     }, /*#__PURE__*/_react.default.createElement(_TableCellContent.default, {
       onRowError: rowErrorHandler,
       handle: createCellEditorHandle(column),
       viewId: props.viewId,
-      editor: column.editor,
+      editor: !props.disabled ? column.editor : null,
       ref: /*#__PURE__*/_react.default.createRef(),
       refCallback: createCell,
       selected: isItemSelected,

package/dist/components/TableCellContent.js

@@ -92,6 +92,11 @@ const TableCellContent = /*#__PURE__*/_react.default.memo(/*#__PURE__*/_react.de
       valueChangeHandler(_Utils.default.isNull(value) ? null : value);
     }
   }, [props.editor]);
+  const formatDate = contentValue => {
+    const date = new Date(contentValue);
+    const formatted = `${String(date.getDate()).padStart(2, '0')}/` + `${String(date.getMonth() + 1).padStart(2, '0')}/` + `${date.getFullYear()}`;
+    return formatted;
+  };
   const getStaticDisplayValue = () => {
     let displayValue;
     let contentValue;
@@ -116,7 +121,7 @@ const TableCellContent = /*#__PURE__*/_react.default.memo(/*#__PURE__*/_react.de
       if (_Utils.default.isNull(contentValue)) {
         displayValue = '';
       } else if (contentType === 'DATE') {
-        displayValue = new Date(contentValue).toLocaleDateString();
+        displayValue = formatDate(contentValue);
       } else if (contentType === 'TIME') {
         displayValue = new Date(contentValue).toLocaleTimeString();
       } else if (contentType === 'CHECKBOX') {

package/dist/components/form/BaseField.js

@@ -27,6 +27,8 @@ const BaseField = props => {
   const [disabled, setDisabled] = _react.default.useState(false);
   const [visible, setVisible] = _react.default.useState(false);
   const [required, setRequired] = _react.default.useState(null);
+  const [minDate, setMinDate] = _react.default.useState(null);
+  const [maxDate, setMaxDate] = _react.default.useState(null);
   const validateOnChange = _react.default.useRef();
   const ref = _react.default.useRef(null);
   const valid = _react.default.useRef(false);
@@ -258,6 +260,12 @@ const BaseField = props => {
       set required(isRequired) {
         setRequired(isRequired);
       },
+      set minDate(minDate) {
+        setMinDate(minDate);
+      },
+      set maxDate(maxDate) {
+        setMaxDate(maxDate);
+      },
       setFieldRequired(newVal) {
         let validate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
         validateOnChange.current = validate;
@@ -286,6 +294,8 @@ const BaseField = props => {
       display: !visible || _Utils.default.getComponentAttribute(config, 'hidden', false) === true ? 'none' : 'block'
     }
   }, /*#__PURE__*/_react.default.createElement("span", null, props.children({
+    minDate: minDate,
+    maxDate: maxDate,
     required: required,
     disabled: disabled,
     valueObject: valueObject,

package/dist/components/form/DatePicker.js

@@ -11,7 +11,6 @@ var _BaseField = require("./BaseField");
 var _reactRedux = require("react-redux");
 var _DynamicJS = _interopRequireDefault(require("../../DynamicJS"));
 var _xDatePickers = require("@mui/x-date-pickers");
-var _demo = require("@mui/x-date-pickers/internals/demo");
 var _AdapterDayjs = require("@mui/x-date-pickers/AdapterDayjs");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -34,7 +33,7 @@ const CustomDatePickerComponent = /*#__PURE__*/_react.default.memo(/*#__PURE__*/
     return n < 10 ? '0' + n : n;
   };
   const getLimitDate = id => {
-    let dateAttr = props.config[id];
+    let dateAttr = props.config.attributes ? props.config.attributes[id] : null;
     if (dateAttr) {
       if (dateAttr.toString().includes('now')) {
         let operator = dateAttr.toString().includes("-") ? '-' : '+';
@@ -64,17 +63,19 @@ const CustomDatePickerComponent = /*#__PURE__*/_react.default.memo(/*#__PURE__*/
   _react.default.useEffect(() => {
     if (minDate === null) {
       setMinDate(getLimitDate("minDate"));
-    } else {
-      setMinDate(minDate);
     }
   }, [minDate]);
   _react.default.useEffect(() => {
     if (maxDate === null) {
       setMaxDate(getLimitDate("maxDate"));
-    } else {
-      setMaxDate(maxDate);
     }
   }, [maxDate]);
+  _react.default.useEffect(() => {
+    setMinDate(base.minDate);
+  }, [base.minDate]);
+  _react.default.useEffect(() => {
+    setMaxDate(base.maxDate);
+  }, [maxDate]);
   const secondaryColor = (0, _reactRedux.useSelector)(state => state.dashboard.secondaryThemeColor);
   const style = _Utils.default.mergeStyles({
     minWidth: minWidth,
@@ -83,8 +84,6 @@ const CustomDatePickerComponent = /*#__PURE__*/_react.default.memo(/*#__PURE__*/
   }, props.config);
   return /*#__PURE__*/_react.default.createElement(_xDatePickers.LocalizationProvider, {
     dateAdapter: _AdapterDayjs.AdapterDayjs
-  }, /*#__PURE__*/_react.default.createElement(_demo.DemoContainer, {
-    components: ['DatePicker', 'DatePicker']
   }, /*#__PURE__*/_react.default.createElement(_xDatePickers.DatePicker, {
     disabled: base.disabled,
     label: props.config.attributes['label'],
@@ -92,6 +91,7 @@ const CustomDatePickerComponent = /*#__PURE__*/_react.default.memo(/*#__PURE__*/
     className: props.className,
     onChange: newValue => handleDateChange(newValue.toDate()),
     error: base.hasError,
+    format: "DD/MM/YYYY",
     slotProps: {
       textField: {
         variant: "outlined",
@@ -106,7 +106,7 @@ const CustomDatePickerComponent = /*#__PURE__*/_react.default.memo(/*#__PURE__*/
     },
     minDate: (0, _dayjs.default)(minDate),
     maxDate: (0, _dayjs.default)(maxDate)
-  })));
+  }));
 }));
 const DatePicker = props => {
   return /*#__PURE__*/_react.default.createElement(_BaseField.BaseField, _extends({}, props, {

package/dist/components/form/GridField.js

@@ -135,6 +135,7 @@ const GridFieldWrapper = /*#__PURE__*/_react.default.memo(/*#__PURE__*/_react.de
     handle: props.gridHandle,
     ref: /*#__PURE__*/_react.default.createRef(),
     viewId: props.viewId,
+    disabled: base.disabled,
     rows: rows,
     formValues: props.values,
     valueChangeHandler: newRows => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilemotion/oui-react-js",
-  "version": "1.8.8",
+  "version": "1.8.11",
   "files": [
     "dist"
   ],