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.

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 report charts #2239

Merged
merged 1 commit into from
Aug 30, 2024
Merged

Fix report charts #2239

merged 1 commit into from
Aug 30, 2024

Conversation

Fosol
Copy link
Collaborator

@Fosol Fosol commented Aug 30, 2024

Fixed issue with charts that should only display the content in their own section.

Fixed issue with regenerate report and charts.

Fixed modal disable confirm button.

@Fosol Fosol added bug Something isn't working subscriber PR contains changes towards the subscriber application, labels Aug 30, 2024
@Fosol Fosol self-assigned this Aug 30, 2024
@@ -90,7 +90,7 @@ export const Modal: React.FC<IModalProps> = ({
<Button
variant={type === 'delete' ? 'error' : 'primary'}
onClick={onConfirm}
disabled={isSubmitting && !enableConfirm}
disabled={isSubmitting || !enableConfirm}
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

If either then disable. The way this was implemented didn't make sense. I hope where ever else it's used it doesn't break.

@@ -156,6 +156,9 @@ export const ReportEditContentForm = React.forwardRef<
}}
/>
</Show>
<Show visible={isSubmitting}>
<Loading />
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The regenerate process takes a bit.

setData(convertToChart(chart, showReportData ? reportContent : testData, values.sections));
}, [chart, reportContent, showReportData, testData, values.sections]);
const sectionContent =
section.filterId || section.folderId || section.linkedReportId
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Only include content in the section when appropriate.

@Fosol Fosol merged commit 8dafcab into bcgov:dev Aug 30, 2024
2 checks passed
@Fosol Fosol deleted the charts branch August 30, 2024 04:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working subscriber PR contains changes towards the subscriber application,
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant