Merge pull request #1416 from jdi-testing/issue_1372

issue 1372: remove hash from invalid locator
jdi-testing · Jul 28, 2023 · 7e24a81 · 7e24a81
2 parents 14d118a + 4afc54f
commit 7e24a81
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
   "name": "JDN",
   "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.13.536",
+  "version": "3.13.537",
   "icons": {
     "128": "icon128.png"
   },

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

diff --git a/src/common/components/notification/useNotifications.tsx b/src/common/components/notification/useNotifications.tsx
@@ -56,7 +56,6 @@ export const useNotifications = (container?: HTMLElement | null) => {
     notification[type]({
       message: _message,
       description,
-      duration: 500,
       getContainer: () => container || document.body,
       placement: "bottom",
       bottom,

diff --git a/src/features/locators/locators.slice.ts b/src/features/locators/locators.slice.ts
@@ -23,6 +23,7 @@ import {
   LocatorCalculationPriority,
   JDNHash,
   LocatorValue,
+  LocatorValidationWarnings,
 } from "./types/locator.types";
 import { checkLocatorsValidityReducer } from "./reducers/checkLocatorValidity.thunk";
 import { LocatorType } from "../../common/types/common";
@@ -73,6 +74,8 @@ const locatorsSlice = createSlice({
         newValue.locator.xPath = locator;
       }
 
+      if (rest.message === LocatorValidationWarnings.NotFound) newValue.jdnHash = "";
+
       locatorsAdapter.upsertOne(state, newValue);
     },
     changeIdentificationStatus(state, { payload }: PayloadAction<IdentificationStatus>) {

diff --git a/src/pageServices/contentScripts/selectable.js b/src/pageServices/contentScripts/selectable.js
@@ -38,11 +38,13 @@ export const selectable = () => {
         });
       } else query = `[id='${payload.jdnHash}']`;
 
-      this.foreach(document.querySelectorAll(query), (element) => {
-        if (element.classList.contains(opt.selectedClass)) {
-          element.classList.remove(opt.selectedClass);
-        }
-      });
+      if (query.length) {
+        this.foreach(document.querySelectorAll(query), (element) => {
+          if (element.classList.contains(opt.selectedClass)) {
+            element.classList.remove(opt.selectedClass);
+          }
+        });
+      }
     };
 
     Selectables.prototype.setSelect = function (payload) {