disable default value editing if key is autoincremental

openforis · Sep 11, 2024 · 8c9b520 · 8c9b520
1 parent 7fc3b39
commit 8c9b520
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 19 deletions.
diff --git a/core/survey/nodeDef.js b/core/survey/nodeDef.js
@@ -459,6 +459,8 @@ export const mergePropsAdvanced = (propsAdvanced) => (nodeDef) =>
   )(nodeDef)
 export const assocDefaultValues = (defaultValues) =>
   mergePropsAdvanced({ [keysPropsAdvanced.defaultValues]: defaultValues })
+export const assocDefaultValueEvaluatedOnlyOneTime = (evaluatedOnlyOneTime) =>
+  mergePropsAdvanced({ [keysPropsAdvanced.defaultValueEvaluatedOneTime]: evaluatedOnlyOneTime })
 export const assocValidations = (validations) => mergePropsAdvanced({ [keysPropsAdvanced.validations]: validations })
 export const dissocTemporary = R.dissoc(keys.temporary)
 export const assocProp = ({ key, value }) =>
@@ -660,6 +662,16 @@ export const clearNotApplicableProps = (cycle) => (nodeDef) => {
 export const canHaveMobileProps = (cycle) => (nodeDef) =>
   canBeHiddenInMobile(nodeDef) || canIncludeInMultipleEntitySummary(cycle)(nodeDef)
 
+const isDefaultValueAutoIncrementExpression = (defaultValue) => {
+  const expression = NodeDefExpression.getExpression(defaultValue)
+  return (
+    (expression === autoIncrementalKeyExpression ||
+      StringUtils.removeSuffix('\n')(expression).replaceAll(' ', '') ===
+        autoIncrementalKeyExpression.replaceAll(' ', '')) &&
+    Objects.isEmpty(NodeDefExpression.getApplyIf(defaultValue))
+  )
+}
+
 export const canHaveAutoIncrementalKey = (nodeDef) => {
   if ([nodeDefType.decimal, nodeDefType.integer].includes(nodeDef)) return false
 
@@ -668,10 +680,5 @@ export const canHaveAutoIncrementalKey = (nodeDef) => {
   if (defaultValues.length > 1) return false
 
   const defaultValue = defaultValues[0]
-
-  // apply if specified => it cannot be auto incremental expression
-  if (Objects.isNotEmpty(NodeDefExpression.getApplyIf(defaultValue))) return false
-
-  const expression = NodeDefExpression.getExpression(defaultValue)
-  return Objects.isEmpty(expression) || expression === autoIncrementalKeyExpression
+  return NodeDefExpression.isEmpty(defaultValue) || isDefaultValueAutoIncrementExpression(defaultValue)
 }
diff --git a/webapp/components/expression/expressionEditor.js b/webapp/components/expression/expressionEditor.js
@@ -28,6 +28,7 @@ const ExpressionEditor = (props) => {
     placeholder = false,
     qualifier,
     query = '',
+    readOnly = false,
     types = [ExpressionEditorType.basic, ExpressionEditorType.advanced],
   } = props
 
@@ -84,13 +85,15 @@ const ExpressionEditor = (props) => {
               {query}
             </div>
           )}
-          <Button
-            className="btn-s btn-edit"
-            iconClassName="icon-pencil2 icon-14px"
-            id={`${idPrefix}-edit-btn`}
-            onClick={() => setEdit(true)}
-            testId={TestId.expressionEditor.editBtn(qualifier)}
-          />
+          {!readOnly && (
+            <Button
+              className="btn-s btn-edit"
+              iconClassName="icon-pencil2 icon-14px"
+              id={`${idPrefix}-edit-btn`}
+              onClick={() => setEdit(true)}
+              testId={TestId.expressionEditor.editBtn(qualifier)}
+            />
+          )}
         </div>
       )}
     </div>
@@ -111,6 +114,7 @@ ExpressionEditor.propTypes = {
   canBeConstant: PropTypes.bool,
   isBoolean: PropTypes.bool,
   onChange: PropTypes.func,
+  readOnly: PropTypes.bool,
 }
 
 export default ExpressionEditor
diff --git a/webapp/components/survey/NodeDefDetails/AdvancedProps.js b/webapp/components/survey/NodeDefDetails/AdvancedProps.js
@@ -80,7 +80,7 @@ const AdvancedProps = (props) => {
             state={state}
             Actions={Actions}
             label={i18n.t('nodeDefEdit.advancedProps.defaultValues')}
-            readOnly={readOnly}
+            readOnly={readOnly || NodeDef.isAutoIncrementalKey(nodeDef)}
             propName={NodeDef.keysPropsAdvanced.defaultValues}
             nodeDefUuidContext={nodeDefUuidContext}
             canBeConstant
@@ -90,7 +90,7 @@ const AdvancedProps = (props) => {
           <div className="form_row without-label">
             <Checkbox
               checked={NodeDef.isDefaultValueEvaluatedOneTime(nodeDef)}
-              disabled={readOnly}
+              disabled={readOnly || NodeDef.isAutoIncrementalKey(nodeDef)}
               label="nodeDefEdit.advancedProps.defaultValueEvaluatedOneTime"
               validation={Validation.getFieldValidation(NodeDef.keysPropsAdvanced.defaultValueEvaluatedOneTime)(
                 validation

diff --git a/webapp/components/survey/NodeDefDetails/ExpressionsProp/ExpressionProp.js b/webapp/components/survey/NodeDefDetails/ExpressionsProp/ExpressionProp.js
@@ -54,9 +54,8 @@ const ExpressionProp = (props) => {
   return (
     <ValidationTooltip validation={validation} showKeys={false}>
       <div className={`node-def-edit__expression${isPlaceholder ? ' placeholder' : ''}`}>
-        {!isPlaceholder && (
+        {!isPlaceholder && !readOnly && (
           <ButtonIconDelete
-            disabled={readOnly}
             id={`expression-editor-${index}-${qualifier}-expression-btn-delete`}
             onClick={() => onDelete(expression)}
             testId={TestId.nodeDefDetails.expressionDeleteBtn(qualifier)}
@@ -80,6 +79,7 @@ const ExpressionProp = (props) => {
             isBoolean={isBoolean}
             types={expressionEditorTypes}
             mode={mode}
+            readOnly={readOnly}
           />
         </div>
 
@@ -98,6 +98,7 @@ const ExpressionProp = (props) => {
               onChange={({ query, callback }) => onUpdate(NodeDefExpression.assocApplyIf(query)(expression), callback)}
               isContextParent={isContextParent}
               canBeConstant={false}
+              readOnly={readOnly}
               types={expressionEditorTypes}
             />
           </div>

diff --git a/webapp/components/survey/NodeDefDetails/ExpressionsProp/ExpressionsProp.js b/webapp/components/survey/NodeDefDetails/ExpressionsProp/ExpressionsProp.js
@@ -128,7 +128,8 @@ const ExpressionsProp = (props) => {
             validation: Validation.getFieldValidation(index)(validation),
           })
         )}
-        {(multiple || R.isEmpty(values)) &&
+        {!readOnly &&
+          (multiple || R.isEmpty(values)) &&
           createExpressionProp({
             index: values.length,
             expression: NodeDefExpression.createExpressionPlaceholder(),

diff --git a/webapp/components/survey/NodeDefDetails/store/actions/useSetProp.js b/webapp/components/survey/NodeDefDetails/store/actions/useSetProp.js
@@ -1,6 +1,7 @@
 import { useCallback } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 
+import * as A from '@core/arena'
 import * as StringUtils from '@core/stringUtils'
 import * as Survey from '@core/survey/survey'
 import * as NodeDef from '@core/survey/nodeDef'
@@ -92,7 +93,10 @@ const _onUpdateAutoIncrementalKey = ({ nodeDef, value }) => {
     })
     defaultValues.push(defaultValueExpression)
   }
-  return NodeDef.assocDefaultValues(defaultValues)(nodeDef)
+  return A.pipe(
+    NodeDef.assocDefaultValues(defaultValues),
+    NodeDef.assocDefaultValueEvaluatedOnlyOneTime(value)
+  )(nodeDef)
 }
 
 const updateFunctionByProp = {