Merge pull request #1862 from openshift-cherrypick-robot/cherry-pick-1861-to-release-4.19

[release-4.19] OLS-2925: Fix revert not clearing edit icon from attachment label

Author: openshift-merge-bot[bot]

src/components/AttachmentModal.tsx

@@ -149,7 +149,7 @@ const AttachmentModal: React.FC = () => {
         attachment.ownerName,
         attachment.namespace,
         value,
-        undefined,
+        value,
         attachment.id,
       ),
     );

unit-tests/redux-reducers.test.ts

@@ -239,6 +239,27 @@ describe('attachments', () => {
     strictEqual(state.getIn(['attachments', 'a']).originalValue, 'apiVersion: v1');
   });
 
+  it('AttachmentSet revert clears changed state when originalValue equals value', () => {
+    let state = initState();
+    state = dispatch(state, ActionType.AttachmentSet, {
+      ...attachment,
+      id: 'a',
+      value: 'edited yaml',
+      originalValue: 'apiVersion: v1',
+    });
+    strictEqual(state.getIn(['attachments', 'a']).value, 'edited yaml');
+    strictEqual(state.getIn(['attachments', 'a']).originalValue, 'apiVersion: v1');
+
+    state = dispatch(state, ActionType.AttachmentSet, {
+      ...attachment,
+      id: 'a',
+      value: 'apiVersion: v1',
+      originalValue: 'apiVersion: v1',
+    });
+    strictEqual(state.getIn(['attachments', 'a']).value, 'apiVersion: v1');
+    strictEqual(state.getIn(['attachments', 'a']).originalValue, 'apiVersion: v1');
+  });
+
   it('AttachmentSet respects empty-string originalValue as explicit', () => {
     let state = initState();
     state = dispatch(state, ActionType.AttachmentSet, {