@teselagen/ui 0.10.18 → 0.10.20

package/PromptUnsavedChanges/index.d.ts

@@ -1,6 +1,6 @@
-export function PromptUnsavedChanges({ message, when }: {
+export const defaultMessagge: "Are you sure you want to leave? There are unsaved changes.";
+export default PromptUnsavedChanges;
+declare function PromptUnsavedChanges({ message, when }: {
     message?: string | undefined;
     when?: boolean | undefined;
 }): import("react/jsx-runtime").JSX.Element | null;
-export const defaultMessagge: "Are you sure you want to leave? There are unsaved changes.";
-export default PromptUnsavedChanges;

package/index.cjs.js

@@ -2923,6 +2923,13 @@ document.addEventListener("mouseup", () => {
   isDragging = false;
 });
 let tippys = [];
+function isInAllowedContainer(element2) {
+  if (window.onlyAllowTooltipsInVeEditor) {
+    return element2.closest(".veEditor") !== null;
+  }
+  return true;
+}
+__name(isInAllowedContainer, "isInAllowedContainer");
 let recentlyHidden = false;
 let clearMe;
 (function() {
@@ -2930,6 +2937,9 @@ let clearMe;
   document.addEventListener("mouseover", function(event) {
     var _a, _b;
     const element2 = event.target;
+    if (!isInAllowedContainer(element2)) {
+      return;
+    }
     if (element2 instanceof Element && element2 !== lastMouseOverElement) {
       let clearOldTippys = /* @__PURE__ */ __name(function(maybeInst) {
         tippys = tippys.filter((t2) => {
@@ -20122,6 +20132,23 @@ function applyWhereClause(records, where) {
               if (!isString$1(value) || !new RegExp(conditionValue.replace(/%/g, ".*")).test(value))
                 return false;
               break;
+            case "_in":
+              if (!some(conditionValue, (item) => isEqual(value, item)))
+                return false;
+              break;
+            case "_nin":
+              if (some(conditionValue, (item) => isEqual(value, item)))
+                return false;
+              break;
+            case "_regex": {
+              try {
+                if (!isString$1(value) || !new RegExp(conditionValue).test(value))
+                  return false;
+              } catch (e) {
+                return false;
+              }
+              break;
+            }
             default:
               if (operator.startsWith("_")) {
                 console.warn(`Unsupported operator: ${operator}`);
@@ -51100,7 +51127,7 @@ const FilterAndSortMenu = /* @__PURE__ */ __name(({
       filterValToUse = false;
     } else if (ccSelectedFilter2 === "inList" || ccSelectedFilter2 === "notInList") {
       if (dataType === "number") {
-        filterValToUse = filterValue && filterValue.map((val) => parseFloat(val.replaceAll(",", "")));
+        filterValToUse = filterValue && filterValue.map((val) => parseFloat(`${val}`.replaceAll(",", "")));
       }
     }
     if (isInvalidFilterValue(filterValToUse)) {
@@ -51206,7 +51233,7 @@ const FilterInput = /* @__PURE__ */ __name(({
           multi: true,
           creatable: true,
           value: (filterValue || []).map((val) => ({
-            label: val,
+            label: `${val}`,
             value: val
           })),
           onChange: /* @__PURE__ */ __name((selectedOptions) => {
@@ -67652,10 +67679,7 @@ const warnBeforeLeave = /* @__PURE__ */ __name((e) => {
   (e || window.event).returnValue = defaultMessagge;
   return defaultMessagge;
 }, "warnBeforeLeave");
-function PromptUnsavedChanges({
-  message = defaultMessagge,
-  when = false
-}) {
+function PromptUnsavedChanges({ message = defaultMessagge, when = false }) {
   React.useEffect(() => {
     if (when) {
       window.addEventListener("beforeunload", warnBeforeLeave);

package/index.es.js

@@ -2905,6 +2905,13 @@ document.addEventListener("mouseup", () => {
   isDragging = false;
 });
 let tippys = [];
+function isInAllowedContainer(element2) {
+  if (window.onlyAllowTooltipsInVeEditor) {
+    return element2.closest(".veEditor") !== null;
+  }
+  return true;
+}
+__name(isInAllowedContainer, "isInAllowedContainer");
 let recentlyHidden = false;
 let clearMe;
 (function() {
@@ -2912,6 +2919,9 @@ let clearMe;
   document.addEventListener("mouseover", function(event) {
     var _a, _b;
     const element2 = event.target;
+    if (!isInAllowedContainer(element2)) {
+      return;
+    }
     if (element2 instanceof Element && element2 !== lastMouseOverElement) {
       let clearOldTippys = /* @__PURE__ */ __name(function(maybeInst) {
         tippys = tippys.filter((t2) => {
@@ -20104,6 +20114,23 @@ function applyWhereClause(records, where) {
               if (!isString$1(value) || !new RegExp(conditionValue.replace(/%/g, ".*")).test(value))
                 return false;
               break;
+            case "_in":
+              if (!some(conditionValue, (item) => isEqual(value, item)))
+                return false;
+              break;
+            case "_nin":
+              if (some(conditionValue, (item) => isEqual(value, item)))
+                return false;
+              break;
+            case "_regex": {
+              try {
+                if (!isString$1(value) || !new RegExp(conditionValue).test(value))
+                  return false;
+              } catch (e) {
+                return false;
+              }
+              break;
+            }
             default:
               if (operator.startsWith("_")) {
                 console.warn(`Unsupported operator: ${operator}`);
@@ -51082,7 +51109,7 @@ const FilterAndSortMenu = /* @__PURE__ */ __name(({
       filterValToUse = false;
     } else if (ccSelectedFilter2 === "inList" || ccSelectedFilter2 === "notInList") {
       if (dataType === "number") {
-        filterValToUse = filterValue && filterValue.map((val) => parseFloat(val.replaceAll(",", "")));
+        filterValToUse = filterValue && filterValue.map((val) => parseFloat(`${val}`.replaceAll(",", "")));
       }
     }
     if (isInvalidFilterValue(filterValToUse)) {
@@ -51188,7 +51215,7 @@ const FilterInput = /* @__PURE__ */ __name(({
           multi: true,
           creatable: true,
           value: (filterValue || []).map((val) => ({
-            label: val,
+            label: `${val}`,
             value: val
           })),
           onChange: /* @__PURE__ */ __name((selectedOptions) => {
@@ -67634,10 +67661,7 @@ const warnBeforeLeave = /* @__PURE__ */ __name((e) => {
   (e || window.event).returnValue = defaultMessagge;
   return defaultMessagge;
 }, "warnBeforeLeave");
-function PromptUnsavedChanges({
-  message = defaultMessagge,
-  when = false
-}) {
+function PromptUnsavedChanges({ message = defaultMessagge, when = false }) {
   useEffect(() => {
     if (when) {
       window.addEventListener("beforeunload", warnBeforeLeave);

package/index.umd.js

@@ -2918,6 +2918,13 @@ var __async = (__this, __arguments, generator) => {
     isDragging = false;
   });
   let tippys = [];
+  function isInAllowedContainer(element2) {
+    if (window.onlyAllowTooltipsInVeEditor) {
+      return element2.closest(".veEditor") !== null;
+    }
+    return true;
+  }
+  __name(isInAllowedContainer, "isInAllowedContainer");
   let recentlyHidden = false;
   let clearMe;
   (function() {
@@ -2925,6 +2932,9 @@ var __async = (__this, __arguments, generator) => {
     document.addEventListener("mouseover", function(event) {
       var _a2, _b2;
       const element2 = event.target;
+      if (!isInAllowedContainer(element2)) {
+        return;
+      }
       if (element2 instanceof Element && element2 !== lastMouseOverElement) {
         let clearOldTippys = /* @__PURE__ */ __name(function(maybeInst) {
           tippys = tippys.filter((t2) => {
@@ -44779,6 +44789,23 @@ ${latestSubscriptionCallbackError.current.stack}
                 if (!isString$1(value) || !new RegExp(conditionValue.replace(/%/g, ".*")).test(value))
                   return false;
                 break;
+              case "_in":
+                if (!some(conditionValue, (item) => isEqual(value, item)))
+                  return false;
+                break;
+              case "_nin":
+                if (some(conditionValue, (item) => isEqual(value, item)))
+                  return false;
+                break;
+              case "_regex": {
+                try {
+                  if (!isString$1(value) || !new RegExp(conditionValue).test(value))
+                    return false;
+                } catch (e) {
+                  return false;
+                }
+                break;
+              }
               default:
                 if (operator.startsWith("_")) {
                   console.warn(`Unsupported operator: ${operator}`);
@@ -78535,7 +78562,7 @@ ${latestSubscriptionCallbackError.current.stack}
         filterValToUse = false;
       } else if (ccSelectedFilter2 === "inList" || ccSelectedFilter2 === "notInList") {
         if (dataType === "number") {
-          filterValToUse = filterValue && filterValue.map((val) => parseFloat(val.replaceAll(",", "")));
+          filterValToUse = filterValue && filterValue.map((val) => parseFloat(`${val}`.replaceAll(",", "")));
         }
       }
       if (isInvalidFilterValue(filterValToUse)) {
@@ -78641,7 +78668,7 @@ ${latestSubscriptionCallbackError.current.stack}
             multi: true,
             creatable: true,
             value: (filterValue || []).map((val) => ({
-              label: val,
+              label: `${val}`,
               value: val
             })),
             onChange: /* @__PURE__ */ __name((selectedOptions) => {
@@ -95087,10 +95114,7 @@ ${latestSubscriptionCallbackError.current.stack}
     (e || window.event).returnValue = defaultMessagge;
     return defaultMessagge;
   }, "warnBeforeLeave");
-  function PromptUnsavedChanges({
-    message = defaultMessagge,
-    when = false
-  }) {
+  function PromptUnsavedChanges({ message = defaultMessagge, when = false }) {
     reactExports.useEffect(() => {
       if (when) {
         window.addEventListener("beforeunload", warnBeforeLeave);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ui",
-  "version": "0.10.18",
+  "version": "0.10.20",
   "main": "./src/index.js",
   "type": "module",
   "repository": "https://github.com/TeselaGen/tg-oss",
@@ -11,7 +11,6 @@
     },
     "./style.css": "./style.css"
   },
-  "devDependencies": {},
   "dependencies": {
     "@blueprintjs/core": "3.54.0",
     "@blueprintjs/datetime": "^3.24.1",
@@ -20,7 +19,6 @@
     "@dnd-kit/modifiers": "^7.0.0",
     "@dnd-kit/sortable": "^8.0.0",
     "@teselagen/react-table": "6.10.18",
-    "chance": "1.1.11",
     "classnames": "^2.3.2",
     "color": "^3.2.1",
     "copy-to-clipboard": "^3.3.1",
@@ -48,7 +46,6 @@
     "recompose": "npm:react-recompose@0.31.1",
     "redux": "^4.1.2",
     "redux-form": "^8.3.10",
-    "redux-thunk": "2.4.1",
     "remark-gfm": "^4.0.0",
     "reselect": "^4.1.7",
     "tippy.js": "^6.3.7",
@@ -58,5 +55,9 @@
     "@dnd-kit/utilities": "3.2.2",
     "@teselagen/file-utils": "0.3.23",
     "@blueprintjs/icons": "3.33.0"
+  },
+  "devDependencies": {
+    "chance": "1.1.11",
+    "redux-thunk": "2.4.1"
   }
 }

package/src/DataTable/FilterAndSortMenu.js

@@ -106,7 +106,7 @@ const FilterAndSortMenu = ({
       if (dataType === "number") {
         filterValToUse =
           filterValue &&
-          filterValue.map(val => parseFloat(val.replaceAll(",", "")));
+          filterValue.map(val => parseFloat(`${val}`.replaceAll(",", "")));
       }
     }
 
@@ -234,7 +234,7 @@ const FilterInput = ({
             multi={true}
             creatable={true}
             value={(filterValue || []).map(val => ({
-              label: val,
+              label: `${val}`,
               value: val
             }))}
             onChange={selectedOptions => {

package/src/DataTable/utils/filterLocalEntitiesToHasura.js

@@ -205,6 +205,23 @@ function applyWhereClause(records, where) {
               )
                 return false;
               break;
+            case "_in":
+              if (!some(conditionValue, item => isEqual(value, item)))
+                return false;
+              break;
+            case "_nin":
+              if (some(conditionValue, item => isEqual(value, item)))
+                return false;
+              break;
+            case "_regex": {
+              try {
+                if (!isString(value) || !new RegExp(conditionValue).test(value))
+                  return false;
+              } catch (e) {
+                return false;
+              }
+              break;
+            }
             default:
               if (operator.startsWith("_")) {
                 console.warn(`Unsupported operator: ${operator}`);

package/src/DataTable/utils/filterLocalEntitiesToHasura.test.js

@@ -1282,4 +1282,203 @@ describe("filterLocalEntitiesToHasura", () => {
     ]);
     expect(result.entityCount).toBe(5);
   });
+
+  it("should filter protein features correctly", () => {
+    const proteinFeatureEntities = [
+      {
+        type: "CDS",
+        strand: 1,
+        name: "araC",
+        start: 3,
+        end: 5,
+        annotationTypePlural: "features",
+        id: "WWBalzQw01Oq",
+        forward: true,
+        color: "#EF6500",
+        size: 3
+      },
+      {
+        type: "protein_bind",
+        strand: 1,
+        name: "Operator I2 and I1",
+        start: 3,
+        end: 8,
+        annotationTypePlural: "features",
+        id: "yOsnjK_GkeAv",
+        forward: true,
+        color: "#2E2E2E",
+        size: 6
+      },
+      {
+        type: "CDS",
+        strand: 1,
+        name: "signal_peptide",
+        start: 3,
+        end: 11,
+        annotationTypePlural: "features",
+        id: "aPKESKXj0qUR",
+        forward: true,
+        color: "#EF6500",
+        size: 9
+      }
+    ];
+    const result_equal = filterLocalEntitiesToHasura(proteinFeatureEntities, {
+      where: {
+        _and: [
+          {
+            size: {
+              _eq: 3
+            }
+          }
+        ]
+      }
+    });
+    expect(result_equal.entities).toEqual([proteinFeatureEntities[0]]);
+
+    const result_in_list = filterLocalEntitiesToHasura(proteinFeatureEntities, {
+      where: {
+        _and: [
+          {
+            size: {
+              _in: [3, 6]
+            }
+          }
+        ]
+      }
+    });
+    expect(result_in_list.entities).toEqual([
+      proteinFeatureEntities[0],
+      proteinFeatureEntities[1]
+    ]);
+
+    const result_not_in_list = filterLocalEntitiesToHasura(
+      proteinFeatureEntities,
+      {
+        where: {
+          _and: [
+            {
+              size: {
+                _nin: [3, 6]
+              }
+            }
+          ]
+        }
+      }
+    );
+    expect(result_not_in_list.entities).toEqual([proteinFeatureEntities[2]]);
+
+    const result_valid_regex = filterLocalEntitiesToHasura(
+      proteinFeatureEntities,
+      {
+        where: {
+          _and: [
+            {
+              name: {
+                _regex: "^signal_"
+              }
+            }
+          ]
+        }
+      }
+    );
+    expect(result_valid_regex.entities).toEqual([proteinFeatureEntities[2]]);
+
+    const result_invalid_regex = filterLocalEntitiesToHasura(
+      proteinFeatureEntities,
+      {
+        where: {
+          _and: [
+            {
+              name: {
+                _regex: "["
+              }
+            }
+          ]
+        }
+      }
+    );
+    expect(result_invalid_regex.entities).toEqual([]);
+  });
+
+  it("should filter DNA features correctly", () => {
+    const dnaFeatureEntities = [
+      {
+        type: "CDS",
+        strand: 1,
+        name: "araC",
+        start: 3,
+        end: 5,
+        annotationTypePlural: "features",
+        id: "WWBalzQw01Oq",
+        forward: true,
+        color: "#EF6500",
+        size: 3
+      },
+      {
+        type: "protein_bind",
+        strand: 1,
+        name: "Operator I2 and I1",
+        start: 3,
+        end: 8,
+        annotationTypePlural: "features",
+        id: "yOsnjK_GkeAv",
+        forward: true,
+        color: "#2E2E2E",
+        size: 6
+      },
+      {
+        type: "CDS",
+        strand: 1,
+        name: "signal_peptide",
+        start: 3,
+        end: 11,
+        annotationTypePlural: "features",
+        id: "aPKESKXj0qUR",
+        forward: true,
+        color: "#EF6500",
+        size: 9
+      }
+    ];
+    const result_equal = filterLocalEntitiesToHasura(dnaFeatureEntities, {
+      where: {
+        _and: [
+          {
+            size: {
+              _eq: 3
+            }
+          }
+        ]
+      }
+    });
+    expect(result_equal.entities).toEqual([dnaFeatureEntities[0]]);
+
+    const result_in_list = filterLocalEntitiesToHasura(dnaFeatureEntities, {
+      where: {
+        _and: [
+          {
+            size: {
+              _in: [3, 6]
+            }
+          }
+        ]
+      }
+    });
+    expect(result_in_list.entities).toEqual([
+      dnaFeatureEntities[0],
+      dnaFeatureEntities[1]
+    ]);
+
+    const result_not_in_list = filterLocalEntitiesToHasura(dnaFeatureEntities, {
+      where: {
+        _and: [
+          {
+            size: {
+              _nin: [3, 6]
+            }
+          }
+        ]
+      }
+    });
+    expect(result_not_in_list.entities).toEqual([dnaFeatureEntities[2]]);
+  });
 });

package/src/PromptUnsavedChanges/index.js

@@ -17,10 +17,7 @@ const warnBeforeLeave = e => {
   return defaultMessagge; //Webkit, Safari, Chrome
 };
 
-export function PromptUnsavedChanges({
-  message = defaultMessagge,
-  when = false
-}) {
+function PromptUnsavedChanges({ message = defaultMessagge, when = false }) {
   useEffect(() => {
     if (when) {
       window.addEventListener("beforeunload", warnBeforeLeave);

package/src/autoTooltip.js

@@ -19,12 +19,22 @@ document.addEventListener("mouseup", () => {
 
 let tippys = [];
 
+function isInAllowedContainer(element) {
+  if (window.onlyAllowTooltipsInVeEditor) {
+    return element.closest(".veEditor") !== null;
+  }
+  return true;
+}
+
 let recentlyHidden = false;
 let clearMe;
 (function () {
   let lastMouseOverElement = null;
   document.addEventListener("mouseover", function (event) {
     const element = event.target;
+    if (!isInAllowedContainer(element)) {
+      return;
+    }
 
     if (element instanceof Element && element !== lastMouseOverElement) {
       lastMouseOverElement = element;