Show "CUSTOM" on permission roles instead of empty entry (#1597)

gradle/changelog/custom_permission_role.yaml

@@ -0,0 +1,2 @@
+- type: changed
+  description: Show "CUSTOM" name instead empty entry for permission roles ([#1597](https://github.com/scm-manager/scm-manager/pull/1597))

scm-ui/ui-webapp/src/repos/permissions/components/RoleSelector.tsx

@@ -31,11 +31,7 @@ type Props = {
   label?: string;
   helpText?: string;
   loading?: boolean;
-};
-
-const emptyOption = {
-  label: "",
-  value: ""
+  emptyLabel?: string;
 };
 
 const createSelectOptions = (roles: string[]) => {
@@ -47,11 +43,13 @@ const createSelectOptions = (roles: string[]) => {
   });
 };
 
-const RoleSelector: FC<Props> = ({ availableRoles, role, handleRoleChange, loading, label, helpText }) => {
+const RoleSelector: FC<Props> = ({ availableRoles, role, handleRoleChange, loading, label, helpText, emptyLabel }) => {
   if (!availableRoles) {
     return null;
   }
-  const options = role ? createSelectOptions(availableRoles) : [emptyOption, ...createSelectOptions(availableRoles)];
+  const options = role
+    ? createSelectOptions(availableRoles)
+    : [{ label: emptyLabel || "", value: "" }, ...createSelectOptions(availableRoles)];
 
   return (
     <Select

scm-ui/ui-webapp/src/repos/permissions/containers/CreatePermissionForm.tsx

@@ -164,6 +164,7 @@ const CreatePermissionForm: FC<Props> = ({
           selectedVerbs={selectedVerbs || []}
           onClose={() => setShowAdvancedDialog(false)}
           onSubmit={submitAdvancedPermissionsDialog}
+          readOnly={!create}
         />
       ) : null}
       <ErrorNotification error={error} />
@@ -212,6 +213,7 @@ const CreatePermissionForm: FC<Props> = ({
                   helpText={t("permission.help.roleHelpText")}
                   handleRoleChange={handleRoleChange}
                   role={permission.role || ""}
+                  emptyLabel={t("permission.custom")}
                 />
               </div>
               <div className="column">

scm-ui/ui-webapp/src/repos/permissions/containers/SinglePermission.tsx

@@ -111,6 +111,7 @@ const SinglePermission: FC<Props> = ({
             availableRoles={availableRoleNames}
             role={permission.role || ""}
             loading={isLoading}
+            emptyLabel={t("permission.custom")}
           />
         </td>
       )}