From 8bdd4416fc51b10ec9b87a097cb3794310bb02a1 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Tue, 14 Jun 2022 12:32:04 -0700 Subject: [PATCH] transition to target lists when the resource creation is successful (#1134) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 🎸 redirect the user to target lists within the project after successfully creating a resource. --- .../quick-setup/create-resources/success.js | 12 +++++++++++- ui/admin/app/styles/app.scss | 4 ++++ .../quick-setup/create-resources/success.hbs | 7 +++++++ .../acceptance/credential-library/create-test.js | 1 - ui/admin/tests/acceptance/onboarding/success-test.js | 10 ++++------ 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/ui/admin/app/routes/onboarding/quick-setup/create-resources/success.js b/ui/admin/app/routes/onboarding/quick-setup/create-resources/success.js index 1c896500e..31dd03467 100644 --- a/ui/admin/app/routes/onboarding/quick-setup/create-resources/success.js +++ b/ui/admin/app/routes/onboarding/quick-setup/create-resources/success.js @@ -1,9 +1,19 @@ import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; +import { action } from '@ember/object'; export default class OnboardingQuickSetupCreateResourcesSuccessRoute extends Route { // =methods - + @service router; model() { return this.modelFor('onboarding.quick-setup.create-resources'); } + + @action + showTargetList(scope) { + const { + project: { id: scopeID }, + } = scope; + this.router.transitionTo('scopes.scope.targets', scopeID); + } } diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss index 05ffbb862..03dcd4ba9 100644 --- a/ui/admin/app/styles/app.scss +++ b/ui/admin/app/styles/app.scss @@ -282,12 +282,15 @@ margin-bottom: 0; margin-top: sizing.rems(xl); } + .create-resources { display: block; width: sizing.rems(xl) * 15; + .rose-form-fieldset { margin-top: sizing.rems(xl); } + .rose-frame-body { p { color: var(--ui-gray); @@ -298,6 +301,7 @@ .create-resource-cards { display: flex; justify-content: space-between; + .rose-form-input { width: sizing.rems(xl) * 6; } diff --git a/ui/admin/app/templates/onboarding/quick-setup/create-resources/success.hbs b/ui/admin/app/templates/onboarding/quick-setup/create-resources/success.hbs index e8762ab5c..50392b7eb 100644 --- a/ui/admin/app/templates/onboarding/quick-setup/create-resources/success.hbs +++ b/ui/admin/app/templates/onboarding/quick-setup/create-resources/success.hbs @@ -63,6 +63,13 @@ {{t 'onboarding.success.links.api'}} + + {{t 'actions.done'}} + \ No newline at end of file diff --git a/ui/admin/tests/acceptance/credential-library/create-test.js b/ui/admin/tests/acceptance/credential-library/create-test.js index 47cc0f8a8..06404a49c 100644 --- a/ui/admin/tests/acceptance/credential-library/create-test.js +++ b/ui/admin/tests/acceptance/credential-library/create-test.js @@ -63,7 +63,6 @@ module('Acceptance | credential-libraries | create', function (hooks) { this.server.schema.credentialLibraries.all().models.length; authenticateSession({}); }); - test('visiting credential libraries', async function (assert) { assert.expect(2); await visit(urls.credentialLibraries); diff --git a/ui/admin/tests/acceptance/onboarding/success-test.js b/ui/admin/tests/acceptance/onboarding/success-test.js index 71cdbddf8..cd3aa9c86 100644 --- a/ui/admin/tests/acceptance/onboarding/success-test.js +++ b/ui/admin/tests/acceptance/onboarding/success-test.js @@ -1,5 +1,5 @@ import { module, test } from 'qunit'; -import { visit, currentURL, click } from '@ember/test-helpers'; +import { visit, find } from '@ember/test-helpers'; import { setupApplicationTest } from 'ember-qunit'; import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; import { authenticateSession } from 'ember-simple-auth/test-support'; @@ -15,16 +15,14 @@ module( }); const urls = { - createResources: - '/scopes/global/onboarding/quick-setup/create-resources/success', + createResources: '/onboarding/quick-setup/create-resources/success', targets: '/scopes/global/targets', }; - test.skip('clicking done takes user to targets screen', async function (assert) { + test('check if the done button is present', async function (assert) { assert.expect(1); await visit(urls.createResources); - await click('.success-button'); - assert.equal(currentURL(), urls.targets); + assert.ok(find('.success-button')); }); } );