@netgrif/components-core 6.0.3 → 6.0.4-rc.1

package/bundles/netgrif-components-core.umd.js

@@ -9726,8 +9726,8 @@
             // TODO IMPROVEMENT 27.4.2020 - we could use regular expressions to search for substrings which would solve the unintuitive
             //  behavior that occurs when we search for strings that contain spaces. We need to escape the input string in a special way
             //  if we choose to do this
-            var escapedValue = Operator.escapeInput(args[0]).value;
-            return Operator.forEachKeyword(elasticKeywords, function (keyword) { return new Query("(" + keyword + ":\\*" + escapedValue + "\\*)"); });
+            var escapedValue = Operator.escapeInput(args[0]).value.replace(' ', '\\ ');
+            return Operator.forEachKeyword(elasticKeywords, function (keyword) { return new Query("(" + keyword + ":*" + escapedValue + "*)"); });
         };
         Substring.prototype.getOperatorNameTemplate = function () {
             return ['search.operator.substring', Operator.INPUT_PLACEHOLDER];
@@ -10029,6 +10029,7 @@
      */
     var SearchIndexResolverService = /** @class */ (function () {
         function SearchIndexResolverService() {
+            this.KEYWORD = '.keyword';
         }
         /**
          * Constructs the index name for the specified field.
@@ -10043,7 +10044,21 @@
          */
         SearchIndexResolverService.prototype.getIndex = function (dataFieldIdentifier, index, keyword) {
             if (keyword === void 0) { keyword = false; }
-            return "dataSet." + dataFieldIdentifier + "." + index + (keyword ? '.keyword' : '');
+            return "dataSet." + dataFieldIdentifier + "." + index + (keyword ? this.KEYWORD : '');
+        };
+        /**
+         * Constructs the index name for the specified core field.
+         *
+         * Note that almost all combinations are valid and will not throw an error when used to query the database, but not all combinations are
+         * used by the application engine. The {@link SearchIndex} class has some information about which field types map to which indices, but
+         * you should consult the backend documentation for more reliable information.
+         * @param index the queried index
+         * @param keyword whether the keyword of a TEXT index should be queried
+         * @returns the full name of the specified index
+         */
+        SearchIndexResolverService.prototype.getCoreIndex = function (index, keyword) {
+            if (keyword === void 0) { keyword = false; }
+            return "" + index + (keyword ? this.KEYWORD : '');
         };
         SearchIndexResolverService.ɵprov = core["ɵɵdefineInjectable"]({ factory: function SearchIndexResolverService_Factory() { return new SearchIndexResolverService(); }, token: SearchIndexResolverService, providedIn: "root" });
         SearchIndexResolverService.decorators = [
@@ -10538,7 +10553,7 @@
             if (!this.isOperatorSelected()) {
                 throw new Error('Category cannot generate a Query if no Operator is selected');
             }
-            return this._operatorFormControl.value.createQuery(this._elasticKeywords, userInput);
+            return this._operatorFormControl.value.createQuery(this.elasticKeywords, userInput);
         };
         /**
          * Calls the [generateQuery]{@link Category#generateQuery} method and creates an {@link ElementaryPredicate} with the result.
@@ -10839,6 +10854,14 @@
             }
             return { segment: segment, bold: true };
         };
+        /**
+         * Checks for selected operator
+         * @param operatorClass the operator to be checked
+         * @return boolean of the statement
+         */
+        Category.prototype.isSelectedOperator = function (operatorClass) {
+            return this.selectedOperator === this._operatorService.getOperator(operatorClass);
+        };
         /**
          * The {@link CategoryMetadataConfiguration} key for this Category's {@link Operator}
          */
@@ -11691,12 +11714,12 @@
                     return resolver.getIndex(datafield.fieldId, exports.SearchIndex.BOOLEAN);
                 case 'file':
                 case 'fileList':
-                    return resolver.getIndex(datafield.fieldId, exports.SearchIndex.FILE_NAME, this.isSelectedOperator(Equals) || this.isSelectedOperator(NotEquals));
+                    return resolver.getIndex(datafield.fieldId, exports.SearchIndex.FILE_NAME, this.isSelectedOperator(Equals) || this.isSelectedOperator(NotEquals) || this.isSelectedOperator(Substring));
                 case 'user':
                 case 'userList':
                     return resolver.getIndex(datafield.fieldId, exports.SearchIndex.USER_ID);
                 default:
-                    return resolver.getIndex(datafield.fieldId, exports.SearchIndex.FULLTEXT, this.isSelectedOperator(Equals) || this.isSelectedOperator(NotEquals));
+                    return resolver.getIndex(datafield.fieldId, exports.SearchIndex.FULLTEXT, this.isSelectedOperator(Equals) || this.isSelectedOperator(NotEquals) || this.isSelectedOperator(Substring));
             }
         };
         Object.defineProperty(CaseDataset.prototype, "inputPlaceholder", {
@@ -11844,9 +11867,6 @@
             }
             return value;
         };
-        CaseDataset.prototype.isSelectedOperator = function (operatorClass) {
-            return this.selectedOperator === this._operatorService.getOperator(operatorClass);
-        };
         CaseDataset.prototype.serializeClass = function () {
             return exports.Categories.CASE_DATASET;
         };
@@ -12067,14 +12087,14 @@
                     break;
                 case 'file':
                 case 'fileList':
-                    this._elasticKeyword = resolver.getIndex(this._fieldId, exports.SearchIndex.FILE_NAME);
+                    this._elasticKeyword = resolver.getIndex(this._fieldId, exports.SearchIndex.FILE_NAME, this.isSelectedOperator(Substring));
                     break;
                 case 'user':
                 case 'userList':
                     this._elasticKeyword = resolver.getIndex(this._fieldId, exports.SearchIndex.USER_ID);
                     break;
                 default:
-                    this._elasticKeyword = resolver.getIndex(this._fieldId, exports.SearchIndex.FULLTEXT);
+                    this._elasticKeyword = resolver.getIndex(this._fieldId, exports.SearchIndex.FULLTEXT, this.isSelectedOperator(Substring));
             }
         };
         Object.defineProperty(CaseSimpleDataset.prototype, "elasticKeywords", {
@@ -12179,13 +12199,15 @@
 
     var CaseTitle = /** @class */ (function (_super) {
         __extends(CaseTitle, _super);
-        function CaseTitle(operators, logger) {
-            return _super.call(this, [exports.CaseSearch.TITLE], [
+        function CaseTitle(operators, logger, _optionalDependencies) {
+            var _this = _super.call(this, [exports.CaseSearch.TITLE], [
                 operators.getOperator(Substring),
                 operators.getOperator(Equals),
                 operators.getOperator(NotEquals),
                 operators.getOperator(Like)
             ], CaseTitle._i18n + ".name", exports.SearchInputType.TEXT, logger, operators) || this;
+            _this._optionalDependencies = _optionalDependencies;
+            return _this;
         }
         Object.defineProperty(CaseTitle.prototype, "inputPlaceholder", {
             get: function () {
@@ -12195,19 +12217,34 @@
             configurable: true
         });
         CaseTitle.prototype.duplicate = function () {
-            return new CaseTitle(this._operatorService, this._log);
+            return new CaseTitle(this._operatorService, this._log, this._optionalDependencies);
         };
         CaseTitle.prototype.serializeClass = function () {
             return exports.Categories.CASE_TITLE;
         };
+        Object.defineProperty(CaseTitle.prototype, "elasticKeywords", {
+            get: function () {
+                if (!!this._optionalDependencies) {
+                    var resolver = this._optionalDependencies.searchIndexResolver;
+                    return [resolver.getCoreIndex(exports.CaseSearch.TITLE, this.isSelectedOperator(Substring))];
+                }
+                else {
+                    return this._elasticKeywords;
+                }
+            },
+            enumerable: false,
+            configurable: true
+        });
         CaseTitle._i18n = 'search.category.case.title';
         return CaseTitle;
     }(NoConfigurationCategory));
 
     var CaseVisualId = /** @class */ (function (_super) {
         __extends(CaseVisualId, _super);
-        function CaseVisualId(operators, logger) {
-            return _super.call(this, [exports.CaseSearch.VISUAL_ID], [operators.getOperator(Substring), operators.getOperator(Equals), operators.getOperator(NotEquals)], CaseVisualId._i18n + ".name", exports.SearchInputType.TEXT, logger, operators) || this;
+        function CaseVisualId(operators, logger, _optionalDependencies) {
+            var _this = _super.call(this, [exports.CaseSearch.VISUAL_ID], [operators.getOperator(Substring), operators.getOperator(Equals), operators.getOperator(NotEquals)], CaseVisualId._i18n + ".name", exports.SearchInputType.TEXT, logger, operators) || this;
+            _this._optionalDependencies = _optionalDependencies;
+            return _this;
         }
         Object.defineProperty(CaseVisualId.prototype, "inputPlaceholder", {
             get: function () {
@@ -12217,11 +12254,24 @@
             configurable: true
         });
         CaseVisualId.prototype.duplicate = function () {
-            return new CaseVisualId(this._operatorService, this._log);
+            return new CaseVisualId(this._operatorService, this._log, this._optionalDependencies);
         };
         CaseVisualId.prototype.serializeClass = function () {
             return exports.Categories.CASE_VISUAL_ID;
         };
+        Object.defineProperty(CaseVisualId.prototype, "elasticKeywords", {
+            get: function () {
+                if (!!this._optionalDependencies) {
+                    var resolver = this._optionalDependencies.searchIndexResolver;
+                    return [resolver.getCoreIndex(exports.CaseSearch.VISUAL_ID, this.isSelectedOperator(Substring))];
+                }
+                else {
+                    return this._elasticKeywords;
+                }
+            },
+            enumerable: false,
+            configurable: true
+        });
         CaseVisualId._i18n = 'search.category.case.visualId';
         return CaseVisualId;
     }(NoConfigurationCategory));
@@ -13646,7 +13696,8 @@
          * @param searchedSubstring value that should be searched on all full text fields
          */
         SearchService.prototype.setFullTextFilter = function (searchedSubstring) {
-            this._fullTextFilter = new SimpleFilter('', this._baseFilter.type, { fullText: searchedSubstring });
+            var whiteSpacedSubstring = searchedSubstring.replace(' ', '\\ ');
+            this._fullTextFilter = new SimpleFilter('', this._baseFilter.type, { fullText: whiteSpacedSubstring });
             this.updateActiveFilter();
         };
         /**