Skip to content

Commit

Permalink
Merge pull request #9576 from ToolJet/release/platform17.2
Browse files Browse the repository at this point in the history
* added dashboard URL in back to apps link

* added decode function to replace symbols in the UI

* Added condition so empty-folder UI is loaded

* naming convention dashboardUrl

* Added bump version changes

* Added loader animation and updated utils (#9570)

* Fix: Query duplication on version creation (#9588)

* Added workspace_signup source (#9688)

* design-fix (#9690)

* Added a fix for the cropped postgresql icon issue (#9681)

* source editor ui changes (#9667)

* Workspace variables (#9616)

* workspace-variable name

* modified workspace variables info message

* Added common data sources (#9468)

* Added common data sources

* Modified the Datasource context to display common data sources on page reload

* Fixed Back to apps dashboard URL and added loader on Org Invitation Page (#9630)

Co-authored-by: Muhsin Shah <muhsinshah21@gmail.com>

* fixed the VerificationSucess Screen loader (#9584)

* fixed the VerificationSucess Screen loader

* added wrapper around loader

* wrapper changes

* fix for organization invite loader

---------

Co-authored-by: Anantshree Chandola <anantshreechandola23@gmail.com>
Co-authored-by: gsmithun4 <gsmithun4@gmail.com>

* Masking workspace constants on frontend (#9596)

* masking workspace constants on frontend

* remove comment

* update

* added logic to verify constants keys used in codehinter

* Add check for value type

* update workspace constant permissions

* Fix exitsing issues related to validation on code hinter

* do not send encrypted value to fe

* small updates

* Add data-cy for workspace constants components

* Modify workspace constants cypress test cases

* fix value alignment

---------

Co-authored-by: ajith-k-v <ajith.jaban@gmail.com>

* Fox for export app with ToolJet DB (#9708)

* Removed common data sources from search (#9728)

* Removed common data sources from search

* removed console logs

* added padding to workspace-variable-text (#9724)

* UI Updates (#9726)

* UI updates

* fix search bar borders and side bars border

* update size of input box

* FIx "<>&" UI errors (#9602)

* added decode entity function

* added decode functions to resolve <> naming

* removed unnecessary fns

* Moved decodeEntities function to helpers/util

* Update frontend/src/_helpers/utils.js

Co-authored-by: Midhun G S <gsmithun4@gmail.com>

---------

Co-authored-by: Midhun G S <gsmithun4@gmail.com>

* Added warning info for local data sources and added a svg to assets (#9704)

* Added warning info for local data sources and added a svg to assets

* converted output of isDataSourceLocal to boolean

* fixed ui <>& symbol issues for tooltip and whitelabel (#9731)

* Added a common fix for all cropped datasource icons on the global datasource page. (#9736)

* Modified workspace constants cypress test cases (#9685)

* UI updates (#9737)

* removed localds migration link (#9743)

* Styling fixes for UI comps (#9752)

* removed documentation from text (#9754)

* Styling updates (#9755)

* UI updates

* fix search bar borders and side bars border

* update size of input box

* ui updates

* keep autocomplete off

* add empty panel in query editor

* style fixes

* update

* Add gap in between added key-value pairs

---------

Co-authored-by: Rudra <rudra21ultra@gmail.com>
Co-authored-by: Adish M <44204658+adishM98@users.noreply.github.com>
Co-authored-by: Rudhra Deep Biswas <98055396+rudeUltra@users.noreply.github.com>
Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
Co-authored-by: kriks7iitk <34170719+kriks7iitk@users.noreply.github.com>
Co-authored-by: Anantshree Chandola <anantshreechandola23@gmail.com>
Co-authored-by: ajith-k-v <ajith.jaban@gmail.com>
  • Loading branch information
7 people committed May 16, 2024
2 parents 321ae5f + e1ac1cc commit da93579
Show file tree
Hide file tree
Showing 73 changed files with 1,119 additions and 364 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.41.1
2.42.0
3 changes: 2 additions & 1 deletion cypress-tests/cypress-workspace.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,9 @@ module.exports = defineConfig({
baseUrl: "http://localhost:8082",
specPattern: [
"cypress/e2e/happyPath/platform/ceTestcases/editor/appSlug.cy.js",
"cypress/e2e/happyPath/platform/ceTestcases/editor/privateAndPublicApp.cy.js",
"cypress/e2e/happyPath/platform/commonTestcases/**/*.cy.js",
"cypress/e2e/happyPath/platform/ceTestcases/**/!(*appSlug).cy.js"
"cypress/e2e/happyPath/platform/ceTestcases/**/!(*appSlug|privateAndPublicApp).cy.js"
],
numTestsKeptInMemory: 1,
redirectionLimit: 15,
Expand Down
1 change: 1 addition & 0 deletions cypress-tests/cypress/constants/selectors/dataSource.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export const dataSourceSelector = {
addDatasourceLink: "[data-cy='add-datasource-link']",

allDatasourceLabelAndCount: '[data-cy="datasource-list-header"]',
commonDsLabelAndCount: '[data-cy="commonlyused-datasource-button"]',
databaseLabelAndCount: '[data-cy="databases-datasource-button"]',
apiLabelAndCount: '[data-cy="apis-datasource-button"]',
cloudStorageLabelAndCount: '[data-cy="cloudstorage-datasource-button"]',
Expand Down
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"]`;
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,25 @@ describe("Global Datasource Manager", () => {
expect($el.contents().first().text().trim()).to.eq("Data sources");
});

cy.get(commonSelectors.breadcrumbPageTitle).verifyVisibleElement(
"have.text",
' Commonly used'
);
cy.get(dataSourceSelector.commonDsLabelAndCount).verifyVisibleElement(
"have.text",
"Commonly used (5)"
).click();
cy.get(dataSourceSelector.databaseLabelAndCount).verifyVisibleElement(
"have.text",
dataSourceText.allDatabase
);
).click();
cy.get(commonSelectors.breadcrumbPageTitle).verifyVisibleElement(
"have.text",
" Databases"
);
cy.get(dataSourceSelector.querySearchBar)
.invoke("attr", "placeholder")
.should("eq", "Search data sources");
.should("eq", "Search data sources");

cy.get(dataSourceSelector.apiLabelAndCount)
.verifyVisibleElement("have.text", dataSourceText.allApis)
Expand Down Expand Up @@ -242,6 +250,7 @@ describe("Global Datasource Manager", () => {
}
});
});

it("Should validate the user's global data source permissions on apps created by admin", () => {
logout();
cy.apiLogin("test@tooljet.com", "password");
Expand Down Expand Up @@ -274,6 +283,7 @@ describe("Global Datasource Manager", () => {
cy.get(dataSourceSelector.queryCreateAndRunButton).click();
verifyValueOnInspector("student_data", "4 items ");
});

it("Should verify the query creation and scope changing functionality.", () => {
cy.removeAssignedApps();

Expand Down

0 comments on commit da93579

Please sign in to comment.