remove recovered services and drop reordering feature (#1829)

Start9Labs · Oct 31, 2022 · 6bd6a6f · 6bd6a6f
1 parent 7d6f1b7
commit 6bd6a6f
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 440 deletions.
diff --git a/frontend/projects/marketplace/src/pipes/filter-packages.pipe.ts b/frontend/projects/marketplace/src/pipes/filter-packages.pipe.ts
@@ -88,7 +88,10 @@ export class FilterPackagesPipe implements PipeTransform {
     return packages
       .filter(p => category === 'all' || p.categories.includes(category))
       .sort((a, b) => {
-        return a['published-at'] > b['published-at'] ? -1 : 1
+        return (
+          new Date(b['published-at']).valueOf() -
+          new Date(a['published-at']).valueOf()
+        )
       })
   }
 }

diff --git a/frontend/projects/ui/src/app/app/preloader/preloader.component.html b/frontend/projects/ui/src/app/app/preloader/preloader.component.html
@@ -41,7 +41,6 @@
   <ion-note></ion-note>
   <ion-progress-bar></ion-progress-bar>
   <ion-radio></ion-radio>
-  <ion-reorder></ion-reorder>
   <ion-row></ion-row>
   <ion-searchbar></ion-searchbar>
   <ion-segment></ion-segment>

diff --git a/frontend/projects/ui/src/app/app/preloader/preloader.component.ts b/frontend/projects/ui/src/app/app/preloader/preloader.component.ts
@@ -71,7 +71,6 @@ const ICONS = [
   'remove',
   'remove-circle-outline',
   'remove-outline',
-  'reorder-three',
   'rocket-outline',
   'save-outline',
   'shield-checkmark-outline',

diff --git a/...d/projects/ui/src/app/pages/apps-routes/app-list/app-list-rec/app-list-rec.component.html b/...d/projects/ui/src/app/pages/apps-routes/app-list/app-list-rec/app-list-rec.component.html
diff --git a/...end/projects/ui/src/app/pages/apps-routes/app-list/app-list-rec/app-list-rec.component.ts b/...end/projects/ui/src/app/pages/apps-routes/app-list/app-list-rec/app-list-rec.component.ts
diff --git a/...ts/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.html b/...ts/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.html
diff --git a/...ts/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.scss b/...ts/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.scss
diff --git a/...ects/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.ts b/...ects/ui/src/app/pages/apps-routes/app-list/app-list-reorder/app-list-reorder.component.ts
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.module.ts b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.module.ts
@@ -14,8 +14,6 @@ import { UiPipeModule } from 'src/app/pipes/ui/ui.module'
 import { AppListIconComponent } from './app-list-icon/app-list-icon.component'
 import { AppListEmptyComponent } from './app-list-empty/app-list-empty.component'
 import { AppListPkgComponent } from './app-list-pkg/app-list-pkg.component'
-import { AppListRecComponent } from './app-list-rec/app-list-rec.component'
-import { AppListReorderComponent } from './app-list-reorder/app-list-reorder.component'
 import { PackageInfoPipe } from './package-info.pipe'
 
 const routes: Routes = [
@@ -42,8 +40,6 @@ const routes: Routes = [
     AppListIconComponent,
     AppListEmptyComponent,
     AppListPkgComponent,
-    AppListRecComponent,
-    AppListReorderComponent,
     PackageInfoPipe,
   ],
 })

diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.html b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.html
@@ -21,23 +21,20 @@
     ></app-list-empty>
 
     <ng-template #list>
-      <app-list-reorder
-        *ngIf="pkgs.length"
-        [(pkgs)]="pkgs"
-        [reordering]="reordering"
-        (reorderingChange)="onReordering($event)"
-      ></app-list-reorder>
+      <ion-item-divider class="ion-padding-bottom"
+        >Installed Services</ion-item-divider
+      >
 
-      <ng-container *ngIf="recoveredPkgs.length && !reordering">
-        <ion-item-group>
-          <ion-item-divider>Recovered Services</ion-item-divider>
-          <app-list-rec
-            *ngFor="let rec of recoveredPkgs"
-            [rec]="rec"
-            (deleted)="deleteRecovered(rec)"
-          ></app-list-rec>
-        </ion-item-group>
-      </ng-container>
+      <ion-grid>
+        <ion-row>
+          <ion-col *ngFor="let pkg of pkgs" sizeSm="12" sizeLg="6">
+            <app-list-pkg
+              *ngIf="pkg | packageInfo | async as info"
+              [pkg]="info"
+            ></app-list-pkg>
+          </ion-col>
+        </ion-row>
+      </ion-grid>
     </ng-template>
   </ng-template>
 </ion-content>
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.scss b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list.page.scss
@@ -1,3 +0,0 @@
-ion-item-divider {
-  margin-bottom: 16px;
-}