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

fix: Users List button not visible #143

Merged
merged 1 commit into from
Apr 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [unreleased]

## [0.10.6] - 2024-04-01

- Backport for fixing a regression bug in user management dashboard that causes the add user button to not be visible when there is only one tenant.

## [0.10.5] - 2024-03-19

- Fixes UI bugs on search and Login methods section in userDetails page.
Expand Down
2 changes: 1 addition & 1 deletion build/static/js/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/static/js/bundle.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dashboard",
"version": "0.10.5",
"version": "0.10.6",
"private": true,
"dependencies": {
"@babel/core": "^7.16.0",
Expand Down
21 changes: 11 additions & 10 deletions src/ui/pages/usersList/UsersList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ import UsersListTable, {
} from "../../components/usersListTable/UsersListTable";
import { PopupContentContext } from "../../contexts/PopupContentContext";
import { useTenantsListContext } from "../../contexts/TenantsListContext";
import "./UsersList.scss";
import { EmailVerificationStatus, User } from "./types";
import "./UsersList.scss";

type UserListPropsReloadRef = MutableRefObject<(() => Promise<void>) | undefined>;

Expand Down Expand Up @@ -307,15 +307,6 @@ export const UsersList: React.FC<UserListProps> = ({
})}
</select>
</div>
<Button
disabled={selectedTenant === undefined || tenantsLoginMethods === undefined}
id="add-user"
className="ml-auto"
color="secondary"
onClick={() => setShowCreateUserDialog(true)}>
<PlusIcon />
Add User
</Button>
</div>
)}

Expand All @@ -327,6 +318,16 @@ export const UsersList: React.FC<UserListProps> = ({
/>
)}

<Button
disabled={selectedTenant === undefined || tenantsLoginMethods === undefined}
id="add-user"
className="ml-auto"
color="secondary"
onClick={() => setShowCreateUserDialog(true)}>
<PlusIcon />
Add User
</Button>

{showCreateUserDialog && selectedTenant !== undefined && tenantsLoginMethods !== undefined ? (
<CreateUserDialog
defaultSelectedTenantId={selectedTenant}
Expand Down
2 changes: 1 addition & 1 deletion src/version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
* under the License.
*/

export const package_version = "0.10.5";
export const package_version = "0.10.6";
Loading