Merge branch 'main' into jeffdaley/empty-state-add-button

hashicorp-forge · Oct 27, 2023 · 2f40c42 · 2f40c42
2 parents 12ca497 + 3423f31
commit 2f40c42
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 26 deletions.
diff --git a/web/app/components/project/tile.hbs b/web/app/components/project/tile.hbs
@@ -35,11 +35,9 @@
       {{/if}}
       {{#if this.jiraObject}}
         <div class="flex items-center gap-1.5">
-          {{#if @project.jiraObject.type}}
-            <span data-test-jira-type>
-              {{@project.jiraObject.type}}
-            </span>
-          {{/if}}
+          <span data-test-jira-type>
+            {{@project.jiraObject.type}}
+          </span>
           <span
             data-test-jira-key
             class="text-body-100 text-color-foreground-faint

diff --git a/web/app/components/project/tile.ts b/web/app/components/project/tile.ts
@@ -10,7 +10,7 @@ interface ProjectTileComponentSignature {
 
 export default class ProjectTileComponent extends Component<ProjectTileComponentSignature> {
   protected get documents() {
-    return this.args.project.documents;
+    return this.args.project.hermesDocuments;
   }
 
   protected get jiraObject() {

diff --git a/web/app/types/project.d.ts b/web/app/types/project.d.ts
@@ -4,22 +4,24 @@ import {
 } from "hermes/components/related-resources";
 import { ProjectStatus } from "./project-status";
 
+export interface JiraObject {
+  key: string;
+  url: string;
+  priority: string;
+  status: string;
+  assignee?: string;
+  type: string;
+  summary: string;
+}
+
 export interface HermesProject {
   id: string; // at least in Mirage...
   title: string;
   status: ProjectStatus;
-  documents?: RelatedHermesDocument[];
+  hermesDocuments?: RelatedHermesDocument[];
   description?: string;
-  jiraObject?: {
-    key: string;
-    url: string;
-    priority: string;
-    status: string;
-    assignee?: string;
-    type?: string;
-    summary: string;
-  };
-  relatedLinks?: RelatedExternalLink[];
+  jiraObject?: JiraObject;
+  externalLinks?: RelatedExternalLink[];
   creator: string; // maybe a Google/HermesUser
   dateCreated: number;
   dateModified: number;

diff --git a/web/tests/acceptance/authenticated/projects-test.ts b/web/tests/acceptance/authenticated/projects-test.ts
@@ -51,12 +51,10 @@ module("Acceptance | authenticated/projects", function (hooks) {
 
         if (project.jiraObject) {
           expectedKeys.push(project.jiraObject.key);
-          if (project.jiraObject.type) {
-            expectedJiraTypes.push(project.jiraObject.type);
-          }
+          expectedJiraTypes.push(project.jiraObject.type);
         }
-        if (project.documents) {
-          project.documents.forEach((doc) => {
+        if (project.hermesDocuments) {
+          project.hermesDocuments.forEach((doc) => {
             if (doc.product) {
               expectedProducts.push(doc.product);
             }

diff --git a/web/tests/integration/components/project/tile-test.ts b/web/tests/integration/components/project/tile-test.ts
@@ -26,7 +26,7 @@ module("Integration | Component | project/tile", function (hooks) {
     this.project = this.server.create("project", {
       title: "Test Title",
       description: "Test Description",
-      documents: [
+      hermesDocuments: [
         {
           product: "Foo",
         },
@@ -46,8 +46,8 @@ module("Integration | Component | project/tile", function (hooks) {
       <Project::Tile @project={{this.project}} />
     `);
 
-    const { title, description, documents, jiraObject } = this.project;
-    const documentProducts = documents
+    const { title, description, hermesDocuments, jiraObject } = this.project;
+    const documentProducts = hermesDocuments
       ?.map((doc) => doc.product as string)
       .uniq();
 
@@ -77,7 +77,7 @@ module("Integration | Component | project/tile", function (hooks) {
 
     project.update({
       description: null,
-      documents: null,
+      hermesDocuments: null,
       jiraObject: null,
     });