misc: made user and machine identity labels clearer

backend/src/ee/services/license/licence-enums.ts

@@ -1,6 +1,6 @@
 export const BillingPlanRows = {
-  MemberLimit: { name: "Organization member limit", field: "memberLimit" },
-  IdentityLimit: { name: "Organization identity limit", field: "identityLimit" },
+  MemberLimit: { name: "Organization user identity limit", field: "memberLimit" },
+  IdentityLimit: { name: "Organization machine identity limit", field: "identityLimit" },
   WorkspaceLimit: { name: "Project limit", field: "workspaceLimit" },
   EnvironmentLimit: { name: "Environment limit", field: "environmentLimit" },
   SecretVersioning: { name: "Secret versioning", field: "secretVersioning" },

frontend/src/pages/organization/AccessManagementPage/AccessManagementPage.tsx

@@ -45,7 +45,7 @@ export const AccessManagementPage = () => {
   const tabSections = [
     {
       key: OrgAccessControlTabSections.Member,
-      label: "Users",
+      label: "User Identities",
       isHidden: permission.cannot(OrgPermissionActions.Read, OrgPermissionSubjects.Member),
       component: OrgMembersTab
     },
@@ -57,7 +57,7 @@ export const AccessManagementPage = () => {
     },
     {
       key: OrgAccessControlTabSections.Identities,
-      label: "Identities",
+      label: "Machine Identities",
       isHidden: permission.cannot(
         OrgPermissionIdentityActions.Read,
         OrgPermissionSubjects.Identity
@@ -80,7 +80,7 @@ export const AccessManagementPage = () => {
       <div className="mx-auto mb-6 w-full max-w-7xl">
         <PageHeader
           title="Organization Access Control"
-          description="Manage fine-grained access for users, groups, roles, and identities within your organization resources."
+          description="Manage fine-grained access for user identities, groups, roles, and machine identities within your organization resources."
         />
         {!currentOrg.shouldUseNewPrivilegeSystem && (
           <div className="mb-4 mt-4 flex flex-col rounded-r border-l-2 border-l-primary bg-mineshaft-300/5 px-4 py-2.5">

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx

@@ -71,9 +71,9 @@ export const IdentitySection = withPermission(
 
     return (
       <div className="rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
-        <div className="mb-4 flex justify-between">
-          <p className="text-xl font-semibold text-mineshaft-100">Identities</p>
-          <div className="flex w-full justify-end pr-4">
+        <div className="mb-4 flex items-center">
+          <p className="text-xl font-semibold text-mineshaft-100">Machine Identities</p>
+          <div className="ml-auto flex items-center gap-2">
             <a
               target="_blank"
               rel="noopener noreferrer"
@@ -86,31 +86,32 @@ export const IdentitySection = withPermission(
                 className="mb-[0.06rem] ml-1 text-xs"
               />
             </a>
+            <OrgPermissionCan
+              I={OrgPermissionIdentityActions.Create}
+              a={OrgPermissionSubjects.Identity}
+            >
+              {(isAllowed) => (
+                <Button
+                  colorSchema="primary"
+                  type="submit"
+                  leftIcon={<FontAwesomeIcon icon={faPlus} />}
+                  onClick={() => {
+                    if (!isMoreIdentitiesAllowed && !isEnterprise) {
+                      handlePopUpOpen("upgradePlan", {
+                        description:
+                          "You can add more identities if you upgrade your Infisical plan."
+                      });
+                      return;
+                    }
+                    handlePopUpOpen("identity");
+                  }}
+                  isDisabled={!isAllowed}
+                >
+                  Create Identity
+                </Button>
+              )}
+            </OrgPermissionCan>
           </div>
-          <OrgPermissionCan
-            I={OrgPermissionIdentityActions.Create}
-            a={OrgPermissionSubjects.Identity}
-          >
-            {(isAllowed) => (
-              <Button
-                colorSchema="primary"
-                type="submit"
-                leftIcon={<FontAwesomeIcon icon={faPlus} />}
-                onClick={() => {
-                  if (!isMoreIdentitiesAllowed && !isEnterprise) {
-                    handlePopUpOpen("upgradePlan", {
-                      description: "You can add more identities if you upgrade your Infisical plan."
-                    });
-                    return;
-                  }
-                  handlePopUpOpen("identity");
-                }}
-                isDisabled={!isAllowed}
-              >
-                Create Identity
-              </Button>
-            )}
-          </OrgPermissionCan>
         </div>
         <IdentityTable handlePopUpOpen={handlePopUpOpen} />
         <IdentityModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />

frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx

@@ -116,7 +116,7 @@ export const OrgMembersSection = () => {
   return (
     <div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
       <div className="mb-4 flex justify-between">
-        <p className="text-xl font-semibold text-mineshaft-100">Users</p>
+        <p className="text-xl font-semibold text-mineshaft-100">User Identities</p>
         <OrgPermissionCan I={OrgPermissionActions.Create} a={OrgPermissionSubjects.Member}>
           {(isAllowed) => (
             <Button

frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx

@@ -38,11 +38,11 @@ const Page = () => {
       <div className="mx-auto mb-6 w-full max-w-7xl">
         <PageHeader
           title="Access Control"
-          description="Manage fine-grained access for users, groups, roles, and identities within your project resources."
+          description="Manage fine-grained access for user identities, groups, roles, and machine identities within your project resources."
         />
         <Tabs value={selectedTab} onValueChange={updateSelectedTab}>
           <TabList>
-            <Tab value={ProjectAccessControlTabs.Member}>Users</Tab>
+            <Tab value={ProjectAccessControlTabs.Member}>User Identities</Tab>
             <Tab value={ProjectAccessControlTabs.Groups}>Groups</Tab>
             <Tab value={ProjectAccessControlTabs.Identities}>
               <div className="flex items-center">

frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx

@@ -156,9 +156,9 @@ export const IdentityTab = withProjectPermission(
         exit={{ opacity: 0, translateX: 30 }}
       >
         <div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
-          <div className="mb-4 flex items-center justify-between">
-            <p className="text-xl font-semibold text-mineshaft-100">Identities</p>
-            <div className="flex w-full justify-end pr-4">
+          <div className="mb-4 flex items-center">
+            <p className="text-xl font-semibold text-mineshaft-100">Machine Identities</p>
+            <div className="ml-auto flex items-center gap-2">
               <a
                 target="_blank"
                 rel="noopener noreferrer"
@@ -172,23 +172,23 @@ export const IdentityTab = withProjectPermission(
                   />
                 </span>
               </a>
+              <ProjectPermissionCan
+                I={ProjectPermissionActions.Create}
+                a={ProjectPermissionSub.Identity}
+              >
+                {(isAllowed) => (
+                  <Button
+                    colorSchema="primary"
+                    type="submit"
+                    leftIcon={<FontAwesomeIcon icon={faPlus} />}
+                    onClick={() => handlePopUpOpen("identity")}
+                    isDisabled={!isAllowed}
+                  >
+                    Add Identity
+                  </Button>
+                )}
+              </ProjectPermissionCan>
             </div>
-            <ProjectPermissionCan
-              I={ProjectPermissionActions.Create}
-              a={ProjectPermissionSub.Identity}
-            >
-              {(isAllowed) => (
-                <Button
-                  colorSchema="primary"
-                  type="submit"
-                  leftIcon={<FontAwesomeIcon icon={faPlus} />}
-                  onClick={() => handlePopUpOpen("identity")}
-                  isDisabled={!isAllowed}
-                >
-                  Add Identity
-                </Button>
-              )}
-            </ProjectPermissionCan>
           </div>
           <Input
             containerClassName="mb-4"

frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersSection.tsx

@@ -57,7 +57,7 @@ export const MembersSection = () => {
   return (
     <div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
       <div className="mb-4 flex justify-between">
-        <p className="text-xl font-semibold text-mineshaft-100">Users</p>
+        <p className="text-xl font-semibold text-mineshaft-100">User Identities</p>
         <ProjectPermissionCan I={ProjectPermissionActions.Create} a={ProjectPermissionSub.Member}>
           {(isAllowed) => (
             <Button