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

fix: datasource title not editable and ctas disabled on create (#18645)

Browse Source 
fix: datasource title not editable on create flow, delete save ctas disabled on rest/graphql form
This commit is contained in:
Sangeeth Sivan 2022-12-04 20:49:01 +05:30 committed by GitHub
parent b7d00d2498
commit 6c498bcbf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx
View File

@ -123,6 +123,8 @@ class DatasourceDBEditor extends JSONtoForm<Props> {
viewMode,
} = this.props;
const createFlow = datasourceId === TEMP_DATASOURCE_ID;
return (
<form
onSubmit={(e) => {
@ -134,7 +136,7 @@ class DatasourceDBEditor extends JSONtoForm<Props> {
<FormTitleContainer>
<PluginImage alt="Datasource" src={this.props.pluginImage} />
<FormTitle
disabled={!canManageDatasource}
disabled={!createFlow && !canManageDatasource}
focusOnMount={this.props.isNewDatasource}
/>
</FormTitleContainer>

39
app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx
View File

@ -55,6 +55,10 @@ import CloseEditor from "components/editorComponents/CloseEditor";
import { updateReplayEntity } from "actions/pageActions";
import { ENTITY_TYPE } from "entities/AppsmithConsole";
import { TEMP_DATASOURCE_ID } from "constants/Datasource";
import {
hasDeleteDatasourcePermission,
hasManageDatasourcePermission,
} from "@appsmith/utils/permissionHelpers";
interface DatasourceRestApiEditorProps {
initializeReplayEntity: (id: string, data: any) => void;
@ -286,9 +290,17 @@ class DatasourceRestAPIEditor extends React.Component<
};
disableSave = (): boolean => {
const { formData } = this.props;
const { datasource, datasourceId, formData } = this.props;
const createMode = datasourceId === TEMP_DATASOURCE_ID;
const canManageDatasource = hasManageDatasourcePermission(
datasource?.userPermissions || [],
);
if (!formData) return true;
return !formData.url || !this.props.isFormDirty;
return (
!formData.url ||
!this.props.isFormDirty ||
(!createMode && !canManageDatasource)
);
};
save = (onSuccess?: ReduxAction<unknown>) => {
@ -401,12 +413,25 @@ class DatasourceRestAPIEditor extends React.Component<
};
renderHeader = () => {
const { hiddenHeader, isNewDatasource, pluginImage } = this.props;
const {
datasource,
datasourceId,
hiddenHeader,
isNewDatasource,
pluginImage,
} = this.props;
const createMode = datasourceId === TEMP_DATASOURCE_ID;
const canManageDatasource = hasManageDatasourcePermission(
datasource?.userPermissions || [],
);
return !hiddenHeader ? (
<Header>
<FormTitleContainer>
<PluginImage alt="Datasource" src={pluginImage} />
<FormTitle focusOnMount={isNewDatasource} />
<FormTitle
disabled={!createMode && !canManageDatasource}
focusOnMount={isNewDatasource}
/>
</FormTitleContainer>
</Header>
) : null;
@ -414,6 +439,10 @@ class DatasourceRestAPIEditor extends React.Component<
renderSave = () => {
const { datasourceId, hiddenHeader, isDeleting, isSaving } = this.props;
const createMode = datasourceId === TEMP_DATASOURCE_ID;
const canDeleteDatasource = hasDeleteDatasourcePermission(
this.props.datasource?.userPermissions || [],
);
return (
<SaveButtonContainer>
@ -421,7 +450,7 @@ class DatasourceRestAPIEditor extends React.Component<
<ActionButton
category={Category.primary}
className="t--delete-datasource"
disabled={datasourceId === TEMP_DATASOURCE_ID}
disabled={createMode || !canDeleteDatasource}
isLoading={isDeleting}
onClick={() => {
this.state.confirmDelete

5
app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx
View File

@ -254,6 +254,9 @@ class DatasourceSaaSEditor extends JSONtoForm<Props, State> {
const params: string = location.search;
const viewMode =
!hiddenHeader && new URLSearchParams(params).get("viewMode");
const createFlow = datasourceId === TEMP_DATASOURCE_ID;
return (
<>
<form
@ -266,7 +269,7 @@ class DatasourceSaaSEditor extends JSONtoForm<Props, State> {
<FormTitleContainer>
<PluginImage alt="Datasource" src={this.props.pluginImage} />
<FormTitle
disabled={!canManageDatasource}
disabled={!createFlow && !canManageDatasource}
focusOnMount={this.props.isNewDatasource}
/>
</FormTitleContainer>