Merge pull request #1442 from metasfresh/dev-1433

Fix Lookup widget #1433
metasfresh · Dec 13, 2017 · ef51aeb · ef51aeb
2 parents 61d765a + e22b478
commit ef51aeb
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 21 deletions.
diff --git a/src/actions/ViewAttributesActions.js b/src/actions/ViewAttributesActions.js
@@ -37,6 +37,29 @@ export function getViewAttributeDropdown(windowId, viewId, rowId, attribute) {
   );
 }
 
+export function getViewAttributeTypeahead(
+  windowId,
+  viewId,
+  rowId,
+  attribute,
+  query
+) {
+  return axios.get(
+    config.API_URL +
+      "/documentView" +
+      "/" +
+      windowId +
+      "/" +
+      viewId +
+      "/" +
+      rowId +
+      "/attributes/attribute/" +
+      attribute +
+      "/typeahead?query=" +
+      encodeURIComponent(query)
+  );
+}
+
 /**
  *
  * @param {*} windowId

diff --git a/src/components/widget/Lookup/Lookup.js b/src/components/widget/Lookup/Lookup.js
@@ -57,6 +57,7 @@ class Lookup extends Component {
         ) {
           let nextProp = properties[nextIndex];
 
+          // TODO: Looks like this code was never used
           if (nextProp.source === "list") {
             this.linkedList.map(listComponent => {
               if (listComponent && listComponent.props) {
@@ -239,7 +240,7 @@ class Lookup extends Component {
               item.field
             )[0];
 
-            if (item.source === "lookup" || item.widgetType === "Lookup") {
+            if (itemByProperty.widgetType === "Lookup") {
               return (
                 <RawLookup
                   key={index}
@@ -284,7 +285,7 @@ class Lookup extends Component {
                   }}
                 />
               );
-            } else if (item.source === "list") {
+            } else if (itemByProperty.widgetType === "List") {
               const isFirstProperty = index === 0;
               const isCurrentProperty =
                 item.field === property && !autofocusDisabled;

diff --git a/src/components/widget/Lookup/RawLookup.js b/src/components/widget/Lookup/RawLookup.js
@@ -2,7 +2,7 @@ import PropTypes from "prop-types";
 import React, { Component } from "react";
 import { connect } from "react-redux";
 
-import { autocompleteRequest } from "../../../actions/GenericActions";
+import { getViewAttributeTypeahead } from "../../../actions/ViewAttributesActions";
 import { openModal } from "../../../actions/WindowActions";
 import LookupList from "./LookupList";
 
@@ -227,13 +227,6 @@ class RawLookup extends Component {
       recent,
       windowType,
       dataId,
-      filterWidget,
-      parameterName,
-      tabId,
-      rowId,
-      entity,
-      subentity,
-      subentityId,
       viewId,
       mainProperty,
       handleInputEmptyStatus,
@@ -252,17 +245,13 @@ class RawLookup extends Component {
         isOpen: true
       });
 
-      autocompleteRequest({
-        docId: filterWidget ? viewId : dataId,
-        docType: windowType,
-        entity,
-        propertyName: filterWidget ? parameterName : mainProperty[0].field,
-        query: this.inputSearch.value,
-        rowId,
-        subentity,
-        subentityId,
-        tabId
-      }).then(response => {
+      getViewAttributeTypeahead(
+        windowType,
+        viewId,
+        dataId,
+        mainProperty[0].field,
+        this.inputSearch.value
+      ).then(response => {
         let values = response.data.values || [];
 
         this.setState({