plugin settings updates

tabby-plugin-manager/src/components/pluginsSettingsTab.component.pug

@@ -1,78 +1,125 @@
-.alert.alert-danger(*ngIf='errorMessage')
+.d-flex.mb-3
-    strong Error in {{erroredPlugin}}:
+    h3 Plugins
-    pre {{errorMessage}}
-
-.d-flex
-    h3.mb-1 Installed
     button.btn.btn-secondary.btn-sm.ml-auto((click)='openPluginsFolder()')
         i.fas.fa-folder
         span Plugins folder
 
-.list-group.list-group-flush.mt-2
+.alert.alert-danger(*ngIf='errorMessage')
-    .list-group-item.d-flex.align-items-center(*ngFor='let plugin of pluginManager.installedPlugins')
+    strong Error in {{erroredPlugin}}:
-        toggle(
+    pre {{errorMessage}}
-            [ngModel]='isPluginEnabled(plugin)',
-            (ngModelChange)='togglePlugin(plugin)',
-            [disabled]='!canDisablePlugin(plugin)'
-        )
 
-        .mr-auto.d-flex.flex-column
+ul.nav-tabs.mb-2(ngbNav, #nav='ngbNav')
-            div
+    li(ngbNavItem)
-                strong {{plugin.name}}
+        a(ngbNavLink) Available
-                small.text-muted.ml-1(*ngIf='!plugin.isBuiltin') {{plugin.version}} / {{plugin.author}}
+        ng-template(ngbNavContent)
-                small.text-muted.ml-1(*ngIf='plugin.isBuiltin') Built-in
+            .input-group.mb-3.mt-3
-                small.text-warning.ml-1(*ngIf='!isPluginEnabled(plugin)') Disabled
+                .input-group-prepend
-            a.text-muted.mb-0((click)='showPluginInfo(plugin)')
+                    .input-group-text
-                small {{plugin.description}}
+                        i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='!availablePluginsReady')
-
+                        i.fas.fa-fw.fa-search(*ngIf='availablePluginsReady')
-        button.btn.btn-primary.ml-2(
+                input.form-control(
-            *ngIf='knownUpgrades[plugin.name]',
+                    type='text',
-            (click)='upgradePlugin(plugin)',
+                    [(ngModel)]='_1',
-            [disabled]='busy.has(plugin.name)'
+                    (ngModelChange)='searchAvailable(_1)',
-        )
+                    placeholder='Search plugins'
-            i.fas.fa-fw.fa-arrow-up(*ngIf='busy.get(plugin.name) != BusyState.Installing')
-            i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy.get(plugin.name) == BusyState.Installing')
-            span Upgrade ({{knownUpgrades[plugin.name].version}})
-
-        button.btn.btn-link.text-danger.ml-2(
-            (click)='uninstallPlugin(plugin)',
-            *ngIf='!plugin.isBuiltin',
-            [disabled]='busy.has(plugin.name)'
-        )
-            i.fas.fa-fw.fa-trash(*ngIf='busy.get(plugin.name) != BusyState.Uninstalling')
-            i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy.get(plugin.name) == BusyState.Uninstalling')
-
-div
-    h3.mt-4 Available
-
-    .input-group.mb-3
-        .input-group-prepend
-            .input-group-text
-                i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='!availablePluginsReady')
-                i.fas.fa-fw.fa-search(*ngIf='availablePluginsReady')
-        input.form-control(
-            type='text',
-            [(ngModel)]='_1',
-            (ngModelChange)='searchAvailable(_1)',
-            placeholder='Search plugins'
-        )
-
-    .list-group.list-group-flush.mb-4(*ngIf='availablePlugins$')
-        ng-container(*ngFor='let plugin of (availablePlugins$|async)')
-            .list-group-item.d-flex.align-items-center(*ngIf='!isAlreadyInstalled(plugin)')
-                button.btn.btn-primary.mr-3(
-                    (click)='installPlugin(plugin)',
-                    [disabled]='busy.has(plugin.name)'
                 )
-                    i.fas.fa-fw.fa-download(*ngIf='busy.get(plugin.name) != BusyState.Installing')
-                    i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy.get(plugin.name) == BusyState.Installing')
 
-                div((click)='showPluginInfo(plugin)')
+            ngb-accordion.mb-4(*ngIf='availablePlugins$', type='dark', [closeOthers]='true')
-                    div
+                ng-container(*ngFor='let plugin of (availablePlugins$|async)')
-                        strong {{plugin.name}}
+                    ngb-panel(*ngIf='!isAlreadyInstalled(plugin)', cardClass='bg-dark')
-                        small.text-muted.ml-1 {{plugin.version}}
+                        ng-template(ngbPanelTitle)
-                        small.text-muted.ml-1(*ngIf='!plugin.isOfficial') by {{plugin.author}}
+                            .text-left
-                        small.text-success.ml-1(*ngIf='plugin.isOfficial')
+                                strong.d-block {{plugin.name}}
-                            i.fas.fa-check
+                                small.d-block.text-muted {{plugin.description}}
-                            span.ml-1 Official
+                        ng-template(ngbPanelContent)
-                    small.text-muted {{plugin.description}}
+                            .row
+                                .col-4
+                                    button.btn.btn-primary.btn-block.justify-content-center(
+                                        (click)='installPlugin(plugin)',
+                                        [disabled]='busy.has(plugin.name)'
+                                    )
+                                        i.fas.fa-fw.fa-cloud-download(*ngIf='busy.get(plugin.name) != BusyState.Installing')
+                                        i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy.get(plugin.name) == BusyState.Installing')
+                                        span.ml-2 Get
+
+                                    button.btn.btn-secondary.btn-block.justify-content-center(
+                                        *ngIf='plugin.homepage',
+                                        (click)='showPluginHomepage(plugin)'
+                                    )
+                                        i.fas.fa-fw.fa-external-link-alt
+                                        span.ml-2 Homepage
+
+                                .col-8
+                                    ng-container(*ngTemplateOutlet='pluginInfo; context: { plugin }')
+
+                            .mt-2 {{plugin.description}}
+
+    li(ngbNavItem)
+        a(ngbNavLink) Installed
+        ng-template(ngbNavContent)
+            ngb-accordion.mb-4(type='dark', [closeOthers]='true')
+                ng-container(*ngFor='let plugin of pluginManager.installedPlugins')
+                    ngb-panel(cardClass='bg-dark')
+                        ng-template(ngbPanelTitle)
+                            .text-left.mr-auto
+                                div
+                                    strong {{plugin.name}}
+                                    small.text-muted.ml-2(*ngIf='plugin.isBuiltin') Built-in
+                                    small.text-warning.ml-2(*ngIf='!isPluginEnabled(plugin)') Disabled
+                                small.d-block.text-muted {{plugin.description}}
+
+                            button.btn.btn-primary.ml-2(
+                                *ngIf='knownUpgrades[plugin.name]',
+                                (click)='upgradePlugin(plugin)',
+                                [disabled]='busy.has(plugin.name)'
+                            )
+                                i.fas.fa-fw.fa-arrow-up(*ngIf='busy.get(plugin.name) != BusyState.Installing')
+                                i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy.get(plugin.name) == BusyState.Installing')
+                                span Upgrade to {{knownUpgrades[plugin.name].version}}
+
+                        ng-template(ngbPanelContent)
+                            .row
+                                .col-4
+                                    button.btn.btn-warning.btn-block.justify-content-center(
+                                        (click)='togglePlugin(plugin)',
+                                        *ngIf='isPluginEnabled(plugin)',
+                                        [disabled]='!canDisablePlugin(plugin)'
+                                    ) Disable
+
+                                    button.btn.btn-success.btn-block.justify-content-center(
+                                        (click)='togglePlugin(plugin)',
+                                        *ngIf='canDisablePlugin(plugin) && !isPluginEnabled(plugin)'
+                                    ) Enable
+
+                                    button.btn.btn-danger.btn-block.justify-content-center(
+                                        (click)='uninstallPlugin(plugin)',
+                                        *ngIf='!plugin.isBuiltin',
+                                        [disabled]='busy.has(plugin.name)'
+                                    )
+                                        i.fas.fa-fw.fa-trash(*ngIf='busy.get(plugin.name) != BusyState.Uninstalling')
+                                        i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy.get(plugin.name) == BusyState.Uninstalling')
+                                        span Uninstall
+                                .col-8
+                                    ng-container(*ngTemplateOutlet='pluginInfo; context: { plugin }')
+
+
+                            .mt-2 {{plugin.description}}
+
+ng-template(#pluginInfo, let-plugin='plugin')
+    .row.align-items-center
+        .col-4
+            strong Version
+        .col-8
+            span {{plugin.version}}
+    .row.align-items-center
+        .col-4
+            strong Author
+        .col-8
+            .badge.badge-success(*ngIf='plugin.isOfficial')
+                i.fas.fa-check
+                span.ml-1 Official
+            a.btn.btn-link.px-0.w-auto((click)='showPluginInfo(plugin)', *ngIf='!plugin.isOfficial')
+                span {{plugin.author}}
+                i.fas.fa-fw.fa-external-link-alt.ml-2
+
+.mb-4([ngbNavOutlet]='nav')

tabby-plugin-manager/src/components/pluginsSettingsTab.component.scss

@@ -1,8 +1,7 @@
-.appearance-preview {
+::ng-deep .card-header {
-    padding: 10px 20px;
+    padding: 0;
-    margin: 0 0 10px;
+
-    overflow: hidden;
+    > button {
-    span {
+        width: 100%;
-        white-space: pre;
     }
 }

tabby-plugin-manager/src/components/pluginsSettingsTab.component.ts

@@ -105,6 +105,10 @@ export class PluginsSettingsTabComponent {
         this.platform.openExternal('https://www.npmjs.com/package/' + plugin.packageName)
     }
 
+    showPluginHomepage (plugin: PluginInfo) {
+        this.platform.openExternal(plugin.homepage ?? '')
+    }
+
     isPluginEnabled (plugin: PluginInfo) {
         return !this.config.store.pluginBlacklist.includes(plugin.name)
     }

tabby-plugin-manager/src/services/pluginManager.service.ts

@@ -32,7 +32,20 @@ export class PluginManagerService {
         return forkJoin(
             this._listAvailableInternal('tabby-', 'tabby-plugin', query),
             this._listAvailableInternal('terminus-', 'terminus-plugin', query),
-        ).pipe(map(x => x.reduce((a, b) => a.concat(b), [])))
+        ).pipe(
+            map(x => x.reduce((a, b) => a.concat(b), [])),
+            map(x => {
+                const names = new Set<string>()
+                return x.filter(item => {
+                    if (names.has(item.name)) {
+                        return false
+                    }
+                    names.add(item.name)
+                    return true
+                })
+            }),
+            map(x => x.sort((a, b) => a.name.localeCompare(b.name))),
+        )
     }
 
     _listAvailableInternal (namePrefix: string, keyword: string, query?: string): Observable<PluginInfo[]> {