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

refactor: useHydratedSession instead of built-in useSession #2407

Merged
merged 12 commits into from
Nov 20, 2024
Prev Previous commit
Next Next commit
fix: merge leftovers
  • Loading branch information
Kiryous committed Nov 19, 2024
commit 1d9a6d11607bb31d14326d3139b44455b8751285
29 changes: 10 additions & 19 deletions keep-ui/app/settings/settings.client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,16 @@ export default function SettingsPage() {
newUserSubTab === "users"
? 0
: newUserSubTab === "groups"
? 1
: newUserSubTab === "roles"
? 2
: newUserSubTab === "permissions"
? 3
: newUserSubTab === "api-keys"
? 4
: newUserSubTab === "sso"
? 5
: 0;
? 1
: newUserSubTab === "roles"
? 2
: newUserSubTab === "permissions"
? 3
: newUserSubTab === "api-keys"
? 4
: newUserSubTab === "sso"
? 5
: 0;
setTabIndex(tabIndex);
setUserSubTabIndex(userSubTabIndex);
setSelectedTab(newSelectedTab);
Expand Down Expand Up @@ -119,10 +119,7 @@ export default function SettingsPage() {
accessToken={session?.accessToken!}
currentUser={session?.user}
groupsAllowed={groupsAllowed}
<<<<<<< HEAD
=======
userCreationAllowed={userCreationAllowed}
>>>>>>> main
/>
);
} else {
Expand Down Expand Up @@ -267,8 +264,6 @@ export default function SettingsPage() {
onDeleteRole={() => {}}
isDisabled={true}
/>
<<<<<<< HEAD
=======
</EmptyStateTable>
);
}
Expand Down Expand Up @@ -301,7 +296,6 @@ export default function SettingsPage() {
onRowClick={() => {}}
isDisabled={true}
/>
>>>>>>> main
</EmptyStateTable>
);
}
Expand Down Expand Up @@ -397,15 +391,12 @@ export default function SettingsPage() {
Roles
</Tab>
<Tab
<<<<<<< HEAD
=======
icon={LockClosedIcon}
onClick={() => handleUserSubTabChange("permissions")}
>
Permissions
</Tab>
<Tab
>>>>>>> main
icon={KeyIcon}
onClick={() => handleUserSubTabChange("api-keys")}
>
Expand Down
Loading