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

Jump to bottom

fix: css templates modal cleanup: keep modal open on error, utilize useEffect #12360

Merged
merged 1 commit into from
Jan 13, 2021
Merged

fix: css templates modal cleanup: keep modal open on error, utilize useEffect #12360

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
58 changes: 36 additions & 22 deletions superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ const CssTemplateModal: FunctionComponent<CssTemplateModalProps> = ({
const update_id = currentCssTemplate.id;
delete currentCssTemplate.id;
delete currentCssTemplate.created_by;
updateResource(update_id, currentCssTemplate).then(() => {
updateResource(update_id, currentCssTemplate).then(response => {
if (!response) {
return;
}

if (onCssTemplateAdd) {
onCssTemplateAdd();
}
Expand All @@ -120,7 +124,11 @@ const CssTemplateModal: FunctionComponent<CssTemplateModalProps> = ({
}
} else if (currentCssTemplate) {
// Create
createResource(currentCssTemplate).then(() => {
createResource(currentCssTemplate).then(response => {
if (!response) {
return;
}

if (onCssTemplateAdd) {
onCssTemplateAdd();
}
Expand Down Expand Up @@ -166,29 +174,35 @@ const CssTemplateModal: FunctionComponent<CssTemplateModalProps> = ({
};

// Initialize
if (
isEditMode &&
(!currentCssTemplate ||
!currentCssTemplate.id ||
(cssTemplate && cssTemplate.id !== currentCssTemplate.id) ||
(isHidden && show))
) {
if (cssTemplate && cssTemplate.id !== null && !loading) {
const id = cssTemplate.id || 0;
useEffect(() => {
if (
isEditMode &&
(!currentCssTemplate ||
!currentCssTemplate.id ||
(cssTemplate && cssTemplate.id !== currentCssTemplate.id) ||
(isHidden && show))
) {
if (cssTemplate && cssTemplate.id !== null && !loading) {
const id = cssTemplate.id || 0;

fetchResource(id).then(() => {
setCurrentCssTemplate(resource);
fetchResource(id);
}
} else if (
!isEditMode &&
(!currentCssTemplate || currentCssTemplate.id || (isHidden && show))
) {
setCurrentCssTemplate({
template_name: '',
css: '',
});
}
} else if (
!isEditMode &&
(!currentCssTemplate || currentCssTemplate.id || (isHidden && show))
) {
setCurrentCssTemplate({
template_name: '',
css: '',
});
}
}, [cssTemplate]);

useEffect(() => {
if (resource) {
setCurrentCssTemplate(resource);
}
}, [resource]);

// Validation
useEffect(() => {
Expand Down