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

Masking workspace constants on frontend #9596

Merged
merged 14 commits into from
May 14, 2024
Merged

Masking workspace constants on frontend #9596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
13b5d0f
masking workspace constants on frontend
AnantshreeChandola May 2, 2024
6b70e7e
remove comment
AnantshreeChandola May 3, 2024
164610e
update
AnantshreeChandola May 3, 2024
e67f640
added logic to verify constants keys used in codehinter
AnantshreeChandola May 3, 2024
05f35f2
Add check for value type
AnantshreeChandola May 6, 2024
20e7968
update workspace constant permissions
AnantshreeChandola May 6, 2024
06e9186
Fix exitsing issues related to validation on code hinter
AnantshreeChandola May 6, 2024
f02cb71
do not send encrypted value to fe
AnantshreeChandola May 7, 2024
48e92d7
small updates
AnantshreeChandola May 8, 2024
fb5ca9b
Add data-cy for workspace constants components
ajith-k-v May 10, 2024
cefa521
Modify workspace constants cypress test cases
ajith-k-v May 10, 2024
03859c2
Merge pull request #9678 from ToolJet/test/workspace-constants-data-cy
AnantshreeChandola May 10, 2024
b94e74f
Merge pull request #9680 from ToolJet/test/constants-test-cases
AnantshreeChandola May 10, 2024
d3d6202
fix value alignment
AnantshreeChandola May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions cypress-tests/cypress/constants/selectors/workspaceConstants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,7 @@ export const workspaceConstantsSelectors = {
constDeleteButton: (constName) => {
return `[data-cy="${cyParamName(constName)}-delete-button"]`;
},
constHideButton: (constName) => {
return `[data-cy="${cyParamName(constName)}-constant-visibility"]`;
},
};
166 changes: 87 additions & 79 deletions cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/workspace/workspaceConstants.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,16 @@ import {
AddNewconstants,
} from "Support/utils/workspaceConstants";
import { buttonText } from "Texts/button";
import {
editAndVerifyWidgetName,
} from "Support/utils/commonWidget";
import { verifypreview } from "Support/utils/dataSource";

import { editAndVerifyWidgetName } from "Support/utils/commonWidget";
import { verifypreview, createDataQuery } from "Support/utils/dataSource";
import { dataSourceSelector } from "Selectors/dataSource";
import {
selectQueryFromLandingPage,
query,
addInputOnQueryField,
} from "Support/utils/queries";

const data = {};
data.constName = fake.firstName.toLowerCase().replaceAll("[^A-Za-z]", "");
data.newConstvalue = `New ${data.constName}`;
data.constantsName = fake.firstName.toLowerCase().replaceAll("[^A-Za-z]", "");
data.constantsValue = "dJ_8Q~BcaMPd";
data.appName = `${fake.companyName}-App`;
data.slug = data.appName.toLowerCase().replace(/\s+/g, "-");

describe("Workspace constants", () => {
const envVar = Cypress.env("environment");
Expand All @@ -36,7 +28,16 @@ describe("Workspace constants", () => {
cy.skipWalkthrough();
});
it("Verify workspace constants UI and CRUD operations", () => {
cy.get('[data-cy="icon-workspace-constants"]').click();
data.constName = fake.firstName.toLowerCase().replaceAll("[^A-Za-z]", "");
data.newConstvalue = `New ${data.constName}`;
data.constantsName = fake.firstName
.toLowerCase()
.replaceAll("[^A-Za-z]", "");
data.constantsValue = "dJ_8Q~BcaMPd";
data.appName = `${fake.companyName}-App`;
data.slug = data.appName.toLowerCase().replace(/\s+/g, "-");

cy.get(commonSelectors.workspaceConstantsIcon).click();

cy.get(commonSelectors.pageSectionHeader).verifyVisibleElement(
"have.text",
Expand Down Expand Up @@ -88,13 +89,14 @@ describe("Workspace constants", () => {
.invoke("attr", "placeholder")
.should("eq", "Enter Constant Name");
cy.get(commonSelectors.nameInputField).should("be.visible");
cy.get(commonSelectors.valueLabel).verifyVisibleElement(
"have.text",
"Value"
);
cy.get(commonSelectors.valueLabel).should(($el) => {
expect($el.contents().first().text().trim()).to.eq("Value");
});
cy.get('[data-cy="encrypted-label"]>').should("be.visible");
cy.verifyLabel("Encrypted");
cy.get(commonSelectors.valueInputField)
.invoke("attr", "placeholder")
.should("eq", "Enter Value");
.should("eq", "Enter value");
cy.get(commonSelectors.valueInputField).should("be.visible");
cy.get(commonSelectors.cancelButton).verifyVisibleElement(
"have.text",
Expand All @@ -118,6 +120,7 @@ describe("Workspace constants", () => {
"Constant name should be between 1 and 32 characters"
);

cy.get(commonSelectors.valueInputField).click();
cy.clearAndType(commonSelectors.valueInputField, " ");
cy.get(commonSelectors.valueErrorText).verifyVisibleElement(
"have.text",
Expand All @@ -128,6 +131,7 @@ describe("Workspace constants", () => {
cy.get(workspaceConstantsSelectors.addNewConstantButton).click();

cy.clearAndType(commonSelectors.nameInputField, data.constName);
cy.get(commonSelectors.valueInputField).click();
cy.clearAndType(commonSelectors.valueInputField, data.constName);
cy.get(workspaceConstantsSelectors.addConstantButton).should("be.enabled");
cy.get(commonSelectors.cancelButton).click();
Expand All @@ -137,6 +141,7 @@ describe("Workspace constants", () => {

cy.get(workspaceConstantsSelectors.addNewConstantButton).click();
cy.clearAndType(commonSelectors.nameInputField, data.constName);
cy.get(commonSelectors.valueInputField).click();
cy.clearAndType(commonSelectors.valueInputField, data.constName);
cy.get(workspaceConstantsSelectors.addConstantButton).click();
cy.verifyToastMessage(
Expand Down Expand Up @@ -167,6 +172,8 @@ describe("Workspace constants", () => {
cy.get(
workspaceConstantsSelectors.constantName(data.constName)
).verifyVisibleElement("have.text", data.constName);

cy.get(workspaceConstantsSelectors.constHideButton(data.constName)).click();
cy.get(
workspaceConstantsSelectors.constantValue(data.constName)
).verifyVisibleElement("have.text", data.constName);
Expand All @@ -189,13 +196,15 @@ describe("Workspace constants", () => {
cy.get(commonSelectors.nameInputField)
.should("be.visible")
.and("be.disabled");
cy.get(commonSelectors.valueLabel).verifyVisibleElement(
"have.text",
"Value"
);
cy.get(commonSelectors.valueLabel).should(($el) => {
expect($el.contents().first().text().trim()).to.eq("Value");
});
cy.get(commonSelectors.valueInputField)
.click()
.should("be.visible")
.and("have.value", data.constName);
// cy.get(commonSelectors.valueInputField)

cy.get(commonSelectors.cancelButton).verifyVisibleElement(
"have.text",
"Cancel"
Expand All @@ -206,6 +215,7 @@ describe("Workspace constants", () => {
);
cy.get(workspaceConstantsSelectors.addConstantButton).should("be.disabled");

cy.get(commonSelectors.valueInputField).click();
cy.clearAndType(commonSelectors.valueInputField, data.newConstvalue);
cy.get(workspaceConstantsSelectors.addConstantButton).should("be.enabled");
cy.get(commonSelectors.cancelButton).click();
Expand All @@ -214,16 +224,17 @@ describe("Workspace constants", () => {
).verifyVisibleElement("have.text", data.constName);

cy.get(workspaceConstantsSelectors.constEditButton(data.constName)).click();
cy.get(commonSelectors.valueInputField).click();
cy.clearAndType(commonSelectors.valueInputField, data.newConstvalue);
cy.get(workspaceConstantsSelectors.addConstantButton).click();
cy.verifyToastMessage(
commonSelectors.toastMessage,
"Constant updated successfully"
);
cy.get(
workspaceConstantsSelectors.constantValue(data.constName)
).verifyVisibleElement("have.text", data.newConstvalue);

cy.get(workspaceConstantsSelectors.constantValue(data.constName))
.should("be.visible")
.and("have.text", data.newConstvalue);
cy.get(
workspaceConstantsSelectors.constDeleteButton(data.constName)
).click();
Expand Down Expand Up @@ -256,77 +267,74 @@ describe("Workspace constants", () => {
});

it("should verify the constants resolving value on components and query", () => {
cy.get('[data-cy="icon-workspace-constants"]').click();
AddNewconstants(data.constantsName, data.constantsValue);
cy.get(
workspaceConstantsSelectors.constantName(data.constantsName)
).verifyVisibleElement("have.text", data.constantsName);
cy.get(
workspaceConstantsSelectors.constantValue(data.constantsName)
).verifyVisibleElement("have.text", data.constantsValue);
cy.viewport(1200, 1300);

data.widgetName = fake.firstName.toLowerCase().replaceAll("[^A-Za-z]", "");
data.appName = `${fake.companyName}-App`;
data.restapilink = fake.firstName.toLowerCase().replaceAll("[^A-Za-z]", "");
data.restapiHeaderKey = fake.firstName
.toLowerCase()
.replaceAll("[^A-Za-z]", "");
data.restapiHeaderValue = fake.firstName
.toLowerCase()
.replaceAll("[^A-Za-z]", "");

cy.get(commonSelectors.workspaceConstantsIcon).click();
AddNewconstants(data.restapilink, "http://localhost:4000/production");
AddNewconstants(data.restapiHeaderKey, "customHeader");
AddNewconstants(data.restapiHeaderValue, "key=value");

cy.get(commonSelectors.homePageLogo).click();
cy.wait("@homePage");
cy.createApp(data.appName);
cy.apiCreateApp(data.appName);

cy.getCookie("tj_auth_token").then((cookie) => {
const headers = {
"Tj-Workspace-Id": Cypress.env("workspaceId"),
Cookie: `tj_auth_token=${cookie.value}`,
};
cy.request({
method: "GET",
url: `http://localhost:3000/api/app-environments/versions?app_id=${Cypress.env(
"appId"
)}`,
headers: headers,
}).then((response) => {
const appVersions = response.body.appVersions;
const appVersionId = appVersions[0].id;
createDataQuery(
appVersionId,
data.restapilink,
data.restapiHeaderKey,
data.restapiHeaderValue
);
});
});

selectQueryFromLandingPage("runjs", "JavaScript");
addInputOnQueryField("runjs", `return constants.${data.constantsName}`);
query("preview");
verifypreview("raw", "dJ_8Q~BcaMPd");
cy.openApp();

cy.dragAndDropWidget("Text", 550, 350);
editAndVerifyWidgetName(data.constantsName, []);
cy.get(".custom-toggle-switch>.switch>").eq(3).click();

cy.waitForAutoSave();
cy.dragAndDropWidget("Text", 550, 650);
editAndVerifyWidgetName(data.widgetName, []);
cy.waitForAutoSave();

cy.get(
'[data-cy="textcomponenttextinput-input-field"]'
).clearAndTypeOnCodeMirror(`{{constants.${data.constantsName}`);
).clearAndTypeOnCodeMirror(`{{queries.restapi1.data.message`);
cy.forceClickOnCanvas();
cy.waitForAutoSave();

common.pinInspector();
// cy.get(".tooltip-inner").invoke("hide");
cy.get(commonWidgetSelector.sidebarinspector).click();
cy.get(commonWidgetSelector.inspectorNodeComponents).click();
cy.get(commonWidgetSelector.nodeComponent(data.constantsName)).click();
cy.get('[data-cy="inspector-node-text"] > .mx-2').verifyVisibleElement(
"have.text",
`"dJ_8Q~BcaMPd"`
);

cy.get('[data-cy="inspector-node-constants"] > .node-key').click();
cy.get(`[data-cy="inspector-node-${data.constantsName}"] > .node-key`)
.eq(1)
.verifyVisibleElement("have.text", data.constantsName);
cy.get(dataSourceSelector.queryCreateAndRunButton).click();
cy.get(
`[data-cy="inspector-node-${data.constantsName}"] > .mx-2`
).verifyVisibleElement("have.text", `"dJ_8Q~BcaMPd"`);
commonWidgetSelector.draggableWidget(data.widgetName)
).verifyVisibleElement("have.text", "Production environment testing");

cy.get('[data-cy="button-release"]').click();
cy.get('[data-cy="yes-button"]').click();
cy.verifyToastMessage(commonSelectors.toastMessage, "Version v1 released");

cy.get(commonWidgetSelector.shareAppButton).click();
cy.clearAndType(commonWidgetSelector.appNameSlugInput, `${data.slug}`);
cy.wait(1500);
cy.get(commonWidgetSelector.modalCloseButton).click();
cy.forceClickOnCanvas();
cy.waitForAutoSave();
cy.wait(500);
cy.openInCurrentTab(commonWidgetSelector.previewButton);
cy.wait(4000);

cy.get(
commonWidgetSelector.draggableWidget(data.constantsName)
).verifyVisibleElement("have.text", "dJ_8Q~BcaMPd");

cy.get('[data-cy="viewer-page-logo"]').click();
cy.wait("@homePage");
cy.visit(`/applications/${data.slug}`);
cy.wait(4000);

cy.get(
commonWidgetSelector.draggableWidget(data.constantsName)
).verifyVisibleElement("have.text", "dJ_8Q~BcaMPd");
commonWidgetSelector.draggableWidget(data.widgetName)
).verifyVisibleElement("have.text", "Production environment testing");
});
});
42 changes: 37 additions & 5 deletions cypress-tests/cypress/support/utils/dataSource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { dataSourceSelector } from "Selectors/dataSource";
import { dataSourceText } from "Texts/dataSource";
import { navigateToAppEditor } from "Support/utils/common";


export const verifyCouldnotConnectWithAlert = (dangerText) => {
cy.get(postgreSqlSelector.connectionFailedText, {
timeout: 10000,
Expand Down Expand Up @@ -133,7 +132,6 @@ export const addQueryAndOpenEditor = (queryName, query, dbName, appName) => {
});
};


export const verifyValueOnInspector = (queryName, value) => {
cy.get('[data-cy="inspector-node-queries"]')
.parent()
Expand All @@ -157,6 +155,40 @@ export const verifyValueOnInspector = (queryName, value) => {
export const selectDatasource = (datasourceName) => {
cy.get(dataSourceSelector.addedDsSearchIcon).click();
cy.clearAndType(dataSourceSelector.AddedDsSearchBar, datasourceName);
cy.wait(500)
cy.get(`[data-cy="${cyParamName(datasourceName)}-button"]`).click()
}
cy.wait(500);
cy.get(`[data-cy="${cyParamName(datasourceName)}-button"]`).click();
};

export const createDataQuery = (versionId, url, key, value) => {
cy.getCookie("tj_auth_token").then((cookie) => {
const headers = {
"Tj-Workspace-Id": Cypress.env("workspaceId"),
Cookie: `tj_auth_token=${cookie.value}`,
};
cy.request({
method: "POST",
url: "http://localhost:3000/api/data_queries",
headers: headers,
body: {
app_id: Cypress.env("appId"),
app_version_id: versionId,
name: "restapi1",
kind: "restapi",
options: {
method: "get",
url: `{{constants.${url}}}`,
url_params: [["", ""]],
headers: [[`{{constants.${key}}}`, `{{constants.${value}}}`]],
body: [["", ""]],
json_body: null,
body_toggle: false,
transformationLanguage: "javascript",
enableTransformation: false,
},
data_source_id: null,
},
}).then((response) => {
expect(response.status).to.equal(201);
});
});
};
10 changes: 7 additions & 3 deletions cypress-tests/cypress/support/utils/workspaceConstants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,17 @@ import * as common from "Support/utils/common";

export const contantsNameValidation = (value, error) => {
cy.clearAndType(commonSelectors.nameInputField, value);
cy.get(commonSelectors.nameErrorText).verifyVisibleElement("have.text", error)
cy.get(commonSelectors.nameErrorText).verifyVisibleElement(
"have.text",
error
);
cy.get(workspaceConstantsSelectors.addConstantButton).should("be.disabled");
}
};

export const AddNewconstants = (name, value) => {
cy.get(workspaceConstantsSelectors.addNewConstantButton).click();
cy.clearAndType(commonSelectors.nameInputField, name);
cy.get(commonSelectors.valueInputField).click();
cy.clearAndType(commonSelectors.valueInputField, value);
cy.get(workspaceConstantsSelectors.addConstantButton).click();
}
};