Skip to content

fix: restore group fetching on the user edit page, update urls #802

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

Merged
t-aleksander merged 2 commits into from
Sep 23, 2024
Merged

fix: restore group fetching on the user edit page, update urls #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4b12cf
fix groups
t-aleksander Sep 23, 2024
a7d4ae7
update url
t-aleksander Sep 23, 2024
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
2 changes: 1 addition & 1 deletion src/enterprise/license.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use crate::{
VERSION,
};

const LICENSE_SERVER_URL: &str = "https://update-service-dev.defguard.net/api/license/renew";
const LICENSE_SERVER_URL: &str = "https://pkgs.defguard.net/api/license/renew";

static LICENSE: RwLock<Option<License>> = RwLock::new(None);

Expand Down
7 changes: 6 additions & 1 deletion web/src/pages/users/UserProfile/ProfileDetails/ProfileDetailsForm/ProfileDetailsForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export const ProfileDetailsForm = () => {
const queryClient = useQueryClient();
const isAdmin = useAuthStore((state) => state.isAdmin);
const isMe = useUserProfileStore((state) => state.isMe);
const [fetchGroups] = useState(false);
const [fetchGroups, setFetchGroups] = useState(false);
const {
user: { editUser },
groups: { getGroups },
Expand Down Expand Up @@ -220,6 +220,11 @@ export const ProfileDetailsForm = () => {
}
}, [submitSubject, getValues, userProfile?.user.username]);

useEffect(() => {
setTimeout(() => setFetchGroups(true), 500);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

return (
<>
<form onSubmit={handleSubmit(onValidSubmit, onInvalidSubmit)}>
Expand Down