mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
NewPanelEditor: Enable new edit mode (#23405)
* WIP: initial commit to transition to new edit mode * More old edit cleanup * Minor update * Refactoring url edit/fullscreen state to simplify logic, now seperate states * Fixed tests and part of the explore integration * Updated snapshot * Fix alert rule links * Fixed issue going back from explore * Updated snapshots * Fixes and changes * Fixed bridge srv issue * Fixed add panel issue * Removed console log * Removed render * Tests: fixes e2e smoketest * Make description optional * Fixed typings * e2e fixes * removed import * updated snapshot Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
This commit is contained in:
@@ -18,6 +18,7 @@ else
|
||||
|
||||
cp -r ./bin $RUNDIR
|
||||
cp -r ./public $RUNDIR
|
||||
cp -r ./tools $RUNDIR
|
||||
|
||||
mkdir $RUNDIR/conf
|
||||
mkdir $PROV_DIR
|
||||
@@ -25,7 +26,6 @@ else
|
||||
mkdir $PROV_DIR/dashboards
|
||||
|
||||
cp ./conf/defaults.ini $RUNDIR/conf/defaults.ini
|
||||
cp ./conf/sample.ini $RUNDIR/conf/custom.ini
|
||||
fi
|
||||
|
||||
echo -e "Copy provisioning setup from devenv"
|
||||
|
||||
@@ -209,7 +209,7 @@ const assertAdding3dependantQueryVariablesScenario = (queryVariables: QueryVaria
|
||||
e2e.pages.SaveDashboardModal.save().click();
|
||||
e2e.flows.assertSuccessNotification();
|
||||
|
||||
e2e.pages.Dashboard.Toolbar.backArrow().click();
|
||||
e2e.pages.Components.BackButton.backArrow().click();
|
||||
|
||||
assertVariableLabelsAndComponents(asserts);
|
||||
|
||||
@@ -264,7 +264,7 @@ const assertDuplicateItem = (queryVariables: QueryVariableData[]) => {
|
||||
e2e.pages.SaveDashboardModal.save().click();
|
||||
e2e.flows.assertSuccessNotification();
|
||||
|
||||
e2e.pages.Dashboard.Toolbar.backArrow().click();
|
||||
e2e.pages.Components.BackButton.backArrow().click();
|
||||
|
||||
e2e.pages.Dashboard.SubMenu.submenuItemLabels(newItem.label).should('be.visible');
|
||||
e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts(newItem.selectedOption)
|
||||
@@ -300,7 +300,7 @@ const assertDeleteItem = (queryVariables: QueryVariableData[]) => {
|
||||
e2e.pages.SaveDashboardModal.save().click();
|
||||
e2e.flows.assertSuccessNotification();
|
||||
|
||||
e2e.pages.Dashboard.Toolbar.backArrow().click();
|
||||
e2e.pages.Components.BackButton.backArrow().click();
|
||||
|
||||
e2e.pages.Dashboard.SubMenu.submenuItemLabels(itemToDelete.label).should('not.exist');
|
||||
|
||||
@@ -347,7 +347,7 @@ const assertUpdateItem = (data: QueryVariableData[]) => {
|
||||
e2e.pages.Dashboard.Settings.Variables.Edit.General.generalHideSelect().select('');
|
||||
e2e.pages.Dashboard.Settings.Variables.Edit.ConstantVariable.constantOptionsQueryInput().type(updatedItem.query);
|
||||
|
||||
e2e.pages.Dashboard.Toolbar.backArrow().click();
|
||||
e2e.pages.Components.BackButton.backArrow().click();
|
||||
|
||||
e2e()
|
||||
.window()
|
||||
@@ -407,7 +407,7 @@ const assertMoveDownItem = (data: QueryVariableData[]) => {
|
||||
});
|
||||
});
|
||||
|
||||
e2e.pages.Dashboard.Toolbar.backArrow().click();
|
||||
e2e.pages.Components.BackButton.backArrow().click();
|
||||
|
||||
assertVariableLabelsAndComponents(queryVariables);
|
||||
|
||||
@@ -552,7 +552,7 @@ const assertMoveUpItem = (data: QueryVariableData[]) => {
|
||||
});
|
||||
});
|
||||
|
||||
e2e.pages.Dashboard.Toolbar.backArrow().click();
|
||||
e2e.pages.Components.BackButton.backArrow().click();
|
||||
|
||||
assertVariableLabelsAndComponents(queryVariables);
|
||||
|
||||
|
||||
@@ -15,48 +15,15 @@ e2e.scenario({
|
||||
e2e.pages.Dashboard.Toolbar.toolbarItems('Add panel').click();
|
||||
e2e.pages.AddDashboard.ctaButtons('Add Query').click();
|
||||
|
||||
e2e.pages.Dashboard.Panels.EditPanel.tabItems('Queries').click();
|
||||
e2e.pages.Dashboard.Panels.DataSource.TestData.QueryTab.scenarioSelect().select('CSV Metric Values');
|
||||
|
||||
e2e.pages.Dashboard.Panels.EditPanel.tabItems('Visualization').click();
|
||||
|
||||
e2e.pages.Dashboard.Panels.Visualization.Graph.VisualizationTab.xAxisSection()
|
||||
.contains('Show')
|
||||
.click();
|
||||
|
||||
e2e.flows.saveDashboard();
|
||||
e2e.pages.Components.BackButton.backArrow().click();
|
||||
|
||||
e2e.pages.Dashboard.Toolbar.backArrow().click();
|
||||
|
||||
e2e.pages.Dashboard.Panels.Panel.title('Panel Title').click();
|
||||
|
||||
e2e.pages.Dashboard.Panels.Panel.headerItems('Share').click();
|
||||
|
||||
e2e.pages.SharePanelModal.linkToRenderedImage().then(($a: any) => {
|
||||
// extract the fully qualified href property
|
||||
const url = $a.prop('href');
|
||||
|
||||
// Test that the image renderer returns 200 OK
|
||||
e2e().request({ method: 'GET', url, timeout: 120000 });
|
||||
|
||||
// Download image
|
||||
if (!e2e.env('CIRCLE_SHA1')) {
|
||||
return;
|
||||
}
|
||||
|
||||
const theOutputImage = `${e2e.config().screenshotsFolder}/received/smoke-test-scenario.png`;
|
||||
const theTruthImage = `${e2e.config().screenshotsFolder}/expected/smoke-test-scenario.png`;
|
||||
|
||||
e2e().wrap(
|
||||
e2e.imgSrcToBlob(url).then((blob: any) => {
|
||||
e2e.blobToBase64String(blob).then((base64String: string) => {
|
||||
const data = base64String.replace(/^data:image\/\w+;base64,/, '');
|
||||
e2e().writeFile(theOutputImage, data, 'base64');
|
||||
});
|
||||
})
|
||||
);
|
||||
e2e().wait(1000); // give the io a chance to flush image to disk
|
||||
e2e().compareSnapshot({ pathToFileA: theOutputImage, pathToFileB: theTruthImage });
|
||||
});
|
||||
// e2e.pages.Dashboard.Panels.Panel.title('Panel Title').click();
|
||||
// e2e.pages.Dashboard.Panels.Panel.headerItems('Inspect').click();
|
||||
},
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user