Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(dashboard): Change text and icons in dashboard editmode #21305

Merged
merged 10 commits into from
Sep 30, 2022
Merged

fix(dashboard): Change text and icons in dashboard editmode #21305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ad5cebc
Change text and icons in dashboard editmode
Sep 2, 2022
6a48e81
Merge branch 'master' into FIX-51398
Sep 25, 2022
6fc59c8
Adjust Cypress Test
Sep 26, 2022
f962411
Fix cypress test
Sep 28, 2022
d529598
Fix cypress test
Sep 28, 2022
1db9a8c
Merge branch 'FIX-51398' of https://github.com/agl-developer/superset…
Sep 29, 2022
18ced91
Adjust test text
Sep 29, 2022
49785e7
Merge branch 'FIX-51398' of https://github.com/agl-developer/superset…
Sep 29, 2022
5b3d61d
Update click coordinates
geido Sep 29, 2022
6a39113
Merge branch 'master' into FIX-51398
Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions superset-frontend/cypress-base/cypress/integration/dashboard/editmode.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,17 +243,17 @@ describe('Dashboard edit', () => {
.click();

// add new markdown component
dragComponent('Markdown', 'new-component', false);
dragComponent('Text', 'new-component', false);

cy.get('[data-test="dashboard-markdown-editor"]')
cy.getBySel('dashboard-markdown-editor')
.should(
'have.text',
'✨Markdown✨Markdown✨MarkdownClick here to edit markdown',
'✨Header 1✨Header 2✨Header 3Click here to learn more about markdown formatting',
)
.click();
.click(10, 10);

cy.getBySel('dashboard-component-chart-holder').contains(
'Click here to edit [markdown](https://bit.ly/1dQOfRK)',
'Click here to learn more about [markdown formatting](https://bit.ly/1dQOfRK)',
);

cy.getBySel('dashboard-markdown-editor').click().type('Test resize');
Expand Down
8 changes: 4 additions & 4 deletions superset-frontend/src/dashboard/components/gridComponents/Markdown.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ const propTypes = {

const defaultProps = {};

const MARKDOWN_PLACE_HOLDER = `# ✨Markdown
## ✨Markdown
### ✨Markdown
const MARKDOWN_PLACE_HOLDER = `# ✨Header 1
## ✨Header 2
### ✨Header 3

<br />

Click here to edit [markdown](https://bit.ly/1dQOfRK)`;
Click here to learn more about [markdown formatting](https://bit.ly/1dQOfRK)`;

const MARKDOWN_ERROR_MESSAGE = t('This markdown component has an error.');

Expand Down
4 changes: 2 additions & 2 deletions superset-frontend/src/dashboard/components/gridComponents/new/NewMarkdown.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ export default function DraggableNewDivider() {
<DraggableNewComponent
id={NEW_MARKDOWN_ID}
type={MARKDOWN_TYPE}
label="Markdown"
className="fa fa-code"
label="Text"
className="fa fa-font"
/>
);
}