From 77a21134112a68e76cdd6ed2e13c2a9e1949cef6 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Sun, 27 Jun 2021 11:04:56 +0200 Subject: [PATCH] fixed official plugins not being marked as such --- .../src/components/pluginsSettingsTab.component.pug | 8 +++++--- .../src/services/pluginManager.service.ts | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug b/terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug index a7410f00..3d6c18aa 100644 --- a/terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug +++ b/terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug @@ -57,7 +57,6 @@ div 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)') @@ -71,6 +70,9 @@ div div((click)='showPluginInfo(plugin)') div strong {{plugin.name}} - small.text-muted.ml-1 {{plugin.version}} / {{plugin.author}} - i.fas.fa-check.text-success.ml-1(*ngIf='plugin.isOfficial', title='Official') + small.text-muted.ml-1 {{plugin.version}} + small.text-muted.ml-1(*ngIf='!plugin.isOfficial') by {{plugin.author}} + small.text-success.ml-1(*ngIf='plugin.isOfficial') + i.fas.fa-check + span.ml-1 Official small.text-muted {{plugin.description}} diff --git a/terminus-plugin-manager/src/services/pluginManager.service.ts b/terminus-plugin-manager/src/services/pluginManager.service.ts index 3c7d69a3..a2f14c67 100644 --- a/terminus-plugin-manager/src/services/pluginManager.service.ts +++ b/terminus-plugin-manager/src/services/pluginManager.service.ts @@ -43,7 +43,7 @@ export class PluginManagerService { version: item.package.version, homepage: item.package.links.homepage, author: (item.package.author || {}).name, - isOfficial: item.package.publisher.username === OFFICIAL_NPM_ACCOUNT, + isOfficial: item.package.publisher.name === OFFICIAL_NPM_ACCOUNT, }))), map(plugins => plugins.filter(x => x.packageName.startsWith(NAME_PREFIX))), map(plugins => plugins.filter(x => !BLACKLIST.includes(x.packageName))),