From 7a8b0f3ffae136df00868d6056317cce9a42e756 Mon Sep 17 00:00:00 2001 From: jdtoombs Date: Tue, 18 Jun 2024 19:11:53 -0700 Subject: [PATCH 1/3] fix --- .../src/features/settings/MyMinisterSettings.tsx | 3 ++- app/subscriber/src/store/hooks/subscriber/useUsers.ts | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/subscriber/src/features/settings/MyMinisterSettings.tsx b/app/subscriber/src/features/settings/MyMinisterSettings.tsx index 587910fd58..c65d31b535 100644 --- a/app/subscriber/src/features/settings/MyMinisterSettings.tsx +++ b/app/subscriber/src/features/settings/MyMinisterSettings.tsx @@ -34,6 +34,7 @@ export const MyMinisterSettings: React.FC = () => { return; } const baseProfile = impersonate ?? profile; + console.log('baseProfile', baseProfile); const createUser = (): ISubscriberUserModel => { // use impersonate if it exists, otherwise use profile return { @@ -48,7 +49,7 @@ export const MyMinisterSettings: React.FC = () => { const user = createUser(); try { - await updateUser(user); + await updateUser(user, !!impersonate); toast.success('Your minister(s) have successfully been updated.'); } catch (error) { // Handle the error, if needed diff --git a/app/subscriber/src/store/hooks/subscriber/useUsers.ts b/app/subscriber/src/store/hooks/subscriber/useUsers.ts index 6a31182a0b..8b249d8dc5 100644 --- a/app/subscriber/src/store/hooks/subscriber/useUsers.ts +++ b/app/subscriber/src/store/hooks/subscriber/useUsers.ts @@ -13,14 +13,14 @@ import { interface IUserController { getUser: () => Promise; findUsers: (filter: IUserFilter) => Promise>; - updateUser: (model: ISubscriberUserModel) => Promise; + updateUser: (model: ISubscriberUserModel, impersonate?: boolean) => Promise; } export const useUsers = (): IUserController => { const { findUsers } = useApiAdminUsers(); const { getUser, updateUser } = useApiSubscriberUsers(); const dispatch = useAjaxWrapper(); - const [, { storeMyProfile }] = useProfileStore(); + const [, { storeMyProfile, storeImpersonate }] = useProfileStore(); const [{ userInfo }, { storeUserInfo }] = useAppStore(); const controller = React.useMemo( @@ -33,11 +33,11 @@ export const useUsers = (): IUserController => { const response = await dispatch('find-users', () => findUsers(filter)); return response.data; }, - updateUser: async (model: ISubscriberUserModel) => { + updateUser: async (model: ISubscriberUserModel, impersonate?: boolean) => { const response = await dispatch('update-user', () => updateUser(model), ); - storeMyProfile(response.data); + impersonate ? storeImpersonate(response.data) : storeMyProfile(response.data); if (userInfo) storeUserInfo({ ...userInfo, preferences: response.data.preferences }); return response.data; }, From b4dcc2052f15d1b0430693aef9802b4e5db9dfc2 Mon Sep 17 00:00:00 2001 From: jdtoombs Date: Tue, 18 Jun 2024 19:18:10 -0700 Subject: [PATCH 2/3] remove log --- app/subscriber/src/features/settings/MyMinisterSettings.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/app/subscriber/src/features/settings/MyMinisterSettings.tsx b/app/subscriber/src/features/settings/MyMinisterSettings.tsx index c65d31b535..404492916f 100644 --- a/app/subscriber/src/features/settings/MyMinisterSettings.tsx +++ b/app/subscriber/src/features/settings/MyMinisterSettings.tsx @@ -34,7 +34,6 @@ export const MyMinisterSettings: React.FC = () => { return; } const baseProfile = impersonate ?? profile; - console.log('baseProfile', baseProfile); const createUser = (): ISubscriberUserModel => { // use impersonate if it exists, otherwise use profile return { From d2c3f052095f7d1ad4f185a17277269f73dd5ba0 Mon Sep 17 00:00:00 2001 From: jdtoombs Date: Thu, 20 Jun 2024 10:01:39 -0700 Subject: [PATCH 3/3] fix console warnings --- app/subscriber/src/App.tsx | 2 +- .../src/components/folder-sub-menu/FolderSubMenu.tsx | 3 ++- app/subscriber/src/components/share-menu/ShareMenu.tsx | 3 ++- app/subscriber/src/components/user-profile/UserProfile.tsx | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/subscriber/src/App.tsx b/app/subscriber/src/App.tsx index 50aadaba28..f94e62d068 100644 --- a/app/subscriber/src/App.tsx +++ b/app/subscriber/src/App.tsx @@ -68,10 +68,10 @@ function App() { = ({ selectedContent } className="folder-menu" place="bottom" openOnClick - style={{ opacity: '1', boxShadow: '0 0 8px #464545', zIndex: '999' }} + opacity={1} + style={{ boxShadow: '0 0 8px #464545', zIndex: '999' }} id="folder" > diff --git a/app/subscriber/src/components/share-menu/ShareMenu.tsx b/app/subscriber/src/components/share-menu/ShareMenu.tsx index 6d1377c698..b5407f9820 100644 --- a/app/subscriber/src/components/share-menu/ShareMenu.tsx +++ b/app/subscriber/src/components/share-menu/ShareMenu.tsx @@ -99,7 +99,8 @@ export const ShareMenu: React.FC = ({ content }) => { className="share-menu" place="bottom" openOnClick - style={{ opacity: '1', boxShadow: '0 0 8px #464545', zIndex: '999' }} + opacity={1} + style={{ boxShadow: '0 0 8px #464545', zIndex: '999' }} id="share" > SHARE WITH A COLLEAGUE: diff --git a/app/subscriber/src/components/user-profile/UserProfile.tsx b/app/subscriber/src/components/user-profile/UserProfile.tsx index 98ff2a24b3..4edcd3f447 100644 --- a/app/subscriber/src/components/user-profile/UserProfile.tsx +++ b/app/subscriber/src/components/user-profile/UserProfile.tsx @@ -64,7 +64,8 @@ export const UserProfile: React.FC = () => { closeOnEsc isOpen={profileMenu} setIsOpen={setProfileMenu} - style={{ opacity: '1', boxShadow: '0 0 8px #464545', zIndex: '999' }} + opacity={1} + style={{ boxShadow: '0 0 8px #464545', zIndex: '999' }} id="my-info" >

My Profile