Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 22 additions & 22 deletions cypress/e2e/functionality/02-homepage.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Mauris tempus, mi nec sodales semper, metus neque blandit sem, non scelerisque n
.find("a")
.eq(0)
.click();
cy.get(".edit-widget-modal").find("button.btn-cancel").click();
cy.get(".ReactModal__Content").find("button.btn-cancel").click();
cy.get(".ld-widget").should("have.length", 0);
});

Expand All @@ -80,10 +80,10 @@ Mauris tempus, mi nec sodales semper, metus neque blandit sem, non scelerisque n
.find("a")
.eq(0)
.click();
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find("input[name='title']", { timeout: 10000 })
.should("be.visible");
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find(".modal-footer__right")
.find("button.btn-primary").click();
cy.get(".ld-widget").should("have.length", 1);
Expand All @@ -92,38 +92,38 @@ Mauris tempus, mi nec sodales semper, metus neque blandit sem, non scelerisque n

it("Should edit a shared dashboard widget", () => {
cy.get(".ld-widget").find(".ld-edit-button").click();
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find("input[name='title']", { timeout: 10000 })
.should("be.visible");
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find("input[name='title']")
.type("With a new title");
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find(".modal-footer__right")
.find("button.btn-primary").click();
cy.get(".ld-widget").find("h4").contains("With a new title");
});

it("Should edit a shared dashboard widget with a lot of text", () => {
cy.get(".ld-widget").find(".ld-edit-button").click();
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find("input[name='title']", { timeout: 10000 })
.should("be.visible");
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find("div[contenteditable='true']")
.clear()
.type(bigLipsum);
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find(".modal-footer__right")
.find("button.btn-primary").click();
});

it("Should delete a shared dashboard widget", () => {
cy.get(".ld-widget").find(".ld-edit-button").click();
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find("input[name='title']", { timeout: 10000 })
.should("be.visible");
cy.get(".edit-widget-modal").find("button.btn-cancel").click();
cy.get(".ReactModal__Content").find("button.btn-cancel").click();
cy.get(".ld-widget").should("have.length", 0);
});
});
Expand All @@ -141,7 +141,7 @@ Mauris tempus, mi nec sodales semper, metus neque blandit sem, non scelerisque n
.find("a")
.eq(0)
.click();
cy.get(".edit-widget-modal").find("button.btn-cancel").click();
cy.get(".ReactModal__Content").find("button.btn-cancel").click();
cy.get(".ld-widget").should("have.length", 1);
});

Expand All @@ -157,10 +157,10 @@ Mauris tempus, mi nec sodales semper, metus neque blandit sem, non scelerisque n
.find("a")
.eq(0)
.click();
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find("input[name='title']", { timeout: 10000 })
.should("be.visible");
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find(".modal-footer__right")
.find("button.btn-primary").click();
cy.get(".ld-widget").should("have.length", 2);
Expand All @@ -170,13 +170,13 @@ Mauris tempus, mi nec sodales semper, metus neque blandit sem, non scelerisque n
it("Should edit a personal dashboard widget", () => {
cy.get("a.nav-link").eq(1).click();
cy.get(".ld-widget").eq(1).find(".ld-edit-button").click();
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find("input[name='title']", { timeout: 10000 })
.should("be.visible");
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find("input[name='title']")
.type("With a new title");
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find(".modal-footer__right")
.find("button.btn-primary").click();
cy.get(".ld-widget").eq(1).find("h4").contains("With a new title");
Expand All @@ -185,25 +185,25 @@ Mauris tempus, mi nec sodales semper, metus neque blandit sem, non scelerisque n
it("Should edit a personal dashboard widget with a lot of text", () => {
cy.get("a.nav-link").eq(1).click();
cy.get(".ld-widget").eq(1).find(".ld-edit-button").click();
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find("input[name='title']", { timeout: 10000 })
.should("be.visible");
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find("div[contenteditable='true']")
.clear()
.type(bigLipsum);
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find(".modal-footer__right")
.find("button.btn-primary").click();
});

it("Should delete a personal dashboard widget", () => {
cy.get("a.nav-link").eq(1).click();
cy.get(".ld-widget").eq(1).find(".ld-edit-button").click();
cy.get(".edit-widget-modal")
cy.get(".ReactModal__Content")
.find("input[name='title']", { timeout: 10000 })
.should("be.visible");
cy.get(".edit-widget-modal").find("button.btn-cancel").click();
cy.get(".ReactModal__Content").find("button.btn-cancel").click();
cy.get(".ld-widget").should("have.length", 1);
});
});
Expand Down
4 changes: 3 additions & 1 deletion src/frontend/components/dashboard/lib/react/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,9 @@
this.setState({ loadingEditHtml: false, editError: editFormHtml.message! });
return;
}
this.setState({ loadingEditHtml: false, editError: "", editHtml: editFormHtml.content! }, ()=>initializeRegisteredComponents(this.formRef.current!));
this.setState({ loadingEditHtml: false, editError: "", editHtml: editFormHtml.content! }, ()=>{
if (this.formRef.current) initializeRegisteredComponents(this.formRef.current!)

Check failure on line 149 in src/frontend/components/dashboard/lib/react/App.tsx

View workflow job for this annotation

GitHub Actions / Lint JS Code

Missing semicolon
});
};

/**
Expand Down
Loading