From 156751ab53c44de49a99f51ac1818985a9b5836f Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Thu, 13 Jun 2024 12:03:52 +0530
Subject: [PATCH 1/2] fix: Tags - Enable tag option is no longer grayed out
 after renaming tag offline.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/libs/actions/Policy/Tag.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts
index 85080d741011..f24a3b3e73b4 100644
--- a/src/libs/actions/Policy/Tag.ts
+++ b/src/libs/actions/Policy/Tag.ts
@@ -194,6 +194,7 @@ function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record<string, {
                                     ...tagsToUpdate[key],
                                     errors: null,
                                     pendingFields: {
+                                        ...policyTag.tags[key].pendingFields,
                                         enabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                                     },
                                     pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
@@ -379,6 +380,7 @@ function renamePolicyTag(policyID: string, policyTag: {oldName: string; newName:
                                 name: newTagName,
                                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                                 pendingFields: {
+                                    ...tag.pendingFields,
                                     name: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                                 },
                                 previousTagName: oldTagName,

From d58edc3f2d832e5084ae58f288cdc5e4a6a50cbc Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Thu, 13 Jun 2024 12:32:14 +0530
Subject: [PATCH 2/2] add pending fields in success and failure data.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/libs/actions/Policy/Tag.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts
index f24a3b3e73b4..18c47a69e351 100644
--- a/src/libs/actions/Policy/Tag.ts
+++ b/src/libs/actions/Policy/Tag.ts
@@ -220,6 +220,7 @@ function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record<string, {
                                     ...tagsToUpdate[key],
                                     errors: null,
                                     pendingFields: {
+                                        ...policyTag.tags[key].pendingFields,
                                         enabled: null,
                                     },
                                     pendingAction: null,
@@ -245,6 +246,7 @@ function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record<string, {
                                     ...tagsToUpdate[key],
                                     errors: ErrorUtils.getMicroSecondOnyxError('workspace.tags.genericFailureMessage'),
                                     pendingFields: {
+                                        ...policyTag.tags[key].pendingFields,
                                         enabled: null,
                                     },
                                     pendingAction: null,
@@ -401,6 +403,7 @@ function renamePolicyTag(policyID: string, policyTag: {oldName: string; newName:
                             [newTagName]: {
                                 pendingAction: null,
                                 pendingFields: {
+                                    ...tag.pendingFields,
                                     name: null,
                                 },
                             },
@@ -421,6 +424,7 @@ function renamePolicyTag(policyID: string, policyTag: {oldName: string; newName:
                                 ...tag,
                                 pendingAction: null,
                                 pendingFields: {
+                                    ...tag.pendingFields,
                                     name: null,
                                 },
                                 errors: ErrorUtils.getMicroSecondOnyxError('workspace.tags.genericFailureMessage'),