Skip to content

Commit f011c1b

Browse files
Merge branch 'master' of github.com:supertokens/dashboard into feat/user-creation
2 parents 1904fe7 + 435c332 commit f011c1b

File tree

12 files changed

+38
-19
lines changed

12 files changed

+38
-19
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [unreleased]
99

10+
## [0.9.1] - 2023-12-19
11+
12+
- Improve UX when showing feature not enabled message for UserRoles recipe.
13+
1014
## [0.9.0] - 2023-11-17
1115

1216
- Adds user roles and permissions feature to dashboard.

build/static/css/main.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/static/css/main.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/static/js/bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/static/js/bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dashboard",
3-
"version": "0.9.0",
3+
"version": "0.9.1",
44
"private": true,
55
"dependencies": {
66
"@babel/core": "^7.16.0",

src/ui/components/alert/alert.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@
5656
& > div {
5757
color: #a44915;
5858
}
59+
60+
a {
61+
color: #a44915;
62+
font-weight: 500;
63+
}
64+
}
65+
66+
a:hover {
67+
background: transparent !important;
5968
}
6069
}
6170

src/ui/components/alert/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ import "./alert.scss";
1818
type AlertProps = {
1919
type?: "primary";
2020
title: string;
21-
content: string;
21+
children: React.ReactNode;
2222
};
2323

24-
export default function Alert({ content, title, type = "primary" }: AlertProps) {
24+
export default function Alert({ children, title, type = "primary" }: AlertProps) {
2525
return (
2626
<div className={`alert ${type}`}>
2727
<span>{title}</span>
28-
<div>{content}</div>
28+
<div>{children}</div>
2929
</div>
3030
);
3131
}

src/ui/components/userDetail/userRoles/UserRolesList.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,13 @@ export default function UserRolesList() {
182182
) : null}
183183
</>
184184
) : (
185-
<Alert
186-
title="Feature is not enabled"
187-
content="Please enable this feature first to manage your user roles and permissions!"
188-
/>
185+
<Alert title="Feature is not enabled">
186+
Enable this feature to manage user roles and permissions. Start by initializing the
187+
UserRoles recipe in the recipeList on the backend. For more details, see{" "}
188+
<a href="https://supertokens.com/docs/userdashboard/managing-user-roles-and-permissions">
189+
this page.
190+
</a>
191+
</Alert>
189192
)}
190193
</>
191194
</div>

src/ui/pages/userroles/index.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,13 @@ export default function UserRolesList() {
106106
function renderContent() {
107107
if (isFeatureEnabled === false) {
108108
return (
109-
<Alert
110-
title="Feature is not enabled"
111-
content="Please enable this feature first to manage your user roles and permissions!"
112-
/>
109+
<Alert title="Feature is not enabled">
110+
Enable this feature to manage user roles and permissions. Start by initializing the UserRoles recipe
111+
in the recipeList on the backend. For more details, see{" "}
112+
<a href="https://supertokens.com/docs/userdashboard/managing-user-roles-and-permissions">
113+
this page.
114+
</a>
115+
</Alert>
113116
);
114117
}
115118

src/version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
* under the License.
1414
*/
1515

16-
export const package_version = "0.9.0";
16+
export const package_version = "0.9.1";

0 commit comments

Comments
 (0)