Fix support various typeahead requests #1433

metasfresh · Dec 14, 2017 · dcc8fb2 · dcc8fb2
1 parent 29835db
commit dcc8fb2
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 9 deletions.
diff --git a/src/components/widget/Lookup/RawLookup.js b/src/components/widget/Lookup/RawLookup.js
@@ -2,6 +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,6 +228,13 @@ class RawLookup extends Component {
       recent,
       windowType,
       dataId,
+      filterWidget,
+      parameterName,
+      tabId,
+      rowId,
+      entity,
+      subentity,
+      subentityId,
       viewId,
       mainProperty,
       handleInputEmptyStatus,
@@ -245,13 +253,30 @@ class RawLookup extends Component {
         isOpen: true
       });
 
-      getViewAttributeTypeahead(
-        windowType,
-        viewId,
-        dataId,
-        mainProperty[0].field,
-        this.inputSearch.value
-      ).then(response => {
+      let typeaheadRequest;
+      if (entity === "documentView" && !filterWidget) {
+        typeaheadRequest = getViewAttributeTypeahead(
+          windowType,
+          viewId,
+          dataId,
+          mainProperty[0].field,
+          this.inputSearch.value
+        );
+      } else {
+        typeaheadRequest = autocompleteRequest({
+          docId: filterWidget ? viewId : dataId,
+          docType: windowType,
+          entity,
+          propertyName: filterWidget ? parameterName : mainProperty[0].field,
+          query: this.inputSearch.value,
+          rowId,
+          subentity,
+          subentityId,
+          tabId
+        });
+      }
+
+      typeaheadRequest.then(response => {
         let values = response.data.values || [];
 
         this.setState({

diff --git a/src/components/widget/RawWidget.js b/src/components/widget/RawWidget.js
@@ -928,7 +928,7 @@ RawWidget.propTypes = {
   isModal: PropTypes.bool,
   filterWidget: PropTypes.bool,
   filterId: PropTypes.string,
-  id: PropTypes.string,
+  id: PropTypes.number,
   range: PropTypes.bool,
   onShow: PropTypes.func,
   onHide: PropTypes.func,
@@ -941,7 +941,7 @@ RawWidget.propTypes = {
   fields: PropTypes.array,
   icon: PropTypes.string,
   entity: PropTypes.string,
-  data: PropTypes.string,
+  data: PropTypes.any,
   closeTableField: PropTypes.func,
   attribute: PropTypes.bool,
   allowShowPassword: PropTypes.bool, // NOTE: looks like this wasn't used