Merge pull request #1744 from jdi-testing/feature/reenable-disabled-c…

…ss-calculation-on-backend feature: reenable disabled css calculation on backend
jdi-testing · Jun 12, 2024 · 92edea7 · 92edea7
2 parents bfb2dd7 + 181f53c
commit 92edea7
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 76 deletions.
diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
   "name": "JDN — Page Object Generator",
   "description": "JDN – helps Test Automation Engineer to create Page Objects in the test automation framework and speed up test development",
   "devtools_page": "index.html",
-  "version": "3.15.36",
+  "version": "3.15.37",
   "icons": {
     "128": "icon128.png"
   },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jdn-ai-chrome-extension",
-  "version": "3.15.36",
+  "version": "3.15.37",
   "description": "jdn-ai chrome extension",
   "scripts": {
     "start": "webpack --watch --env devenv",

diff --git a/src/app/App.tsx b/src/app/App.tsx
@@ -8,7 +8,7 @@ import { StatusBar } from './components/StatusBar';
 import { SeveralTabsWarning } from './components/SeveralTabsWarning';
 import { HttpEndpoint, request } from '../services/backend';
 import { checkSession, initLocatorSocketController } from './utils/appUtils';
-import { selectCurrentPage, selectServerLocation } from './main.selectors';
+import { selectCurrentPage } from './main.selectors';
 import { AppDispatch, RootState, store } from './store/store';
 import { useOnDisconnect } from './utils/hooks/useOnDisconnect';
 
@@ -22,7 +22,6 @@ import { isPageObjectPage } from './utils/helpers';
 import './styles/index.less';
 import { Onboarding, useOnboarding } from '../features/onboarding/useOnboarding';
 import { OnboardingProvider, useOnboardingContext } from '../features/onboarding/OnboardingProvider';
-import { URL } from './utils/constants';
 
 const App = () => {
   const dispatch = useDispatch<AppDispatch>();
@@ -33,7 +32,6 @@ const App = () => {
   const xpathConfig = useSelector((state: RootState) => state.main.xpathConfig);
   const currentPage = useSelector(selectCurrentPage);
   const isSessionUnique = useSelector((state: RootState) => state.main.isSessionUnique);
-  const serverLocation = useSelector(selectServerLocation);
 
   const { stepsRef } = useOnboardingContext();
 
@@ -54,10 +52,7 @@ const App = () => {
     };
 
     if (backendAvailable === BackendStatus.Accessed) {
-      // TODO: remove condition ("serverLocation === URL.local") when back-end will be ready (issues/1734)
-      if (serverLocation === URL.local) {
-        fetchTemplates();
-      }
+      fetchTemplates();
       initLocatorSocketController(xpathConfig);
     }
   }, [backendAvailable]);

diff --git a/src/features/locators/utils/LocatorGenerationController.ts b/src/features/locators/utils/LocatorGenerationController.ts
@@ -45,7 +45,6 @@ class LocatorGenerationController {
     pageDocument: string,
     pageObject?: PageObject,
     maxGenerationTime?: MaxGenerationTime,
-    isLocalServer?: boolean,
   ) {
     if (pageObject) this.pageObject = pageObject;
     this.pageDocument = pageDocument;
@@ -77,32 +76,21 @@ class LocatorGenerationController {
       action: WebSocketMessage.SCHEDULE_MULTIPLE_CSS_SELECTOR_GENERATIONS,
       payload: {
         document: this.pageDocument,
-        // TODO: remove condition ("isLocalServer ?", ": []") when back-end will be ready (issues/1284)
-        id: isLocalServer ? hashes : [],
+        id: hashes,
       },
     };
 
     const messages = getWebSocketMessages(locatorType, this.xPathGenerationMessage, this.CssSelectorGenerationMessage);
 
-    // TODO: remove condition and variable "webSocketOperation" when back-end will be ready (issues/1284) 88, 98-105 lines
-    const webSocketOperation = isLocalServer
-      ? webSocketController
-          .sendSocket(JSON.stringify(messages[0]))
-          .then(() => webSocketController.sendSocket(JSON.stringify(messages[1])))
-          .then(() => {
-            webSocketController.startPing();
-          })
-          .catch((error: unknown) => {
-            console.error('Error sending messages: ', error);
-          })
-      : webSocketController
-          .sendSocket(JSON.stringify(this.xPathGenerationMessage))
-          .then(() => {
-            webSocketController.startPing();
-          })
-          .catch((error: unknown) => {
-            console.error('Error sending message: ', error);
-          });
+    const webSocketOperation = webSocketController
+      .sendSocket(JSON.stringify(messages[0]))
+      .then(() => webSocketController.sendSocket(JSON.stringify(messages[1])))
+      .then(() => {
+        webSocketController.startPing();
+      })
+      .catch((error: unknown) => {
+        console.error('Error sending messages: ', error);
+      });
 
     return webSocketOperation;
   }

diff --git a/src/features/locators/utils/runLocatorGeneration.ts b/src/features/locators/utils/runLocatorGeneration.ts
@@ -4,8 +4,6 @@ import { selectCurrentPageObject, selectCurrentPOLocatorType } from '../../pageO
 import { ILocator, LocatorsGenerationStatus } from '../types/locator.types';
 import { locatorGenerationController } from './LocatorGenerationController';
 import { GeneralLocatorType, LocatorType } from '../../../common/types/common';
-import { URL } from '../../../app/utils/constants';
-import { selectServerLocation } from '../../../app/main.selectors';
 
 export const runLocatorGeneration = (
   state: RootState,
@@ -16,18 +14,12 @@ export const runLocatorGeneration = (
   const pageObject = selectCurrentPageObject(state)!;
   const locatorType: GeneralLocatorType = selectCurrentPOLocatorType(state) ?? LocatorType.xPath;
 
-  // TODO: remove when back-end will be ready (issues/1734) 20-21 lines
-  const serverLocation = selectServerLocation(state);
-  const isLocalServer = serverLocation === URL.local;
-
   locatorGenerationController.scheduleMultipleLocatorGeneration(
     locatorType,
     generationData,
     pageDocument,
     pageObject,
     maxGenerationTime,
-    // TODO: remove when back-end will be ready (issues/1734) 30 line
-    isLocalServer,
   );
 
   return LocatorsGenerationStatus.started;

diff --git a/src/features/locators/utils/utils.ts b/src/features/locators/utils/utils.ts
@@ -213,7 +213,7 @@ export const getLocatorValueOnTypeSwitch = async (
 
       ({ cssSelector: newLocatorValue } = await generateSelectorByHash(elementId, foundHash));
     } else {
-      if (newLocatorType === LocatorType.cssSelector) newLocatorValue = locatorValue.cssSelector; // а не original ли надо делать?
+      if (newLocatorType === LocatorType.cssSelector) newLocatorValue = locatorValue.cssSelector;
       try {
         newLocatorValue = getLocatorValueByType(locatorValue, newLocatorType);
       } catch (error) {
@@ -239,31 +239,28 @@ export const getTaskStatus = (
   cssSelectorStatus: LocatorTaskStatus,
 ): LocatorTaskStatus | null => {
   if (!xPathStatus && !cssSelectorStatus) return LocatorTaskStatus.NOT_STARTED;
-  // TODO: delete when back-end will be ready (issues/1284)
-  return xPathStatus;
 
-  // TODO: uncomment when back-end will be ready (issues/1284) 246-266 lines
-  // const statusMap = {
-  //   success: xPathStatus === LocatorTaskStatus.SUCCESS && cssSelectorStatus === LocatorTaskStatus.SUCCESS,
-  //   pending: xPathStatus === LocatorTaskStatus.PENDING || cssSelectorStatus === LocatorTaskStatus.PENDING,
-  //   failure: xPathStatus === LocatorTaskStatus.FAILURE || cssSelectorStatus === LocatorTaskStatus.FAILURE,
-  //   revoked: xPathStatus === LocatorTaskStatus.REVOKED || cssSelectorStatus === LocatorTaskStatus.REVOKED,
-  // };
-  //
-  // if (statusMap.success) {
-  //   return LocatorTaskStatus.SUCCESS;
-  // }
-  // if (statusMap.pending) {
-  //   return LocatorTaskStatus.PENDING;
-  // }
-  // if (statusMap.failure) {
-  //   return LocatorTaskStatus.FAILURE;
-  // }
-  // if (statusMap.revoked) {
-  //   return LocatorTaskStatus.REVOKED;
-  // }
-  // // fallback for any unhandled cases
-  // return null;
+  const statusMap = {
+    success: xPathStatus === LocatorTaskStatus.SUCCESS && cssSelectorStatus === LocatorTaskStatus.SUCCESS,
+    pending: xPathStatus === LocatorTaskStatus.PENDING || cssSelectorStatus === LocatorTaskStatus.PENDING,
+    failure: xPathStatus === LocatorTaskStatus.FAILURE || cssSelectorStatus === LocatorTaskStatus.FAILURE,
+    revoked: xPathStatus === LocatorTaskStatus.REVOKED || cssSelectorStatus === LocatorTaskStatus.REVOKED,
+  };
+
+  if (statusMap.success) {
+    return LocatorTaskStatus.SUCCESS;
+  }
+  if (statusMap.pending) {
+    return LocatorTaskStatus.PENDING;
+  }
+  if (statusMap.failure) {
+    return LocatorTaskStatus.FAILURE;
+  }
+  if (statusMap.revoked) {
+    return LocatorTaskStatus.REVOKED;
+  }
+  // fallback for any unhandled cases
+  return null;
 };
 
 export const hasAllLocators = ({ locatorValue }: ILocator) =>

diff --git a/src/services/webSocketMessageHandler.ts b/src/services/webSocketMessageHandler.ts
@@ -20,9 +20,6 @@ import {
   WSResponseAction,
   XpathMultipleGenerationPayload,
 } from './webSoket.types';
-import { useSelector } from 'react-redux';
-import { URL } from '../app/utils/constants';
-import { selectServerLocation } from '../app/main.selectors';
 
 const isCssSelectorsGenerationPayloadGuard = (payload: any): payload is CssSelectorsGenerationPayload => {
   return (
@@ -75,17 +72,11 @@ export const updateSocketMessageHandler = (dispatch: any, state: any) => {
                 );
               }
               const locatorType: GeneralLocatorType = selectCurrentPOLocatorType(state) ?? LocatorType.xPath;
-              // TODO: remove when back-end will be ready (issues/1734) 79-80 lines
-              const serverLocation = useSelector(selectServerLocation);
-              const isLocalServer = serverLocation === URL.local;
+
               locatorGenerationController.scheduleMultipleLocatorGeneration(
                 locatorType,
                 [element],
                 pageDocumentForRubula,
-                // TODO: remove when back-end will be ready (issues/1734) 86-88 lines
-                undefined,
-                undefined,
-                isLocalServer,
               );
             };
             rescheduleTask();