From a78c5018e161629630045db0e66b7131641866f1 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Thu, 18 Jun 2020 14:03:52 -0400 Subject: [PATCH 1/4] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Add=20ui/core=20err?= =?UTF-8?q?or=20message=20template?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add error messages to be displayed for unauthorized 401, forbidden 403, not found 404, server issue 500, and catchall error in ui/core. Also update 'nothing to display' on projects and host catalogs overview pages to 'welcome' messages. --- ui/core/app/templates/orgs/org/error.hbs | 24 ++++++++++++++++--- .../app/templates/orgs/org/projects/index.hbs | 8 ++++--- .../projects/project/host-catalogs/index.hbs | 14 ++++++----- ui/core/mirage/config.js | 14 ++++++++--- ui/core/translations/en-us.yaml | 15 ++++++++++++ 5 files changed, 60 insertions(+), 15 deletions(-) diff --git a/ui/core/app/templates/orgs/org/error.hbs b/ui/core/app/templates/orgs/org/error.hbs index be87afd4d..d3241d609 100644 --- a/ui/core/app/templates/orgs/org/error.hbs +++ b/ui/core/app/templates/orgs/org/error.hbs @@ -13,27 +13,45 @@ * we don't distinguish it yet --}} - {{#each @model.errors as |error|}} - {{#if error.isUnauthenticated}} {{!-- error.status === 401 --}} + + {{error.message}} {{t 'descriptions.unauthenticated-error'}} + {{t 'actions.help'}} + {{/if}} {{#if error.isForbidden}} {{!-- error.status === 403 --}} + + {{error.message}} {{t 'descriptions.forbidden-error'}} + {{t 'actions.help'}} + {{/if}} {{#if error.isNotFound}} {{!-- error.status === 404 --}} + + {{error.message}} {{t 'descriptions.notfound-error'}} + {{t 'actions.help'}} + {{/if}} {{#if error.isServer}} {{!-- error.status === 500 --}} + + {{error.message}} {{t 'descriptions.server-error'}} + {{t 'actions.help'}} + {{/if}} {{#if error.isUnknown}} - {{!-- error.status === 🤷 --}} + {{!-- error.status === 🤷 everything else --}} + + {{error.message}} {{t '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..817fc90c9 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,23 @@ titles: overview: Overview settings: Settings empty-set: No Items Yet + projects-welcome: Welcome to Projects + host-catalogs-welcome: Welcome to Host Catalogs + unauthenticated-error: You are not authorized + forbidden-error: You are not authorized + notfound-error: Resource not found + server-error: Server error + unknown-error: Something went wrong 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. + unauthenticated-error: You are not authorized to view this data. Ask your administrator if you think you should have access. + 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. states: info: Info success: Success From 83ea5ab72d2f891f682b56ff033418cd811d13b2 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Thu, 18 Jun 2020 14:22:44 -0400 Subject: [PATCH 2/4] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Add=20centered=20la?= =?UTF-8?q?yout=20to=20ui/core=20error=20template?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/core/app/templates/orgs/org/error.hbs | 67 ++++++++++++------------ 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/ui/core/app/templates/orgs/org/error.hbs b/ui/core/app/templates/orgs/org/error.hbs index d3241d609..ac2abe9e9 100644 --- a/ui/core/app/templates/orgs/org/error.hbs +++ b/ui/core/app/templates/orgs/org/error.hbs @@ -13,45 +13,46 @@ * we don't distinguish it yet --}} -{{#each @model.errors as |error|}} - {{#if error.isUnauthenticated}} + + {{#each @model.errors as |error|}} {{!-- error.status === 401 --}} - - {{error.message}} {{t 'descriptions.unauthenticated-error'}} - {{t 'actions.help'}} - - {{/if}} + {{#if error.isUnauthenticated}} + + {{error.message}} {{t 'descriptions.unauthenticated-error'}} + {{t 'actions.help'}} + + {{/if}} - {{#if error.isForbidden}} {{!-- error.status === 403 --}} - - {{error.message}} {{t 'descriptions.forbidden-error'}} - {{t 'actions.help'}} - - {{/if}} + {{#if error.isForbidden}} + + {{error.message}} {{t 'descriptions.forbidden-error'}} + {{t 'actions.help'}} + + {{/if}} - {{#if error.isNotFound}} {{!-- error.status === 404 --}} - - {{error.message}} {{t 'descriptions.notfound-error'}} - {{t 'actions.help'}} - - {{/if}} + {{#if error.isNotFound}} + + {{error.message}} {{t 'descriptions.notfound-error'}} + {{t 'actions.help'}} + + {{/if}} - {{#if error.isServer}} {{!-- error.status === 500 --}} - - {{error.message}} {{t 'descriptions.server-error'}} - {{t 'actions.help'}} - - {{/if}} + {{#if error.isServer}} + + {{error.message}} {{t 'descriptions.server-error'}} + {{t 'actions.help'}} + + {{/if}} - {{#if error.isUnknown}} {{!-- error.status === 🤷 everything else --}} - - {{error.message}} {{t 'descriptions.unknown-error'}} - {{t 'actions.help'}} - - {{/if}} - -{{/each}} + {{#if error.isUnknown}} + + {{error.message}} {{t 'descriptions.unknown-error'}} + {{t 'actions.help'}} + + {{/if}} + {{/each}} + From 06b1c0fc80190e0729b44ee4c5690f62f550fab2 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Thu, 18 Jun 2020 16:39:11 -0400 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Update=20401=20e?= =?UTF-8?q?rror=20message=20in=20ui/core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/core/app/templates/orgs/org/error.hbs | 20 ++++++++++---------- ui/core/translations/en-us.yaml | 18 +++++++++++++----- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/ui/core/app/templates/orgs/org/error.hbs b/ui/core/app/templates/orgs/org/error.hbs index ac2abe9e9..b903c31ad 100644 --- a/ui/core/app/templates/orgs/org/error.hbs +++ b/ui/core/app/templates/orgs/org/error.hbs @@ -17,40 +17,40 @@ {{#each @model.errors as |error|}} {{!-- error.status === 401 --}} {{#if error.isUnauthenticated}} - - {{error.message}} {{t 'descriptions.unauthenticated-error'}} + + {{t 'errors.descriptions.unauthenticated-error'}} {{t 'actions.help'}} {{/if}} {{!-- error.status === 403 --}} {{#if error.isForbidden}} - - {{error.message}} {{t 'descriptions.forbidden-error'}} + + {{t 'errors.descriptions.forbidden-error'}} {{t 'actions.help'}} {{/if}} {{!-- error.status === 404 --}} {{#if error.isNotFound}} - - {{error.message}} {{t 'descriptions.notfound-error'}} + + {{t 'errors.descriptions.notfound-error'}} {{t 'actions.help'}} {{/if}} {{!-- error.status === 500 --}} {{#if error.isServer}} - - {{error.message}} {{t 'descriptions.server-error'}} + + {{t 'errors.descriptions.server-error'}} {{t 'actions.help'}} {{/if}} {{!-- error.status === 🤷 everything else --}} {{#if error.isUnknown}} - - {{error.message}} {{t 'descriptions.unknown-error'}} + + {{t 'errors.descriptions.unknown-error'}} {{t 'actions.help'}} {{/if}} diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml index 817fc90c9..43c4e0b41 100644 --- a/ui/core/translations/en-us.yaml +++ b/ui/core/translations/en-us.yaml @@ -16,11 +16,6 @@ titles: empty-set: No Items Yet projects-welcome: Welcome to Projects host-catalogs-welcome: Welcome to Host Catalogs - unauthenticated-error: You are not authorized - forbidden-error: You are not authorized - notfound-error: Resource not found - server-error: Server error - unknown-error: Something went wrong 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. @@ -41,6 +36,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 From 38e759bacdfb2ea11a4c50262fa35716fb458fd3 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Thu, 18 Jun 2020 17:09:37 -0400 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Remove=20unused=20e?= =?UTF-8?q?rror=20translations=20in=20ui/core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/core/translations/en-us.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml index 43c4e0b41..29ba0c47f 100644 --- a/ui/core/translations/en-us.yaml +++ b/ui/core/translations/en-us.yaml @@ -21,11 +21,6 @@ descriptions: 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. - unauthenticated-error: You are not authorized to view this data. Ask your administrator if you think you should have access. - 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. states: info: Info success: Success