Skip to content

fix: Remove Gsheets unauth method #36125

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

Merged
rishabhrathod01 merged 7 commits into from
Sep 10, 2024
Merged

fix: Remove Gsheets unauth method #36125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4ace96d
fix: Remove Gsheets unauth method
Sep 5, 2024
04b30eb
fix gsheet cypress
Sep 5, 2024
f57132f
fix prettier issue
Sep 5, 2024
4a445e3
Trigger qc-check
Sep 5, 2024
60e41fa
fix cypress test
Sep 5, 2024
757d256
skip test for the removed options
Sep 9, 2024
040643a
skip all access spec
Sep 10, 2024
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 app/client/cypress/e2e/GSheet/AllAccess_Spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const workspaceName = "gsheet apps";
const dataSourceName = "gsheet-all";
let appName = "gsheet-app";
let spreadSheetName = "test-sheet";
describe(
describe.skip(
"GSheet-Functional Tests With All Access",
{ tags: ["@tag.Datasource", "@tag.GSheet"] },
function () {
Expand Down
2 changes: 1 addition & 1 deletion app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const workspaceName = "gsheet apps";
const dataSourceName = "gsheet-all";
let appName = "gsheet-app";
let spreadSheetName = "test-sheet";
describe(
describe.skip(
"GSheet Miscellaneous Tests",
{ tags: ["@tag.Datasource", "@tag.GSheet"] },
function () {
Expand Down
2 changes: 1 addition & 1 deletion app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
appSettings,
} from "../../support/Objects/ObjectsCore";

describe(
describe.skip(
"GSheet-Functional Tests With Read/Write Access",
{ tags: ["@tag.Datasource", "@tag.GSheet"] },
function () {
Expand Down
2 changes: 1 addition & 1 deletion app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
appSettings,
} from "../../support/Objects/ObjectsCore";

describe(
describe.skip(
"GSheet-Functional Tests With Read Access",
{ tags: ["@tag.Datasource", "@tag.GSheet"] },
function () {
Expand Down
2 changes: 1 addition & 1 deletion app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const workspaceName = "gsheet apps";
const dataSourceName = "gsheet-all";
let appName = "gsheet-app";
let spreadSheetName = "test-sheet";
describe(
describe.skip(
"GSheet-widget binding",
{ tags: ["@tag.Datasource", "@tag.GSheet"] },
function () {
Expand Down
9 changes: 4 additions & 5 deletions app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ describe(
dataSources.CreatePlugIn("Google Sheets");
VerifyFunctionDropdown([
"Read / Write / Delete | Selected google sheets",
"Read / Write / Delete | All google sheets",
"Read / Write | All google sheets",
"Read | All google sheets",
// Hiding below methods as they are not authorized at this state
// "Read / Write / Delete | All google sheets",
// "Read / Write | All google sheets",
// "Read | All google sheets",
Comment on lines +23 to +26
Copy link
Contributor

@coderabbitai coderabbitai bot Sep 6, 2024

Choose a reason for hiding this comment

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

Use Data Attributes for Selectors

To enhance the maintainability and readability of your test code, consider using data-* attributes for your selectors instead of relying on class names or other attributes. This practice helps decouple your tests from changes in the UI and makes your selectors more descriptive and easier to manage.

]);
dataSources.SaveDSFromDialog(false);
});
Expand All @@ -31,8 +32,6 @@ describe(
agHelper.GetNClick(dataSources._gsScopeDropdown);
cy.get(dataSources._gsScopeOptions).then(function ($ele) {
expect($ele.eq(0).text()).to.be.oneOf(scopeOptions);
expect($ele.eq(1).text()).to.be.oneOf(scopeOptions);
expect($ele.eq(2).text()).to.be.oneOf(scopeOptions);
});
agHelper.GetNClick(dataSources._gsScopeDropdown);
}
Expand Down
12 changes: 0 additions & 12 deletions app/server/appsmith-plugins/googleSheetsPlugin/src/main/resources/form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,6 @@
{
"label": "Read / Write / Delete | Selected google sheets",
"value": "https://www.googleapis.com/auth/drive.file"
},
{
"label": "Read / Write / Delete | All google sheets",
"value": "https://www.googleapis.com/auth/spreadsheets,https://www.googleapis.com/auth/drive"
},
{
"label": "Read / Write | All google sheets",
"value": "https://www.googleapis.com/auth/spreadsheets,https://www.googleapis.com/auth/drive.readonly"
},
{
"label": "Read | All google sheets",
"value": "https://www.googleapis.com/auth/spreadsheets.readonly,https://www.googleapis.com/auth/drive.readonly"
}
],
"initialValue": "https://www.googleapis.com/auth/spreadsheets,https://www.googleapis.com/auth/drive",
Expand Down