@things-factory/import-ui 4.3.767 → 4.3.790

package/client/components/import-pop-up.js

@@ -14,7 +14,9 @@ class ImportPopUp extends localize(i18next)(LitElement) {
       config: Object,
       _config: Object,
       records: Array,
-      enableDirectInbound: Boolean
+      enableDirectInbound: Boolean,
+      enableRowErrors: Boolean,
+      _importing: Boolean
     }
   }
 
@@ -62,6 +64,26 @@ class ImportPopUp extends localize(i18next)(LitElement) {
     return this.shadowRoot.querySelector('data-grist')
   }
 
+  _blockClose() {
+    if (this._originalHistoryBack) return
+    this._originalHistoryBack = history.back.bind(history)
+    history.back = () => {
+      // Blocked — import in progress
+    }
+  }
+
+  _unblockClose() {
+    if (this._originalHistoryBack) {
+      history.back = this._originalHistoryBack
+      this._originalHistoryBack = null
+    }
+  }
+
+  disconnectedCallback() {
+    super.disconnectedCallback()
+    this._unblockClose()
+  }
+
   render() {
     return html`
       <div class="grist">
@@ -70,7 +92,10 @@ class ImportPopUp extends localize(i18next)(LitElement) {
 
       <div class="button-container">
         <mwc-button
+          ?disabled=${this._importing}
           @click=${async () => {
+            if (this._importing) return
+
             const patches = this.getCurrentRecord()
             if (patches.length) {
               const answer = await CustomAlert({
@@ -82,7 +107,26 @@ class ImportPopUp extends localize(i18next)(LitElement) {
 
               if (!answer.value) return
 
-              this.importHandler(patches)
+              this._importing = true
+              this._blockClose()
+              this.dataGrist.showSpinner()
+              try {
+                const result = await this.importHandler(patches)
+                this._unblockClose()
+                if (Array.isArray(result)) {
+                  this.records = result
+                  this.dataGrist.data = { records: result, total: result.length }
+                } else {
+                  // Success — handler returned undefined/null, close popup
+                  history.back()
+                }
+              } catch (e) {
+                this._unblockClose()
+                // Handler threw — it already showed a toast
+              } finally {
+                this._importing = false
+                this.dataGrist.hideSpinner()
+              }
             } else {
               CustomAlert({
                 title: i18next.t('text.nothing_selected'),
@@ -92,7 +136,7 @@ class ImportPopUp extends localize(i18next)(LitElement) {
           }}
           >${i18next.t('button.import')}</mwc-button
         >
-        <mwc-button @click=${e => history.back()}>${i18next.t('button.cancel')}</mwc-button>
+        <mwc-button ?disabled=${this._importing} @click=${e => { if (!this._importing) history.back() }}>${i18next.t('button.cancel')}</mwc-button>
       </div>
     `
   }
@@ -106,7 +150,7 @@ class ImportPopUp extends localize(i18next)(LitElement) {
         pagination: { infinite: true },
         columns: [{ type: 'gutter', gutterName: 'row-selector', multiple: true }, ...columns]
       }
-      if(this.enableDirectInbound){
+      if(this.enableDirectInbound || this.enableRowErrors){
           this._config.rows =  {
           appendable: false,
           classifier: (record, rowIndex) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/import-ui",
-  "version": "4.3.767",
+  "version": "4.3.790",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,10 +24,10 @@
   },
   "dependencies": {
     "@things-factory/context-base": "^4.3.767",
-    "@things-factory/grist-ui": "^4.3.767",
+    "@things-factory/grist-ui": "^4.3.770",
     "@things-factory/i18n-base": "^4.3.767",
     "@things-factory/import-base": "^4.3.767",
     "@things-factory/layout-base": "^4.3.767"
   },
-  "gitHead": "065b02059d800f6a759a98c240fed8608b48a52c"
+  "gitHead": "aac8be0c440911f309204b31d37d0b9fabd0c451"
 }