From b6a8df6d3eceaf22a0232c333e760f41fd7d3599 Mon Sep 17 00:00:00 2001
From: Amanda Ariyaratne <amandaa@wso2.com>
Date: Wed, 1 Nov 2023 09:44:29 +0530
Subject: [PATCH 1/4] Update role name field input validation

---
 .../src/features/roles/components/edit-role/edit-role-basic.tsx | 2 +-
 .../features/roles/components/wizard-updated/role-basics.tsx    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/console/src/features/roles/components/edit-role/edit-role-basic.tsx b/apps/console/src/features/roles/components/edit-role/edit-role-basic.tsx
index 2655f732762..96e36fa3db5 100644
--- a/apps/console/src/features/roles/components/edit-role/edit-role-basic.tsx
+++ b/apps/console/src/features/roles/components/edit-role/edit-role-basic.tsx
@@ -167,7 +167,7 @@ export const BasicRoleDetails: FunctionComponent<BasicRoleProps> = (props: Basic
                     <Field.Input
                         ariaLabel="roleName"
                         name="roleName"
-                        inputType="identifier"
+                        inputType="resource_name"
                         required={ true }
                         readOnly={ isReadOnly }
                         value={ role?.displayName }
diff --git a/apps/console/src/features/roles/components/wizard-updated/role-basics.tsx b/apps/console/src/features/roles/components/wizard-updated/role-basics.tsx
index 4190c478633..3c29f2084fc 100644
--- a/apps/console/src/features/roles/components/wizard-updated/role-basics.tsx
+++ b/apps/console/src/features/roles/components/wizard-updated/role-basics.tsx
@@ -266,7 +266,7 @@ export const RoleBasics: FunctionComponent<RoleBasicProps> = (props: RoleBasicPr
         >
             <Field.Input
                 ariaLabel="roleName"
-                inputType="identifier"
+                inputType="resource_name"
                 data-componentid={ `${ componentId }-role-name-input` }
                 type="text"
                 name="roleName"

From abfc5e25eaa7a4afd8d2063fd019e6147fc39021 Mon Sep 17 00:00:00 2001
From: Amanda Ariyaratne <amandaa@wso2.com>
Date: Wed, 1 Nov 2023 09:51:31 +0530
Subject: [PATCH 2/4] Add changeset

---
 .changeset/little-pens-exist.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/little-pens-exist.md

diff --git a/.changeset/little-pens-exist.md b/.changeset/little-pens-exist.md
new file mode 100644
index 00000000000..76c972f647e
--- /dev/null
+++ b/.changeset/little-pens-exist.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/console": patch
+---
+
+Update role name field input validation

From a3c3d4219acbbeb5df816acf82fb839f177a1877 Mon Sep 17 00:00:00 2001
From: Amanda Ariyaratne <amandaa@wso2.com>
Date: Wed, 1 Nov 2023 12:00:48 +0530
Subject: [PATCH 3/4] Add rolename as input type for form field

---
 .../components/edit-role/edit-role-basic.tsx  |  2 +-
 .../components/wizard-updated/role-basics.tsx |  2 +-
 modules/form/src/components/field-input.tsx   |  5 +++--
 modules/form/src/utils/validate.ts            |  8 ++++++-
 modules/validation/src/index.ts               |  4 +++-
 modules/validation/src/validation.ts          | 22 ++++++++++++++++++-
 6 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/apps/console/src/features/roles/components/edit-role/edit-role-basic.tsx b/apps/console/src/features/roles/components/edit-role/edit-role-basic.tsx
index 96e36fa3db5..403460ec9f0 100644
--- a/apps/console/src/features/roles/components/edit-role/edit-role-basic.tsx
+++ b/apps/console/src/features/roles/components/edit-role/edit-role-basic.tsx
@@ -167,7 +167,7 @@ export const BasicRoleDetails: FunctionComponent<BasicRoleProps> = (props: Basic
                     <Field.Input
                         ariaLabel="roleName"
                         name="roleName"
-                        inputType="resource_name"
+                        inputType="roleName"
                         required={ true }
                         readOnly={ isReadOnly }
                         value={ role?.displayName }
diff --git a/apps/console/src/features/roles/components/wizard-updated/role-basics.tsx b/apps/console/src/features/roles/components/wizard-updated/role-basics.tsx
index 3c29f2084fc..cc518ecc27e 100644
--- a/apps/console/src/features/roles/components/wizard-updated/role-basics.tsx
+++ b/apps/console/src/features/roles/components/wizard-updated/role-basics.tsx
@@ -266,7 +266,7 @@ export const RoleBasics: FunctionComponent<RoleBasicProps> = (props: RoleBasicPr
         >
             <Field.Input
                 ariaLabel="roleName"
-                inputType="resource_name"
+                inputType="roleName"
                 data-componentid={ `${ componentId }-role-name-input` }
                 type="text"
                 name="roleName"
diff --git a/modules/form/src/components/field-input.tsx b/modules/form/src/components/field-input.tsx
index 1852208b0fb..97c8e731cc3 100644
--- a/modules/form/src/components/field-input.tsx
+++ b/modules/form/src/components/field-input.tsx
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021, WSO2 LLC. (https://www.wso2.com).
+ * Copyright (c) 2021-2023, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -44,7 +44,8 @@ export interface FieldInputPropsInterface extends FormFieldPropsInterface {
         | "url"
         | "copy_input"
         | "password"
-        | "phoneNumber";
+        | "phoneNumber"
+        | "roleName";
     /**
      * Hint of the form field.
      */
diff --git a/modules/form/src/utils/validate.ts b/modules/form/src/utils/validate.ts
index 23e18a174d3..8d780e384f3 100644
--- a/modules/form/src/utils/validate.ts
+++ b/modules/form/src/utils/validate.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2021-2023, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -82,6 +82,12 @@ export const getDefaultValidation = (
                     return FieldConstants.INVALID_SCOPES_ERROR;
                 }
 
+                break;
+            case "roleName":
+                if (!FormValidation.isValidRoleName(value)) {
+                    return FieldConstants.INVALID_NAME_ERROR;
+                }
+
                 break;
         }
     }
diff --git a/modules/validation/src/index.ts b/modules/validation/src/index.ts
index 602a2cdcc61..2e42c55186f 100644
--- a/modules/validation/src/index.ts
+++ b/modules/validation/src/index.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2019, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2019-2023, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -27,6 +27,7 @@ import {
     isValidDescription,
     isValidResourceKey,
     isValidResourceName,
+    isValidRoleName,
     mobileNumber,
     resourceName,
     scopes,
@@ -43,6 +44,7 @@ export const FormValidation = {
     isValidDescription,
     isValidResourceKey,
     isValidResourceName,
+    isValidRoleName,
     mobileNumber,
     resourceName,
     scopes,
diff --git a/modules/validation/src/validation.ts b/modules/validation/src/validation.ts
index fbf60fbeafb..5114c49c0cd 100644
--- a/modules/validation/src/validation.ts
+++ b/modules/validation/src/validation.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2019, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2019-2023, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -314,3 +314,23 @@ export const isValidResourceKey = (value: string): boolean => {
         return false;
     }
 };
+
+/**
+ * This validates the role name. Returns true if valid. False if not valid.
+ *
+ * @param value - Input to be validated.
+ * @returns whether input is accepted or not.
+ */
+export const isValidRoleName = (value: string): boolean => {
+    try {
+        const result: ValidationResult = Joi.string()
+            .regex(new RegExp("^[a-zA-Z][a-zA-Z0-9-_. ]+$"))
+            .min(3)
+            .max(255)
+            .validate(value);
+
+        return !result.error;
+    } catch (error) {
+        return false;
+    }
+};

From 9beb9abf218f2ffd24b75ac8b6392df8c5e5a69a Mon Sep 17 00:00:00 2001
From: Amanda Ariyaratne <amandaa@wso2.com>
Date: Wed, 1 Nov 2023 12:02:59 +0530
Subject: [PATCH 4/4] Update changeset

---
 .changeset/little-pens-exist.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.changeset/little-pens-exist.md b/.changeset/little-pens-exist.md
index 76c972f647e..37ef2047c7c 100644
--- a/.changeset/little-pens-exist.md
+++ b/.changeset/little-pens-exist.md
@@ -1,5 +1,7 @@
 ---
 "@wso2is/console": patch
+"@wso2is/form": patch
+"@wso2is/validation": patch
 ---
 
 Update role name field input validation