@startinblox/core 0.17.31 → 0.18.0-beta.2

package/dist/components/solid-form.js

@@ -1,95 +1,3 @@
-function _templateObject9() {
-  const data = _taggedTemplateLiteral(["\n        ", "\n      "]);
-
-  _templateObject9 = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject8() {
-  const data = _taggedTemplateLiteral(["<input type=\"reset\" />"]);
-
-  _templateObject8 = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject7() {
-  const data = _taggedTemplateLiteral(["\n        <form\n          @submit=", "\n          @reset=", "\n        >\n          ", "\n          ", "\n          ", "\n        </form>\n      "]);
-
-  _templateObject7 = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject6() {
-  const data = _taggedTemplateLiteral(["\n      <div data-id=\"error\"></div>\n      ", "\n      ", "\n    "]);
-
-  _templateObject6 = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject5() {
-  const data = _taggedTemplateLiteral(["\n          <input type=\"submit\" value=", ">\n        "]);
-
-  _templateObject5 = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject4() {
-  const data = _taggedTemplateLiteral(["\n          <button type=\"submit\">", "</button>\n        "]);
-
-  _templateObject4 = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject3() {
-  const data = _taggedTemplateLiteral(["\n      <div class=", ">\n        ", "\n      </div>\n    "]);
-
-  _templateObject3 = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject2() {
-  const data = _taggedTemplateLiteral(["\n         <li>", "</li>\n        "]);
-
-  _templateObject2 = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject() {
-  const data = _taggedTemplateLiteral(["\n      <p>A validation error occurred.</p>\n      <ul>\n        ", "\n      </ul>\n    "]);
-
-  _templateObject = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
 import { Sib } from '../libs/Sib.js';
 import { WidgetMixin } from '../mixins/widgetMixin.js';
 import { StoreMixin } from '../mixins/storeMixin.js';
@@ -138,75 +46,63 @@ export const SolidForm = {
   initialState: {
     error: ''
   },
-
   get defaultMultipleWidget() {
     return 'solid-multiple-form';
   },
-
   get defaultSetWidget() {
     return 'solid-set-default';
   },
-
   get value() {
     const values = {};
     this.widgets.forEach(widget => {
       const name = (widget.component || widget).name;
       if (name == null) return;
       let value = widget.component ? widget.component.getValue() : widget.value;
-
       try {
         value = JSON.parse(value);
       } catch (e) {}
-
       setDeepProperty(values, name.split('.'), value);
-    }); // add @id if edition
-
-    if (this.resource && !this.resource.isContainer()) values['@id'] = this.resourceId;
+    });
+    // add @id if edition
+    if (this.resource && !this.resource.isContainer?.()) values['@id'] = this.resourceId;
     return values;
   },
-
   get isNaked() {
     return this.element.hasAttribute('naked');
   },
-
   get isSavingAutomatically() {
     return this.autosave !== null;
   },
-
   isCreationForm(formValue) {
     return !('@id' in formValue);
   },
-
   async getFormValue() {
     let value = this.value;
-
-    if (this.resource && !this.resource.isContainer()) {
+    if (this.resource && !this.resource.isContainer?.()) {
       for (let predicate of Object.keys(this.value)) {
         // add @id for nested resources
         const object = await this.resource[predicate];
         if (object && object['@id'] && !value[predicate]['@id']) value[predicate]['@id'] = object['@id'];
       }
     }
-
     return transformArrayToContainer(value);
   },
-
-  getWidget(field, isSet = false) {
+  getWidget(field) {
+    let isSet = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     let tagName = '';
-    const widgetAttribute = this.element.getAttribute('widget-' + field); // Choose widget
+    const widgetAttribute = this.element.getAttribute('widget-' + field);
 
+    // Choose widget
     if (!widgetAttribute && this.element.hasAttribute('upload-url-' + field)) {
       tagName = 'solid-form-file';
     } else if (!widgetAttribute && (this.element.hasAttribute('range-' + field) || this.element.hasAttribute('enum-' + field))) {
       tagName = 'solid-form-dropdown';
     } else {
       tagName = widgetAttribute || (!isSet ? this.defaultWidget : this.defaultSetWidget);
-    } // Create widget
-
-
+    }
+    // Create widget
     return this.widgetFromTagName(tagName);
   },
-
   change(resource) {
     this.element.dispatchEvent(new CustomEvent('formChange', {
       bubbles: true,
@@ -215,14 +111,12 @@ export const SolidForm = {
       }
     }));
   },
-
   async save() {
     this.toggleLoaderHidden(false);
     this.hideError();
     const resource = await this.getFormValue();
     resource['@context'] = this.context;
     let saved;
-
     try {
       if (this.partial == null) {
         saved = resource['@id'] ? await store.put(resource, this.resourceId) : await store.post(resource, this.resourceId);
@@ -231,13 +125,11 @@ export const SolidForm = {
       }
     } catch (e) {
       this.toggleLoaderHidden(true);
-
       if (e) {
         // if server error
         e.json().then(error => this.showError(error));
         throw e;
       } // else, ldpframework error, we continue
-
     }
 
     this.element.dispatchEvent(new CustomEvent('save', {
@@ -250,38 +142,33 @@ export const SolidForm = {
     this.toggleLoaderHidden(true);
     return saved;
   },
-
   async submitForm() {
     let id;
-
     try {
       id = (await this.save()) || this.getFormValue()['@id'];
     } catch (e) {
       return;
     }
-
     this.reset();
     this.goToNext({
       '@id': id
     });
   },
-
   async onInput() {
     const formValue = await this.getFormValue();
     this.change(formValue);
   },
-
   async onChange() {
     const formValue = await this.getFormValue();
     if (!this.isCreationForm(formValue) && this.isSavingAutomatically) this.submitForm(); // if autosave, submitForm
   },
 
-  findErrorMessage(errors, errorFullName = '') {
+  findErrorMessage(errors) {
+    let errorFullName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
     let errorsArray = [];
     errors.forEach(member => {
       let errorNextName = Object.values(member)[0];
       let errorAddName = errorFullName === "" ? errorNextName : errorFullName.concat(' - ', errorNextName);
-
       if (Array.isArray(Object.values(member)[1]) === true) {
         let errorMessage = Object.values(member)[1];
         let errorGlobal = errorAddName.concat(': ', errorMessage.join(', '));
@@ -294,29 +181,32 @@ export const SolidForm = {
     });
     return errorsArray;
   },
-
   empty() {},
-
   showError(e) {
     let errors = Object.entries(e).filter(field => !field[0].startsWith('@context'));
-    const errorTemplate = html(_templateObject(), this.findErrorMessage(errors).map(field => html(_templateObject2(), field))); // If field exists pick its label (unsure if that's easily possible)
+    const errorTemplate = html`
+      <p>A validation error occurred.</p>
+      <ul>
+        ${this.findErrorMessage(errors).map(field => html`
+         <li>${field}</li>
+        `)}
+      </ul>
+    `;
+    // If field exists pick its label (unsure if that's easily possible)
     // In this.getFields() map with each field and get label
     // If it does not just add a notice as we do that it's missing that field
-    // Validation message in english ?
 
+    // Validation message in english ?
     const parentElement = this.element.querySelector('[data-id=error]');
     if (parentElement) render(errorTemplate, parentElement);
   },
-
   hideError() {
     const parentElement = this.element.querySelector('[data-id=error]');
     if (parentElement) render('', parentElement);
   },
-
   reset() {
     if (!this.isNaked) this.element.querySelector('form').reset();
   },
-
   onSubmit(event) {
     if (!this.isNaked) {
       event.preventDefault();
@@ -328,27 +218,42 @@ export const SolidForm = {
     //send method to validationMixin, used by the dialog modal and performAction method
     return this.submitForm();
   },
-
   onReset() {
     if (!this.isNaked) setTimeout(() => this.onInput());
   },
-
   getSubmitTemplate() {
-    return html(_templateObject3(), ifDefined(this.classSubmitButton), this.submitWidget === 'button' ? html(_templateObject4(), this.submitButton || this.t("solid-form.submit-button")) : html(_templateObject5(), this.submitButton || this.t("solid-form.submit-button")));
+    return html`
+      <div class=${ifDefined(this.classSubmitButton)}>
+        ${this.submitWidget === 'button' ? html`
+          <button type="submit">${this.submitButton || this.t("solid-form.submit-button")}</button>
+        ` : html`
+          <input type="submit" value=${this.submitButton || this.t("solid-form.submit-button")}>
+        `}
+      </div>
+    `;
   },
-
   async populate() {
     this.element.oninput = () => this.onInput(); // prevent from firing change multiple times
-
-
     this.element.onchange = () => this.onChange();
-
     const fields = await this.getFields();
     const widgetTemplates = await Promise.all(fields.map(field => this.createWidgetTemplate(field)));
-    const template = html(_templateObject6(), !this.isNaked ? html(_templateObject7(), this.onSubmit.bind(this), this.onReset.bind(this), widgetTemplates, !this.isSavingAutomatically ? this.getSubmitTemplate() : '', this.element.hasAttribute('reset') ? html(_templateObject8()) : '') : html(_templateObject9(), widgetTemplates), this.getModalDialog());
+    const template = html`
+      <div data-id="error"></div>
+      ${!this.isNaked ? html`
+        <form
+          @submit=${this.onSubmit.bind(this)}
+          @reset=${this.onReset.bind(this)}
+        >
+          ${widgetTemplates}
+          ${!this.isSavingAutomatically ? this.getSubmitTemplate() : ''}
+          ${this.element.hasAttribute('reset') ? html`<input type="reset" />` : ''}
+        </form>
+      ` : html`
+        ${widgetTemplates}
+      `}
+      ${this.getModalDialog()}
+    `;
     render(template, this.element);
   }
-
 };
-Sib.register(SolidForm);
-//# sourceMappingURL=solid-form.js.map
+Sib.register(SolidForm);

package/dist/components/solid-lang.js

@@ -1,15 +1,3 @@
-function _templateObject() {
-  const data = _taggedTemplateLiteral(["\n    <button\n      @click=", "\n    >\n      ", "\n    </button>\n    "]);
-
-  _templateObject = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
 import { Sib } from '../libs/Sib.js';
 import { store } from '../libs/store/store.js';
 import { html, render } from '../_snowpack/pkg/lit-html.js';
@@ -26,21 +14,22 @@ export const SolidLang = {
       default: null
     }
   },
-
   created() {
     this.render();
   },
-
   languageLoader() {
     store.selectLanguage(this.lang);
     location.reload();
   },
-
   render() {
-    let template = html(_templateObject(), this.languageLoader.bind(this), this.dataLabel);
+    let template = html`
+    <button
+      @click=${this.languageLoader.bind(this)}
+    >
+      ${this.dataLabel}
+    </button>
+    `;
     render(template, this.element);
   }
-
 };
-Sib.register(SolidLang);
-//# sourceMappingURL=solid-lang.js.map
+Sib.register(SolidLang);

package/dist/components/solid-map.js

@@ -1,25 +1,3 @@
-function _templateObject2() {
-  const data = _taggedTemplateLiteral(["\n      <solid-display\n        fields=\"", "\"\n        data-src=\"", "\"\n        ...=", "\n      ></solid-display>\n    "]);
-
-  _templateObject2 = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject() {
-  const data = _taggedTemplateLiteral(["\n      <div id=", " style=\"width:100%;height:100%;\"></div>\n    "]);
-
-  _templateObject = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
 import { Sib } from '../libs/Sib.js';
 import { ListMixin } from '../mixins/listMixin.js';
 import { StoreMixin } from '../mixins/storeMixin.js';
@@ -31,11 +9,11 @@ import { GrouperMixin } from '../mixins/grouperMixin.js';
 import { NextMixin } from '../mixins/nextMixin.js';
 import { store } from '../libs/store/store.js';
 import { uniqID } from '../libs/helpers.js';
-import { spread } from '../libs/lit-helpers.js'; //@ts-ignore
-
-import L from 'https://cdn.skypack.dev/leaflet@1.7.1'; // TODO : revert to "leaflet" when apps up to date
+import { spread } from '../libs/lit-helpers.js';
 
-import 'https://cdn.skypack.dev/leaflet.markercluster@1.4.1'; // TODO : revert to "leaflet.markercluster" when apps up to date
+//@ts-ignore
+import L from 'https://cdn.skypack.dev/leaflet'; // TODO : revert to "leaflet" when apps up to date
+import 'https://cdn.skypack.dev/leaflet.markercluster'; // TODO : revert to "leaflet.markercluster" when apps up to date
 
 import { html, render } from '../_snowpack/pkg/lit-html.js';
 import { ifDefined } from '../_snowpack/pkg/lit-html/directives/if-defined.js';
@@ -56,45 +34,42 @@ export const SolidMap = {
     resetPlanned: false,
     hasBeenResetOnce: false
   },
-
   created() {
     //@ts-ignore
-    import("../_snowpack/pkg/leaflet/dist/leaflet.css.proxy.js"); //@ts-ignore
-
-    import("../style/default-theme.css.proxy.js"); //@ts-ignore
-
-    import("../_snowpack/pkg/leaflet.markercluster/dist/MarkerCluster.css.proxy.js"); //@ts-ignore
-
-    import("../_snowpack/pkg/leaflet.markercluster/dist/MarkerCluster.Default.css.proxy.js"); // reset when it becomes visible to prevent bug https://git.startinblox.com/framework/sib-core/issues/661
+    import("../_snowpack/pkg/leaflet/dist/leaflet.css.proxy.js");
+    //@ts-ignore
+    import("../style/default-theme.css.proxy.js");
+    //@ts-ignore
+    import("../_snowpack/pkg/leaflet.markercluster/dist/MarkerCluster.css.proxy.js");
+    //@ts-ignore
+    import("../_snowpack/pkg/leaflet.markercluster/dist/MarkerCluster.Default.css.proxy.js");
 
+    // reset when it becomes visible to prevent bug https://git.startinblox.com/framework/sib-core/issues/661
     document.body.addEventListener('navigate', () => setTimeout(() => this.isVisible && !this.hasBeenResetOnce && this.reset()));
     this.markers = [];
     this.subscriptions = new Map();
   },
-
   get isVisible() {
     return this.element.offsetParent !== null;
   },
-
   attached() {
     const id = uniqID();
-    const template = html(_templateObject(), id);
+    const template = html`
+      <div id=${id} style="width:100%;height:100%;"></div>
+    `;
     render(template, this.element);
-    const div = this.element.querySelector("#".concat(id));
+    const div = this.element.querySelector(`#${id}`);
     this.map = L.map(div);
     L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png').addTo(this.map);
-
     if (this.clustering !== null) {
       this.markersCluster = L.markerClusterGroup();
       this.map.addLayer(this.markersCluster);
     }
   },
-
   reset() {
     if (this.isVisible) {
       // reset only if visible
       this.map.invalidateSize();
-
       if (this.markers.length) {
         this.map.fitBounds(L.featureGroup(this.markers).getBounds()); // Center map on markers if some available
       } else {
@@ -104,7 +79,6 @@ export const SolidMap = {
       this.hasBeenResetOnce = true;
     }
   },
-
   /**
    * Execute a reset only if none is planned already
    */
@@ -117,7 +91,6 @@ export const SolidMap = {
       });
     }
   },
-
   dispatchSelect(event) {
     const target = event.target;
     const resource = target['options'].resource;
@@ -128,7 +101,6 @@ export const SolidMap = {
     }));
     this.goToNext(resource);
   },
-
   /**
    * Override listMixin method: initialize a marker on the map
    * @param resourceId: id of the resource to display
@@ -136,15 +108,12 @@ export const SolidMap = {
    */
   async appendChildElt(resourceId, groupClass) {
     const resource = await store.getData(resourceId, this.context);
-
     if (!this.subscriptions.get(resourceId)) {
       this.subscriptions.set(resourceId, PubSub.subscribe(resourceId, () => this.updateDOM()));
     }
-
     if (!resource) return;
     const lat = await resource['lat'];
     const lng = await resource['lng'];
-
     if (lat && lng) {
       const icon = L.divIcon({
         // create the icon, doc here: https://leafletjs.com/reference-1.6.0.html#icon
@@ -153,15 +122,15 @@ export const SolidMap = {
         iconSize: [8, 8],
         iconAnchor: [12, 34],
         popupAnchor: [0, -34]
-      }); // create a marker, doc here: https://leafletjs.com/reference-1.6.0.html#marker
+      });
 
+      // create a marker, doc here: https://leafletjs.com/reference-1.6.0.html#marker
       const marker = L.marker([lat.toString(), lng.toString()], {
         resource,
         icon
       });
       if (this.clustering === null) marker.addTo(this.map);else this.markersCluster.addLayer(marker);
       marker.on('click', this.dispatchSelect.bind(this));
-
       if (this.fields !== null) {
         // show popups only if fields attribute
         marker.bindPopup(() => this.getPopupContent(resourceId), {
@@ -172,43 +141,41 @@ export const SolidMap = {
       this.markers.push(marker);
     }
   },
-
   /**
    * Generate the solid-display of the popup
    * @param resourceId: id of the popup clicked
    */
   getPopupContent(resourceId) {
     const attributes = {};
-
     for (let attr of this.element.attributes) {
       //copy widget and value attributes
       if (attr.name.startsWith('value-') || attr.name.startsWith('label-') || attr.name.startsWith('widget-') || attr.name.startsWith('class-') || attr.name.startsWith('multiple-') || attr.name.startsWith('editable-') || attr.name.startsWith('action-') || attr.name.startsWith('default-') || attr.name == 'extra-context') attributes[attr.name] = attr.value;
       if (attr.name.startsWith('child-')) attributes[attr.name.replace(/^child-/, '')] = attr.value;
     }
-
     const div = document.createElement('div');
-    const template = html(_templateObject2(), ifDefined(this.fields), resourceId, spread(attributes));
+    const template = html`
+      <solid-display
+        fields="${ifDefined(this.fields)}"
+        data-src="${resourceId}"
+        ...=${spread(attributes)}
+      ></solid-display>
+    `;
     render(template, div);
     return div.querySelector('solid-display');
   },
-
   /**
    * Override widgetMixin method: empty the map
    */
   empty() {
     if (!this.map) return;
     if (this.markersCluster) this.map.removeLayer(this.markersCluster);
-
     for (let marker of this.markers) this.map.removeLayer(marker);
-
     if (this.clustering !== null) {
       this.markersCluster = L.markerClusterGroup();
       this.map.addLayer(this.markersCluster);
     }
-
     this.markers = [];
   },
-
   /**
    * Override groupMixin method
    * @param groupName: value of the group
@@ -216,11 +183,9 @@ export const SolidMap = {
   renderGroup(groupName) {
     const sanitizedGroupName = encodeURIComponent(groupName.toLowerCase()).replace(/%[0-9A-F]{2}/gi, '');
     const div = document.createElement('div'); // used to pass group info to renderDOM
-
     div.dataset.groupClass = 'group-' + sanitizedGroupName;
     return div;
   },
-
   /**
    * Override listMixin method: display all the resources
    * @param resources
@@ -230,13 +195,10 @@ export const SolidMap = {
    */
   async renderDOM(resources, listPostProcessors, div, context) {
     const groupClass = div.dataset.groupClass || ''; // get the group class from the useless div element
-
     await Promise.all(resources.map(resource => this.appendChildElt(resource['@id'], groupClass)));
     this.planReset();
     const nextProcessor = listPostProcessors.shift();
     if (nextProcessor) await nextProcessor(resources, listPostProcessors, div, context);
   }
-
 };
-Sib.register(SolidMap);
-//# sourceMappingURL=solid-map.js.map
+Sib.register(SolidMap);