Merge pull request #374 from jdi-testing/1.0.50generation_issues

1.0.55generation issues

.gitignore

@@ -1,6 +1,6 @@
 .idea
 node_modules
 dist
-
+.vscode
 
 yarn-lock.json

README.md

@@ -36,8 +36,8 @@ For updating version in package.json and manifest.json you can run
 ```
   npm run patch
 ```
-or manualy change version in this files.
+or manually change version in these files.
 
 Commit and push changes.
 
-When your request has been merged, github actions will create draft of release with current package.json version tag.
+When your request has been merged, GitHub actions will create draft of release with current package.json version tag.

manifest.json

@@ -3,7 +3,7 @@
   "name": "JDN",
   "description": "",
   "devtools_page": "index.html",
-  "version": "3.0.54",
+  "version": "3.0.55",
   "permissions": [
     "activeTab",
     "tabs",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jdi-react-extension",
-  "version": "3.0.54",
+  "version": "3.0.55",
   "description": "jdi react extension",
   "scripts": {
     "start": "npm run webpack",

src/js/blocks/autoFind/autoFindProvider/AutoFindProvider.jsx

@@ -1,17 +1,16 @@
 /* eslint-disable indent */
-import _, { sortBy } from "lodash";
-import React, { useState, useEffect } from "react";
-import { inject, observer } from "mobx-react";
-import { useContext } from "react";
+import _, {sortBy} from "lodash";
+import React, {useContext, useEffect, useState} from "react";
+import {inject, observer} from "mobx-react";
 import {
+  generatePageObject,
   getElements,
   highlightElements,
-  runDocumentListeners,
-  generatePageObject,
   requestGenerationData,
-} from "./../utils/pageDataHandlers";
-import { JDIclasses, getJdiClassName } from "./../utils/generationClassesMap";
-import { connector, sendMessage } from "../utils/connector";
+  runDocumentListeners,
+} from "../utils/pageDataHandlers";
+import {getJdiClassName, JDIClasses} from "../utils/generationClassesMap";
+import {connector, sendMessage} from "../utils/connector";
 
 export const autoFindStatus = {
   noStatus: "",
@@ -157,7 +156,7 @@ const AutoFindProvider = inject("mainModel")(
       sendMessage.elementData({
         element,
         types: sortBy(
-          Object.keys(JDIclasses).map((label) => {
+          Object.keys(JDIClasses).map((label) => {
             return { label, jdi: getJdiClassName(label) };
           }),
           ["jdi"]

src/js/blocks/autoFind/components/ControlBar.jsx

@@ -1,3 +1,4 @@
+
 import { Divider, Space, Menu, Dropdown } from "antd";
 import React, { useState, useEffect } from "react";
 import { useAutoFind } from "../autoFindProvider/AutoFindProvider";

src/js/blocks/autoFind/components/GenerationButtons.jsx

@@ -1,12 +1,12 @@
-import Icon, { SearchOutlined } from "@ant-design/icons";
-import { Button, Space } from "antd";
+import Icon, {SearchOutlined} from "@ant-design/icons";
+import {Button, Space} from "antd";
 import React from "react";
-import { autoFindStatus, useAutoFind, xpathGenerationStatus } from "../autoFindProvider/AutoFindProvider";
+import {autoFindStatus, useAutoFind, xpathGenerationStatus} from "../autoFindProvider/AutoFindProvider";
 
 // import "./GenerationButtons.less";
 import ClearAllSvg from "../../../../icons/clear-all.svg";
 import DownloadSvg from "../../../../icons/download.svg";
-import { Content } from "antd/lib/layout/layout";
+import {Content} from "antd/lib/layout/layout";
 
 export const GenerationButtons = () => {
   const [
@@ -20,7 +20,7 @@ export const GenerationButtons = () => {
         <Button
           icon={<SearchOutlined />}
           type="primary"
-          loading={status == autoFindStatus.loading}
+          loading={status === autoFindStatus.loading}
           disabled={!allowIdentifyElements}
           onClick={identifyElements}
           className="jdn__buttons"

src/js/blocks/autoFind/components/PerceptionTreshold.jsx

@@ -1,9 +1,8 @@
-import React from "react";
+import React, {useState} from "react";
 import Text from "antd/lib/typography/Text";
-import { Col, Row, Slider, Tooltip } from "antd";
-import { useAutoFind } from "../autoFindProvider/AutoFindProvider";
-import { useState } from "react";
-import { Content } from "antd/lib/layout/layout";
+import {Col, Row, Slider, Tooltip} from "antd";
+import {useAutoFind} from "../autoFindProvider/AutoFindProvider";
+import {Content} from "antd/lib/layout/layout";
 import Icon from "@ant-design/icons";
 
 import QuestionFilled from "../../../../icons/question-filled.svg";

src/js/blocks/autoFind/components/Result.jsx

@@ -1,8 +1,8 @@
-import { Space } from "antd";
-import { Content } from "antd/lib/layout/layout";
+import {Space} from "antd";
+import {Content} from "antd/lib/layout/layout";
 import Text from "antd/lib/typography/Text";
 import React from "react";
-import { autoFindStatus, useAutoFind } from "../autoFindProvider/AutoFindProvider";
+import {autoFindStatus, useAutoFind} from "../autoFindProvider/AutoFindProvider";
 
 const hideStatus = [autoFindStatus.loading, autoFindStatus.removed];
 

src/js/blocks/autoFind/components/XPathSettings.jsx

@@ -1,10 +1,10 @@
 import React from "react";
 
-import { Collapse, InputNumber } from "antd";
+import {Collapse, InputNumber} from "antd";
 import CollapsePanel from "antd/lib/collapse/CollapsePanel";
 import Checkbox from "antd/lib/checkbox/Checkbox";
 
-import { useAutoFind } from "../autoFindProvider/AutoFindProvider";
+import {useAutoFind} from "../autoFindProvider/AutoFindProvider";
 
 export const XPathSettings = () => {
   const [{ xpathConfig }, { setXpathConfig }] = useAutoFind();

src/js/blocks/autoFind/contentScripts/generationData.js

@@ -34,7 +34,7 @@ export const getGenerationAttributes = () => {
       return {
         ...predictedElement,
       };
-    })).filter(el => !!el);
+    })).filter((el) => !!el);
     return generationAttributes;
   };
 

src/js/blocks/autoFind/contentScripts/highlight.js

@@ -109,10 +109,10 @@ export const highlightOnPage = () => {
   };
 
   const clearContainer = (parent) => {
-    nodes.forEach(node => {
+    nodes.forEach((node) => {
       if (parent.contains(node)) {
         const id = node.getAttribute('jdn-hash');
-        predictedElements.find(elem => elem.element_id === id).hidden = true;
+        predictedElements.find((elem) => elem.element_id === id).hidden = true;
         chrome.runtime.sendMessage({
           message: "REMOVE_ELEMENT",
           param: id,

src/js/blocks/autoFind/tests/autoFind.test.js

@@ -1,10 +1,10 @@
 import React from "react";
-import { AutoFindProvider, autoFindStatus, useAutoFind } from "../autoFindProvider/AutoFindProvider";
+import {AutoFindProvider, autoFindStatus, useAutoFind} from "../autoFindProvider/AutoFindProvider";
 
-import { act } from "react-dom/test-utils";
-import { render, unmountComponentAtNode } from "react-dom";
+import {act} from "react-dom/test-utils";
+import {render, unmountComponentAtNode} from "react-dom";
 import * as pageDataHandlers from "../utils/pageDataHandlers";
-import { connector } from "../utils/connector";
+import {connector} from "../utils/connector";
 import {
   abovePerception,
   generationData,

src/js/blocks/autoFind/utils/generationClassesMap.js

@@ -1,6 +1,6 @@
 export const defaultClass = "UIElement";
 
-export const JDIclasses = {
+export const JDIClasses = {
   button: "Button",
   link: "Link",
   iframe: defaultClass,
@@ -23,7 +23,7 @@ export const JDIclasses = {
   table: "Table",
 };
 
-export const getJDILabel = (label) => JDIclasses[label] || label;
+export const getJDILabel = (label) => JDIClasses[label] || label;
 
 export const getJdiClassName = (label) => {
   let jdiClass = getJDILabel(label);

src/js/blocks/autoFind/utils/pageDataHandlers.js

@@ -1,14 +1,13 @@
-import { connector, sendMessage } from "./connector";
-import { runContextMenu } from "./../contentScripts/contextMenu/contextmenu";
-import { getGenerationAttributes } from "./../contentScripts/generationData";
-import { highlightOnPage } from "./../contentScripts/highlight";
-import { getPageData } from "./../contentScripts/pageData";
-import { urlListener } from "./../contentScripts/urlListener";
-import { getPage, predictedToConvert } from "./pageObject";
-import { autoFindStatus } from "./../autoFindProvider/AutoFindProvider";
-import { highlightOrder } from "./../contentScripts/highlightOrder";
-import { reportProblemPopup } from "../contentScripts/reportProblemPopup/reportProblemPopup";
-import { GENERATE_XPATH, MUI_PREDICT, request } from "./backend";
+import {connector, sendMessage} from "./connector";
+import {runContextMenu} from "../contentScripts/contextMenu/contextmenu";
+import {getGenerationAttributes} from "../contentScripts/generationData";
+import {highlightOnPage} from "../contentScripts/highlight";
+import {getPageData} from "../contentScripts/pageData";
+import {urlListener} from "../contentScripts/urlListener";
+import {getPage, predictedToConvert} from "./pageObject";
+import {autoFindStatus} from "../autoFindProvider/AutoFindProvider";
+import {highlightOrder} from "../contentScripts/highlightOrder";
+import {reportProblemPopup} from "../contentScripts/reportProblemPopup/reportProblemPopup";
 /* global chrome*/
 
 let documentListenersStarted;

src/js/blocks/autoFind/utils/pageObject.js

@@ -1,10 +1,9 @@
-import { camelCase } from "../../../models/GenerateBlockModel";
-import { getJDILabel } from "./generationClassesMap";
-import { connector } from "./connector";
+import {camelCase} from "../../../models/GenerateBlockModel";
+import {getJDILabel} from "./generationClassesMap";
+import {connector} from "./connector";
 
 const getPackage = (url) => {
-  const urlObject = new URL(url);
-  return urlObject.hostname
+  return new URL(url).hostname
       .split(".")
       .reverse()
       .map((e) => e.replace(/[^a-zA-Z0-9]+/g, ""))
@@ -32,15 +31,17 @@ export const predictedToConvert = (elements) => {
 
     const customElementName = e.jdi_custom_class_name;
 
-    if (uniqueNames.indexOf(elementName) >= 0) elementName += i;
-    if (elementTagId && uniqueNames.indexOf(elementTagId) >= 0) elementTagId += i;
+    if (uniqueNames.indexOf(elementName) >= 0) {
+      elementName += i;
+    }
+    if (elementTagId && uniqueNames.indexOf(elementTagId) >= 0) {
+      elementTagId += i;
+    }
     uniqueNames.push(elementTagId, elementName);
 
     const name = customElementName ?
       customElementName :
-      elementTagId ?
-        elementTagId :
-        elementName;
+      elementTagId ? elementTagId : elementName;
 
     return {
       ...e,