fix #762 and fix #815

homebridge · Aug 23, 2020 · f484398 · f484398
1 parent 1c32c66
commit f484398
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@ All notable changes to this project will be documented in this file. This projec
 * **Plugins:** Partnered with [`homebridge-nest-cam`](https://github.com/Brandawg93/homebridge-nest-cam) to integrate the "issue token" retrieval process into the UI (may require plugin update)
 * **API:** Added REST API endpoints to list and control Homebridge accessories, see the [Swagger API documentation](https://github.com/oznu/homebridge-config-ui-x/wiki/API-Reference) for details.
 
+## Bug Fixes
+
+* **Plugins:** Plugins are now properly sorted in Firefox ([#762](https://github.com/oznu/homebridge-config-ui-x/issues/762))
+
 ## 4.26.0 (2020-08-19)
 
 ### Bug Fixes 

diff --git a/src/modules/plugins/plugins.controller.ts b/src/modules/plugins/plugins.controller.ts
@@ -1,4 +1,3 @@
-
 import { Controller, Get, Param, UseGuards } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
 import { ApiTags, ApiBearerAuth, ApiParam, ApiOperation } from '@nestjs/swagger';
@@ -10,7 +9,6 @@ import { AdminGuard } from '../../core/auth/guards/admin.guard';
 @UseGuards(AuthGuard())
 @Controller('plugins')
 export class PluginsController {
-
   constructor(
     private pluginsService: PluginsService,
   ) { }

diff --git a/ui/src/app/modules/plugins/installed-plugins/installed-plugins.component.ts b/ui/src/app/modules/plugins/installed-plugins/installed-plugins.component.ts
@@ -55,7 +55,7 @@ export class InstalledPluginsComponent implements OnInit, OnDestroy {
     this.loading = true;
     this.$api.get(`/plugins`).subscribe(
       (data: any) => {
-        this.installedPlugins = data.sort(x => !x.update);
+        this.installedPlugins = data;
         this.loading = false;
         this.checkRecentlyInstalled();
       },

diff --git a/ui/src/app/modules/plugins/plugins.component.html b/ui/src/app/modules/plugins/plugins.component.html
@@ -22,8 +22,8 @@
           <p class="mb-0 grey-text" *ngIf="!plugin.installedVersion" [translate]="'plugins.status_not_installed'">
             Not Installed
           </p>
-          <p class="mb-0 primary-text" *ngIf="plugin.updateAvailable" [translate]="'plugins.status_update_available'">
-            Update Available
+          <p class="mb-0 primary-text" *ngIf="plugin.updateAvailable">
+            <i class="far fa-arrow-alt-circle-up"></i> {{ 'plugins.status_update_available' | translate }}
           </p>
         </div>
         <div class="">