From 35fe06a892f19ad46ab0a203ea78c5279d35c25b Mon Sep 17 00:00:00 2001
From: Lucy Cifferello <12953208+elvece@users.noreply.github.com>
Date: Fri, 5 Apr 2024 16:56:06 -0400
Subject: [PATCH] fix registry connect styles and remove view complete listing
 link

---
 .../src/components/menu/menu.component.html   |  2 --
 .../src/pages/list/search/search.component.ts |  2 --
 .../src/pages/show/about/about.component.html |  1 -
 .../marketplace/modals/preview.component.ts   | 21 +-------------
 .../marketplace/modals/registry.component.ts  | 28 +++++++++++--------
 5 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/web/projects/marketplace/src/components/menu/menu.component.html b/web/projects/marketplace/src/components/menu/menu.component.html
index efc98bcbe..2a55249ec 100644
--- a/web/projects/marketplace/src/components/menu/menu.component.html
+++ b/web/projects/marketplace/src/components/menu/menu.component.html
@@ -75,7 +75,6 @@
                   rel="noreferrer"
                   href="https://docs.start9.com/0.3.5.x/developer-docs/"
                 >
-                  <!-- @TODO need rocket icon -->
                   <span>Package a service</span>
                   <tui-icon
                     tuiAppearance="icon"
@@ -109,7 +108,6 @@
             rel="noreferrer"
             href="https://docs.start9.com/0.3.5.x/developer-docs/"
           >
-            <!-- @TODO need rocket icon -->
             <span>Package a service</span>
             <tui-icon
               tuiAppearance="icon"
diff --git a/web/projects/marketplace/src/pages/list/search/search.component.ts b/web/projects/marketplace/src/pages/list/search/search.component.ts
index 2f1e2427d..835facd9f 100644
--- a/web/projects/marketplace/src/pages/list/search/search.component.ts
+++ b/web/projects/marketplace/src/pages/list/search/search.component.ts
@@ -27,7 +27,5 @@ export class SearchComponent {
   onModelChange(query: string) {
     this.query = query
     this.queryChange.emit(query)
-    // @TODO fix in brochure
-    // this.router.navigate(['../'])
   }
 }
diff --git a/web/projects/marketplace/src/pages/show/about/about.component.html b/web/projects/marketplace/src/pages/show/about/about.component.html
index 6761e3194..515d04637 100644
--- a/web/projects/marketplace/src/pages/show/about/about.component.html
+++ b/web/projects/marketplace/src/pages/show/about/about.component.html
@@ -4,6 +4,5 @@
     <p>
       {{ pkg.manifest.description.long }}
     </p>
-    <ng-content></ng-content>
   </div>
 </div>
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/modals/preview.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/modals/preview.component.ts
index 953e9c2a9..6d754a0b9 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/modals/preview.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/modals/preview.component.ts
@@ -45,19 +45,7 @@ import { Router } from '@angular/router'
             <ng-content select="[slot=controls]" />
           </marketplace-package-hero>
           <div class="inner-container">
-            <marketplace-about [pkg]="pkg">
-              @if (hostInfo$ | async; as info) {
-                <a
-                  [href]="constructDetailLink(info, pkg.manifest.id)"
-                  rel="noreferrer"
-                  target="_blank"
-                  class="listing"
-                >
-                  View complete listing
-                  <tui-icon icon="tuiIconExternalLink" />
-                </a>
-              }
-            </marketplace-about>
+            <marketplace-about [pkg]="pkg" />
             @if (!(pkg.manifest.dependencies | empty)) {
               <marketplace-dependencies
                 [pkg]="pkg"
@@ -121,7 +109,6 @@ import { Router } from '@angular/router'
         margin-top: 5rem;
 
         @media (min-width: 768px) {
-          // min-width: 30rem;
           margin-top: 0;
         }
       }
@@ -192,7 +179,6 @@ export class MarketplacePreviewComponent {
     this.router.routerState.snapshot.root.queryParamMap.get('url') || undefined
 
   readonly loadVersion$ = new BehaviorSubject<string>('*')
-  readonly hostInfo$ = this.marketplaceService.getSelectedHost$()
   readonly pkg$ = this.loadVersion$.pipe(
     switchMap(version =>
       this.marketplaceService.getPackage$(this.pkgId, version, this.url),
@@ -212,11 +198,6 @@ export class MarketplacePreviewComponent {
     this.router.navigate([], { queryParams: { id } })
   }
 
-  constructDetailLink(info: StoreIdentity, id: string) {
-    const domain = new URL(info.url).hostname
-    return `https://marketplace.start9.com/${id}?api=${domain}&name=${info.name}`
-  }
-
   presentAlertVersions(
     pkg: MarketplacePkg,
     version: TemplateRef<TuiDialogContext>,
diff --git a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/modals/registry.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/modals/registry.component.ts
index b9cd79fcc..c8dfd2420 100644
--- a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/modals/registry.component.ts
+++ b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/modals/registry.component.ts
@@ -43,12 +43,17 @@ import { getMarketplaceValueSpec, getPromptOptions } from '../utils/registry'
         ></button>
       }
       <h3 class="g-title">Custom Registries</h3>
-      <button tuiCell (click)="add()">
-        <tui-icon icon="tuiIconPlus" [style.margin-inline.rem]="0.5" />
+      <button tuiCell (click)="add()" [style.width]="'-webkit-fill-available'">
+        <tui-icon icon="tuiIconPlus" [style.margin-inline.rem]="'0.5'" />
         <div tuiTitle>Add custom registry</div>
       </button>
       @for (registry of stores.alt; track $index) {
-        <div tuiCell [registry]="registry">
+        <div class="connect-container">
+          <button
+            tuiCell
+            [registry]="registry"
+            (click)="connect(registry.url)"
+          ></button>
           <button
             tuiIconButton
             appearance="icon"
@@ -57,18 +62,19 @@ import { getMarketplaceValueSpec, getPromptOptions } from '../utils/registry'
           >
             Delete
           </button>
-          <button
-            tuiIconButton
-            appearance="icon"
-            iconLeft="tuiIconLogIn"
-            (click)="connect(registry.url)"
-          >
-            Connect
-          </button>
         </div>
       }
     }
   `,
+  styles: [
+    `
+      .connect-container {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+      }
+    `,
+  ],
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     CommonModule,