@startinblox/core 0.18.0 → 0.18.2

package/dist/components/solid-form-search.js

@@ -52,6 +52,8 @@ export const SolidFormSearch = {
   get defaultSetWidget() {
     return 'solid-set-default';
   },
+  // Returns the current value of the search from
+  // As a search query object
   get value() {
     const values = {};
     this.widgets.forEach(widget => {
@@ -61,6 +63,7 @@ export const SolidFormSearch = {
       try {
         value = JSON.parse(value);
       } catch {}
+      // Add another filter value in the values array
       value = {
         type: widget.component.type,
         list: !!widget.component.multiple,

package/dist/libs/filter.js

@@ -67,7 +67,7 @@ const orThrow = (throwOn, ret) => {
  */
 const matchValue = async (val, query, throwOn) => {
   const subject = await val;
-  if (subject == null && query.value === '') return orThrow(throwOn, true); // filter not set and subject not existing -> ignore filter
+  if (subject == null && query.value === '' && query.type !== 'string') return orThrow(throwOn, true); // filter not set and subject not existing -> ignore filter only if type is not string
   if (subject == null) return orThrow(throwOn, false); // return false; // property does not exist on resource
   if (query.list) {
     // Filter on a container

package/dist/libs/helpers.js

@@ -136,7 +136,10 @@ function fuzzyCompare(subject, search) {
 }
 const compare = {
   string(subject, query) {
-    if (query === '') return true;
+    // Exact match on empty string between query and subject
+    if (query === '' && subject.toString() === '') return false;
+    // Else if query is empty and subject is something else, return true
+    else if (query === '') return true;
     if (subject.toString().toLowerCase().includes(String(query).toLowerCase())) return true;
     return fuzzyCompare(subject, query);
   },

package/dist/libs/store/store.js

@@ -573,7 +573,10 @@ class CustomGetter {
     this.parentId = parentId;
     this.resource = this.expandProperties({
       ...resource
-    }, serverContext);
+    }, {
+      ...serverContext,
+      ...clientContext
+    });
     this.resourceId = resourceId;
     this.serverPagination = serverPagination;
     this.serverSearch = serverSearch;
@@ -617,8 +620,8 @@ class CustomGetter {
     if (!this.isFullResource()) {
       // if resource is not complete, fetch it first
       await this.getResource(this.resourceId, {
-        ...this.clientContext,
-        ...this.serverContext
+        ...this.serverContext,
+        ...this.clientContext
       }, this.parentId);
     }
     while (true) {
@@ -635,15 +638,15 @@ class CustomGetter {
       // end of the path
       if (!value || !value['@id']) return value; // no value or not a resource
       return await this.getResource(value['@id'], {
-        ...this.clientContext,
-        ...this.serverContext
+        ...this.serverContext,
+        ...this.clientContext
       }, this.parentId || this.resourceId); // return complete resource
     }
 
     if (!value) return undefined;
     let resource = await this.getResource(value['@id'], {
-      ...this.clientContext,
-      ...this.serverContext
+      ...this.serverContext,
+      ...this.clientContext
     }, this.parentId || this.resourceId);
     store.subscribeResourceTo(this.resourceId, value['@id']);
     return resource ? await resource[path2.join('.')] : undefined; // return value
@@ -733,8 +736,8 @@ class CustomGetter {
     if (!permissions) {
       // if no permission, re-fetch data
       await this.getResource(this.resourceId, {
-        ...this.clientContext,
-        ...this.serverContext
+        ...this.serverContext,
+        ...this.clientContext
       }, this.parentId, true);
       permissions = this.resource[permissionPredicate];
     }
@@ -749,20 +752,20 @@ class CustomGetter {
   }
   getExpandedPredicate(property) {
     return ContextParser.expandTerm(property, {
-      ...this.clientContext,
-      ...this.serverContext
+      ...this.serverContext,
+      ...this.clientContext
     }, true);
   }
   getCompactedPredicate(property) {
     return ContextParser.compactIri(property, {
-      ...this.clientContext,
-      ...this.serverContext
+      ...this.serverContext,
+      ...this.clientContext
     }, true);
   }
   getCompactedIri(id) {
     return ContextParser.compactIri(id, {
-      ...this.clientContext,
-      ...this.serverContext
+      ...this.serverContext,
+      ...this.clientContext
     });
   }
   toString() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startinblox/core",
-  "version": "0.18.0",
+  "version": "0.18.2",
   "description": "This is a series of web component respecting both the web components standards and the Linked Data Platform convention.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",