diff --git a/ui/core/app/templates/orgs/org/error.hbs b/ui/core/app/templates/orgs/org/error.hbs
index be87afd4d..b903c31ad 100644
--- a/ui/core/app/templates/orgs/org/error.hbs
+++ b/ui/core/app/templates/orgs/org/error.hbs
@@ -13,27 +13,46 @@
* we don't distinguish it yet
--}}
-
-{{#each @model.errors as |error|}}
-
- {{#if error.isUnauthenticated}}
+
+ {{#each @model.errors as |error|}}
{{!-- error.status === 401 --}}
- {{/if}}
+ {{#if error.isUnauthenticated}}
+
+ {{t 'errors.descriptions.unauthenticated-error'}}
+ {{t 'actions.help'}}
+
+ {{/if}}
- {{#if error.isForbidden}}
{{!-- error.status === 403 --}}
- {{/if}}
+ {{#if error.isForbidden}}
+
+ {{t 'errors.descriptions.forbidden-error'}}
+ {{t 'actions.help'}}
+
+ {{/if}}
- {{#if error.isNotFound}}
{{!-- error.status === 404 --}}
- {{/if}}
+ {{#if error.isNotFound}}
+
+ {{t 'errors.descriptions.notfound-error'}}
+ {{t 'actions.help'}}
+
+ {{/if}}
- {{#if error.isServer}}
{{!-- error.status === 500 --}}
- {{/if}}
+ {{#if error.isServer}}
+
+ {{t 'errors.descriptions.server-error'}}
+ {{t 'actions.help'}}
+
+ {{/if}}
- {{#if error.isUnknown}}
- {{!-- error.status === 🤷 --}}
- {{/if}}
-
-{{/each}}
+ {{!-- error.status === 🤷 everything else --}}
+ {{#if error.isUnknown}}
+
+ {{t 'errors.descriptions.unknown-error'}}
+ {{t 'actions.help'}}
+
+ {{/if}}
+ {{/each}}
+
diff --git a/ui/core/app/templates/orgs/org/projects/index.hbs b/ui/core/app/templates/orgs/org/projects/index.hbs
index e95b565bd..b6cac496b 100644
--- a/ui/core/app/templates/orgs/org/projects/index.hbs
+++ b/ui/core/app/templates/orgs/org/projects/index.hbs
@@ -9,7 +9,9 @@
- {{t 'titles.new'}}
+ {{#if @model}}
+ {{t 'titles.new'}}
+ {{/if}}
@@ -31,9 +33,9 @@
{{else}}
-
+
- {{t 'descriptions.empty-set'}}
+ {{t 'descriptions.projects-welcome'}}
diff --git a/ui/core/app/templates/orgs/org/projects/project/host-catalogs/index.hbs b/ui/core/app/templates/orgs/org/projects/project/host-catalogs/index.hbs
index cf53d7117..6e712fb11 100644
--- a/ui/core/app/templates/orgs/org/projects/project/host-catalogs/index.hbs
+++ b/ui/core/app/templates/orgs/org/projects/project/host-catalogs/index.hbs
@@ -10,9 +10,11 @@
-
- {{t 'titles.new'}}
-
+ {{#if @model}}
+
+ {{t 'titles.new'}}
+
+ {{/if}}
@@ -48,9 +50,9 @@
{{else}}
-
+
- {{t 'descriptions.empty-set'}}
+ {{t 'descriptions.host-catalogs-welcome'}}
@@ -58,7 +60,7 @@
-
+
{{/if}}
diff --git a/ui/core/mirage/config.js b/ui/core/mirage/config.js
index c98942919..2f3584887 100644
--- a/ui/core/mirage/config.js
+++ b/ui/core/mirage/config.js
@@ -1,5 +1,5 @@
import config from '../config/environment';
-//import { Response } from 'miragejs';
+// import { Response } from 'miragejs';
export default function() {
@@ -30,6 +30,14 @@ export default function() {
this.del('/orgs/:org_id/projects/:project_id/host-catalogs/:id');
// Uncomment the following line and the Response import above
- // Then change the response code to simulate error responses
- //this.get('/orgs/:org_id/projects', () => new Response(401));
+ // Then change the response code to simulate error responses.
+ // this.get('/orgs/:org_id/projects', () => new Response(505));
+
+ // Update error payload to simulate specific error responses.
+ // this.get('/orgs/:org_id/projects', () => new Response(505, {}, {
+ // errors: [{
+ // status: 505,
+ // message: 'HTTP version not supported.',
+ // }]
+ // }));
}
diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml
index fa0873322..29ba0c47f 100644
--- a/ui/core/translations/en-us.yaml
+++ b/ui/core/translations/en-us.yaml
@@ -3,6 +3,7 @@ actions:
delete: Delete
dismiss: Dismiss
save: Save
+ help: Need help?
resources:
projects: Projects
project: Project
@@ -13,9 +14,13 @@ titles:
overview: Overview
settings: Settings
empty-set: No Items Yet
+ projects-welcome: Welcome to Projects
+ host-catalogs-welcome: Welcome to Host Catalogs
descriptions:
host-catalogs: Overview of collections of hosts and host sets.
empty-set: There are no items to display yet. You may be able to add items or try back later.
+ projects-welcome: Projects allow you to create and manage host catalogs. To start, create a project.
+ host-catalogs-welcome: Host catalogs allow you to configure to collect and create hosts and host sets. To start, create a host catalog.
states:
info: Info
success: Success
@@ -26,6 +31,19 @@ form:
name: Name
description: Description
type: Type
+errors:
+ titles:
+ unauthenticated-error: You are not signed in
+ forbidden-error: You are not authorized
+ notfound-error: Resource not found
+ server-error: Server error
+ unknown-error: Something went wrong
+ descriptions:
+ unauthenticated-error: You are not authenticated. Please authenticate and try again later.
+ forbidden-error: You must be granted permissions to view this data. Ask your administrator if you think you should have access.
+ notfound-error: We could not find the requested resource. You can ask your administrator or try again later.
+ server-error: We ran into a problem and could not continue. You can ask your administrator or try again later.
+ unknown-error: Please contact your administrator or try again later.
dev:
default-org: Default Org
menu-item: Menu item