Merge branch 'master' into fix/survey-hierarchy-sorting

openforis · Sep 20, 2024 · 64ef58a · 64ef58a
2 parents 9b4f344 + 22e16ad
commit 64ef58a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/webapp/components/buttons/ButtonNext.js b/webapp/components/buttons/ButtonNext.js
@@ -4,7 +4,7 @@ import { Button } from './Button'
 
 export const ButtonNext = (props) => {
   const { label = 'common.next' } = props
-  return <Button {...props} iconClassName="icon-arrow-right icon-12px icon-left" label={label} />
+  return <Button {...props} iconClassName="icon-arrow-right icon-12px" label={label} />
 }
 
 ButtonNext.propTypes = {

diff --git a/webapp/components/buttons/ButtonPrevious.js b/webapp/components/buttons/ButtonPrevious.js
@@ -4,7 +4,7 @@ import { Button } from './Button'
 
 export const ButtonPrevious = (props) => {
   const { label = 'common.previous' } = props
-  return <Button {...props} iconClassName="icon-arrow-left icon-12px icon-left" label={label} />
+  return <Button {...props} iconClassName="icon-arrow-left icon-12px" label={label} />
 }
 
 ButtonPrevious.propTypes = {

diff --git a/webapp/components/form/Input/Input.js b/webapp/components/form/Input/Input.js
@@ -6,7 +6,7 @@ import classNames from 'classnames'
 import { TextField } from '@mui/material'
 import PropTypes from 'prop-types'
 
-import { Strings } from '@openforis/arena-core'
+import { Objects } from '@openforis/arena-core'
 
 import { useOnUpdate } from '../../hooks'
 import ValidationTooltip from '../../validationTooltip'
@@ -41,11 +41,13 @@ export const Input = React.forwardRef((props, ref) => {
   const selectionAllowed = type === 'text'
   const selectionInitial = selectionAllowed ? [value.length, value.length] : null
   const selectionRef = useRef(selectionInitial)
-  const valueText = Strings.defaultIfEmpty('')(value)
+  const valueText = Objects.isEmpty(value) ? '' : String(value)
   const title = titleProp ?? valueText
 
   const handleValueChange = useCallback(
     (newValue) => {
+      if (disabled) return
+
       const input = inputRef.current
       if (selectionAllowed) {
         selectionRef.current = [input.selectionStart, input.selectionEnd]
@@ -54,7 +56,7 @@ export const Input = React.forwardRef((props, ref) => {
         onChange(textTransformFunction(newValue))
       }
     },
-    [inputRef, onChange, selectionAllowed, textTransformFunction]
+    [disabled, inputRef, onChange, selectionAllowed, textTransformFunction]
   )
 
   const onFormattedValueChange = useCallback(

diff --git a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefBoolean.scss b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefBoolean.scss
@@ -3,7 +3,8 @@
 
 .survey-form__node-def-boolean {
   display: flex;
-  border: $formBorder;
+  margin-left: 0.2rem;
+  height: 1.2rem;
 }
 
 .survey-form__node-def-entity-table-row {

diff --git a/...p/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributePopUp.scss b/...p/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributePopUp.scss
@@ -16,7 +16,7 @@
 
     button {
       margin: 0 0.4rem;
-      padding: 0.6rem 0.6rem;
+      padding: 0.4rem 0.6rem;
       white-space: nowrap;
     }
 

diff --git a/webapp/views/App/views/Data/MapView/MapView.js b/webapp/views/App/views/Data/MapView/MapView.js
@@ -12,7 +12,6 @@ import { useSurvey } from '@webapp/store/survey'
 
 import { useRandomColors } from '@webapp/components/hooks/useRandomColors'
 import { Map } from '@webapp/components/Map'
-import SurveyDefsLoader from '@webapp/components/survey/SurveyDefsLoader'
 
 import { SamplingPointDataLayer } from './SamplingPointDataLayer'
 import { CoordinateAttributeDataLayer } from './CoordinateAttributeDataLayer'
@@ -106,8 +105,4 @@ const MapWrapper = () => {
   )
 }
 
-export const MapView = () => (
-  <SurveyDefsLoader draft={false} requirePublish>
-    <MapWrapper />
-  </SurveyDefsLoader>
-)
+export const MapView = () => <MapWrapper />
diff --git a/webapp/views/App/views/Data/MapView/MapView.scss b/webapp/views/App/views/Data/MapView/MapView.scss
@@ -30,6 +30,11 @@
 
           button {
             margin: 0;
+            height: 2rem;
+          }
+
+          .new-record-btn {
+            width: 20rem;
           }
         }
       }

diff --git a/webapp/views/App/views/Data/MapView/SamplingPointDataLayer/SamplingPointDataItemPopup.js b/webapp/views/App/views/Data/MapView/SamplingPointDataLayer/SamplingPointDataItemPopup.js
@@ -83,6 +83,7 @@ ${itemCodes
         )}
         {canCreateRecord && !recordUuid && (
           <ButtonAdd
+            className="new-record-btn"
             label="mapView.createRecord"
             showLabel
             onClick={() => createRecordFromSamplingPointDataItem({ itemUuid, callback: onRecordCreate })}