## Description ### Fixes - [x] https://github.com/appsmithorg/appsmith/issues/19383 - [x] https://github.com/appsmithorg/appsmith/issues/19384 - [x] https://github.com/appsmithorg/appsmith/issues/19385 - [x] https://github.com/appsmithorg/appsmith/issues/19386 - [x] https://github.com/appsmithorg/appsmith/issues/19387 - [x] https://github.com/appsmithorg/appsmith/issues/19388 - [x] https://github.com/appsmithorg/appsmith/issues/19389 - [x] https://github.com/appsmithorg/appsmith/issues/19390 - [x] https://github.com/appsmithorg/appsmith/issues/19391 - [x] https://github.com/appsmithorg/appsmith/issues/19392 - [x] https://github.com/appsmithorg/appsmith/issues/19393 - [x] https://github.com/appsmithorg/appsmith/issues/19394 - [x] https://github.com/appsmithorg/appsmith/issues/19395 - [x] https://github.com/appsmithorg/appsmith/issues/19396 - [x] https://github.com/appsmithorg/appsmith/issues/19397 - [x] https://github.com/appsmithorg/appsmith/issues/19398 - [x] https://github.com/appsmithorg/appsmith/issues/19399 - [x] https://github.com/appsmithorg/appsmith/issues/19400 - [x] https://github.com/appsmithorg/appsmith/issues/19401 - [x] https://github.com/appsmithorg/appsmith/issues/19402 - [x] https://github.com/appsmithorg/appsmith/issues/19403 - [x] https://github.com/appsmithorg/appsmith/issues/19404 - [x] https://github.com/appsmithorg/appsmith/issues/19405 - [x] https://github.com/appsmithorg/appsmith/issues/19406 - [x] https://github.com/appsmithorg/appsmith/issues/19407 - [x] https://github.com/appsmithorg/appsmith/issues/19408 - [x] https://github.com/appsmithorg/appsmith/issues/19409 Fixes # (issue) > 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 > Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) - Breaking change (fix or feature that would cause existing functionality to not work as expected) - Chore (housekeeping or task changes that don't impact user perception) - This change requires a documentation update ## How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Provide instructions, so we can reproduce. > Please also list any relevant details for your test configuration. > Delete anything that is not important - Manual - Jest - 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 - [ ] 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 - [ ] 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: Ankita Kinger <ankita@appsmith.com> Co-authored-by: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvi@appsmith.com> Co-authored-by: Arsalan <arsalanyaldram0211@outlook.com> Co-authored-by: Aman Agarwal <aman@appsmith.com> Co-authored-by: Rohit Agarwal <rohit_agarwal@live.in> Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com> Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvibhakta@gmail.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local> Co-authored-by: Vijetha-Kaja <vijetha@appsmith.com> Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com> Co-authored-by: Apple <nandan@thinkify.io> Co-authored-by: Saroj <43822041+sarojsarab@users.noreply.github.com> Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com> Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com> Co-authored-by: rahulramesha <rahul@appsmith.com> Co-authored-by: Aswath K <aswath.sana@gmail.com> Co-authored-by: Preet Sidhu <preetsidhu.bits@gmail.com> Co-authored-by: Vijetha-Kaja <119562824+Vijetha-Kaja@users.noreply.github.com> Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
390 lines
11 KiB
TypeScript
390 lines
11 KiB
TypeScript
import React, { useState, useEffect } from "react";
|
|
import styled from "styled-components";
|
|
import { useDispatch, useSelector } from "react-redux";
|
|
import {
|
|
getEntities,
|
|
getPluginNameFromId,
|
|
getPluginTypeFromDatasourceId,
|
|
getPluginPackageFromDatasourceId,
|
|
} from "selectors/entitiesSelector";
|
|
import {
|
|
testDatasource,
|
|
deleteDatasource,
|
|
updateDatasource,
|
|
redirectAuthorizationCode,
|
|
getOAuthAccessToken,
|
|
setDatasourceViewMode,
|
|
createDatasourceFromForm,
|
|
toggleSaveActionFlag,
|
|
} from "actions/datasourceActions";
|
|
import AnalyticsUtil from "utils/AnalyticsUtil";
|
|
import { getCurrentApplicationId } from "selectors/editorSelectors";
|
|
import { useParams, useLocation } from "react-router";
|
|
import type { ExplorerURLParams } from "@appsmith/pages/Editor/Explorer/helpers";
|
|
import type { AppState } from "@appsmith/reducers";
|
|
import type { Datasource } from "entities/Datasource";
|
|
import { AuthType, AuthenticationStatus } from "entities/Datasource";
|
|
import {
|
|
CONFIRM_CONTEXT_DELETING,
|
|
OAUTH_AUTHORIZATION_APPSMITH_ERROR,
|
|
OAUTH_AUTHORIZATION_FAILED,
|
|
} from "@appsmith/constants/messages";
|
|
import { Button, toast } from "design-system";
|
|
import {
|
|
CONTEXT_DELETE,
|
|
CONFIRM_CONTEXT_DELETE,
|
|
createMessage,
|
|
} from "@appsmith/constants/messages";
|
|
import { debounce } from "lodash";
|
|
import type { ApiDatasourceForm } from "entities/Datasource/RestAPIForm";
|
|
import { TEMP_DATASOURCE_ID } from "constants/Datasource";
|
|
|
|
import {
|
|
hasDeleteDatasourcePermission,
|
|
hasManageDatasourcePermission,
|
|
} from "@appsmith/utils/permissionHelpers";
|
|
import { SHOW_FILE_PICKER_KEY } from "constants/routes";
|
|
|
|
interface Props {
|
|
datasource: Datasource;
|
|
formData: Datasource | ApiDatasourceForm;
|
|
getSanitizedFormData: () => Datasource;
|
|
isInvalid: boolean;
|
|
pageId?: string;
|
|
shouldRender?: boolean;
|
|
isInsideReconnectModal?: boolean;
|
|
datasourceButtonConfiguration: string[] | undefined;
|
|
shouldDisplayAuthMessage?: boolean;
|
|
triggerSave?: boolean;
|
|
isFormDirty?: boolean;
|
|
datasourceDeleteTrigger: () => void;
|
|
scopeValue?: string;
|
|
}
|
|
|
|
export type DatasourceFormButtonTypes = Record<string, string[]>;
|
|
|
|
export enum AuthorizationStatus {
|
|
SUCCESS = "success",
|
|
APPSMITH_ERROR = "appsmith_error",
|
|
}
|
|
|
|
export enum DatasourceButtonTypeEnum {
|
|
DELETE = "DELETE",
|
|
SAVE = "SAVE",
|
|
TEST = "TEST",
|
|
SAVE_AND_AUTHORIZE = "SAVE_AND_AUTHORIZE",
|
|
}
|
|
|
|
export const DatasourceButtonType: Record<
|
|
keyof typeof DatasourceButtonTypeEnum,
|
|
string
|
|
> = {
|
|
DELETE: "DELETE",
|
|
SAVE: "SAVE",
|
|
TEST: "TEST",
|
|
SAVE_AND_AUTHORIZE: "SAVE_AND_AUTHORIZE",
|
|
};
|
|
|
|
const SaveButtonContainer = styled.div`
|
|
margin-top: 24px;
|
|
display: flex;
|
|
justify-content: flex-end;
|
|
gap: 9px;
|
|
`;
|
|
|
|
const StyledAuthMessage = styled.div`
|
|
color: var(--ads-v2-color-fg-error);
|
|
margin-top: 15px;
|
|
&:after {
|
|
content: " *";
|
|
color: inherit;
|
|
}
|
|
`;
|
|
|
|
function DatasourceAuth({
|
|
datasource,
|
|
datasourceButtonConfiguration = ["DELETE", "SAVE"],
|
|
datasourceDeleteTrigger,
|
|
formData,
|
|
getSanitizedFormData,
|
|
isInvalid,
|
|
pageId: pageIdProp,
|
|
shouldRender,
|
|
shouldDisplayAuthMessage = true,
|
|
triggerSave,
|
|
isFormDirty,
|
|
scopeValue,
|
|
isInsideReconnectModal,
|
|
}: Props) {
|
|
const authType =
|
|
formData && "authType" in formData
|
|
? formData?.authType
|
|
: formData?.datasourceConfiguration?.authentication?.authenticationType;
|
|
|
|
const { id: datasourceId, isDeleting, pluginId } = datasource;
|
|
const applicationId = useSelector(getCurrentApplicationId);
|
|
const pluginName = useSelector((state: AppState) =>
|
|
getPluginNameFromId(state, pluginId),
|
|
);
|
|
const pluginPackageName = useSelector((state: AppState) =>
|
|
getPluginPackageFromDatasourceId(state, datasource?.id || ""),
|
|
);
|
|
|
|
const datasourcePermissions = datasource.userPermissions || [];
|
|
|
|
const canManageDatasource = hasManageDatasourcePermission(
|
|
datasourcePermissions,
|
|
);
|
|
|
|
const canDeleteDatasource = hasDeleteDatasourcePermission(
|
|
datasourcePermissions,
|
|
);
|
|
|
|
// hooks
|
|
const dispatch = useDispatch();
|
|
const location = useLocation();
|
|
const { pageId: pageIdQuery } = useParams<ExplorerURLParams>();
|
|
|
|
const pageId = (pageIdQuery || pageIdProp) as string;
|
|
const [confirmDelete, setConfirmDelete] = useState(false);
|
|
|
|
const dsName = datasource?.name;
|
|
const orgId = datasource?.workspaceId;
|
|
|
|
useEffect(() => {
|
|
if (confirmDelete) {
|
|
delayConfirmDeleteToFalse();
|
|
}
|
|
}, [confirmDelete]);
|
|
|
|
useEffect(() => {
|
|
if (authType === AuthType.OAUTH2) {
|
|
// When the authorization server redirects a user to the datasource form page, the url contains the "response_status" query parameter .
|
|
// Get the access token if response_status is successful else show a toast error
|
|
|
|
const search = new URLSearchParams(location.search);
|
|
const status = search.get("response_status");
|
|
const queryIsImport = search.get("importForGit");
|
|
const queryDatasourceId = search.get("datasourceId");
|
|
const showFilePicker = search.get(SHOW_FILE_PICKER_KEY);
|
|
const shouldNotify =
|
|
!queryIsImport ||
|
|
(queryIsImport &&
|
|
queryDatasourceId === datasourceId &&
|
|
!showFilePicker);
|
|
if (status && shouldNotify) {
|
|
const display_message = search.get("display_message");
|
|
const oauthReason = status;
|
|
AnalyticsUtil.logEvent("DATASOURCE_AUTHORIZE_RESULT", {
|
|
dsName,
|
|
oauthReason,
|
|
orgId,
|
|
pluginName,
|
|
});
|
|
if (status !== AuthorizationStatus.SUCCESS) {
|
|
const message =
|
|
status === AuthorizationStatus.APPSMITH_ERROR
|
|
? OAUTH_AUTHORIZATION_APPSMITH_ERROR
|
|
: OAUTH_AUTHORIZATION_FAILED;
|
|
toast.show(display_message || message, { kind: "error" });
|
|
} else {
|
|
dispatch(getOAuthAccessToken(datasourceId));
|
|
}
|
|
AnalyticsUtil.logEvent("DATASOURCE_AUTH_COMPLETE", {
|
|
applicationId,
|
|
datasourceId,
|
|
pageId,
|
|
});
|
|
}
|
|
}
|
|
}, [authType]);
|
|
|
|
// selectors
|
|
const {
|
|
datasources: { isTesting, loading: isSaving },
|
|
} = useSelector(getEntities);
|
|
|
|
const delayConfirmDeleteToFalse = debounce(
|
|
() => setConfirmDelete(false),
|
|
2200,
|
|
);
|
|
|
|
const pluginType = useSelector((state: AppState) =>
|
|
getPluginTypeFromDatasourceId(state, datasourceId),
|
|
);
|
|
|
|
useEffect(() => {
|
|
if (triggerSave) {
|
|
if (pluginType === "SAAS") {
|
|
handleOauthDatasourceSave();
|
|
} else {
|
|
handleDefaultAuthDatasourceSave();
|
|
}
|
|
}
|
|
}, [triggerSave]);
|
|
|
|
const isAuthorized =
|
|
datasource?.datasourceConfiguration?.authentication
|
|
?.authenticationStatus === AuthenticationStatus.SUCCESS;
|
|
|
|
// Button Operations for respective buttons.
|
|
|
|
// Handles datasource deletion
|
|
const handleDatasourceDelete = () => {
|
|
dispatch(deleteDatasource({ id: datasourceId }));
|
|
datasourceDeleteTrigger();
|
|
};
|
|
|
|
// Handles datasource testing
|
|
const handleDatasourceTest = () => {
|
|
AnalyticsUtil.logEvent("TEST_DATA_SOURCE_CLICK", {
|
|
pageId: pageId,
|
|
appId: applicationId,
|
|
});
|
|
dispatch(testDatasource(getSanitizedFormData()));
|
|
};
|
|
|
|
// Handles default auth datasource saving
|
|
const handleDefaultAuthDatasourceSave = () => {
|
|
dispatch(toggleSaveActionFlag(true));
|
|
AnalyticsUtil.logEvent("SAVE_DATA_SOURCE_CLICK", {
|
|
pageId: pageId,
|
|
appId: applicationId,
|
|
pluginName: pluginName || "",
|
|
pluginPackageName: pluginPackageName || "",
|
|
});
|
|
// After saving datasource, only redirect to the 'new integrations' page
|
|
// if datasource is not used to generate a page
|
|
if (datasource.id === TEMP_DATASOURCE_ID) {
|
|
dispatch(createDatasourceFromForm(getSanitizedFormData()));
|
|
} else {
|
|
// If the datasource is being saved from the reconnect modal, we don't want to redirect to the active datasource list
|
|
if (!isInsideReconnectModal) dispatch(setDatasourceViewMode(true));
|
|
dispatch(
|
|
updateDatasource(
|
|
getSanitizedFormData(),
|
|
undefined,
|
|
undefined,
|
|
isInsideReconnectModal,
|
|
),
|
|
);
|
|
}
|
|
};
|
|
|
|
// Handles Oauth datasource saving
|
|
const handleOauthDatasourceSave = () => {
|
|
dispatch(toggleSaveActionFlag(true));
|
|
if (datasource.id === TEMP_DATASOURCE_ID) {
|
|
dispatch(
|
|
createDatasourceFromForm(
|
|
getSanitizedFormData(),
|
|
pluginType
|
|
? redirectAuthorizationCode(pageId, datasourceId, pluginType)
|
|
: undefined,
|
|
),
|
|
);
|
|
} else {
|
|
dispatch(setDatasourceViewMode(true));
|
|
dispatch(
|
|
updateDatasource(
|
|
getSanitizedFormData(),
|
|
pluginType
|
|
? redirectAuthorizationCode(pageId, datasourceId, pluginType)
|
|
: undefined,
|
|
),
|
|
);
|
|
}
|
|
AnalyticsUtil.logEvent("DATASOURCE_AUTHORIZE_CLICK", {
|
|
dsName,
|
|
orgId,
|
|
pluginName,
|
|
scopeValue,
|
|
});
|
|
};
|
|
|
|
const createMode = datasourceId === TEMP_DATASOURCE_ID;
|
|
|
|
const datasourceButtonsComponentMap = (buttonType: string): JSX.Element => {
|
|
return {
|
|
[DatasourceButtonType.DELETE]: (
|
|
<Button
|
|
className="t--delete-datasource"
|
|
isDisabled={createMode || !canDeleteDatasource}
|
|
isLoading={isDeleting}
|
|
key={buttonType}
|
|
kind="error"
|
|
onClick={() => {
|
|
if (!isDeleting) {
|
|
confirmDelete ? handleDatasourceDelete() : setConfirmDelete(true);
|
|
}
|
|
}}
|
|
size="md"
|
|
>
|
|
{isDeleting
|
|
? createMessage(CONFIRM_CONTEXT_DELETING)
|
|
: confirmDelete
|
|
? createMessage(CONFIRM_CONTEXT_DELETE)
|
|
: createMessage(CONTEXT_DELETE)}
|
|
</Button>
|
|
),
|
|
[DatasourceButtonType.TEST]: (
|
|
<Button
|
|
className="t--test-datasource"
|
|
isLoading={isTesting}
|
|
key={buttonType}
|
|
kind="secondary"
|
|
onClick={handleDatasourceTest}
|
|
size="md"
|
|
>
|
|
Test
|
|
</Button>
|
|
),
|
|
[DatasourceButtonType.SAVE]: (
|
|
<Button
|
|
className="t--save-datasource"
|
|
isDisabled={
|
|
isInvalid || !isFormDirty || (!createMode && !canManageDatasource)
|
|
}
|
|
isLoading={isSaving}
|
|
key={buttonType}
|
|
onClick={handleDefaultAuthDatasourceSave}
|
|
size="md"
|
|
>
|
|
Save
|
|
</Button>
|
|
),
|
|
[DatasourceButtonType.SAVE_AND_AUTHORIZE]: (
|
|
<Button
|
|
className="t--save-datasource"
|
|
isDisabled={isInvalid || (!createMode && !canManageDatasource)}
|
|
isLoading={isSaving}
|
|
key={buttonType}
|
|
onClick={handleOauthDatasourceSave}
|
|
size="md"
|
|
>
|
|
Save and Authorize
|
|
</Button>
|
|
),
|
|
}[buttonType];
|
|
};
|
|
|
|
return (
|
|
<>
|
|
{authType === AuthType.OAUTH2 &&
|
|
!isAuthorized &&
|
|
shouldDisplayAuthMessage && (
|
|
<StyledAuthMessage>Datasource not authorized</StyledAuthMessage>
|
|
)}
|
|
{shouldRender && (
|
|
<SaveButtonContainer>
|
|
{datasourceButtonConfiguration?.map((btnConfig) =>
|
|
datasourceButtonsComponentMap(btnConfig),
|
|
)}
|
|
</SaveButtonContainer>
|
|
)}
|
|
</>
|
|
);
|
|
}
|
|
|
|
export default DatasourceAuth;
|