Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Empty message in changes modal in local unit #1617

Merged
merged 1 commit into from
Jan 6, 2025
Merged

fix: Empty message in changes modal in local unit #1617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ontextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
"confirmChangesContentQuestion": "Are you sure you want to have these changes in this local unit?",
"newLocalUnitDescription": "New local unit",
"latitude": "Latitude",
"longitude": "Longitude"
"longitude": "Longitude",
"noChangesMessage": "You have made no changes to this local unit."
}
}
12 changes: 10 additions & 2 deletions ...ontextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,9 @@ function LocalUnitsForm(props: Props) {
const readOnly = readOnlyFromProps
|| localUnitDetailsResponse?.is_locked;

const emptyLocalUnitChangesFormFields = localUnitChangedFormFields
&& localUnitChangedFormFields.length <= 0;

const {
response: localUnitsOptions,
pending: localUnitsOptionsPending,
Expand Down Expand Up @@ -696,8 +699,11 @@ function LocalUnitsForm(props: Props) {
<Button
name={undefined}
onClick={handleFormSubmit}
disabled={addLocalUnitsPending
|| updateLocalUnitsPending}
disabled={
addLocalUnitsPending
|| updateLocalUnitsPending
|| emptyLocalUnitChangesFormFields
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix Lint error: Unexpected newline before '}'

>
{strings.submitButtonLabel}
</Button>
Expand Down Expand Up @@ -1807,6 +1813,8 @@ function LocalUnitsForm(props: Props) {
onClose={setShowChangesModalFalse}
footerActions={submitButton}
headerDescription={strings.confirmChangesContentQuestion}
empty={emptyLocalUnitChangesFormFields}
emptyMessage={strings.noChangesMessage}
>
<RawList
data={localUnitChangedFormFields}
Expand Down
Loading