chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
import type { Plugin } from "api/PluginApi";
|
2023-05-22 08:44:06 +00:00
|
|
|
import {
|
|
|
|
|
DATASOURCE_DB_FORM,
|
|
|
|
|
DATASOURCE_REST_API_FORM,
|
|
|
|
|
DATASOURCE_SAAS_FORM,
|
2023-06-05 21:27:40 +00:00
|
|
|
} from "@appsmith/constants/forms";
|
2023-07-03 13:06:05 +00:00
|
|
|
import { getCurrentEnvironment } from "@appsmith/utils/Environments";
|
2023-05-22 08:44:06 +00:00
|
|
|
import { diff } from "deep-diff";
|
feat: default table name populated in query editor for mock datasources (#25263)
## Description
This is a follow-up to
https://github.com/appsmithorg/appsmith/issues/23960.
In above issue, we picked the first available entity (table/collection,
etc) and show the user a read query by default. With a [[real
datasource](https://www.notion.so/7b5b3f6302cc4a8e93f8ecd1a3965cad?pvs=21)](https://www.notion.so/7b5b3f6302cc4a8e93f8ecd1a3965cad?pvs=21),
it is not possible to know which is the most meaningful entity to
choose. However, with mock datasources, we do have the option because we
own the underlying databases.
This PR adds that functionality, In case of Users mock DB, we will
populate the query editor with `select * from public.users limit 10`, as
Users mock DB contains users table.
#### PR fixes following issue(s)
Fixes #25247
> if no issue exists, please create an issue and ask the maintainers
about this first
>
>
#### Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video
>
>
#### Type of change
- New feature (non-breaking change which adds functionality)
>
>
>
## Testing
>
#### How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Also
list any relevant details for your test configuration.
> Delete anything that is not relevant
- [x] Manual
- [ ] Jest
- [x] Cypress
>
>
#### Test Plan
> Add Testsmith test cases links that relate to this PR
>
>
#### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
>
>
>
## Checklist:
#### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
#### QA activity:
- [x] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [x] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [x] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
---------
Co-authored-by: “sneha122” <“sneha@appsmith.com”>
2023-07-17 06:26:39 +00:00
|
|
|
import { PluginName, PluginPackageName, PluginType } from "entities/Action";
|
chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
import type { Datasource } from "entities/Datasource";
|
|
|
|
|
import { AuthenticationStatus, AuthType } from "entities/Datasource";
|
2023-07-03 13:06:05 +00:00
|
|
|
import { get, isArray } from "lodash";
|
feat: default table name populated in query editor for mock datasources (#25263)
## Description
This is a follow-up to
https://github.com/appsmithorg/appsmith/issues/23960.
In above issue, we picked the first available entity (table/collection,
etc) and show the user a read query by default. With a [[real
datasource](https://www.notion.so/7b5b3f6302cc4a8e93f8ecd1a3965cad?pvs=21)](https://www.notion.so/7b5b3f6302cc4a8e93f8ecd1a3965cad?pvs=21),
it is not possible to know which is the most meaningful entity to
choose. However, with mock datasources, we do have the option because we
own the underlying databases.
This PR adds that functionality, In case of Users mock DB, we will
populate the query editor with `select * from public.users limit 10`, as
Users mock DB contains users table.
#### PR fixes following issue(s)
Fixes #25247
> if no issue exists, please create an issue and ask the maintainers
about this first
>
>
#### Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video
>
>
#### Type of change
- New feature (non-breaking change which adds functionality)
>
>
>
## Testing
>
#### How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Also
list any relevant details for your test configuration.
> Delete anything that is not relevant
- [x] Manual
- [ ] Jest
- [x] Cypress
>
>
#### Test Plan
> Add Testsmith test cases links that relate to this PR
>
>
#### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
>
>
>
## Checklist:
#### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
#### QA activity:
- [x] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [x] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [x] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
---------
Co-authored-by: “sneha122” <“sneha@appsmith.com”>
2023-07-17 06:26:39 +00:00
|
|
|
import store from "store";
|
|
|
|
|
import { getPlugin } from "selectors/entitiesSelector";
|
|
|
|
|
import type { AppState } from "@appsmith/reducers";
|
2022-12-11 14:42:32 +00:00
|
|
|
export function isCurrentFocusOnInput() {
|
|
|
|
|
return (
|
|
|
|
|
["input", "textarea"].indexOf(
|
|
|
|
|
document.activeElement?.tagName?.toLowerCase() || "",
|
|
|
|
|
) >= 0
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2022-10-17 15:16:38 +00:00
|
|
|
/**
|
|
|
|
|
* This method returns boolean if the propertyControl is focused.
|
|
|
|
|
* @param domElement
|
|
|
|
|
* @returns
|
|
|
|
|
*/
|
|
|
|
|
export function shouldFocusOnPropertyControl(
|
|
|
|
|
domElement?: HTMLDivElement | null,
|
|
|
|
|
) {
|
|
|
|
|
let isCurrentFocusOnProperty = false;
|
|
|
|
|
|
|
|
|
|
if (domElement) {
|
|
|
|
|
isCurrentFocusOnProperty = domElement.contains(document.activeElement);
|
|
|
|
|
}
|
|
|
|
|
|
2022-12-11 14:42:32 +00:00
|
|
|
return !(isCurrentFocusOnInput() || isCurrentFocusOnProperty);
|
2022-10-17 15:16:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
2022-11-15 06:20:18 +00:00
|
|
|
* Returns a focusable field of PropertyControl.
|
2022-10-17 15:16:38 +00:00
|
|
|
* @param element
|
|
|
|
|
* @returns
|
|
|
|
|
*/
|
|
|
|
|
export function getPropertyControlFocusElement(
|
|
|
|
|
element: HTMLDivElement | null,
|
|
|
|
|
): HTMLElement | undefined {
|
2022-11-15 06:20:18 +00:00
|
|
|
if (element?.children) {
|
|
|
|
|
const [, propertyInputElement] = element.children;
|
|
|
|
|
|
|
|
|
|
if (propertyInputElement) {
|
|
|
|
|
const uiInputElement = propertyInputElement.querySelector(
|
|
|
|
|
'button:not([tabindex="-1"]), input, [tabindex]:not([tabindex="-1"])',
|
|
|
|
|
) as HTMLElement | undefined;
|
|
|
|
|
if (uiInputElement) {
|
|
|
|
|
return uiInputElement;
|
|
|
|
|
}
|
chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
const codeEditorInputElement =
|
|
|
|
|
propertyInputElement.getElementsByClassName("CodeEditorTarget")[0] as
|
|
|
|
|
| HTMLElement
|
|
|
|
|
| undefined;
|
2022-11-15 06:20:18 +00:00
|
|
|
if (codeEditorInputElement) {
|
|
|
|
|
return codeEditorInputElement;
|
|
|
|
|
}
|
|
|
|
|
|
chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
const lazyCodeEditorInputElement =
|
|
|
|
|
propertyInputElement.getElementsByClassName("LazyCodeEditor")[0] as
|
|
|
|
|
| HTMLElement
|
|
|
|
|
| undefined;
|
2022-11-15 06:20:18 +00:00
|
|
|
if (lazyCodeEditorInputElement) {
|
|
|
|
|
return lazyCodeEditorInputElement;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2022-10-17 15:16:38 +00:00
|
|
|
}
|
2022-12-20 15:10:18 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Returns true if :
|
|
|
|
|
* - authentication type is not oauth2 or is not a Google Sheet Plugin
|
|
|
|
|
* - authentication type is oauth2 and authorized status success and is a Google Sheet Plugin
|
|
|
|
|
* @param datasource Datasource
|
|
|
|
|
* @param plugin Plugin
|
|
|
|
|
* @returns boolean
|
|
|
|
|
*/
|
|
|
|
|
export function isDatasourceAuthorizedForQueryCreation(
|
|
|
|
|
datasource: Datasource,
|
|
|
|
|
plugin: Plugin,
|
2023-07-21 05:53:17 +00:00
|
|
|
currentEnvironment = getCurrentEnvironment(),
|
2022-12-20 15:10:18 +00:00
|
|
|
): boolean {
|
2023-07-21 05:53:17 +00:00
|
|
|
if (
|
|
|
|
|
!datasource ||
|
|
|
|
|
!datasource.hasOwnProperty("datasourceStorages") ||
|
|
|
|
|
!datasource.datasourceStorages.hasOwnProperty(currentEnvironment)
|
|
|
|
|
)
|
|
|
|
|
return false;
|
|
|
|
|
const datasourceStorage = datasource.datasourceStorages[currentEnvironment];
|
|
|
|
|
if (
|
|
|
|
|
!datasourceStorage ||
|
|
|
|
|
!datasourceStorage.hasOwnProperty("id") ||
|
|
|
|
|
!datasourceStorage.hasOwnProperty("datasourceConfiguration")
|
|
|
|
|
)
|
|
|
|
|
return false;
|
2023-07-03 13:06:05 +00:00
|
|
|
const authType = get(
|
2023-07-21 05:53:17 +00:00
|
|
|
datasourceStorage,
|
|
|
|
|
"datasourceConfiguration.authentication.authenticationType",
|
2023-07-03 13:06:05 +00:00
|
|
|
);
|
2022-12-20 15:10:18 +00:00
|
|
|
|
2023-06-01 07:27:15 +00:00
|
|
|
const isGoogleSheetPlugin = isGoogleSheetPluginDS(plugin?.packageName);
|
|
|
|
|
if (isGoogleSheetPlugin) {
|
2022-12-20 15:10:18 +00:00
|
|
|
const isAuthorized =
|
2023-06-01 07:27:15 +00:00
|
|
|
authType === AuthType.OAUTH2 &&
|
2023-07-03 13:06:05 +00:00
|
|
|
get(
|
2023-07-21 05:53:17 +00:00
|
|
|
datasourceStorage,
|
|
|
|
|
"datasourceConfiguration.authentication.authenticationStatus",
|
2023-07-03 13:06:05 +00:00
|
|
|
) === AuthenticationStatus.SUCCESS;
|
2022-12-20 15:10:18 +00:00
|
|
|
return isAuthorized;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
feat: gsheet disable new query when no files selected (#21912)
## Description
This PR adds:
- When gsheet datasource is created with "Selected Sheets" Modality, and
if user fails to select any files from file picker
- we should disable new query creation
- we should show error message banner on datasource review page
**How to test:**
- Create google sheet datasource, break the authorisation flow, check
review page, error message like "Data source is not authorized, please
authorize to continue." would be shown.
- Edit datasource, complete the authorisation but do not pick any files
from file picker, error message like "Datasource does not have access to
any files, please authorize google sheets to use this data source" would
be shown
Fixes #20290
Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video
## Type of change
> Please delete options that are not relevant.
- New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
- Manual
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [x] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: “sneha122” <“sneha@appsmith.com”>
2023-04-06 14:12:34 +00:00
|
|
|
|
2023-06-01 07:27:15 +00:00
|
|
|
/**
|
|
|
|
|
* Determines whether plugin is google sheet or not
|
|
|
|
|
* @param pluginPackageName string
|
|
|
|
|
* @returns boolean
|
|
|
|
|
*/
|
2023-06-01 17:26:05 +00:00
|
|
|
export function isGoogleSheetPluginDS(pluginPackageName?: string) {
|
2023-06-01 07:27:15 +00:00
|
|
|
return pluginPackageName === PluginPackageName.GOOGLE_SHEETS;
|
|
|
|
|
}
|
|
|
|
|
|
feat: gsheet disable new query when no files selected (#21912)
## Description
This PR adds:
- When gsheet datasource is created with "Selected Sheets" Modality, and
if user fails to select any files from file picker
- we should disable new query creation
- we should show error message banner on datasource review page
**How to test:**
- Create google sheet datasource, break the authorisation flow, check
review page, error message like "Data source is not authorized, please
authorize to continue." would be shown.
- Edit datasource, complete the authorisation but do not pick any files
from file picker, error message like "Datasource does not have access to
any files, please authorize google sheets to use this data source" would
be shown
Fixes #20290
Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video
## Type of change
> Please delete options that are not relevant.
- New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
- Manual
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [x] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: “sneha122” <“sneha@appsmith.com”>
2023-04-06 14:12:34 +00:00
|
|
|
/**
|
|
|
|
|
* Returns datasource property value from datasource?.datasourceConfiguration?.properties
|
|
|
|
|
* @param datasource Datasource
|
|
|
|
|
* @param propertyKey string
|
|
|
|
|
* @returns string | null
|
|
|
|
|
*/
|
|
|
|
|
export function getDatasourcePropertyValue(
|
|
|
|
|
datasource: Datasource,
|
|
|
|
|
propertyKey: string,
|
2023-07-03 13:06:05 +00:00
|
|
|
currentEnvironment: string,
|
feat: gsheet disable new query when no files selected (#21912)
## Description
This PR adds:
- When gsheet datasource is created with "Selected Sheets" Modality, and
if user fails to select any files from file picker
- we should disable new query creation
- we should show error message banner on datasource review page
**How to test:**
- Create google sheet datasource, break the authorisation flow, check
review page, error message like "Data source is not authorized, please
authorize to continue." would be shown.
- Edit datasource, complete the authorisation but do not pick any files
from file picker, error message like "Datasource does not have access to
any files, please authorize google sheets to use this data source" would
be shown
Fixes #20290
Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video
## Type of change
> Please delete options that are not relevant.
- New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
- Manual
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [x] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: “sneha122” <“sneha@appsmith.com”>
2023-04-06 14:12:34 +00:00
|
|
|
): string | null {
|
|
|
|
|
if (!datasource) {
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
2023-07-03 13:06:05 +00:00
|
|
|
const properties = get(
|
|
|
|
|
datasource,
|
|
|
|
|
`datasourceStorages.${currentEnvironment}.datasourceConfiguration.properties`,
|
|
|
|
|
);
|
feat: gsheet disable new query when no files selected (#21912)
## Description
This PR adds:
- When gsheet datasource is created with "Selected Sheets" Modality, and
if user fails to select any files from file picker
- we should disable new query creation
- we should show error message banner on datasource review page
**How to test:**
- Create google sheet datasource, break the authorisation flow, check
review page, error message like "Data source is not authorized, please
authorize to continue." would be shown.
- Edit datasource, complete the authorisation but do not pick any files
from file picker, error message like "Datasource does not have access to
any files, please authorize google sheets to use this data source" would
be shown
Fixes #20290
Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video
## Type of change
> Please delete options that are not relevant.
- New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
- Manual
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [x] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: “sneha122” <“sneha@appsmith.com”>
2023-04-06 14:12:34 +00:00
|
|
|
if (!!properties && properties.length > 0) {
|
|
|
|
|
const propertyObj = properties.find((prop) => prop.key === propertyKey);
|
|
|
|
|
if (!!propertyObj) {
|
|
|
|
|
return propertyObj.value;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
}
|
2023-05-22 08:44:06 +00:00
|
|
|
|
|
|
|
|
export function getFormName(plugin: Plugin): string {
|
|
|
|
|
const pluginType = plugin?.type;
|
|
|
|
|
if (!!pluginType) {
|
|
|
|
|
switch (pluginType) {
|
|
|
|
|
case PluginType.DB:
|
|
|
|
|
case PluginType.REMOTE:
|
|
|
|
|
return DATASOURCE_DB_FORM;
|
|
|
|
|
case PluginType.SAAS:
|
|
|
|
|
return DATASOURCE_SAAS_FORM;
|
|
|
|
|
case PluginType.API:
|
|
|
|
|
return DATASOURCE_REST_API_FORM;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return DATASOURCE_DB_FORM;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export function getFormDiffPaths(initialValues: any, currentValues: any) {
|
|
|
|
|
const difference = diff(initialValues, currentValues);
|
|
|
|
|
const diffPaths: string[] = [];
|
|
|
|
|
if (!!difference) {
|
|
|
|
|
difference.forEach((diff) => {
|
|
|
|
|
if (!!diff.path && isArray(diff.path)) {
|
|
|
|
|
diffPaths.push(diff.path.join("."));
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
return diffPaths;
|
|
|
|
|
}
|
feat: default table name populated in query editor for mock datasources (#25263)
## Description
This is a follow-up to
https://github.com/appsmithorg/appsmith/issues/23960.
In above issue, we picked the first available entity (table/collection,
etc) and show the user a read query by default. With a [[real
datasource](https://www.notion.so/7b5b3f6302cc4a8e93f8ecd1a3965cad?pvs=21)](https://www.notion.so/7b5b3f6302cc4a8e93f8ecd1a3965cad?pvs=21),
it is not possible to know which is the most meaningful entity to
choose. However, with mock datasources, we do have the option because we
own the underlying databases.
This PR adds that functionality, In case of Users mock DB, we will
populate the query editor with `select * from public.users limit 10`, as
Users mock DB contains users table.
#### PR fixes following issue(s)
Fixes #25247
> if no issue exists, please create an issue and ask the maintainers
about this first
>
>
#### Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video
>
>
#### Type of change
- New feature (non-breaking change which adds functionality)
>
>
>
## Testing
>
#### How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Also
list any relevant details for your test configuration.
> Delete anything that is not relevant
- [x] Manual
- [ ] Jest
- [x] Cypress
>
>
#### Test Plan
> Add Testsmith test cases links that relate to this PR
>
>
#### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
>
>
>
## Checklist:
#### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
#### QA activity:
- [x] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [x] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [x] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
---------
Co-authored-by: “sneha122” <“sneha@appsmith.com”>
2023-07-17 06:26:39 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Returns mock datasource default table name to be populated in query editor, based on plugin name
|
|
|
|
|
* @param pluginId string
|
|
|
|
|
* @returns string
|
|
|
|
|
*/
|
|
|
|
|
export function getSQLPluginsMockTableName(pluginId: string) {
|
|
|
|
|
const state: AppState = store.getState();
|
|
|
|
|
const plugin: Plugin | undefined = getPlugin(state, pluginId);
|
|
|
|
|
|
|
|
|
|
switch (plugin?.name) {
|
|
|
|
|
case PluginName.POSTGRES: {
|
|
|
|
|
return "public.users";
|
|
|
|
|
}
|
|
|
|
|
default: {
|
|
|
|
|
return "";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|