diff --git a/backend/src/templates/organizationInvitation.handlebars b/backend/src/templates/organizationInvitation.handlebars
index f76c42ba5..045a9602b 100644
--- a/backend/src/templates/organizationInvitation.handlebars
+++ b/backend/src/templates/organizationInvitation.handlebars
@@ -8,7 +8,7 @@
Join your organization on Infisical
- {{inviterFirstName}}({{inviterEmail}}) has invited you to their Infisical organization — {{organizationName}}
+ {{inviterFirstName}} ({{inviterEmail}}) has invited you to their Infisical organization — {{organizationName}}
Join now
What is Infisical?
Infisical is an easy-to-use end-to-end encrypted tool that enables developers to sync and manage their secrets and configs.
diff --git a/backend/src/templates/workspaceInvitation.handlebars b/backend/src/templates/workspaceInvitation.handlebars
index e899d86e6..60556555c 100644
--- a/backend/src/templates/workspaceInvitation.handlebars
+++ b/backend/src/templates/workspaceInvitation.handlebars
@@ -7,7 +7,7 @@
Join your team on Infisical
- {{inviterFirstName}}({{inviterEmail}}) has invited you to their Infisical project — {{workspaceName}}
+ {{inviterFirstName}} ({{inviterEmail}}) has invited you to their Infisical project — {{workspaceName}}
Join now
What is Infisical?
Infisical is an easy-to-use end-to-end encrypted tool that enables developers to sync and manage their secrets and configs.
diff --git a/frontend/public/locales/en/nav.json b/frontend/public/locales/en/nav.json
index de5218619..3d0c6faca 100644
--- a/frontend/public/locales/en/nav.json
+++ b/frontend/public/locales/en/nav.json
@@ -1,6 +1,6 @@
{
"support": {
- "slack": "[NEW] Join Slack Forum",
+ "slack": "Join Slack Forum",
"docs": "Read Docs",
"issue": "Open a Github Issue",
"email": "Send us an Email"
diff --git a/frontend/src/components/navigation/NavHeader.tsx b/frontend/src/components/navigation/NavHeader.tsx
index 68f591141..57a3f96fd 100644
--- a/frontend/src/components/navigation/NavHeader.tsx
+++ b/frontend/src/components/navigation/NavHeader.tsx
@@ -1,7 +1,7 @@
import { faAngleRight } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { useOrgnization, useWorkspace } from '@app/context';
+import { useOrganization, useWorkspace } from '@app/context';
/**
* This is the component at the top of almost every page.
@@ -20,7 +20,7 @@ export default function NavHeader({
isProjectRelated?: boolean;
}): JSX.Element {
const { currentWorkspace } = useWorkspace();
- const { currentOrg } = useOrgnization();
+ const { currentOrg } = useOrganization();
return (
diff --git a/frontend/src/components/v2/Button/Button.tsx b/frontend/src/components/v2/Button/Button.tsx
index df12c25f7..af59f3d51 100644
--- a/frontend/src/components/v2/Button/Button.tsx
+++ b/frontend/src/components/v2/Button/Button.tsx
@@ -24,7 +24,7 @@ const buttonVariants = cva(
{
variants: {
colorSchema: {
- primary: ['bg-primary', 'text-black', 'border-primary hover:bg-opacity-80'],
+ primary: ['bg-primary', 'text-black', 'border-primary bg-opacity-80 hover:bg-opacity-100'],
secondary: ['bg-mineshaft', 'text-gray-300', 'border-mineshaft hover:bg-opacity-80'],
danger: ['bg-red', 'text-white', 'border-red hover:bg-opacity-90']
},
diff --git a/frontend/src/components/v2/Card/Card.tsx b/frontend/src/components/v2/Card/Card.tsx
index 1f8448a03..4bb3c3674 100644
--- a/frontend/src/components/v2/Card/Card.tsx
+++ b/frontend/src/components/v2/Card/Card.tsx
@@ -8,9 +8,9 @@ export type CardTitleProps = {
};
export const CardTitle = ({ children, className, subTitle }: CardTitleProps) => (
-
+
{children}
- {subTitle &&
{subTitle}
}
+ {subTitle &&
{subTitle}
}
);
diff --git a/frontend/src/components/v2/Checkbox/Checkbox.tsx b/frontend/src/components/v2/Checkbox/Checkbox.tsx
index 5b30fb458..c2ecfad14 100644
--- a/frontend/src/components/v2/Checkbox/Checkbox.tsx
+++ b/frontend/src/components/v2/Checkbox/Checkbox.tsx
@@ -28,8 +28,9 @@ export const Checkbox = ({
-
+
diff --git a/frontend/src/components/v2/Menu/Menu.tsx b/frontend/src/components/v2/Menu/Menu.tsx
index cb2625384..262c618f9 100644
--- a/frontend/src/components/v2/Menu/Menu.tsx
+++ b/frontend/src/components/v2/Menu/Menu.tsx
@@ -36,14 +36,15 @@ export const MenuItem =
({
}: MenuItemProps & ComponentPropsWithRef): JSX.Element => (
- -
- {icon && {icon}}
+
-
+
+ {icon && {icon}}
{children}
{description && {description}}
diff --git a/frontend/src/components/v2/Modal/Modal.tsx b/frontend/src/components/v2/Modal/Modal.tsx
index efc6ba3a3..c33881772 100644
--- a/frontend/src/components/v2/Modal/Modal.tsx
+++ b/frontend/src/components/v2/Modal/Modal.tsx
@@ -25,7 +25,7 @@ export const ModalContent = forwardRef(
@@ -36,7 +36,7 @@ export const ModalContent = forwardRef(
diff --git a/frontend/src/components/v2/Select/Select.tsx b/frontend/src/components/v2/Select/Select.tsx
index ad0319619..5a1aa7a35 100644
--- a/frontend/src/components/v2/Select/Select.tsx
+++ b/frontend/src/components/v2/Select/Select.tsx
@@ -51,7 +51,7 @@ export const Select = forwardRef(
-
+
{isLoading ? (
@@ -85,7 +85,7 @@ export const SelectItem = forwardRef
(
{...props}
className={twMerge(
`relative flex cursor-pointer
- select-none items-center rounded-md py-2 pl-10 pr-4 text-sm
+ select-none items-center rounded-md py-2 pl-10 pr-4 mb-0.5 text-sm
outline-none transition-all hover:bg-mineshaft-500`,
isSelected && 'bg-primary',
isDisabled && 'cursor-not-allowed text-gray-600 hover:bg-transparent hover:text-gray-600',
@@ -93,8 +93,8 @@ export const SelectItem = forwardRef(
)}
ref={forwardedRef}
>
-
-
+
+
{children}
diff --git a/frontend/src/context/OrganizationContext/OrganizationContext.tsx b/frontend/src/context/OrganizationContext/OrganizationContext.tsx
index 6f5a1562e..31a97d07c 100644
--- a/frontend/src/context/OrganizationContext/OrganizationContext.tsx
+++ b/frontend/src/context/OrganizationContext/OrganizationContext.tsx
@@ -26,7 +26,7 @@ export const OrgProvider = ({ children }: Props): JSX.Element => {
// memorize the workspace details for the context
const value = useMemo(
() => ({
- org: userOrgs,
+ orgs: userOrgs,
currentOrg: (userOrgs || []).find(({ _id }) => _id === currentWsOrgID),
isLoading
}),
@@ -36,10 +36,10 @@ export const OrgProvider = ({ children }: Props): JSX.Element => {
return {children};
};
-export const useOrgnization = () => {
+export const useOrganization = () => {
const ctx = useContext(OrgContext);
if (!ctx) {
- throw new Error('useOrgnization to be used within ');
+ throw new Error('useOrganization to be used within ');
}
return ctx;
diff --git a/frontend/src/context/OrganizationContext/index.tsx b/frontend/src/context/OrganizationContext/index.tsx
index 8f21078cb..ac9091e35 100644
--- a/frontend/src/context/OrganizationContext/index.tsx
+++ b/frontend/src/context/OrganizationContext/index.tsx
@@ -1 +1 @@
-export { OrgProvider, useOrgnization } from './OrganizationContext';
+export { OrgProvider, useOrganization } from './OrganizationContext';
diff --git a/frontend/src/context/index.tsx b/frontend/src/context/index.tsx
index 31c7f7985..215802f5d 100644
--- a/frontend/src/context/index.tsx
+++ b/frontend/src/context/index.tsx
@@ -1,5 +1,5 @@
export { AuthProvider } from './AuthContext';
-export { OrgProvider, useOrgnization } from './OrganizationContext';
+export { OrgProvider, useOrganization } from './OrganizationContext';
export { SubscriptionProvider, useSubscription } from './SubscriptionContext';
export { UserProvider, useUser } from './UserContext';
export { useWorkspace, WorkspaceProvider } from './WorkspaceContext';
diff --git a/frontend/src/layouts/AppLayout/AppLayout.tsx b/frontend/src/layouts/AppLayout/AppLayout.tsx
index e0b584545..3f4e0f95e 100644
--- a/frontend/src/layouts/AppLayout/AppLayout.tsx
+++ b/frontend/src/layouts/AppLayout/AppLayout.tsx
@@ -38,7 +38,7 @@ import {
Select,
SelectItem
} from '@app/components/v2';
-import { useOrgnization, useUser, useWorkspace } from '@app/context';
+import { useOrganization, useUser, useWorkspace } from '@app/context';
import { usePopUp } from '@app/hooks';
import { fetchOrgUsers, useAddUserToWs, useCreateWorkspace, useUploadWsKey } from '@app/hooks/api';
import getOrganizations from '@app/pages/api/organization/getOrgs';
@@ -61,8 +61,10 @@ export const AppLayout = ({ children }: LayoutProps) => {
const router = useRouter();
const { createNotification } = useNotificationContext();
- const { workspaces, currentWorkspace } = useWorkspace();
- const { currentOrg } = useOrgnization();
+ // eslint-disable-next-line prefer-const
+ let { workspaces, currentWorkspace } = useWorkspace();
+ const { currentOrg } = useOrganization();
+ workspaces = workspaces.filter(ws => ws.organization === currentOrg?._id)
const { user } = useUser();
const createWs = useCreateWorkspace();
@@ -210,35 +212,35 @@ export const AppLayout = ({ children }: LayoutProps) => {
return (
<>
-
+
-