Merge pull request #1440 from lnbits/noreloadinstall

Removes install page reloads

lnbits/core/templates/core/install.html

@@ -29,8 +29,8 @@
             align="left"
           >
             <q-tab
-              name="featured"
+              name="installed"
-              label="Featured"
+              label="Installed"
               @update="val => tab = val.name"
             ></q-tab>
             <q-tab
@@ -39,8 +39,8 @@
               @update="val => tab = val.name"
             ></q-tab>
             <q-tab
-              name="installed"
+              name="featured"
-              label="Installed"
+              label="Featured"
               @update="val => tab = val.name"
             ></q-tab>
           </q-tabs>
@@ -318,7 +318,7 @@
     data: function () {
       return {
         searchTerm: '',
-        tab: 'featured',
+        tab: 'all',
         filteredExtensions: null,
         showUninstallDialog: false,
         showUpgradeDialog: false,
@@ -356,10 +356,10 @@
       },
       installExtension: async function (release) {
         const extension = this.selectedExtension
-        try {
+        extension.inProgress = true
-          extension.inProgress = true
+        this.showUpgradeDialog = false
-          this.showUpgradeDialog = false
+        LNbits.api
-          await LNbits.api.request(
+          .request(
             'POST',
             `/api/v1/extension?usr=${this.g.user.id}`,
             this.g.user.wallets[0].adminkey,
@@ -369,46 +369,61 @@
               source_repo: release.source_repo
             }
           )
-          window.location.href = [
+          .then(response => {
-            "{{ url_for('install.extensions') }}",
+            extension.isAvailable = true
-            '?usr=',
+            extension.isInstalled = true
-            this.g.user.id
+            this.toggleExtension(extension)
-          ].join('')
+            extension.inProgress = false
-        } catch (error) {
+            this.filteredExtensions = this.extensions.concat([])
-          LNbits.utils.notifyApiError(error)
+            this.handleTabChanged('installed')
-          extension.inProgress = false
+            this.tab = 'installed'
-        }
+          })
+          .catch(err => {
+            LNbits.utils.notifyApiError(err)
+            extension.inProgress = false
+          })
       },
       uninstallExtension: async function () {
         const extension = this.selectedExtension
         this.showUpgradeDialog = false
         this.showUninstallDialog = false
-        try {
+        extension.inProgress = true
-          extension.inProgress = true
+        LNbits.api
-          await LNbits.api.request(
+          .request(
             'DELETE',
             `/api/v1/extension/${extension.id}?usr=${this.g.user.id}`,
             this.g.user.wallets[0].adminkey
           )
-          window.location.href = [
+          .then(response => {
-            "{{ url_for('install.extensions') }}",
+            extension.isAvailable = false
-            '?usr=',
+            extension.isInstalled = false
-            this.g.user.id
+            extension.inProgress = false
-          ].join('')
+            this.filteredExtensions = this.extensions.concat([])
-        } catch (error) {
+            this.handleTabChanged('installed')
-          LNbits.utils.notifyApiError(error)
+            this.tab = 'installed'
-          extension.inProgress = false
+          })
-        }
+          .catch(err => {
+            LNbits.utils.notifyApiError(err)
+            extension.inProgress = false
+          })
       },
       toggleExtension: function (extension) {
         const action = extension.isActive ? 'activate' : 'deactivate'
-        window.location.href = [
+        LNbits.api
-          "{{ url_for('install.extensions') }}",
+          .request(
-          '?usr=',
+            'GET',
-          this.g.user.id,
+            "{{ url_for('install.extensions') }}?usr=" +
-          `&${action}=`,
+              this.g.user.id +
-          extension.id
+              '&' +
-        ].join('')
+              action +
+              '=' +
+              extension.id
+          )
+          .then(response => {})
+          .catch(err => {
+            LNbits.utils.notifyApiError(err)
+            extension.inProgress = false
+          })
       },
 
       showUninstall: function () {
@@ -477,7 +492,12 @@
         inProgress: false
       }))
       this.filteredExtensions = this.extensions.concat([])
-      this.handleTabChanged('featured')
+      for (let i = 0; i < this.filteredExtensions.length; i++) {
+        if (this.filteredExtensions[i].isInstalled != false) {
+          this.handleTabChanged('installed')
+          this.tab = 'installed'
+        }
+      }
     },
     mixins: [windowMixin]
   })

lnbits/core/views/api.py

@@ -761,6 +761,8 @@ async def api_install_extension(
         if extension.upgrade_hash:
             ext_info.nofiy_upgrade()
 
+        return extension
+
     except Exception as ex:
         logger.warning(ex)
         ext_info.clean_extension_files()