Skip to content

FOUR-21178: Navigation button shouldn't have the clipboard page as an option #1784

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

Closed
rodriquelca wants to merge 2 commits into from
Closed

FOUR-21178: Navigation button shouldn't have the clipboard page as an option #1784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31a00bc
FOUR-21178: Navigation button shouldn't have the clipboard page as an…
rodriquelca Jan 21, 2025
b844d01
Switch to Ubuntu 22.04 in Storybook workflow to fix browser installat…
caleeli Jan 23, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/storybook.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
jobs:
test:
timeout-minutes: 60
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand Down
4 changes: 2 additions & 2 deletions src/components/editor/loop.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</b-badge>
<div class="ml-auto">
<clipboard-button
v-if="screenType === 'form'"
v-if="screenType === 'form' && !element.config.disableClipboard"
:index="index"
:config="element.config"
:isInClipboard="isInClipboard(items[index])"
Expand Down Expand Up @@ -118,7 +118,7 @@
</b-badge>
<div class="ml-auto">
<clipboard-button
v-if="screenType === 'form'"
v-if="screenType === 'form' && !element.config.disableClipboard"
:index="index"
:config="element.config"
:isInClipboard="isInClipboard(items[index])"
Expand Down
4 changes: 2 additions & 2 deletions src/components/editor/multi-column.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</b-badge>
<div class="ml-auto">
<clipboard-button
v-if="screenType === 'form'"
v-if="screenType === 'form' && !element.config.disableClipboard"
:index="index"
:config="element.config"
:isInClipboard="isInClipboard(element)"
Expand Down Expand Up @@ -130,7 +130,7 @@
</b-badge>
<div class="ml-auto">
<clipboard-button
v-if="screenType === 'form'"
v-if="screenType === 'form' && !element.config.disableClipboard"
:index="index"
:config="element.config"
:isInClipboard="isInClipboard(element)"
Expand Down
4 changes: 2 additions & 2 deletions src/components/vue-form-builder.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
</b-badge>
<div class="ml-auto">
<clipboard-button
v-if="!isClipboardPage(tabPage) && screenType === 'form'"
v-if="!isClipboardPage(tabPage) && screenType === 'form' && !element.config.disableClipboard"
:index="index"
:config="element.config"
:isInClipboard="isInClipboard(extendedPages[tabPage].items[index])"
Expand Down Expand Up @@ -288,7 +288,7 @@
</b-badge>
<div class="ml-auto">
<clipboard-button
v-if="!isClipboardPage(tabPage) && screenType === 'form'"
v-if="!isClipboardPage(tabPage) && screenType === 'form' && !element.config.disableClipboard"
:index="index"
:config="element.config"
:isInClipboard="isInClipboard(extendedPages[tabPage].items[index])"
Expand Down
2 changes: 1 addition & 1 deletion src/form-builder-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ export default [
variant: 'primary',
event: 'pageNavigate',
eventData: null,

disableClipboard: true,
Copy link
Collaborator

@caleeli caleeli Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems the steps are not clear, but the problem is that the Clipboard appears as option in the destination screen:

image

},
inspector: [
{
Expand Down
11 changes: 1 addition & 10 deletions tests/e2e/specs/ClipboardTestCases.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ describe("Clipboard Button Actions", () => {
.should('have.length', 6);
});

it("TCP4-4443: Verify that the control from the NAVIGATION section have been added to the clipboard", () => {
it("TCP4-4443: Verify that the control from the NAVIGATION section have not been added to the clipboard", () => {
Copy link
Collaborator

@caleeli caleeli Jan 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
it("TCP4-4443: Verify that the control from the NAVIGATION section have not been added to the clipboard", () => {
it("TCP4-4443: Verify the "Clipboard" button in NAVIGATION, but not "Clipboard" as a page option.");

cy.clearLocalStorage();
cy.visit("/");
cy.openAcordeonByLabel("Navigation");
Expand All @@ -166,16 +166,7 @@ describe("Clipboard Button Actions", () => {
cy.get('[data-cy=controls-FormButton]:contains("Page")').drag("[data-cy=screen-drop-zone]", { position: "bottom" });

cy.get(':nth-child(1) > [data-cy="screen-element-container"]').click();
cy.get('[data-cy="addToClipboard"]').should("be.visible");
cy.get('[data-cy="addToClipboard"]').click();
cy.get('[data-cy="addToClipboard"]').should("not.exist");
cy.get('[data-cy="copied-badge"]').should("exist");

cy.get("[data-test=page-dropdown").click();
cy.get("[data-test=clipboard]").should("exist").click({ force: true });
cy.get('[data-cy="screen-element-container"]')
.children()
.should('have.length', 1);
});

it("TCP4-4443: Verify that the control from the FILES section have been added to the clipboard", () => {
Expand Down
Loading