2020-08-28 18:51:16 +00:00
|
|
|
import React from "react";
|
|
|
|
|
|
2022-06-15 15:37:41 +00:00
|
|
|
import {
|
|
|
|
|
deleteWorkspaceLogo,
|
|
|
|
|
saveWorkspace,
|
|
|
|
|
uploadWorkspaceLogo,
|
2024-08-06 14:52:22 +00:00
|
|
|
} from "ee/actions/workspaceActions";
|
|
|
|
|
import type { SaveWorkspaceRequest } from "ee/api/WorkspaceApi";
|
2020-11-25 12:24:14 +00:00
|
|
|
import { debounce } from "lodash";
|
2023-05-19 18:37:06 +00:00
|
|
|
import { Input } from "design-system";
|
2020-08-28 18:51:16 +00:00
|
|
|
import { useSelector, useDispatch } from "react-redux";
|
2020-12-01 22:01:27 +00:00
|
|
|
import {
|
|
|
|
|
getCurrentError,
|
2024-01-25 13:41:48 +00:00
|
|
|
getFetchedWorkspaces,
|
2024-08-06 14:52:22 +00:00
|
|
|
} from "ee/selectors/workspaceSelectors";
|
2020-08-28 18:51:16 +00:00
|
|
|
import { useParams } from "react-router-dom";
|
|
|
|
|
import styled from "styled-components";
|
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 { SetProgress, UploadCallback } from "design-system-old";
|
|
|
|
|
import { FilePickerV2, FileType, Text, TextType } from "design-system-old";
|
2022-10-13 20:13:44 +00:00
|
|
|
import { Classes } from "@blueprintjs/core";
|
2021-10-04 15:34:37 +00:00
|
|
|
import { useMediaQuery } from "react-responsive";
|
2024-01-25 13:41:48 +00:00
|
|
|
import {
|
|
|
|
|
getIsFetchingApplications,
|
|
|
|
|
selectedWorkspaceLoadingStates,
|
2024-08-06 14:52:22 +00:00
|
|
|
} from "ee/selectors/selectedWorkspaceSelectors";
|
2023-11-23 12:42:28 +00:00
|
|
|
import type { AxiosProgressEvent } from "axios";
|
2020-11-25 12:24:14 +00:00
|
|
|
|
2023-11-07 06:34:47 +00:00
|
|
|
// This wrapper ensures that the scroll behaviour is consistent with the other tabs
|
|
|
|
|
const ScrollWrapper = styled.div`
|
|
|
|
|
overflow: auto;
|
|
|
|
|
height: 100%;
|
|
|
|
|
width: 100%;
|
|
|
|
|
`;
|
|
|
|
|
|
2021-06-16 18:36:34 +00:00
|
|
|
// trigger tests
|
2021-10-04 15:34:37 +00:00
|
|
|
const GeneralWrapper = styled.div<{
|
|
|
|
|
isMobile?: boolean;
|
|
|
|
|
isPortrait?: boolean;
|
|
|
|
|
}>`
|
2023-05-19 18:37:06 +00:00
|
|
|
width: 320px;
|
|
|
|
|
/* padding: 20px 0px; */
|
|
|
|
|
/* margin: 0 auto; */
|
|
|
|
|
.upload-form-container {
|
|
|
|
|
.button-wrapper {
|
|
|
|
|
svg {
|
|
|
|
|
width: 40px;
|
|
|
|
|
height: 40px;
|
|
|
|
|
path {
|
|
|
|
|
fill: var(--ads-v2-color-fg);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
.drag-drop-text {
|
|
|
|
|
color: var(--ads-v2-color-fg);
|
|
|
|
|
+ form a {
|
|
|
|
|
--button-padding: var(--ads-v2-spaces-3) var(--ads-v2-spaces-4);
|
|
|
|
|
background-color: var(--ads-v2-color-bg);
|
|
|
|
|
border: 1px solid var(--ads-v2-color-border);
|
|
|
|
|
width: 100%;
|
|
|
|
|
height: 100%;
|
|
|
|
|
padding: var(--button-padding);
|
|
|
|
|
border-radius: var(--ads-v2-border-radius);
|
|
|
|
|
text-transform: capitalize;
|
|
|
|
|
&:hover {
|
|
|
|
|
background-color: var(--ads-v2-color-bg-subtle);
|
|
|
|
|
color: var(--ads-v2-color-fg);
|
|
|
|
|
border-color: var(--ads-v2-color-border);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
.remove-button {
|
|
|
|
|
a {
|
|
|
|
|
border-radius: var(--ads-v2-border-radius);
|
|
|
|
|
text-transform: capitalize !important;
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-10-04 15:34:37 +00:00
|
|
|
`;
|
2021-06-16 18:36:34 +00:00
|
|
|
|
2020-08-28 18:51:16 +00:00
|
|
|
const InputLabelWrapper = styled.div`
|
|
|
|
|
display: flex;
|
|
|
|
|
align-items: center;
|
2023-05-19 18:37:06 +00:00
|
|
|
margin-bottom: 4px;
|
|
|
|
|
span {
|
|
|
|
|
color: var(--ads-v2-color-fg);
|
|
|
|
|
}
|
2020-08-28 18:51:16 +00:00
|
|
|
`;
|
|
|
|
|
|
|
|
|
|
const SettingWrapper = styled.div`
|
2021-10-04 15:34:37 +00:00
|
|
|
width: 100%;
|
2020-08-28 18:51:16 +00:00
|
|
|
display: flex;
|
2021-10-04 15:34:37 +00:00
|
|
|
margin-bottom: 15px;
|
2020-08-28 18:51:16 +00:00
|
|
|
`;
|
|
|
|
|
|
|
|
|
|
const Loader = styled.div`
|
|
|
|
|
height: 38px;
|
2020-12-01 22:01:27 +00:00
|
|
|
width: 320px;
|
2023-05-19 18:37:06 +00:00
|
|
|
border-radius: var(--ads-v2-border-radius);
|
2020-12-01 22:01:27 +00:00
|
|
|
`;
|
|
|
|
|
|
|
|
|
|
const FilePickerLoader = styled.div`
|
|
|
|
|
height: 190px;
|
|
|
|
|
width: 333px;
|
2023-05-19 18:37:06 +00:00
|
|
|
border-radius: var(--ads-v2-border-radius);
|
2020-08-28 18:51:16 +00:00
|
|
|
`;
|
|
|
|
|
|
2021-04-08 05:50:26 +00:00
|
|
|
// testing
|
|
|
|
|
export const Row = styled.div`
|
2021-10-04 15:34:37 +00:00
|
|
|
width: 100%;
|
2021-04-08 05:50:26 +00:00
|
|
|
`;
|
|
|
|
|
|
2020-08-28 18:51:16 +00:00
|
|
|
export function GeneralSettings() {
|
2022-06-15 15:37:41 +00:00
|
|
|
const { workspaceId } = useParams<{ workspaceId: string }>();
|
2020-08-28 18:51:16 +00:00
|
|
|
const dispatch = useDispatch();
|
2024-01-25 13:41:48 +00:00
|
|
|
const currentWorkspace = useSelector(getFetchedWorkspaces).filter(
|
2022-06-15 15:37:41 +00:00
|
|
|
(el) => el.id === workspaceId,
|
2020-11-25 12:24:14 +00:00
|
|
|
)[0];
|
2022-06-15 15:37:41 +00:00
|
|
|
function saveChanges(settings: SaveWorkspaceRequest) {
|
|
|
|
|
dispatch(saveWorkspace(settings));
|
2020-08-28 18:51:16 +00:00
|
|
|
}
|
|
|
|
|
|
2020-11-25 12:24:14 +00:00
|
|
|
const timeout = 1000;
|
2020-08-28 18:51:16 +00:00
|
|
|
|
2020-11-25 12:24:14 +00:00
|
|
|
const onWorkspaceNameChange = debounce((newName: string) => {
|
2020-08-28 18:51:16 +00:00
|
|
|
saveChanges({
|
2022-06-15 15:37:41 +00:00
|
|
|
id: workspaceId as string,
|
2020-08-28 18:51:16 +00:00
|
|
|
name: newName,
|
|
|
|
|
});
|
2020-11-25 12:24:14 +00:00
|
|
|
}, timeout);
|
2020-08-28 18:51:16 +00:00
|
|
|
|
2020-11-25 12:24:14 +00:00
|
|
|
const onWebsiteChange = debounce((newWebsite: string) => {
|
2020-08-28 18:51:16 +00:00
|
|
|
saveChanges({
|
2022-06-15 15:37:41 +00:00
|
|
|
id: workspaceId as string,
|
2020-08-28 18:51:16 +00:00
|
|
|
website: newWebsite,
|
|
|
|
|
});
|
2020-11-25 12:24:14 +00:00
|
|
|
}, timeout);
|
2020-08-28 18:51:16 +00:00
|
|
|
|
2020-11-25 12:24:14 +00:00
|
|
|
const onEmailChange = debounce((newEmail: string) => {
|
2020-08-28 18:51:16 +00:00
|
|
|
saveChanges({
|
2022-06-15 15:37:41 +00:00
|
|
|
id: workspaceId as string,
|
2020-08-28 18:51:16 +00:00
|
|
|
email: newEmail,
|
|
|
|
|
});
|
2020-11-25 12:24:14 +00:00
|
|
|
}, timeout);
|
2020-08-28 18:51:16 +00:00
|
|
|
|
2024-01-25 13:41:48 +00:00
|
|
|
const { isFetchingCurrentWorkspace } = useSelector(
|
|
|
|
|
selectedWorkspaceLoadingStates,
|
|
|
|
|
);
|
2020-12-01 22:01:27 +00:00
|
|
|
const logoUploadError = useSelector(getCurrentError);
|
|
|
|
|
|
|
|
|
|
const FileUploader = (
|
|
|
|
|
file: File,
|
|
|
|
|
setProgress: SetProgress,
|
|
|
|
|
onUpload: UploadCallback,
|
|
|
|
|
) => {
|
2023-11-23 12:42:28 +00:00
|
|
|
const progress = (progressEvent: AxiosProgressEvent) => {
|
|
|
|
|
if (progressEvent.total) {
|
|
|
|
|
const uploadPercentage = Math.round(
|
|
|
|
|
(progressEvent.loaded / progressEvent.total) * 100,
|
|
|
|
|
);
|
|
|
|
|
if (uploadPercentage === 100) {
|
|
|
|
|
onUpload(currentWorkspace.logoUrl || "");
|
|
|
|
|
}
|
|
|
|
|
setProgress(uploadPercentage);
|
2020-12-01 22:01:27 +00:00
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
dispatch(
|
2022-06-15 15:37:41 +00:00
|
|
|
uploadWorkspaceLogo({
|
|
|
|
|
id: workspaceId as string,
|
2020-12-01 22:01:27 +00:00
|
|
|
logo: file,
|
|
|
|
|
progress: progress,
|
|
|
|
|
}),
|
|
|
|
|
);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const DeleteLogo = () => {
|
2022-06-15 15:37:41 +00:00
|
|
|
dispatch(deleteWorkspaceLogo(workspaceId));
|
2020-12-01 22:01:27 +00:00
|
|
|
};
|
2020-11-25 12:24:14 +00:00
|
|
|
const isFetchingApplications = useSelector(getIsFetchingApplications);
|
2020-08-28 18:51:16 +00:00
|
|
|
|
2021-10-04 15:34:37 +00:00
|
|
|
const isMobile: boolean = useMediaQuery({ maxWidth: 767 });
|
|
|
|
|
const isPortrait: boolean = useMediaQuery({
|
|
|
|
|
query: "(orientation: portrait)",
|
|
|
|
|
});
|
|
|
|
|
|
2020-08-28 18:51:16 +00:00
|
|
|
return (
|
2023-11-07 06:34:47 +00:00
|
|
|
<ScrollWrapper>
|
|
|
|
|
<GeneralWrapper isMobile={isMobile} isPortrait={isPortrait}>
|
|
|
|
|
<SettingWrapper>
|
|
|
|
|
<Row>
|
|
|
|
|
{isFetchingApplications && <Loader className={Classes.SKELETON} />}
|
|
|
|
|
{!isFetchingApplications && (
|
|
|
|
|
<Input
|
|
|
|
|
data-testid="t--workspace-name-input"
|
|
|
|
|
defaultValue={currentWorkspace && currentWorkspace.name}
|
|
|
|
|
isRequired
|
|
|
|
|
label="Workspace name"
|
|
|
|
|
labelPosition="top"
|
|
|
|
|
onChange={onWorkspaceNameChange}
|
|
|
|
|
placeholder="Workspace name"
|
|
|
|
|
renderAs="input"
|
|
|
|
|
size="md"
|
|
|
|
|
type="text"
|
|
|
|
|
/>
|
|
|
|
|
)}
|
|
|
|
|
</Row>
|
|
|
|
|
</SettingWrapper>
|
|
|
|
|
|
|
|
|
|
<SettingWrapper>
|
|
|
|
|
<Row className="t--workspace-settings-filepicker">
|
|
|
|
|
<InputLabelWrapper>
|
|
|
|
|
<Text type={TextType.P1}>Upload logo</Text>
|
|
|
|
|
</InputLabelWrapper>
|
2024-01-25 13:41:48 +00:00
|
|
|
{isFetchingCurrentWorkspace && (
|
2023-11-07 06:34:47 +00:00
|
|
|
<FilePickerLoader className={Classes.SKELETON} />
|
|
|
|
|
)}
|
2024-01-25 13:41:48 +00:00
|
|
|
{!isFetchingCurrentWorkspace && (
|
2023-11-07 06:34:47 +00:00
|
|
|
<FilePickerV2
|
|
|
|
|
fileType={FileType.IMAGE}
|
|
|
|
|
fileUploader={FileUploader}
|
|
|
|
|
logoUploadError={logoUploadError.message}
|
|
|
|
|
onFileRemoved={DeleteLogo}
|
|
|
|
|
url={currentWorkspace && currentWorkspace.logoUrl}
|
|
|
|
|
/>
|
|
|
|
|
)}
|
|
|
|
|
</Row>
|
|
|
|
|
</SettingWrapper>
|
|
|
|
|
|
|
|
|
|
<SettingWrapper>
|
|
|
|
|
<Row>
|
|
|
|
|
{isFetchingApplications && <Loader className={Classes.SKELETON} />}
|
|
|
|
|
{!isFetchingApplications && (
|
|
|
|
|
<Input
|
|
|
|
|
data-testid="t--workspace-website-input"
|
|
|
|
|
defaultValue={
|
|
|
|
|
(currentWorkspace && currentWorkspace.website) || ""
|
|
|
|
|
}
|
|
|
|
|
label="Website"
|
|
|
|
|
labelPosition="top"
|
|
|
|
|
onChange={onWebsiteChange}
|
|
|
|
|
placeholder="Your website"
|
|
|
|
|
renderAs="input"
|
|
|
|
|
size="md"
|
|
|
|
|
type="text"
|
|
|
|
|
/>
|
|
|
|
|
)}
|
|
|
|
|
</Row>
|
|
|
|
|
</SettingWrapper>
|
|
|
|
|
|
|
|
|
|
<SettingWrapper>
|
|
|
|
|
<Row>
|
|
|
|
|
{isFetchingApplications && <Loader className={Classes.SKELETON} />}
|
|
|
|
|
{!isFetchingApplications && (
|
|
|
|
|
<Input
|
|
|
|
|
data-testid="t--workspace-email-input"
|
|
|
|
|
defaultValue={
|
|
|
|
|
(currentWorkspace && currentWorkspace.email) || ""
|
|
|
|
|
}
|
|
|
|
|
label="Email"
|
|
|
|
|
labelPosition="top"
|
|
|
|
|
onChange={onEmailChange}
|
|
|
|
|
placeholder="Email"
|
|
|
|
|
renderAs="input"
|
|
|
|
|
size="md"
|
|
|
|
|
type="text"
|
|
|
|
|
/>
|
|
|
|
|
)}
|
|
|
|
|
</Row>
|
|
|
|
|
</SettingWrapper>
|
|
|
|
|
</GeneralWrapper>
|
|
|
|
|
</ScrollWrapper>
|
2020-08-28 18:51:16 +00:00
|
|
|
);
|
|
|
|
|
}
|