Approver list refactor and bug fix (#184)

* Add badge to Approvers list (owner view) * Component-ize Approvers
hashicorp-forge · May 30, 2023 · 6f36db0 · 6f36db0
1 parent a2392b6
commit 6f36db0
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 13 deletions.
diff --git a/web/app/components/document/sidebar.hbs b/web/app/components/document/sidebar.hbs
@@ -215,7 +215,7 @@
                   <ol class="person-list">
                     {{#each this.approvers as |approver|}}
                       <li>
-                        <Person
+                        <Person::Approver
                           @imgURL={{approver.imgURL}}
                           @email={{approver.email}}
                         />
@@ -240,11 +240,7 @@
               <ol class="person-list">
                 {{#each this.approvers as |approver|}}
                   <li>
-                    <Person
-                      @badge={{if
-                        (has-approved-doc @document approver.email)
-                        "approved"
-                      }}
+                    <Person::Approver
                       @imgURL={{approver.imgURL}}
                       @email={{approver.email}}
                     />

diff --git a/web/app/components/person.js b/web/app/components/person.js
diff --git a/web/app/components/person/approver.hbs b/web/app/components/person/approver.hbs
@@ -0,0 +1,5 @@
+<Person
+  @badge={{if (has-approved-doc @email) "approved"}}
+  @imgURL={{@imgURL}}
+  @email={{@email}}
+/>
diff --git a/web/app/components/person/approver.ts b/web/app/components/person/approver.ts
@@ -0,0 +1,20 @@
+import Component from "@glimmer/component";
+
+interface PersonApproverComponentSignature {
+  Element: HTMLDivElement;
+  Args: {
+    email: string;
+    imgURL?: string;
+  };
+  Blocks: {
+    default: [];
+  };
+}
+
+export default class PersonApproverComponent extends Component<PersonApproverComponentSignature> {}
+
+declare module "@glint/environment-ember-loose/registry" {
+  export default interface Registry {
+    "Person::Approver": typeof PersonApproverComponent;
+  }
+}
diff --git a/web/app/components/person.hbs → web/app/components/person/index.hbs b/web/app/components/person.hbs → web/app/components/person/index.hbs
@@ -1,3 +1,4 @@
+{{! @glint-nocheck - not typesafe yet}}
 {{#unless this.isHidden}}
   <div class="flex space-x-2 w-full" ...attributes>
     <div class="relative">

diff --git a/web/app/components/person/index.ts b/web/app/components/person/index.ts
@@ -0,0 +1,23 @@
+import Component from "@glimmer/component";
+
+interface PersonComponentSignature {
+  Element: HTMLDivElement;
+  Args: {
+    email: string;
+    imgURL?: string;
+    ignoreUnknown?: boolean;
+    badge?: string;
+  };
+}
+
+export default class PersonComponent extends Component<PersonComponentSignature> {
+  get isHidden() {
+    return this.args.ignoreUnknown && !this.args.email;
+  }
+}
+
+declare module "@glint/environment-ember-loose/registry" {
+  export default interface Registry {
+    Person: typeof PersonComponent;
+  }
+}