feat: minor bug fixes and text changes

backend/src/ee/routes/v1/org-role-router.ts

@@ -1,6 +1,7 @@
+import slugify from "@sindresorhus/slugify";
 import { z } from "zod";
 
-import { OrgMembershipsSchema, OrgRolesSchema } from "@app/db/schemas";
+import { OrgMembershipRole, OrgMembershipsSchema, OrgRolesSchema } from "@app/db/schemas";
 import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
 import { AuthMode } from "@app/services/auth/auth-type";
 
@@ -13,7 +14,14 @@ export const registerOrgRoleRouter = async (server: FastifyZodProvider) => {
         organizationId: z.string().trim()
       }),
       body: z.object({
-        slug: z.string().trim(),
+        slug: z
+          .string()
+          .min(1)
+          .trim()
+          .refine((val) => Object.keys(OrgMembershipRole).includes(val), "Invalid keyword slugs")
+          .refine((v) => slugify(v) === v, {
+            message: "Slug must be a valid slug"
+          }),
         name: z.string().trim(),
         description: z.string().trim().optional(),
         permissions: z.any().array()
@@ -45,7 +53,17 @@ export const registerOrgRoleRouter = async (server: FastifyZodProvider) => {
         roleId: z.string().trim()
       }),
       body: z.object({
-        slug: z.string().trim().optional(),
+        slug: z
+          .string()
+          .trim()
+          .optional()
+          .refine(
+            (val) => typeof val === "undefined" || Object.keys(OrgMembershipRole).includes(val),
+            "Invalid keyword slugs"
+          )
+          .refine((val) => typeof val === "undefined" || slugify(val) === val, {
+            message: "Slug must be a valid slug"
+          }),
         name: z.string().trim().optional(),
         description: z.string().trim().optional(),
         permissions: z.any().array()

backend/src/server/routes/v1/project-membership-router.ts

@@ -1,3 +1,4 @@
+import ms from "ms";
 import { z } from "zod";
 
 import {
@@ -147,7 +148,7 @@ export const registerProjectMembershipRouter = async (server: FastifyZodProvider
                 role: z.string(),
                 isTemporary: z.literal(true),
                 temporaryMode: z.nativeEnum(ProjectUserMembershipTemporaryMode),
-                temporaryRange: z.string(),
+                temporaryRange: z.string().refine((val) => ms(val) > 0, "Temporary range must be positive"),
                 temporaryAccessStartTime: z.string().datetime()
               })
             ])

backend/src/server/routes/v2/identity-project-router.ts

@@ -1,3 +1,4 @@
+import ms from "ms";
 import { z } from "zod";
 
 import {
@@ -69,13 +70,12 @@ export const registerIdentityProjectRouter = async (server: FastifyZodProvider)
                 role: z.string(),
                 isTemporary: z.literal(true),
                 temporaryMode: z.nativeEnum(ProjectUserMembershipTemporaryMode),
-                temporaryRange: z.string(),
+                temporaryRange: z.string().refine((val) => ms(val) > 0, "Temporary range must be positive"),
                 temporaryAccessStartTime: z.string().datetime()
               })
             ])
           )
           .min(1)
-          .refine((data) => data.some(({ isTemporary }) => !isTemporary), "Atleast one permanent role required")
       }),
       response: {
         200: z.object({

backend/src/services/identity-project/identity-project-service.ts

@@ -158,9 +158,6 @@ export const identityProjectServiceFactory = ({
 
       // check cron or relative here later for now its just relative
       const relativeTimeInMs = ms(inputRole.temporaryRange);
-      if (relativeTimeInMs <= 0) {
-        throw new BadRequestError({ message: "Temporary relative time range must be positive" });
-      }
       return {
         projectMembershipId: projectIdentity.id,
         role: isCustomRole ? ProjectMembershipRole.Custom : inputRole.role,

backend/src/services/org/org-role-service.ts

@@ -58,7 +58,7 @@ export const orgRoleServiceFactory = ({ orgRoleDAL, permissionService }: TOrgRol
       { id: roleId, orgId },
       { ...data, permissions: data.permissions ? JSON.stringify(data.permissions) : undefined }
     );
-    if (!updateRole) throw new BadRequestError({ message: "Role not found", name: "Update role" });
+    if (!updatedRole) throw new BadRequestError({ message: "Role not found", name: "Update role" });
     return updatedRole;
   };
 
@@ -66,7 +66,7 @@ export const orgRoleServiceFactory = ({ orgRoleDAL, permissionService }: TOrgRol
     const { permission } = await permissionService.getUserOrgPermission(userId, orgId, actorOrgId);
     ForbiddenError.from(permission).throwUnlessCan(OrgPermissionActions.Delete, OrgPermissionSubjects.Role);
     const [deletedRole] = await orgRoleDAL.delete({ id: roleId, orgId });
-    if (!deleteRole) throw new BadRequestError({ message: "Role not found", name: "Update role" });
+    if (!deletedRole) throw new BadRequestError({ message: "Role not found", name: "Update role" });
 
     return deletedRole;
   };

backend/src/services/project-membership/project-membership-service.ts

@@ -320,9 +320,6 @@ export const projectMembershipServiceFactory = ({
 
       // check cron or relative here later for now its just relative
       const relativeTimeInMs = ms(inputRole.temporaryRange);
-      if (relativeTimeInMs <= 0) {
-        throw new BadRequestError({ message: "Temporary relative time range must be positive" });
-      }
       return {
         projectMembershipId: membershipId,
         role: isCustomRole ? ProjectMembershipRole.Custom : inputRole.role,

backend/src/services/project-role/project-role-service.ts

@@ -76,7 +76,7 @@ export const projectRoleServiceFactory = ({ projectRoleDAL, permissionService }:
     const { permission } = await permissionService.getProjectPermission(actor, actorId, projectId, actorOrgId);
     ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Delete, ProjectPermissionSub.Role);
     const [deletedRole] = await projectRoleDAL.delete({ id: roleId, projectId });
-    if (!deleteRole) throw new BadRequestError({ message: "Role not found", name: "Update role" });
+    if (!deletedRole) throw new BadRequestError({ message: "Role not found", name: "Update role" });
 
     return deletedRole;
   };

frontend/src/views/Project/MembersPage/MembersPage.tsx

@@ -5,12 +5,7 @@ import { Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
 import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context";
 import { withProjectPermission } from "@app/hoc";
 
-import {
+import { IdentityTab, MemberListTab, ProjectRoleListTab, ServiceTokenTab } from "./components";
-  IdentityTab,
-  MemberListTab,
-  ProjectRoleListTab,
-  ServiceTokenTab
-} from "./components";
 
 enum TabSections {
   Member = "members",
@@ -23,19 +18,14 @@ export const MembersPage = withProjectPermission(
   () => {
     return (
       <div className="container mx-auto flex flex-col justify-between bg-bunker-800 text-white">
-        <div className="mb-6 w-full py-6 px-6 max-w-7xl mx-auto">
+        <div className="mx-auto mb-6 w-full max-w-7xl py-6 px-6">
-          <p className="mr-4 mb-4 text-3xl font-semibold text-white">
+          <p className="mr-4 mb-4 text-3xl font-semibold text-white">Project Access Control</p>
-            Project Access Control
-          </p>
           <Tabs defaultValue={TabSections.Member}>
             <TabList>
               <Tab value={TabSections.Member}>People</Tab>
               <Tab value={TabSections.Identities}>
                 <div className="flex items-center">
                   <p>Machine Identities</p>
-                  <div className="ml-2 rounded-md text-yellow text-sm inline-block bg-yellow/20 px-1.5 pb-[0.03rem] pt-[0.04rem] opacity-80 hover:opacity-100 cursor-default">
-                    New
-                  </div>
                 </div>
               </Tab>
               <Tab value={TabSections.ServiceTokens}>Service Tokens</Tab>

frontend/src/views/Project/MembersPage/components/IdentityTab/components/IdentitySection/IdentityRoles.tsx

@@ -155,7 +155,7 @@ const IdentityTemporaryRoleForm = ({
                   })()
                 }
               >
-                Give access
+                Grant access
               </Button>
             ) : (
               <Button

frontend/src/views/Project/MembersPage/components/MemberListTab/MemberRoles.tsx

@@ -155,7 +155,7 @@ const TemporaryRoleForm = ({
                   })()
                 }
               >
-                Give access
+                Grant access
               </Button>
             ) : (
               <Button

frontend/src/views/Settings/ProjectSettingsPage/components/ProjectNameChangeSection/ProjectNameChangeSection.tsx

@@ -78,18 +78,26 @@ export const ProjectNameChangeSection = () => {
           </CopyButton>
         </div>
       </div>
-
       <div className="max-w-md">
+        <ProjectPermissionCan I={ProjectPermissionActions.Edit} a={ProjectPermissionSub.Workspace}>
+          {(isAllowed) => (
             <Controller
               defaultValue=""
               render={({ field, fieldState: { error } }) => (
                 <FormControl isError={Boolean(error)} errorText={error?.message}>
-              <Input placeholder="Project name" {...field} className="bg-mineshaft-800" />
+                  <Input
+                    placeholder="Project name"
+                    {...field}
+                    className="bg-mineshaft-800"
+                    isDisabled={!isAllowed}
+                  />
                 </FormControl>
               )}
               control={control}
               name="name"
             />
+          )}
+        </ProjectPermissionCan>
       </div>
       <ProjectPermissionCan I={ProjectPermissionActions.Edit} a={ProjectPermissionSub.Workspace}>
         {(isAllowed) => (