some cleanup and test adjustments

Author: chriskari

src/shared/ResourceForm/components/ResourceForm.js

@@ -14,16 +14,15 @@ import jp from 'jsonpath';
 import { Form, FormItem } from '@ui5/webcomponents-react';
 import { UI5Panel } from 'shared/components/UI5Panel/UI5Panel';
 
-import { useRecoilValue, useSetRecoilState } from 'recoil';
+import { useRecoilValue } from 'recoil';
 import { editViewModeState } from 'state/preferences/editViewModeAtom';
-import { isResourceEditedState } from 'state/resourceEditedAtom';
 import { createPortal } from 'react-dom';
 import { UnsavedMessageBox } from 'shared/components/UnsavedMessageBox/UnsavedMessageBox';
 import { getDescription, SchemaContext } from 'shared/helpers/schema';
 
-import './ResourceForm.scss';
 import { columnLayoutState } from 'state/columnLayoutAtom';
 import { useFormEditTracking } from 'shared/hooks/useFormEditTracking';
+import './ResourceForm.scss';
 
 export function ResourceForm({
   pluralKind, // used for the request path
@@ -95,15 +94,9 @@ export function ResourceForm({
   }
 
   const editViewMode = useRecoilValue(editViewModeState);
-  const setIsResourceEdited = useSetRecoilState(isResourceEditedState);
   const [editorError, setEditorError] = useState(null);
 
-  useFormEditTracking(
-    resource,
-    initialResource,
-    setIsResourceEdited,
-    editorError,
-  );
+  useFormEditTracking(resource, initialResource, editorError);
 
   const { t } = useTranslation();
   const createResource = useCreateResource({

src/shared/ResourceForm/components/Single.js

@@ -2,8 +2,6 @@ import { useEffect, useRef } from 'react';
 import classnames from 'classnames';
 
 import { ResourceFormWrapper } from './Wrapper';
-import { useSetRecoilState } from 'recoil';
-import { isResourceEditedState } from 'state/resourceEditedAtom';
 import { createPortal } from 'react-dom';
 import { UnsavedMessageBox } from 'shared/components/UnsavedMessageBox/UnsavedMessageBox';
 import { useFormEditTracking } from 'shared/hooks/useFormEditTracking';
@@ -20,7 +18,6 @@ export function SingleForm({
   ...props
 }) {
   const validationRef = useRef(true);
-  const setIsResourceEdited = useSetRecoilState(isResourceEditedState);
 
   useEffect(() => {
     if (setCustomValid) {
@@ -29,7 +26,7 @@ export function SingleForm({
     validationRef.current = true;
   }, [resource, children, setCustomValid]);
 
-  useFormEditTracking(resource, initialResource, setIsResourceEdited);
+  useFormEditTracking(resource, initialResource);
 
   return (
     <section className={classnames('resource-form', className)}>

src/shared/hooks/useFormEditTracking.js

@@ -1,5 +1,7 @@
 import { cloneDeep, isEqual } from 'lodash';
 import { useEffect, useMemo, useRef } from 'react';
+import { useSetRecoilState } from 'recoil';
+import { isResourceEditedState } from 'state/resourceEditedAtom';
 
 const excludeStatus = resource => {
   if (!resource) return null;
@@ -13,9 +15,9 @@ const excludeStatus = resource => {
 export function useFormEditTracking(
   resource,
   initialResource,
-  setIsResourceEdited,
   editorError = false,
 ) {
+  const setIsResourceEdited = useSetRecoilState(isResourceEditedState);
   // timeout ID for debouncing
   const timeoutRef = useRef(null);
 

tests/integration/support/create-edit-support.js

@@ -10,7 +10,7 @@ Cypress.Commands.add('saveChanges', (action = 'Create') => {
     .contains('ui5-button:visible', isCreate ? 'Create' : 'Save')
     .click();
 
-  cy.wait(1000);
+  cy.wait(1500);
 });
 
 Cypress.Commands.add('checkUnsavedDialog', () => {

tests/integration/tests/namespace/test-jobs.spec.js

@@ -173,7 +173,7 @@ context('Test Jobs', () => {
 
     cy.inspectTab('View');
 
-    cy.contains('a=b');
+    cy.contains('a=b', { timeout: 15000 });
   });
 
   it('Inspect list', () => {