## Description Added ESLint rule to force blank lines between statements. Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="@tag.All" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!CAUTION] > 🔴 🔴 🔴 Some tests have failed. > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/10924926728> > Commit: 34f57714a1575ee04e94e03cbcaf95e57a96c86c > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10924926728&attempt=1&selectiontype=test&testsstatus=failed&specsstatus=fail" target="_blank">Cypress dashboard</a>. > Tags: @tag.All > Spec: > The following are new failures, please fix them before merging the PR: <ol> > <li>cypress/e2e/Regression/ClientSide/Anvil/AnvilModal_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCheckboxGroupWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCurrencyInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilIconButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInlineButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilParagraphWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilPhoneInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilStatsWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchGroupWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilTableWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilToolbarButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilZoneSectionWidgetSnapshot_spec.ts</ol> > <a href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master" target="_blank">List of identified flaky tests</a>. > <hr>Wed, 18 Sep 2024 16:33:36 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No --------- Co-authored-by: Valera Melnikov <valera@appsmith.com>
277 lines
7.4 KiB
TypeScript
277 lines
7.4 KiB
TypeScript
import React from "react";
|
|
|
|
import {
|
|
deleteWorkspaceLogo,
|
|
saveWorkspace,
|
|
uploadWorkspaceLogo,
|
|
} from "ee/actions/workspaceActions";
|
|
import type { SaveWorkspaceRequest } from "ee/api/WorkspaceApi";
|
|
import { debounce } from "lodash";
|
|
import { Input } from "@appsmith/ads";
|
|
import { useSelector, useDispatch } from "react-redux";
|
|
import {
|
|
getCurrentError,
|
|
getFetchedWorkspaces,
|
|
} from "ee/selectors/workspaceSelectors";
|
|
import { useParams } from "react-router-dom";
|
|
import styled from "styled-components";
|
|
import type { SetProgress, UploadCallback } from "@appsmith/ads-old";
|
|
import { FilePickerV2, FileType, Text, TextType } from "@appsmith/ads-old";
|
|
import { Classes } from "@blueprintjs/core";
|
|
import { useMediaQuery } from "react-responsive";
|
|
import {
|
|
getIsFetchingApplications,
|
|
selectedWorkspaceLoadingStates,
|
|
} from "ee/selectors/selectedWorkspaceSelectors";
|
|
import type { AxiosProgressEvent } from "axios";
|
|
|
|
// This wrapper ensures that the scroll behaviour is consistent with the other tabs
|
|
const ScrollWrapper = styled.div`
|
|
overflow: auto;
|
|
height: 100%;
|
|
width: 100%;
|
|
`;
|
|
|
|
// trigger tests
|
|
const GeneralWrapper = styled.div<{
|
|
isMobile?: boolean;
|
|
isPortrait?: boolean;
|
|
}>`
|
|
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;
|
|
}
|
|
}
|
|
`;
|
|
|
|
const InputLabelWrapper = styled.div`
|
|
display: flex;
|
|
align-items: center;
|
|
margin-bottom: 4px;
|
|
span {
|
|
color: var(--ads-v2-color-fg);
|
|
}
|
|
`;
|
|
|
|
const SettingWrapper = styled.div`
|
|
width: 100%;
|
|
display: flex;
|
|
margin-bottom: 15px;
|
|
`;
|
|
|
|
const Loader = styled.div`
|
|
height: 38px;
|
|
width: 320px;
|
|
border-radius: var(--ads-v2-border-radius);
|
|
`;
|
|
|
|
const FilePickerLoader = styled.div`
|
|
height: 190px;
|
|
width: 333px;
|
|
border-radius: var(--ads-v2-border-radius);
|
|
`;
|
|
|
|
// testing
|
|
export const Row = styled.div`
|
|
width: 100%;
|
|
`;
|
|
|
|
export function GeneralSettings() {
|
|
const { workspaceId } = useParams<{ workspaceId: string }>();
|
|
const dispatch = useDispatch();
|
|
const currentWorkspace = useSelector(getFetchedWorkspaces).filter(
|
|
(el) => el.id === workspaceId,
|
|
)[0];
|
|
|
|
function saveChanges(settings: SaveWorkspaceRequest) {
|
|
dispatch(saveWorkspace(settings));
|
|
}
|
|
|
|
const timeout = 1000;
|
|
|
|
const onWorkspaceNameChange = debounce((newName: string) => {
|
|
saveChanges({
|
|
id: workspaceId as string,
|
|
name: newName,
|
|
});
|
|
}, timeout);
|
|
|
|
const onWebsiteChange = debounce((newWebsite: string) => {
|
|
saveChanges({
|
|
id: workspaceId as string,
|
|
website: newWebsite,
|
|
});
|
|
}, timeout);
|
|
|
|
const onEmailChange = debounce((newEmail: string) => {
|
|
saveChanges({
|
|
id: workspaceId as string,
|
|
email: newEmail,
|
|
});
|
|
}, timeout);
|
|
|
|
const { isFetchingCurrentWorkspace } = useSelector(
|
|
selectedWorkspaceLoadingStates,
|
|
);
|
|
const logoUploadError = useSelector(getCurrentError);
|
|
|
|
const FileUploader = (
|
|
file: File,
|
|
setProgress: SetProgress,
|
|
onUpload: UploadCallback,
|
|
) => {
|
|
const progress = (progressEvent: AxiosProgressEvent) => {
|
|
if (progressEvent.total) {
|
|
const uploadPercentage = Math.round(
|
|
(progressEvent.loaded / progressEvent.total) * 100,
|
|
);
|
|
|
|
if (uploadPercentage === 100) {
|
|
onUpload(currentWorkspace.logoUrl || "");
|
|
}
|
|
|
|
setProgress(uploadPercentage);
|
|
}
|
|
};
|
|
|
|
dispatch(
|
|
uploadWorkspaceLogo({
|
|
id: workspaceId as string,
|
|
logo: file,
|
|
progress: progress,
|
|
}),
|
|
);
|
|
};
|
|
|
|
const DeleteLogo = () => {
|
|
dispatch(deleteWorkspaceLogo(workspaceId));
|
|
};
|
|
const isFetchingApplications = useSelector(getIsFetchingApplications);
|
|
|
|
const isMobile: boolean = useMediaQuery({ maxWidth: 767 });
|
|
const isPortrait: boolean = useMediaQuery({
|
|
query: "(orientation: portrait)",
|
|
});
|
|
|
|
return (
|
|
<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>
|
|
{isFetchingCurrentWorkspace && (
|
|
<FilePickerLoader className={Classes.SKELETON} />
|
|
)}
|
|
{!isFetchingCurrentWorkspace && (
|
|
<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>
|
|
);
|
|
}
|