diff --git a/backend/src/ee/services/license/licence-fns.ts b/backend/src/ee/services/license/licence-fns.ts
index 189a3c4e0..492d09ec3 100644
--- a/backend/src/ee/services/license/licence-fns.ts
+++ b/backend/src/ee/services/license/licence-fns.ts
@@ -33,7 +33,7 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
status: null,
trial_end: null,
has_used_trial: true,
- secretApproval: false,
+ secretApproval: true,
secretRotation: true
});
diff --git a/frontend/src/components/basic/Divider.tsx b/frontend/src/components/basic/Divider.tsx
new file mode 100644
index 000000000..f1a570d7b
--- /dev/null
+++ b/frontend/src/components/basic/Divider.tsx
@@ -0,0 +1,15 @@
+import { twMerge } from "tailwind-merge";
+
+interface IProps {
+ className?: string;
+}
+
+const Divider = ({ className }: IProps): JSX.Element => {
+ return (
+
+ );
+};
+
+export default Divider;
diff --git a/frontend/src/components/permissions/PermissionDeniedBanner.tsx b/frontend/src/components/permissions/PermissionDeniedBanner.tsx
index 067ee9c4a..f9707d634 100644
--- a/frontend/src/components/permissions/PermissionDeniedBanner.tsx
+++ b/frontend/src/components/permissions/PermissionDeniedBanner.tsx
@@ -3,6 +3,8 @@ import { faLock } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { twMerge } from "tailwind-merge";
+import { Button } from "../v2";
+
type Props = {
containerClassName?: string;
className?: string;
@@ -17,24 +19,24 @@ export const PermissionDeniedBanner = ({ containerClassName, className, children
containerClassName
)}
>
-
-
-
-
-
-
Access Restricted
- {children || (
-
- Your role has limited permissions, please contact your administrator to gain
- access
-
- )}
+
+
+
+
+
+
+
Access Restricted
+ {children || (
+
+ Your role has limited permissions, please contact your administrator to gain
+ access
+
+ )}
+
+
+ Request access
+
);
diff --git a/frontend/src/layouts/AppLayout/AppLayout.tsx b/frontend/src/layouts/AppLayout/AppLayout.tsx
index 2550150f3..a6c25c7c2 100644
--- a/frontend/src/layouts/AppLayout/AppLayout.tsx
+++ b/frontend/src/layouts/AppLayout/AppLayout.tsx
@@ -115,7 +115,7 @@ type TAddProjectFormData = yup.InferType
;
export const AppLayout = ({ children }: LayoutProps) => {
const router = useRouter();
-
+
const { mutateAsync } = useGetOrgTrialUrl();
const { workspaces, currentWorkspace } = useWorkspace();
@@ -554,7 +554,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
}
icon="system-outline-189-domain-verification"
>
- Secret Approvals
+ Approvals
{Boolean(secretApprovalReqCount?.open) && (
{secretApprovalReqCount?.open}
diff --git a/frontend/src/views/SecretApprovalPage/SecretApprovalPage.tsx b/frontend/src/views/SecretApprovalPage/SecretApprovalPage.tsx
index ce1896efa..4ab5830fe 100644
--- a/frontend/src/views/SecretApprovalPage/SecretApprovalPage.tsx
+++ b/frontend/src/views/SecretApprovalPage/SecretApprovalPage.tsx
@@ -2,6 +2,7 @@ import Link from "next/link";
import { faArrowUpRightFromSquare } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import Divider from "@app/components/basic/Divider";
import { Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
import { useWorkspace } from "@app/context";
@@ -9,8 +10,10 @@ import { SecretApprovalPolicyList } from "./components/SecretApprovalPolicyList"
import { SecretApprovalRequest } from "./components/SecretApprovalRequest";
enum TabSection {
- ApprovalRequests = "approval-requests",
- Rules = "approval-rules"
+ SecretApprovalRequests = "approval-requests",
+ SecretPolicies = "approval-rules",
+ ResourcePolicies = "resource-rules",
+ ResourceApprovalRequests = "resource-requests"
}
export const SecretApprovalPage = () => {
@@ -21,7 +24,7 @@ export const SecretApprovalPage = () => {
-
Secret Approval Workflows
+
Approval Workflows
Create approval policies for any modifications to secrets in sensitive environments and
folders.
@@ -39,15 +42,18 @@ export const SecretApprovalPage = () => {
-
+
- Secret PRs
- Policies
+ Secret Approvals
+ Secret Policies
+
+ Resource Approvals
+ Resource Policies
-
+
-
+