Fine-tuning

hashicorp · Jan 12, 2022 · e6b2d60 · e6b2d60
1 parent f256492
commit e6b2d60
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/ui/app/components/resources-table-extended.hbs b/ui/app/components/resources-table-extended.hbs
@@ -13,17 +13,17 @@
 
  <thead>
  <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Age</th>
- <th>Status</th>
- <th>Provisioned by</th>
+ <th>{{t "page.resources.table.headings.name"}}</th>
+ <th>{{t "page.resources.table.headings.type"}}</th>
+ <th>{{t "page.resources.table.headings.age"}}</th>
+ <th>{{t "page.resources.table.headings.status"}}</th>
+ <th>{{t "page.resources.table.headings.provisioned-by"}}</th>
  </tr>
  </thead>
 
  <tbody>
- {{#each @resources key="id" as |resourceObject|}}
- {{#with resourceObject.resource as |resource|}}
+ {{#each @resources key="resource.id" as |resourceObject|}}
+ {{#let resourceObject.resource as |resource|}}
  <tr>
  <th scope="row">
  <LinkTo
@@ -44,7 +44,7 @@
  @route="workspace.projects.project.app.deployment.deployment-seq"
  @models={{array resourceObject.source.sequence}}
  >
- Deployment <b class="badge badge--version">v{{resourceObject.source.sequence}}</b>
+ {{t "page.resources.table.deployment"}} <b class="badge badge--version">v{{resourceObject.source.sequence}}</b>
  </LinkTo>
  {{/if}}
  {{#if (eq resourceObject.type 'release')}}
@@ -53,12 +53,12 @@
  @route="workspace.projects.project.app.release-id"
  @models={{array resourceObject.source.sequence}}
  >
- Release <b class="badge badge--version">v{{resourceObject.source.sequence}}</b>
+ {{t "page.resources.table.release"}}<b class="badge badge--version">v{{resourceObject.source.sequence}}</b>
  </LinkTo>
  {{/if}}
  </td>
  </tr>
- {{/with}}
+ {{/let}}
  {{/each}}
  </tbody>
 </Table>
diff --git a/ui/app/components/resources-table.hbs b/ui/app/components/resources-table.hbs
@@ -13,10 +13,10 @@
 
  <thead>
  <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Age</th>
- <th>Status</th>
+ <th>{{t "page.resources.table.headings.name"}}</th>
+ <th>{{t "page.resources.table.headings.type"}}</th>
+ <th>{{t "page.resources.table.headings.age"}}</th>
+ <th>{{t "page.resources.table.headings.status"}}</th>
  </tr>
  </thead>
 

diff --git a/ui/app/routes/workspace/projects/project/app/resources.ts b/ui/app/routes/workspace/projects/project/app/resources.ts
@@ -4,7 +4,7 @@ import { Model as AppRouteModel } from '../app';
 import Route from '@ember/routing/route';
 import { StatusReport } from 'waypoint-pb';
 
-type Model = AppRouteModel['deployments'];
+type Model = ResourceMap[];
 
 interface ResourceMap {
  resource: StatusReport.Resource.AsObject;

diff --git a/ui/app/templates/workspace/projects/project/app/resources.hbs b/ui/app/templates/workspace/projects/project/app/resources.hbs
@@ -1,8 +1,7 @@
 {{#if @model.length}}
  <ResourcesTableExtended
  @resources={{@model}}
- >
- </ResourcesTableExtended>
+ />
 {{else}}
  <EmptyState>
  <p>{{t 'page.resources.table.empty-state.line-1'}}</p>

diff --git a/ui/translations/en-us.yaml b/ui/translations/en-us.yaml
@@ -82,11 +82,18 @@ page:
  line-3: 'from the CLI'
  resources:
  table:
+ headings:
+ name: 'Name'
+ type: 'Type'
+ age: 'Age'
+ status: 'Status'
+ provisioned-by: 'Provisioned by'
  empty-state:
  line-1: 'There are no resources to display for this app yet'
  line-2: 'To create your first release, you can run'
  line-3: 'from the CLI'
- release:
+ release: 'Release'
+ deployment: 'Deployment'
  title: 'Release'
  resources:
  heading: Resources