| Name |
- Status |
-
- Review Date
- |
+ Review Date |
Actions
|
@@ -1093,17 +1100,6 @@ export function Control({
)}
-
-
- {policy.status}
-
- |
{policy.reviewDate
? new Date(
@@ -1137,7 +1133,7 @@ export function Control({
handleLinkPolicy(policy.id)
}
disabled={isLinkingPolicy}
- className="text-xs h-7 text-info border-info-b hover:bg-h-info-bg"
+ className="text-xs h-7 text-info border-info-b hover:bg-h-info-bg"
>
{isLinkingPolicy ? (
@@ -1193,7 +1189,6 @@ export function Control({
| Name |
- Status |
Review Date |
Actions
@@ -1214,17 +1209,6 @@ export function Control({
)}
- |
-
- {policy.status}
-
- |
{policy.reviewDate
? new Date(policy.reviewDate).toLocaleDateString()
diff --git a/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlLinkedPoliciesQuery.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlLinkedPoliciesQuery.graphql.ts
index c31c8654e..dcca1dfbb 100644
--- a/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlLinkedPoliciesQuery.graphql.ts
+++ b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlLinkedPoliciesQuery.graphql.ts
@@ -1,5 +1,5 @@
/**
- * @generated SignedSource<<9bddb18bf52f14881a85995793bdc1ca>>
+ * @generated SignedSource<<85bdd7f83672d1a88247d958f4b7dfaf>>
* @lightSyntaxTransform
* @nogrep
*/
@@ -9,7 +9,6 @@
// @ts-nocheck
import { ConcreteRequest } from 'relay-runtime';
-export type PolicyStatus = "ACTIVE" | "DRAFT";
export type ControlLinkedPoliciesQuery$variables = {
controlId: string;
};
@@ -19,11 +18,16 @@ export type ControlLinkedPoliciesQuery$data = {
readonly policies?: {
readonly edges: ReadonlyArray<{
readonly node: {
- readonly content: string;
+ readonly createdAt: string;
+ readonly currentPublishedVersion: number | null | undefined;
+ readonly description: string;
readonly id: string;
- readonly name: string;
- readonly reviewDate: string | null | undefined;
- readonly status: PolicyStatus;
+ readonly owner: {
+ readonly fullName: string;
+ readonly id: string;
+ };
+ readonly title: string;
+ readonly updatedAt: string;
};
}>;
};
@@ -85,28 +89,54 @@ v4 = [
"alias": null,
"args": null,
"kind": "ScalarField",
- "name": "name",
+ "name": "title",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
- "name": "content",
+ "name": "description",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
- "name": "status",
+ "name": "currentPublishedVersion",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
- "name": "reviewDate",
+ "name": "createdAt",
+ "storageKey": null
+ },
+ {
+ "alias": null,
+ "args": null,
+ "kind": "ScalarField",
+ "name": "updatedAt",
+ "storageKey": null
+ },
+ {
+ "alias": null,
+ "args": null,
+ "concreteType": "People",
+ "kind": "LinkedField",
+ "name": "owner",
+ "plural": false,
+ "selections": [
+ (v2/*: any*/),
+ {
+ "alias": null,
+ "args": null,
+ "kind": "ScalarField",
+ "name": "fullName",
+ "storageKey": null
+ }
+ ],
"storageKey": null
},
(v3/*: any*/)
@@ -244,7 +274,7 @@ return {
]
},
"params": {
- "cacheID": "67f9bf1d5f255f5406e932abde540e08",
+ "cacheID": "24c5ce380772f28348df8cf089a58a8e",
"id": null,
"metadata": {
"connection": [
@@ -261,11 +291,11 @@ return {
},
"name": "ControlLinkedPoliciesQuery",
"operationKind": "query",
- "text": "query ControlLinkedPoliciesQuery(\n $controlId: ID!\n) {\n control: node(id: $controlId) {\n __typename\n id\n ... on Control {\n policies(first: 100) {\n edges {\n node {\n id\n name\n content\n status\n reviewDate\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n }\n }\n }\n }\n}\n"
+ "text": "query ControlLinkedPoliciesQuery(\n $controlId: ID!\n) {\n control: node(id: $controlId) {\n __typename\n id\n ... on Control {\n policies(first: 100) {\n edges {\n node {\n id\n title\n description\n currentPublishedVersion\n createdAt\n updatedAt\n owner {\n id\n fullName\n }\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n }\n }\n }\n }\n}\n"
}
};
})();
-(node as any).hash = "3904c2344754177177fa7c16129dc894";
+(node as any).hash = "d4d16cac2a05ea1d38fde55d04f21c01";
export default node;
diff --git a/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOrganizationPoliciesQuery.graphql.ts b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOrganizationPoliciesQuery.graphql.ts
index ac483608f..8e139a145 100644
--- a/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOrganizationPoliciesQuery.graphql.ts
+++ b/apps/console/src/pages/organizations/frameworks/controls/__generated__/ControlOrganizationPoliciesQuery.graphql.ts
@@ -1,5 +1,5 @@
/**
- * @generated SignedSource<>
+ * @generated SignedSource<<1f9de20276a5c0b1291c5e25dc11990b>>
* @lightSyntaxTransform
* @nogrep
*/
@@ -9,7 +9,6 @@
// @ts-nocheck
import { ConcreteRequest } from 'relay-runtime';
-export type PolicyStatus = "ACTIVE" | "DRAFT";
export type ControlOrganizationPoliciesQuery$variables = {
organizationId: string;
};
@@ -19,11 +18,16 @@ export type ControlOrganizationPoliciesQuery$data = {
readonly policies?: {
readonly edges: ReadonlyArray<{
readonly node: {
- readonly content: string;
+ readonly createdAt: string;
+ readonly currentPublishedVersion: number | null | undefined;
+ readonly description: string;
readonly id: string;
- readonly name: string;
- readonly reviewDate: string | null | undefined;
- readonly status: PolicyStatus;
+ readonly owner: {
+ readonly fullName: string;
+ readonly id: string;
+ };
+ readonly title: string;
+ readonly updatedAt: string;
};
}>;
};
@@ -85,28 +89,54 @@ v4 = [
"alias": null,
"args": null,
"kind": "ScalarField",
- "name": "name",
+ "name": "title",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
- "name": "content",
+ "name": "description",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
- "name": "status",
+ "name": "currentPublishedVersion",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
- "name": "reviewDate",
+ "name": "createdAt",
+ "storageKey": null
+ },
+ {
+ "alias": null,
+ "args": null,
+ "kind": "ScalarField",
+ "name": "updatedAt",
+ "storageKey": null
+ },
+ {
+ "alias": null,
+ "args": null,
+ "concreteType": "People",
+ "kind": "LinkedField",
+ "name": "owner",
+ "plural": false,
+ "selections": [
+ (v2/*: any*/),
+ {
+ "alias": null,
+ "args": null,
+ "kind": "ScalarField",
+ "name": "fullName",
+ "storageKey": null
+ }
+ ],
"storageKey": null
},
(v3/*: any*/)
@@ -244,7 +274,7 @@ return {
]
},
"params": {
- "cacheID": "3a3c91f3e18e8a4b66011aa583e262e4",
+ "cacheID": "94e32c7758c8df264b99a44150de687d",
"id": null,
"metadata": {
"connection": [
@@ -261,11 +291,11 @@ return {
},
"name": "ControlOrganizationPoliciesQuery",
"operationKind": "query",
- "text": "query ControlOrganizationPoliciesQuery(\n $organizationId: ID!\n) {\n organization: node(id: $organizationId) {\n __typename\n id\n ... on Organization {\n policies(first: 100) {\n edges {\n node {\n id\n name\n content\n status\n reviewDate\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n }\n }\n }\n }\n}\n"
+ "text": "query ControlOrganizationPoliciesQuery(\n $organizationId: ID!\n) {\n organization: node(id: $organizationId) {\n __typename\n id\n ... on Organization {\n policies(first: 100) {\n edges {\n node {\n id\n title\n description\n currentPublishedVersion\n createdAt\n updatedAt\n owner {\n id\n fullName\n }\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n }\n }\n }\n }\n}\n"
}
};
})();
-(node as any).hash = "f4699d729e6df6192efd201047689204";
+(node as any).hash = "47aaf55ffb65d3220df2b0fe2688bc12";
export default node;
diff --git a/apps/console/src/pages/organizations/policies/EditPolicyView.tsx b/apps/console/src/pages/organizations/policies/EditPolicyView.tsx
index 5ffc9d121..a1e60a434 100644
--- a/apps/console/src/pages/organizations/policies/EditPolicyView.tsx
+++ b/apps/console/src/pages/organizations/policies/EditPolicyView.tsx
@@ -10,27 +10,30 @@ import {
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
import { Label } from "@/components/ui/label";
import { toast } from "@/hooks/use-toast";
-import { Calendar, User } from "lucide-react";
-import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
import { Suspense } from "react";
-import PolicyEditor from "@/components/PolicyEditor";
import PeopleSelector from "@/components/PeopleSelector";
import type { EditPolicyViewQuery } from "./__generated__/EditPolicyViewQuery.graphql";
import type { EditPolicyViewMutation as EditPolicyViewMutationType } from "./__generated__/EditPolicyViewMutation.graphql";
import { PageTemplate } from "@/components/PageTemplate";
import { EditPolicyViewSkeleton } from "./EditPolicyPage";
+import { User } from "lucide-react";
const editPolicyViewQuery = graphql`
- query EditPolicyViewQuery($policyId: ID!, $organizationId: ID!) {
+ query EditPolicyViewQuery($policyId: ID!, $organizationId: ID!, $policyVersionId: ID!) {
+ policyVersion: node(id: $policyVersionId) {
+ id
+ ... on PolicyVersion {
+ content
+ }
+ }
+
policy: node(id: $policyId) {
id
... on Policy {
- name
- content
- status
- reviewDate
+ title
owner {
id
fullName
@@ -44,18 +47,11 @@ const editPolicyViewQuery = graphql`
`;
const UpdatePolicyMutation = graphql`
- mutation EditPolicyViewMutation($input: UpdatePolicyInput!) {
- updatePolicy(input: $input) {
- policy {
+ mutation EditPolicyViewMutation($input: UpdatePolicyVersionInput!) {
+ updatePolicyVersion(input: $input) {
+ policyVersion {
id
- name
content
- status
- reviewDate
- owner {
- id
- fullName
- }
}
}
}
@@ -67,56 +63,28 @@ function EditPolicyViewContent({
queryRef: PreloadedQuery;
}) {
const navigate = useNavigate();
- const { organizationId, policyId } = useParams();
+ const { organizationId, policyId, versionId } = useParams();
const data = usePreloadedQuery(
editPolicyViewQuery,
queryRef
);
- console.log("EditPolicyView data:", data.policy);
+ const [content, setContent] = useState(data.policyVersion.content || "");
- const [name, setName] = useState(data.policy.name);
- const [content, setContent] = useState(data.policy.content || "");
- const [status, setStatus] = useState(data.policy.status);
- const [reviewDate, setReviewDate] = useState(data.policy.reviewDate || "");
- const [ownerId, setOwnerId] = useState(
- data.policy.owner?.id || null
- );
- const [isSubmitting, setIsSubmitting] = useState(false);
-
- console.log(
- "EditPolicyView state - content:",
- content
- ? content.substring(0, 50) + (content.length > 50 ? "..." : "")
- : "empty"
- );
-
- const [commitMutation] =
+ const [updatePolicy, isSubmitting] =
useMutation(UpdatePolicyMutation);
const handleSubmit = (e: React.FormEvent) => {
e.preventDefault();
- setIsSubmitting(true);
- // Convert reviewDate string to ISO format for the API
- let reviewDateValue = null;
- if (reviewDate) {
- reviewDateValue = new Date(reviewDate).toISOString();
- }
-
- commitMutation({
+ updatePolicy({
variables: {
input: {
- id: data.policy.id,
- name,
+ policyVersionId: data.policyVersion.id,
content,
- status,
- reviewDate: reviewDateValue,
- ownerId,
},
},
- onCompleted: (response, errors) => {
- setIsSubmitting(false);
+ onCompleted: (_, errors) => {
if (errors) {
console.error("Error updating policy:", errors);
toast({
@@ -134,7 +102,6 @@ function EditPolicyViewContent({
navigate(`/organizations/${organizationId}/policies/${policyId}`);
},
onError: (error) => {
- setIsSubmitting(false);
console.error("Error updating policy:", error);
toast({
title: "Error",
@@ -153,77 +120,20 @@ function EditPolicyViewContent({
Policy Information
-
-
- setName(e.target.value)}
- required
- />
-
-
| |