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: before fetching subscriptions, ensure modal is visible #8389

Merged
merged 5 commits into from
Jul 14, 2021
Merged

fix: before fetching subscriptions, ensure modal is visible #8389

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b24a21b
before fetching subscriptions, ensure modal is visible
benbrown Jul 13, 2021
ac71f40
remove comment
benbrown Jul 13, 2021
4cd99a3
Merge branch 'main' into benbrown/extrasubs
pavolum Jul 13, 2021
0387f90
Merge branch 'main' into benbrown/extrasubs
benbrown Jul 14, 2021
adc82c0
Merge branch 'main' into benbrown/extrasubs
benbrown Jul 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Composer/packages/client/src/components/ManageService/ManageService.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export const ManageService: React.FC<ManageServiceProps> = (props: ManageService
};

useEffect(() => {
if (isAuthenticated) {
if (isAuthenticated && !props.hidden) {
setAvailableSubscriptions([]);
setSubscriptionsErrorMessage(undefined);
getSubscriptions(currentUser.token)
Expand All @@ -153,7 +153,7 @@ export const ManageService: React.FC<ManageServiceProps> = (props: ManageService
setSubscriptionsErrorMessage(err.message);
});
}
}, [isAuthenticated]);
}, [isAuthenticated, props.hidden]);

useEffect(() => {
// reset the ui
Expand Down
4 changes: 2 additions & 2 deletions Composer/packages/client/src/components/QnA/CreateQnAModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export const CreateQnAModal: React.FC<CreateQnAModalProps> = (props) => {
}, []);

useEffect(() => {
if (isAuthenticated) {
if (isAuthenticated && showCreateQnAFrom) {
setAvailableSubscriptions([]);
setSubscriptionsErrorMessage(undefined);
getSubscriptions(currentUser.token)
Expand All @@ -173,7 +173,7 @@ export const CreateQnAModal: React.FC<CreateQnAModalProps> = (props) => {
setSubscriptionsErrorMessage(err.message);
});
}
}, [currentUser, isAuthenticated]);
}, [currentUser, isAuthenticated, showCreateQnAFrom]);

useEffect(() => {
// reset the ui
Expand Down
4 changes: 2 additions & 2 deletions Composer/packages/client/src/components/QnA/ReplaceQnAFromModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export const ReplaceQnAFromModal: React.FC<ReplaceQnAModalProps> = (props) => {
}, []);

useEffect(() => {
if (isAuthenticated) {
if (isAuthenticated && !hidden) {
setAvailableSubscriptions([]);
setSubscriptionsErrorMessage(undefined);
getSubscriptions(currentUser.token)
Expand All @@ -154,7 +154,7 @@ export const ReplaceQnAFromModal: React.FC<ReplaceQnAModalProps> = (props) => {
setSubscriptionsErrorMessage(err.message);
});
}
}, [currentUser, isAuthenticated]);
}, [currentUser, isAuthenticated, hidden]);

useEffect(() => {
// reset the ui
Expand Down