Skip to content

Commit f07dc91

Browse files
authored
Merge pull request #1047 from trycompai/main
[comp] Production Deploy
2 parents a38c7a2 + da26c68 commit f07dc91

File tree

2 files changed

+27
-26
lines changed

2 files changed

+27
-26
lines changed

apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/UpdatePolicyOverview.tsx

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ export function UpdatePolicyOverview({
4040
// Track selected status
4141
const [selectedStatus, setSelectedStatus] = useState<PolicyStatus>(policy.status);
4242

43+
// Track selected assignee
44+
const [selectedAssigneeId, setSelectedAssigneeId] = useState<string | null>(policy.assigneeId);
45+
4346
// Date picker state - UI only
4447
const [isDatePickerOpen, setIsDatePickerOpen] = useState(false);
4548
const [tempDate, setTempDate] = useState<Date | undefined>(undefined);
@@ -99,7 +102,7 @@ export function UpdatePolicyOverview({
99102
// Get form data directly from the form element
100103
const formData = new FormData(e.currentTarget);
101104
const status = formData.get('status') as PolicyStatus;
102-
const assigneeId = (formData.get('assigneeId') as string) || null;
105+
const assigneeId = selectedAssigneeId; // Use state instead of form data
103106
const department = formData.get('department') as Departments;
104107
const reviewFrequency = formData.get('review_frequency') as Frequency;
105108
const isRequiredToSign =
@@ -147,7 +150,7 @@ export function UpdatePolicyOverview({
147150
// Get form data directly from the DOM
148151
const form = document.getElementById('policy-form') as HTMLFormElement;
149152
const formData = new FormData(form);
150-
const assigneeId = (formData.get('assigneeId') as string) || null;
153+
const assigneeId = selectedAssigneeId; // Use state instead of form data
151154
const department = formData.get('department') as Departments;
152155
const reviewFrequency = formData.get('review_frequency') as Frequency;
153156
const isRequiredToSign =
@@ -176,7 +179,10 @@ export function UpdatePolicyOverview({
176179

177180
// Determine button text based on status and form interaction
178181
let buttonText = 'Save';
179-
if (policy.status === 'draft' || (policy.status === 'published' && hasFormChanges)) {
182+
if (
183+
(policy.status === 'draft' && selectedStatus === 'published') ||
184+
(policy.status === 'published' && hasFormChanges)
185+
) {
180186
buttonText = 'Submit for Approval';
181187
}
182188

@@ -270,22 +276,13 @@ export function UpdatePolicyOverview({
270276
<label htmlFor="assigneeId" className="text-sm font-medium">
271277
Assignee
272278
</label>
273-
{/* Hidden input for form submission */}
274-
<input
275-
type="hidden"
276-
name="assigneeId"
277-
id="assigneeId"
278-
value={policy.assigneeId || ''}
279-
/>
280279
<SelectAssignee
281280
assignees={assignees}
282281
onAssigneeChange={(id) => {
283-
// Update the hidden input value
284-
const input = document.getElementById('assigneeId') as HTMLInputElement;
285-
if (input) input.value = id || '';
282+
setSelectedAssigneeId(id);
286283
handleFormChange();
287284
}}
288-
assigneeId={policy.assigneeId || ''}
285+
assigneeId={selectedAssigneeId || ''}
289286
disabled={fieldsDisabled}
290287
withTitle={false}
291288
/>

yarn.lock

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,14 +1191,14 @@
11911191
"@types/conventional-commits-parser" "^5.0.0"
11921192
chalk "^5.3.0"
11931193

1194-
"@comp/analytics@packages/analytics":
1194+
"@comp/analytics@^workspace:packages/analytics":
11951195
version "workspace:packages/analytics"
11961196
resolved "workspace:packages/analytics"
11971197
dependencies:
11981198
posthog-js "^1.236.6"
11991199
posthog-node "^4.14.0"
12001200

1201-
"@comp/app@apps/app", "@comp/app@workspace:*":
1201+
"@comp/app@^workspace:apps/app", "@comp/app@workspace:*":
12021202
version "workspace:apps/app"
12031203
resolved "workspace:apps/app"
12041204
devDependencies:
@@ -1226,7 +1226,9 @@
12261226
"@browserbasehq/sdk" "^2.5.0"
12271227
"@calcom/atoms" "^1.0.102-framer"
12281228
"@calcom/embed-react" "^1.5.3"
1229+
dependencies:
12291230
"@comp/db" "workspace:*"
1231+
dependencies:
12301232
"@date-fns/tz" "^1.2.0"
12311233
"@dnd-kit/core" "^6.3.1"
12321234
"@dnd-kit/modifiers" "^9.0.0"
@@ -1294,18 +1296,19 @@
12941296
xml2js "^0.6.2"
12951297
zustand "^5.0.3"
12961298

1297-
"@comp/db@packages/db", "@comp/db@workspace:*":
1299+
"@comp/db@^workspace:packages/db", "@comp/db@workspace:*":
12981300
version "workspace:packages/db"
12991301
resolved "workspace:packages/db"
13001302
devDependencies:
13011303
"@comp/tsconfig" "workspace:*"
1304+
devDependencies:
13021305
prisma "^6.9.0"
13031306
ts-node "^10.9.2"
13041307
typescript "^5.8.3"
13051308
dependencies:
13061309
"@prisma/client" "6.9.0"
13071310

1308-
"@comp/email@packages/email":
1311+
"@comp/email@^workspace:packages/email":
13091312
version "workspace:packages/email"
13101313
resolved "workspace:packages/email"
13111314
devDependencies:
@@ -1325,7 +1328,7 @@
13251328
react-email "^4.0.15"
13261329
responsive-react-email "^0.0.5"
13271330

1328-
"@comp/framework-editor@apps/framework-editor":
1331+
"@comp/framework-editor@^workspace:apps/framework-editor":
13291332
version "workspace:apps/framework-editor"
13301333
resolved "workspace:apps/framework-editor"
13311334
devDependencies:
@@ -1341,6 +1344,7 @@
13411344
dependencies:
13421345
"@comp/db" "workspace:*"
13431346
"@comp/ui" "workspace:*"
1347+
dependencies:
13441348
"@hookform/resolvers" "^5.1.1"
13451349
"@tanstack/react-table" "^8.21.3"
13461350
"@tanstack/react-virtual" "^3.13.8"
@@ -1354,7 +1358,7 @@
13541358
tippy.js "^6.3.7"
13551359
zod "3.25.67"
13561360

1357-
"@comp/integrations@packages/integrations":
1361+
"@comp/integrations@^workspace:packages/integrations":
13581362
version "workspace:packages/integrations"
13591363
resolved "workspace:packages/integrations"
13601364
devDependencies:
@@ -1377,14 +1381,14 @@
13771381
stoppable "^1.1.0"
13781382
zod "3.25.67"
13791383

1380-
"@comp/kv@packages/kv":
1384+
"@comp/kv@^workspace:packages/kv":
13811385
version "workspace:packages/kv"
13821386
resolved "workspace:packages/kv"
13831387
dependencies:
13841388
"@upstash/redis" "^1.34.2"
13851389
server-only "0.0.1"
13861390

1387-
"@comp/portal@apps/portal":
1391+
"@comp/portal@^workspace:apps/portal":
13881392
version "workspace:apps/portal"
13891393
resolved "workspace:apps/portal"
13901394
devDependencies:
@@ -1415,7 +1419,7 @@
14151419
next "15.4.0-canary.85"
14161420
react-email "^4.0.15"
14171421

1418-
"@comp/trust@apps/trust":
1422+
"@comp/trust@^workspace:apps/trust":
14191423
version "workspace:apps/trust"
14201424
resolved "workspace:apps/trust"
14211425
devDependencies:
@@ -1436,11 +1440,11 @@
14361440
lucide-react "^0.518.0"
14371441
next "15.4.0-canary.85"
14381442

1439-
"@comp/tsconfig@packages/tsconfig", "@comp/tsconfig@workspace:*":
1443+
"@comp/tsconfig@^workspace:packages/tsconfig", "@comp/tsconfig@workspace:*":
14401444
version "workspace:packages/tsconfig"
14411445
resolved "workspace:packages/tsconfig"
14421446

1443-
"@comp/ui@packages/ui", "@comp/ui@workspace:*":
1447+
"@comp/ui@^workspace:packages/ui", "@comp/ui@workspace:*":
14441448
version "workspace:packages/ui"
14451449
resolved "workspace:packages/ui"
14461450
devDependencies:
@@ -1523,7 +1527,7 @@
15231527
use-debounce "^10.0.4"
15241528
vaul "^0.9.6"
15251529

1526-
"@comp/utils@packages/utils", "@comp/utils@workspace:*":
1530+
"@comp/utils@^workspace:packages/utils", "@comp/utils@workspace:*":
15271531
version "workspace:packages/utils"
15281532
resolved "workspace:packages/utils"
15291533
devDependencies:

0 commit comments

Comments
 (0)