This is an automated email from the ASF dual-hosted git repository. jihao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push: new 3b95a64 [TE] frontend harleyjj/create-alert turn form off for create-alert (#3905) 3b95a64 is described below commit 3b95a640d71cb6f131de75ae9bdb113e6986e623 Author: Harley Jackson <harleyy...@gmail.com> AuthorDate: Mon Mar 4 15:39:43 2019 -0800 [TE] frontend harleyjj/create-alert turn form off for create-alert (#3905) --- .../app/pods/self-serve/create-alert/controller.js | 4 +- .../app/pods/self-serve/create-alert/template.hbs | 2 + .../tests/acceptance/self-serve-onboarding-test.js | 187 --------------------- 3 files changed, 4 insertions(+), 189 deletions(-) diff --git a/thirdeye/thirdeye-frontend/app/pods/self-serve/create-alert/controller.js b/thirdeye/thirdeye-frontend/app/pods/self-serve/create-alert/controller.js index 560311a..a6c272d 100644 --- a/thirdeye/thirdeye-frontend/app/pods/self-serve/create-alert/controller.js +++ b/thirdeye/thirdeye-frontend/app/pods/self-serve/create-alert/controller.js @@ -70,7 +70,7 @@ export default Controller.extend({ snippet: '' }], metricHelpMailto: `mailto:${config.email}?subject=Metric Onboarding Request (non-additive UMP or derived)`, - helpDocLink: config.docs.createAlert, + helpDocLink: config.docs ? config.docs.createAlert : null, /** * Component property initial settings @@ -79,7 +79,7 @@ export default Controller.extend({ graphConfig: {}, selectedFilters: JSON.stringify({}), selectedWeeklyEffect: true, - isForm: true, + isForm: false, /** * Object to cover basic ield 'presence' validation diff --git a/thirdeye/thirdeye-frontend/app/pods/self-serve/create-alert/template.hbs b/thirdeye/thirdeye-frontend/app/pods/self-serve/create-alert/template.hbs index 828a240..7a183af 100644 --- a/thirdeye/thirdeye-frontend/app/pods/self-serve/create-alert/template.hbs +++ b/thirdeye/thirdeye-frontend/app/pods/self-serve/create-alert/template.hbs @@ -1,4 +1,5 @@ <h1 class="te-title">Create Alert <a class="thirdeye-link-secondary" target="_blank" href="{{helpDocLink}}">click here for a step-by-step guide</a> + {{#if (eq debug "show")}} {{#x-toggle value=isForm classNames="te-toggle te-toggle--form te-toggle--left report-toggle pull-right" @@ -16,6 +17,7 @@ <span class="te-label te-label--flush">Form</span> {{/toggle.label}} {{/x-toggle}} + {{/if}} </h1> <main class="alert-create card-container card-container--padded te-form"> {{#if isForm}} diff --git a/thirdeye/thirdeye-frontend/tests/acceptance/self-serve-onboarding-test.js b/thirdeye/thirdeye-frontend/tests/acceptance/self-serve-onboarding-test.js deleted file mode 100644 index 2beea9c..0000000 --- a/thirdeye/thirdeye-frontend/tests/acceptance/self-serve-onboarding-test.js +++ /dev/null @@ -1,187 +0,0 @@ -import $ from 'jquery'; -import moment from 'moment'; -import { module, test } from 'qunit'; -import { setupApplicationTest } from 'ember-qunit'; -import { selfServeConst, selfServeSettings, optionsToString } from 'thirdeye-frontend/tests/utils/constants'; -import { visit, fillIn, click, currentURL, triggerKeyEvent, waitFor } from '@ember/test-helpers'; -import { filters, dimensions, granularities } from 'thirdeye-frontend/mocks/metricPeripherals'; -import { selectChoose, clickTrigger } from 'thirdeye-frontend/tests/helpers/ember-power-select'; - -module('Acceptance | create alert', function(hooks) { - setupApplicationTest(hooks); - - const id = '1'; - const selectedConfigGroup = `test_alert_${id}`; - const selectedMetric = `test_collection_${id}::test_metric_${id}`; - const toRecipients = 'k...@disney.com, ki...@disney.com, k...@disney.com'; - const ccRecipients = 'si...@disney.com, n...@disney.com'; - const bccRecipients = 's...@disney.com'; - const newRecipient = 'du...@therock.com'; - const selectedApp = 'the-lion-king'; - const alertNameGeneric = `test_function_${id}`; - const alertName = 'theLionKing_testMetric1_upDown_5Minutes'; - - // Flatten filter object in order to easily compare it to the list of options rendered - const filterArray = Object.values(filters).map(filterGroup => [...Object.values(filterGroup)]); - - test(`visiting alert creation page to test onboarding flow for self-serve`, async (assert) => { - server.createList('alert', 2); - await visit(`/self-serve/create-alert`); - const $granularityDropdown = $(selfServeConst.GRANULARITY_SELECT); - const $graphContainer = $(selfServeConst.GRAPH_CONTAINER); - - // Initial state: fields and graph are disabled - assert.equal( - $granularityDropdown.attr('aria-disabled'), - 'true', - 'Granularity field (representative) is disabled until metric is selected' - ); - assert.equal( - $graphContainer.get(0).classList[1], - 'te-graph-alert--pending', - 'Graph placeholder is visible. Data is not yet loaded.' - ); - - // Select a metric, wait for data to be loaded into graph - await click(selfServeConst.METRIC_SELECT); - await fillIn(selfServeConst.METRIC_INPUT, 'test'); - await click($(`${selfServeConst.OPTION_ITEM}:contains(${selectedMetric})`).get(0)); - await waitFor(`${selfServeConst.GRANULARITY_SELECT} ${selfServeConst.SELECTED_ITEM}`, { timeout: 3000 }); - - // Fields are now enabled with defaults and load correct options, graph is loaded - assert.equal( - $granularityDropdown.find(selfServeConst.SELECTED_ITEM).get(0).innerText.trim(), - '5_MINUTES', - 'granularity field (representative) is enabled after metric is selected' - ); - assert.equal( - $graphContainer.get(0).classList.length, - 1, - 'Graph placeholder is replaced.' - ); - assert.equal( - $graphContainer.find('svg').length, - 2, - 'Graph and legend svg elements are rendered.' - ); - assert.notOk( - $(selfServeConst.SPINNER).length, - 'Loading icon is removed.' - ); - - // Now, verify that our selectable options are correct - await click(selfServeConst.GRANULARITY_SELECT); - assert.equal( - optionsToString($(selfServeConst.OPTION_ITEM)), - granularities.join(), - 'Granularity options render, number and text of options is correct' - ); - - await click(selfServeConst.DIMENSION_SELECT); - assert.equal( - optionsToString($(selfServeConst.OPTION_ITEM)), - dimensions.join(), - 'Dimension options render, number and text of options is correct' - ); - - await click(selfServeConst.FILTER_SELECT); - assert.equal( - optionsToString($(selfServeConst.OPTION_ITEM)), - filterArray.join(), - 'Filter options render, number and text of options is correct' - ); - - await click(selfServeConst.PATTERN_SELECT); - assert.equal( - optionsToString($(selfServeConst.OPTION_ITEM)), - selfServeConst.PATTERN_OPTIONS.join(), - 'Pattern options render, number and text of options is correct' - ); - assert.ok( - $(selfServeConst.SUBMIT_BUTTON).get(0).disabled, - 'Submit button is still disabled' - ); - - // Now verify expected field conditional behavior - await selectChoose(selfServeConst.PATTERN_SELECT, selfServeConst.PATTERN_OPTIONS[0]); - await selectChoose(selfServeConst.APP_OPTIONS, selectedApp); - assert.equal( - $(selfServeConst.INPUT_NAME).val(), - alertName, - 'Alert name autocomplete primer is working.' - ); - - await click(selfServeConst.SUBGROUP_SELECT); - assert.equal( - $(selfServeConst.OPTION_ITEM).get(0).innerText.trim(), - selectedConfigGroup, - 'The config group associated with the selected app is found in the group selection options.' - ); - - await selectChoose(selfServeConst.SUBGROUP_SELECT, selectedConfigGroup); - assert.equal( - $(selfServeConst.CONFIG_GROUP_ALERTS).get(0).innerText.trim(), - `See all alerts monitored by: ${selectedConfigGroup}`, - 'Custom accordion block with alert table for selected group appears' - ); - assert.equal( - $(selfServeConst.CONFIG_BLOCK).find('.control-label').get(0).innerText.trim().replace(/\r?\n?/g, ''), - `Recipients in subscription group ${selectedConfigGroup}:To: ${toRecipients}Cc: ${ccRecipients}`, - 'Label and email for recipients is correctly rendered' - ); - - await fillIn(selfServeConst.CONFIG_RECIPIENTS_INPUT, toRecipients); - await triggerKeyEvent(selfServeConst.CONFIG_RECIPIENTS_INPUT, 'keyup', '8'); - assert.equal( - $(selfServeConst.EMAIL_WARNING).get(0).innerText.trim(), - `Warning: ${toRecipients} is already included in this group.`, - 'Duplicate email warning appears correctly.' - ); - - await fillIn(selfServeConst.CONFIG_RECIPIENTS_INPUT, newRecipient); - assert.ok( - $(selfServeConst.SUBMIT_BUTTON).get(0).disabled, - 'Submit button is disabled' - ); - - await fillIn(selfServeConst.CONFIG_RECIPIENTS_INPUT, 'test-onboard...@linkedin.com'); - - // Trigger key event in field to get submit button to detect change - await triggerKeyEvent(selfServeConst.CONFIG_RECIPIENTS_INPUT, 'keyup', '8'); - - assert.notOk( - $(selfServeConst.SUBMIT_BUTTON).get(0).disabled, - 'Submit button is enabled again' - ); - - // Submit the form to trigger alert onboard sequence - await click(selfServeConst.SUBMIT_BUTTON); - - // Once sequence is complete (replay successful), verify transition to Alert Page - await waitFor(selfServeConst.ALERT_TITLE, { timeout: 3000 }) - - assert.ok( - currentURL().includes(`/manage/alert/1/explore?duration=3m`), - 'Navigation to alert page succeeded' - ); - - assert.equal( - $(selfServeConst.ALERT_TITLE).get(0).firstElementChild.innerText.trim(), - alertNameGeneric, - 'Alert details header title is correct' - ); - - assert.equal( - $(selfServeConst.ALERT_ACTIVE_LABEL).get(0).innerText.trim(), - 'ACTIVE', - 'Alert status label is set to active.' - ); - - await waitFor(selfServeConst.ALERT_CARDS_CONTAINER, { timeout: 3000 }); - - assert.ok( - $(selfServeConst.ALERT_CARDS_CONTAINER).length > 0, - 'Transition complete' - ); - }); -}); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org