Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: disable uppy informer and hide welcome tour cta for airgap (#22695)

Browse Source
This commit is contained in:
Sangeeth Sivan 2023-04-26 12:49:08 +05:30 committed by GitHub
parent ae05e93ec9
commit 9f7fc71d27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/package.json
View File

@ -80,7 +80,7 @@
"cypress-log-to-output": "^1.1.2", "cypress-log-to-output": "^1.1.2",
"dayjs": "^1.10.6", "dayjs": "^1.10.6",
"deep-diff": "^1.0.2", "deep-diff": "^1.0.2",
"design-system-old": "npm:@appsmithorg/design-system-old@1.1.4", "design-system-old": "npm:@appsmithorg/design-system-old@1.1.5",
"downloadjs": "^1.4.7", "downloadjs": "^1.4.7",
"exceljs": "^4.3.0", "exceljs": "^4.3.0",
"fast-deep-equal": "^3.1.3", "fast-deep-equal": "^3.1.3",

39
app/client/src/pages/Editor/FirstTimeUserOnboarding/Checklist.tsx
View File

@ -51,7 +51,7 @@ import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidg
import { triggerWelcomeTour } from "./Utils"; import { triggerWelcomeTour } from "./Utils";
import { builderURL, integrationEditorURL } from "RouteBuilder"; import { builderURL, integrationEditorURL } from "RouteBuilder";
import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants"; import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants";
import { getAssetUrl } from "@appsmith/utils/airgapHelpers"; import { getAssetUrl, isAirgapped } from "@appsmith/utils/airgapHelpers";
const Wrapper = styled.div` const Wrapper = styled.div`
padding: ${(props) => props.theme.spaces[7]}px 55px; padding: ${(props) => props.theme.spaces[7]}px 55px;
@ -217,6 +217,7 @@ function getSuggestedNextActionAndCompletedTasks(
} }
export default function OnboardingChecklist() { export default function OnboardingChecklist() {
const isAirgappedInstance = isAirgapped();
const dispatch = useDispatch(); const dispatch = useDispatch();
const datasources = useSelector(getDatasources); const datasources = useSelector(getDatasources);
const pageId = useSelector(getCurrentPageId); const pageId = useSelector(getCurrentPageId);
@ -557,23 +558,25 @@ export default function OnboardingChecklist() {
)} )}
</StyledListItem> </StyledListItem>
</StyledList> </StyledList>
<StyledFooter {!isAirgappedInstance && (
className="flex" <StyledFooter
onClick={() => triggerWelcomeTour(dispatch)} className="flex"
> onClick={() => triggerWelcomeTour(dispatch)}
<StyledImg >
alt="rocket" <StyledImg
src={getAssetUrl(`${ASSETS_CDN_URL}/Rocket.png`)} alt="rocket"
/> src={getAssetUrl(`${ASSETS_CDN_URL}/Rocket.png`)}
<Text style={{ lineHeight: "14px" }} type={TextType.P1}> />
{createMessage(ONBOARDING_CHECKLIST_FOOTER)} <Text style={{ lineHeight: "14px" }} type={TextType.P1}>
</Text> {createMessage(ONBOARDING_CHECKLIST_FOOTER)}
<Icon </Text>
color={theme.colors.applications.iconColor} <Icon
icon="chevron-right" color={theme.colors.applications.iconColor}
iconSize={16} icon="chevron-right"
/> iconSize={16}
</StyledFooter> />
</StyledFooter>
)}
</Wrapper> </Wrapper>
); );
} }

3
app/client/src/pages/UserProfile/UserProfileImagePicker.tsx
View File

@ -7,8 +7,10 @@ import { USER_PHOTO_ASSET_URL } from "constants/userConstants";
import { DisplayImageUpload } from "design-system-old"; import { DisplayImageUpload } from "design-system-old";
import type Uppy from "@uppy/core"; import type Uppy from "@uppy/core";
import { isAirgapped } from "@appsmith/utils/airgapHelpers";
function FormDisplayImage() { function FormDisplayImage() {
const isAirgappedInstance = isAirgapped();
const [file, setFile] = useState<any>(); const [file, setFile] = useState<any>();
const dispatch = useDispatch(); const dispatch = useDispatch();
const user = useSelector(getCurrentUser); const user = useSelector(getCurrentUser);
@ -53,6 +55,7 @@ function FormDisplayImage() {
return ( return (
<DisplayImageUpload <DisplayImageUpload
disableUppyInformer={isAirgappedInstance}
onChange={onSelectFile} onChange={onSelectFile}
onRemove={removeProfileImage} onRemove={removeProfileImage}
submit={upload} submit={upload}

8
app/client/yarn.lock
View File

@ -9969,10 +9969,10 @@ depd@~1.1.2:
version "1.1.2" version "1.1.2"
resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
"design-system-old@npm:@appsmithorg/design-system-old@1.1.4": "design-system-old@npm:@appsmithorg/design-system-old@1.1.5":
version "1.1.4" version "1.1.5"
resolved "https://registry.yarnpkg.com/@appsmithorg/design-system-old/-/design-system-old-1.1.4.tgz#f779945d28297d5c16a4af30929d9988ab033182" resolved "https://registry.yarnpkg.com/@appsmithorg/design-system-old/-/design-system-old-1.1.5.tgz#4911f997cedebf8c8bc20ddef9bb7e2e657d8be5"
integrity sha512-W4ZsbjbvfjBi4U4wNeTPr1JasnxGwwF3/vbzoANd+A2+0vbg1+FkQcr7hwvy1AS/iVgPah+TGIXwk3vTs7WowQ== integrity sha512-h2XOWYryvmkl5ZjRgQ56HDNaSH+uzR0s7V2ZRt4iZBspXyf0wdf4fCcgIByZesRwLHFLmBPR2hQjOUcEnILVSQ==
dependencies: dependencies:
emoji-mart "3.0.1" emoji-mart "3.0.1"