Merge branch 'master' of github.com:supertokens/dashboard into feat/u…

…ser-creation
supertokens · Dec 20, 2023 · f011c1b · f011c1b
2 parents 1904fe7 + 435c332
commit f011c1b
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.9.1] - 2023-12-19
+
+-   Improve UX when showing feature not enabled message for UserRoles recipe.
+
 ## [0.9.0] - 2023-11-17
 
 -   Adds user roles and permissions feature to dashboard.

diff --git a/build/static/css/main.css b/build/static/css/main.css
diff --git a/build/static/css/main.css.map b/build/static/css/main.css.map
diff --git a/build/static/js/bundle.js b/build/static/js/bundle.js
diff --git a/build/static/js/bundle.js.map b/build/static/js/bundle.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "dashboard",
-	"version": "0.9.0",
+	"version": "0.9.1",
 	"private": true,
 	"dependencies": {
 		"@babel/core": "^7.16.0",

diff --git a/src/ui/components/alert/alert.scss b/src/ui/components/alert/alert.scss
@@ -56,6 +56,15 @@
 		& > div {
 			color: #a44915;
 		}
+
+		a {
+			color: #a44915;
+			font-weight: 500;
+		}
+	}
+
+	a:hover {
+		background: transparent !important;
 	}
 }
 

diff --git a/src/ui/components/alert/index.tsx b/src/ui/components/alert/index.tsx
@@ -18,14 +18,14 @@ import "./alert.scss";
 type AlertProps = {
 	type?: "primary";
 	title: string;
-	content: string;
+	children: React.ReactNode;
 };
 
-export default function Alert({ content, title, type = "primary" }: AlertProps) {
+export default function Alert({ children, title, type = "primary" }: AlertProps) {
 	return (
 		<div className={`alert ${type}`}>
 			<span>{title}</span>
-			<div>{content}</div>
+			<div>{children}</div>
 		</div>
 	);
 }
diff --git a/src/ui/components/userDetail/userRoles/UserRolesList.tsx b/src/ui/components/userDetail/userRoles/UserRolesList.tsx
@@ -182,10 +182,13 @@ export default function UserRolesList() {
 							) : null}
 						</>
 					) : (
-						<Alert
-							title="Feature is not enabled"
-							content="Please enable this feature first to manage your user roles and permissions!"
-						/>
+						<Alert title="Feature is not enabled">
+							Enable this feature to manage user roles and permissions. Start by initializing the
+							UserRoles recipe in the recipeList on the backend. For more details, see{" "}
+							<a href="https://supertokens.com/docs/userdashboard/managing-user-roles-and-permissions">
+								this page.
+							</a>
+						</Alert>
 					)}
 				</>
 			</div>

diff --git a/src/ui/pages/userroles/index.tsx b/src/ui/pages/userroles/index.tsx
@@ -106,10 +106,13 @@ export default function UserRolesList() {
 	function renderContent() {
 		if (isFeatureEnabled === false) {
 			return (
-				<Alert
-					title="Feature is not enabled"
-					content="Please enable this feature first to manage your user roles and permissions!"
-				/>
+				<Alert title="Feature is not enabled">
+					Enable this feature to manage user roles and permissions. Start by initializing the UserRoles recipe
+					in the recipeList on the backend. For more details, see{" "}
+					<a href="https://supertokens.com/docs/userdashboard/managing-user-roles-and-permissions">
+						this page.
+					</a>
+				</Alert>
 			);
 		}
 

diff --git a/src/version.ts b/src/version.ts
@@ -13,4 +13,4 @@
  * under the License.
  */
 
-export const package_version = "0.9.0";
+export const package_version = "0.9.1";