BFLOWS/bflows-bandi-fe
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make some call fields editable after publishing the call

Browse Source 
- call form fields are editable (according to the list of keys);
- some parts of the form are editable;
This commit is contained in:
Vitalii Kiiko
2024-11-14 14:27:19 +01:00
parent 74647cc2fd
commit b08e2d46c0
15 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/assets/scss/components/appForm.scss
View File

@@ -147,6 +147,7 @@
.appForm__fileUploadItemName { .appForm__fileUploadItemName {
color: var(--global-textColor); color: var(--global-textColor);
font-style: italic; font-style: italic;
text-align: left;
} }
.appForm__row { .appForm__row {

4
src/assets/scss/components/misc.scss
View File

@@ -118,6 +118,10 @@
user-select: none; user-select: none;
} }
.p-dropdown-panel {
max-width: 100%;
}
.p-inputgroup.flex-1 { .p-inputgroup.flex-1 {
align-items: center; align-items: center;
} }

1
src/components/FormFieldRepeater/index.js
View File

@@ -73,6 +73,7 @@ const FormFieldRepeater = ({
const properField = (item, i) => { const properField = (item, i) => {
return !isNil(item.lookUpDataId) return !isNil(item.lookUpDataId)
? <Dropdown value={item.value} ? <Dropdown value={item.value}
filter
disabled={disabled} disabled={disabled}
onChange={(e) => selectItem(e, i)} onChange={(e) => selectItem(e, i)}
optionDisabled={(opt) => usedExistingValues().includes(opt.value)} optionDisabled={(opt) => usedExistingValues().includes(opt.value)}

1
src/components/FormFieldRepeaterCriteria/index.js
View File

@@ -79,6 +79,7 @@ const FormFieldRepeaterCriteria = ({
const properField = (item, i) => { const properField = (item, i) => {
return !isNil(item.lookUpDataId) return !isNil(item.lookUpDataId)
? <Dropdown value={item.value} ? <Dropdown value={item.value}
filter
disabled={disabled} disabled={disabled}
onChange={(e) => selectItem(e, i)} onChange={(e) => selectItem(e, i)}
optionDisabled={(opt) => usedExistingValues().includes(opt.value)} optionDisabled={(opt) => usedExistingValues().includes(opt.value)}

1
src/components/FormFieldRepeaterFaq/index.js
View File

@@ -182,6 +182,7 @@ const FormFieldRepeaterFaq = ({
disabled={disabled} disabled={disabled}
icon="pi pi-plus" onClick={addNewItem}/> icon="pi pi-plus" onClick={addNewItem}/>
<Dropdown onChange={(e) => selectItem(e)} <Dropdown onChange={(e) => selectItem(e)}
filter
disabled={disabled} disabled={disabled}
optionDisabled={(opt) => usedExistingValues().includes(opt.title)} optionDisabled={(opt) => usedExistingValues().includes(opt.title)}
options={stateOptionsData} options={stateOptionsData}

6
src/pages/BandoEdit/components/BandoEditFormActions/index.js
View File

@@ -5,14 +5,16 @@ import { isNil } from 'ramda';
// components // components
import { Button } from 'primereact/button'; import { Button } from 'primereact/button';
const BandoEditFormActions = ({ id, openPreview, openPreviewEvaluation, submitFn }) => { const BandoEditFormActions = ({ id, openPreview, openPreviewEvaluation, submitFn, status }) => {
return ( return (
<div className="appPageSection"> <div className="appPageSection">
<div className="appPageSection__actions"> <div className="appPageSection__actions">
<Button <Button
type="button" type="button"
onClick={submitFn} onClick={submitFn}
label={__('Salva bozza', 'gepafin')} icon="pi pi-save" iconPos="right"/> label={status === 'PUBLISH'
? __('Modifica', 'gepafin')
: __('Salva bozza', 'gepafin')} icon="pi pi-save" iconPos="right"/>
<Button <Button
type="button" type="button"
disabled={isNil(id)} disabled={isNil(id)}

3
src/pages/BandoEdit/components/BandoEditFormStep1/index.js
View File

@@ -180,7 +180,8 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
return values.status === 'PUBLISH' && return values.status === 'PUBLISH' &&
![ ![
'descriptionShort', 'descriptionLong', 'documentationRequested', 'threshold', 'descriptionShort', 'descriptionLong', 'documentationRequested', 'threshold',
'aimedTo', 'criteria', 'docs', 'checklist', 'faq' 'aimedTo', 'criteria', 'docs', 'checklist', 'faq', 'amount', 'amountMin', 'amountMax',
'email', 'phoneNumber', 'checkList', 'images'
].includes(fieldName) ].includes(fieldName)
} }

17
src/pages/BandoEdit/components/BandoEditFormStep2/index.js
View File

@@ -206,8 +206,13 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
} }
}, []); }, []);
const shouldDisableField = () => { const shouldDisableField = (fieldName) => {
return values.status === 'PUBLISH' return values.status === 'PUBLISH' &&
![
'descriptionShort', 'descriptionLong', 'documentationRequested', 'threshold',
'aimedTo', 'criteria', 'docs', 'checklist', 'faq', 'amount', 'amountMin', 'amountMax',
'email', 'phoneNumber', 'checkList', 'images'
].includes(fieldName)
} }
const acceptAllFormats = () => { const acceptAllFormats = () => {
@@ -219,7 +224,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
<UnsavedChangesDetector getValuesFn={getValues}/> <UnsavedChangesDetector getValuesFn={getValues}/>
<FormFieldRepeaterCriteria <FormFieldRepeaterCriteria
data={values} data={values}
disabled={shouldDisableField()} disabled={shouldDisableField('criteria')}
setDataFn={setValue} setDataFn={setValue}
fieldName="criteria" fieldName="criteria"
options={criteriaOptions} options={criteriaOptions}
@@ -238,7 +243,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
<FormField <FormField
type="fileuploadasync" type="fileuploadasync"
disabled={shouldDisableField()} disabled={shouldDisableField('docs')}
setDataFn={setValue} setDataFn={setValue}
fieldName="docs" fieldName="docs"
label={__('Documentazione', 'gepafin')} label={__('Documentazione', 'gepafin')}
@@ -257,7 +262,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
<FormField <FormField
type="fileuploadasync" type="fileuploadasync"
disabled={shouldDisableField()} disabled={shouldDisableField('images')}
setDataFn={setValue} setDataFn={setValue}
fieldName="images" fieldName="images"
label={__('Immagine del Bando', 'gepafin')} label={__('Immagine del Bando', 'gepafin')}
@@ -273,7 +278,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
<FormFieldRepeater <FormFieldRepeater
data={values['checkList']} data={values['checkList']}
disabled={shouldDisableField()} disabled={shouldDisableField('checkList')}
setDataFn={setValue} setDataFn={setValue}
fieldName="checkList" fieldName="checkList"
options={checklistOptions} options={checklistOptions}

22
src/pages/BandoFormsEdit/components/BuilderElement/index.js
View File

@@ -11,7 +11,7 @@ import { Button } from 'primereact/button';
import { Tag } from 'primereact/tag'; import { Tag } from 'primereact/tag';
import BuilderElementProperLabel from '../BuilderElementProperLabel'; import BuilderElementProperLabel from '../BuilderElementProperLabel';
const BuilderElement = ({ id, name, label, index }) => { const BuilderElement = ({ id, name, label, index, bandoStatus }) => {
const draggingElementId = useStore().main.draggingElementId(); const draggingElementId = useStore().main.draggingElementId();
const ref = useRef(null); const ref = useRef(null);
@@ -109,28 +109,10 @@ const BuilderElement = ({ id, name, label, index }) => {
</div> </div>
<div className="actions"> <div className="actions">
<Button icon="pi pi-cog" onClick={() => openSettings(id)} outlined severity="info"/> <Button icon="pi pi-cog" onClick={() => openSettings(id)} outlined severity="info"/>
<Button icon="pi pi-trash" onClick={() => remove(id)} outlined severity="danger"/> <Button icon="pi pi-trash" disabled={bandoStatus === 'PUBLISH'} onClick={() => remove(id)} outlined severity="danger"/>
</div> </div>
</div> </div>
) )
/*return (
<div ref={ref} className="formBuilder__element" style={{ opacity }} data-handler-id={handlerId}>
{draggingId === id
? <div className="formBuilder__elementNew"></div>
: <>
<div className="meta">
<Tag value={name} severity="info"/>
<BuilderElementProperLabel id={id} defaultLabel={label}/>
</div>
<div className="actions">
<Button icon="pi pi-cog" onClick={() => openSettings(id)} outlined severity="info"/>
<Button icon="pi pi-trash" onClick={() => remove(id)} outlined severity="danger"/>
</div>
</>
}
</div>
)*/
} }
export default BuilderElement; export default BuilderElement;

4
src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSetting/index.js
View File

@@ -11,7 +11,7 @@ import { Editor } from 'primereact/editor';
import { mimeTypes } from '../../../../../../configData'; import { mimeTypes } from '../../../../../../configData';
import ElementSettingTableColumns from '../ElementSettingTableColumns'; import ElementSettingTableColumns from '../ElementSettingTableColumns';
const ElementSetting = ({ setting, changeFn, updateDataFn }) => { const ElementSetting = ({ setting, changeFn, updateDataFn, bandoStatus }) => {
const settingLabels = { const settingLabels = {
label: __('Label', 'gepafin'), label: __('Label', 'gepafin'),
@@ -48,6 +48,7 @@ const ElementSetting = ({ setting, changeFn, updateDataFn }) => {
return <ElementSettingRepeater return <ElementSettingRepeater
value={is(Array, setting.value) ? setting.value : []} value={is(Array, setting.value) ? setting.value : []}
name={setting.name} name={setting.name}
bandoStatus={bandoStatus}
setDataFn={updateDataFn}/> setDataFn={updateDataFn}/>
} else if (setting.name === 'mime') { } else if (setting.name === 'mime') {
return <MultiSelect return <MultiSelect
@@ -75,6 +76,7 @@ const ElementSetting = ({ setting, changeFn, updateDataFn }) => {
return <ElementSettingTableColumns return <ElementSettingTableColumns
value={is(Object, setting.value) ? setting.value : {}} value={is(Object, setting.value) ? setting.value : {}}
name={setting.name} name={setting.name}
bandoStatus={bandoStatus}
setDataFn={updateDataFn}/> setDataFn={updateDataFn}/>
} else { } else {
return <InputText id={setting.name} aria-describedby={`${setting.name}-help`} return <InputText id={setting.name} aria-describedby={`${setting.name}-help`}

7
src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSettingRepeater/index.js
View File

@@ -11,7 +11,8 @@ import uniqid from '../../../../../../helpers/uniqid';
const ElementSettingRepeater = ({ const ElementSettingRepeater = ({
value, value,
name, name,
setDataFn setDataFn,
bandoStatus
}) => { }) => {
const [stateFieldData, setStateFieldData] = useState([]); const [stateFieldData, setStateFieldData] = useState([]);
@@ -53,10 +54,10 @@ const ElementSettingRepeater = ({
{stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem"> {stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem">
<div className="p-inputgroup flex-1"> <div className="p-inputgroup flex-1">
{properField(o, i)} {properField(o, i)}
<Button icon="pi pi-times" className="p-button-danger" onClick={() => removeItem(i)}/> <Button icon="pi pi-times" disabled={bandoStatus === 'PUBLISH'} className="p-button-danger" onClick={() => removeItem(i)}/>
</div> </div>
</div>)} </div>)}
<Button type="button" outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/> <Button type="button" disabled={bandoStatus === 'PUBLISH'} outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/>
</div> </div>
) )
} }

18
src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSettingTableColumns/index.js
View File

@@ -14,7 +14,8 @@ import uniqid from '../../../../../../helpers/uniqid';
const ElementSettingTableColumns = ({ const ElementSettingTableColumns = ({
value, value,
name, name,
setDataFn setDataFn,
bandoStatus
}) => { }) => {
const [stateFieldData, setStateFieldData] = useState([]); const [stateFieldData, setStateFieldData] = useState([]);
const [rowsData, setRowsData] = useState([]); const [rowsData, setRowsData] = useState([]);
@@ -34,7 +35,7 @@ const ElementSettingTableColumns = ({
.reduce((acc, cur) => { .reduce((acc, cur) => {
acc[cur.name] = '' acc[cur.name] = ''
return acc; return acc;
}, {}); }, {});
setRowsData([...rowsData, obj]); setRowsData([...rowsData, obj]);
} }
@@ -87,7 +88,10 @@ const ElementSettingTableColumns = ({
<InputText value={item.label} onInput={(e) => onInputChange(e, i)}/> <InputText value={item.label} onInput={(e) => onInputChange(e, i)}/>
<div className="flex-1"> <div className="flex-1">
<span>{__('Predefinito?', 'gepafin')}</span> <span>{__('Predefinito?', 'gepafin')}</span>
<InputSwitch checked={item.predefined} onChange={(e) => setChecked(e.value, i)}/> <InputSwitch
checked={item.predefined}
disabled={bandoStatus === 'PUBLISH'}
onChange={(e) => setChecked(e.value, i)}/>
</div> </div>
</> </>
} }
@@ -118,10 +122,10 @@ const ElementSettingTableColumns = ({
{stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem"> {stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem">
<div className="p-inputgroup flex-1"> <div className="p-inputgroup flex-1">
{properField(o, i)} {properField(o, i)}
<Button icon="pi pi-times" className="p-button-danger" onClick={() => removeItem(i)}/> <Button icon="pi pi-times" disabled={bandoStatus === 'PUBLISH'} className="p-button-danger" onClick={() => removeItem(i)}/>
</div> </div>
</div>)} </div>)}
<Button type="button" outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/> <Button type="button" disabled={bandoStatus === 'PUBLISH'} outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/>
</div> </div>
{stateFieldData {stateFieldData
.filter(o => o.predefined) .filter(o => o.predefined)
@@ -138,7 +142,9 @@ const ElementSettingTableColumns = ({
</div> </div>
</div> </div>
})} })}
<Button type="button" outlined <Button type="button"
outlined
disabled={bandoStatus === 'PUBLISH'}
label={__('Aggiungi una righa', 'gepafin')} label={__('Aggiungi una righa', 'gepafin')}
onClick={addNewRow}/> onClick={addNewRow}/>
</div> </div>

3
src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js
View File

@@ -17,7 +17,7 @@ import ElementSetting from './components/ElementSetting';
import { Dropdown } from 'primereact/dropdown'; import { Dropdown } from 'primereact/dropdown';
import { MultiSelect } from 'primereact/multiselect'; import { MultiSelect } from 'primereact/multiselect';
const BuilderElementSettings = ({ closeSettingsFn }) => { const BuilderElementSettings = ({ closeSettingsFn, bandoStatus }) => {
const elements = useStore().main.formElements(); const elements = useStore().main.formElements();
const activeElement = useStore().main.activeElement(); const activeElement = useStore().main.activeElement();
const criteriaOptions = useStore().main.bandoCriteria(); const criteriaOptions = useStore().main.bandoCriteria();
@@ -162,6 +162,7 @@ const BuilderElementSettings = ({ closeSettingsFn }) => {
? settings.map((o) => <ElementSetting ? settings.map((o) => <ElementSetting
key={o.name} key={o.name}
setting={o} setting={o}
bandoStatus={bandoStatus}
changeFn={onChange} changeFn={onChange}
updateDataFn={onUpdateOptions}/>) updateDataFn={onUpdateOptions}/>)
: null} : null}

7
src/pages/BandoFormsEdit/components/FormBuilder/index.js
View File

@@ -13,7 +13,7 @@ import BuilderElementSettings from '../BuilderElementSettings';
import BuilderDropzone from '../BuilderDropzone'; import BuilderDropzone from '../BuilderDropzone';
import BlockingOverlay from '../../../../components/BlockingOverlay'; import BlockingOverlay from '../../../../components/BlockingOverlay';
const FormBuilder = () => { const FormBuilder = ({ bandoStatus }) => {
const elements = useStore().main.formElements(); const elements = useStore().main.formElements();
const elementItems = useStore().main.elementItems(); const elementItems = useStore().main.elementItems();
const activeElement = useStore().main.activeElement(); const activeElement = useStore().main.activeElement();
@@ -27,9 +27,10 @@ const FormBuilder = () => {
id={field.id} id={field.id}
label={field.label} label={field.label}
name={field.name} name={field.name}
bandoStatus={bandoStatus}
/> />
) )
}, []); }, [bandoStatus]);
const renderItem = useCallback((item) => { const renderItem = useCallback((item) => {
return ( return (
@@ -57,7 +58,7 @@ const FormBuilder = () => {
<> <>
<Sidebar visible={!isEmpty(activeElement)} onHide={closeSettings} className="formBuilder__elementSettings"> <Sidebar visible={!isEmpty(activeElement)} onHide={closeSettings} className="formBuilder__elementSettings">
<h2>{__('Impostazioni del campo modulo', 'gepafin')}</h2> <h2>{__('Impostazioni del campo modulo', 'gepafin')}</h2>
{!isEmpty(activeElement) ? <BuilderElementSettings closeSettingsFn={closeSettings}/> : null} {!isEmpty(activeElement) ? <BuilderElementSettings closeSettingsFn={closeSettings} bandoStatus={bandoStatus}/> : null}
</Sidebar> </Sidebar>
<div className="formBuilder"> <div className="formBuilder">
<div className="formBuilder__main"> <div className="formBuilder__main">

8
src/pages/BandoFormsEdit/index.js
View File

@@ -210,7 +210,6 @@ const BandoFormsEdit = () => {
} }
const errFormDeleteCallback = (data) => { const errFormDeleteCallback = (data) => {
console.log('errFormDeleteCallback', data)
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }
@@ -223,7 +222,6 @@ const BandoFormsEdit = () => {
} }
const errGetElementItemsCallbacks = (data) => { const errGetElementItemsCallbacks = (data) => {
console.log('errGetElementItemsCallbacks', data)
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }
@@ -246,9 +244,9 @@ const BandoFormsEdit = () => {
const getBandoCallback = (data) => { const getBandoCallback = (data) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {
setBandoStatus(data.data.status);
const criteria = pathOr([], ['data', 'criteria'], data); const criteria = pathOr([], ['data', 'criteria'], data);
const criteriaOptions = criteria.map(o => ({value: o.id, label: o.value})); const criteriaOptions = criteria.map(o => ({value: o.id, label: o.value}));
console.log('criteriaOptions', criteriaOptions);
storeSet.main.bandoCriteria(criteriaOptions); storeSet.main.bandoCriteria(criteriaOptions);
} }
} }
@@ -319,7 +317,7 @@ const BandoFormsEdit = () => {
<div className="appPageSection"> <div className="appPageSection">
<DndProvider backend={HTML5Backend}> <DndProvider backend={HTML5Backend}>
<FormBuilder/> <FormBuilder bandoStatus={bandoStatus}/>
</DndProvider> </DndProvider>
</div> </div>
@@ -334,7 +332,7 @@ const BandoFormsEdit = () => {
label={__('Indietro', 'gepafin')} icon="pi pi-arrow-left" iconPos="left"/> label={__('Indietro', 'gepafin')} icon="pi pi-arrow-left" iconPos="left"/>
<Button <Button
onClick={() => doSave()} onClick={() => doSave()}
disabled={isAsyncRequest || 'PUBLISH' === bandoStatus} disabled={isAsyncRequest}
label={__('Salva progressi', 'gepafin')} icon="pi pi-save" iconPos="right"/> label={__('Salva progressi', 'gepafin')} icon="pi pi-save" iconPos="right"/>
<Button <Button
outlined outlined