@michalrakus/x-react-web-lib 1.32.10 → 1.32.12

package/lib/components/XFormDataTable2.d.ts

@@ -11,6 +11,7 @@ import { XFormComponentDT } from "./XFormComponentDT";
 import { XErrorMap } from "./XErrors";
 import { IconType } from "primereact/utils";
 import { ButtonProps } from "primereact/button";
+import { XSuggestionsLoadProp } from "./XAutoCompleteBase";
 export interface XRowTechData {
     xFormComponentDTList: Array<XFormComponentDT<any>>;
     errorMap: XErrorMap;
@@ -113,14 +114,18 @@ export interface XFormDropdownColumnProps extends XFormColumnBaseProps {
 }
 export interface XFormAutoCompleteColumnProps extends XFormColumnBaseProps {
     assocField: string;
-    displayField: string;
+    displayField: string | string[];
+    itemTemplate?: (suggestion: any, index: number, createStringValue: boolean, defaultValue: (suggestion: any) => string) => React.ReactNode;
     searchBrowse?: JSX.Element;
     assocForm?: JSX.Element;
     addRowEnabled: boolean;
     filter?: XTableFieldFilterProp;
     sortField?: string | DataTableSortMeta[];
     fields?: string[];
+    scrollHeight?: string;
     suggestions?: any[];
+    suggestionsLoad?: XSuggestionsLoadProp;
+    lazyLoadMaxRows?: number;
 }
 export interface XFormSearchButtonColumnProps extends XFormColumnBaseProps {
     assocField: string;

package/lib/components/XFormDataTable2.js

@@ -145,7 +145,10 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         }
         else if (columnProps.type === "autoComplete") {
             var columnPropsAutoComplete = columnProps;
-            return columnPropsAutoComplete.assocField + '.' + columnPropsAutoComplete.displayField;
+            // for simplicity we use here the first column (is used for filtering/sorting)
+            // TODO - all columns add in constructor (through method props.form.addField(...))
+            var displayField = Array.isArray(columnPropsAutoComplete.displayField) ? columnPropsAutoComplete.displayField[0] : columnPropsAutoComplete.displayField;
+            return columnPropsAutoComplete.assocField + '.' + displayField;
         }
         else if (columnProps.type === "searchButton") {
             var columnPropsSearchButton = columnProps;
@@ -404,7 +407,7 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         }
         else if (columnProps.type === "autoComplete") {
             var columnPropsAutoComplete = columnProps;
-            body = react_1.default.createElement(XAutoCompleteDT_1.XAutoCompleteDT, { form: this.props.form, entity: this.getEntity(), assocField: columnPropsAutoComplete.assocField, displayField: columnPropsAutoComplete.displayField, searchBrowse: columnPropsAutoComplete.searchBrowse, assocForm: columnPropsAutoComplete.assocForm, addRowEnabled: columnPropsAutoComplete.addRowEnabled, filter: columnPropsAutoComplete.filter, sortField: columnPropsAutoComplete.sortField, fields: columnPropsAutoComplete.fields, suggestions: columnPropsAutoComplete.suggestions, rowData: rowData, readOnly: readOnly });
+            body = react_1.default.createElement(XAutoCompleteDT_1.XAutoCompleteDT, { form: this.props.form, entity: this.getEntity(), assocField: columnPropsAutoComplete.assocField, displayField: columnPropsAutoComplete.displayField, itemTemplate: columnPropsAutoComplete.itemTemplate, searchBrowse: columnPropsAutoComplete.searchBrowse, assocForm: columnPropsAutoComplete.assocForm, addRowEnabled: columnPropsAutoComplete.addRowEnabled, filter: columnPropsAutoComplete.filter, sortField: columnPropsAutoComplete.sortField, fields: columnPropsAutoComplete.fields, scrollHeight: columnPropsAutoComplete.scrollHeight, suggestions: columnPropsAutoComplete.suggestions, suggestionsLoad: columnPropsAutoComplete.suggestionsLoad, lazyLoadMaxRows: columnPropsAutoComplete.lazyLoadMaxRows, rowData: rowData, readOnly: readOnly });
         }
         else if (columnProps.type === "searchButton") {
             var columnPropsSearchButton = columnProps;

package/lib/components/XUtils.d.ts

@@ -113,6 +113,7 @@ export declare class XUtils {
     static clearStorage(): void;
     static reloadIfNewVersion(): void;
     static reloadIfNewVersionNow(): Promise<void>;
+    static isLocalhost(): boolean;
     static isNewVersion(): Promise<boolean>;
     static reload(): void;
 }

package/lib/components/XUtils.js

@@ -781,9 +781,12 @@ var XUtils = /** @class */ (function () {
             });
         });
     };
+    XUtils.isLocalhost = function () {
+        return window.location.hostname === 'localhost';
+    };
     XUtils.isNewVersion = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var response, text, r, remoteMainScript, localMainScript, scripts, scripts_1, scripts_1_1, script, rl, err_1;
+            var response, text, remoteMainScript, r, localMainScript, scripts, scripts_1, scripts_1_1, script, rl, err_1;
             var e_7, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -795,25 +798,28 @@ var XUtils = /** @class */ (function () {
                         return [4 /*yield*/, response.text()];
                     case 2:
                         text = _b.sent();
+                        remoteMainScript = null;
                         r = /^.*<script.*\/(main.*\.js).*$/gim.exec(text);
-                        if (!r || r.length < 2) {
-                            return [2 /*return*/, false];
+                        if (r && r.length >= 2) {
+                            remoteMainScript = r[1];
                         }
-                        remoteMainScript = r.length > 1 ? r[1] : null;
                         if (remoteMainScript === null) {
+                            if (!XUtils.isLocalhost()) {
+                                console.log("XUtils.isNewVersion(): Unexpected error - remoteMainScript (e.g. main.9d782ae7.js) not found in index.html from server. Content of index.html:");
+                                console.log(text);
+                            }
                             return [2 /*return*/, false];
                         }
                         localMainScript = null;
-                        scripts = document.body.getElementsByTagName('script');
+                        scripts = document.head.getElementsByTagName('script');
                         try {
                             for (scripts_1 = __values(scripts), scripts_1_1 = scripts_1.next(); !scripts_1_1.done; scripts_1_1 = scripts_1.next()) {
                                 script = scripts_1_1.value;
                                 rl = /^.*\/(main.*\.js).*$/gim.exec(script.src);
-                                if (!rl || rl.length < 2) {
-                                    continue;
+                                if (rl && rl.length >= 2) {
+                                    localMainScript = rl[1];
+                                    break;
                                 }
-                                localMainScript = rl[1];
-                                break;
                             }
                         }
                         catch (e_7_1) { e_7 = { error: e_7_1 }; }
@@ -824,6 +830,10 @@ var XUtils = /** @class */ (function () {
                             finally { if (e_7) throw e_7.error; }
                         }
                         if (localMainScript === null) {
+                            if (!XUtils.isLocalhost()) {
+                                console.log("XUtils.isNewVersion(): Unexpected error - localMainScript (e.g. main.9d782ae7.js) not found in element <head>...<script src=\"->here<-\"/>...</head>");
+                                console.log(document.head);
+                            }
                             return [2 /*return*/, false];
                         }
                         return [2 /*return*/, remoteMainScript !== localMainScript];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michalrakus/x-react-web-lib",
-  "version": "1.32.10",
+  "version": "1.32.12",
   "description": "",
   "scripts": {
     "clean": "rimraf lib",