Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-04-21 13:37:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

required helper text

Browse source
This commit is contained in:
abhijeet760 2026-03-02 08:09:44 +00:00
parent bce929efcb
commit f87fda5831
1 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
frontend/src/modules/dataSources/components/DataSourceManager/DataSourceManager.jsx
View file

@ -38,9 +38,31 @@ import { canUpdateDataSource } from '@/_helpers';
import DataSourceSchemaManager from '@/_helpers/dataSourceSchemaManager';
import MultiEnvTabs from './MultiEnvTabs';
import { generateCypressDataCy } from '../../../common/helpers/cypressHelpers';
import { allManifests } from '@tooljet/plugins/client';
import posthogHelper from '@/modules/common/helpers/posthogHelper';
import SampleDataSourceBody from './SampleDataSourceBody';
const getManifestByKind = (kind) =>
Object.values(allManifests).find((m) => m['tj:source']?.kind === kind);
const hasEmptyRequiredFields = (schema, options) => {
if (!schema || !options) return false;
const required = schema.required || [];
const conditionalRequired = (schema.allOf || []).flatMap((condition) => {
if (!condition.if?.properties || !condition.then?.required) return [];
const matches = Object.entries(condition.if.properties).every(
([key, val]) => options?.[key]?.value === val.const
);
return matches ? condition.then.required : [];
});
return [...required, ...conditionalRequired].some((key) => {
const val = options?.[key]?.value;
return val === undefined || val === null || val === '';
});
};
class DataSourceManagerComponent extends React.Component {
constructor(props) {
super(props);
@ -962,6 +984,11 @@ class DataSourceManagerComponent extends React.Component {
!isEmpty(validationMessages)
: true;
this.props.setGlobalDataSourceStatus({ isEditing: !isSaveDisabled });
const hintKind = selectedDataSource?.kind;
const hintManifest = hintKind ? getManifestByKind(hintKind) : null;
const showSaveHint = !isSaving && !this.props.isVersionReleased &&
hintManifest != null &&
hasEmptyRequiredFields(hintManifest, options);
const docLink = isSampleDb
? 'https://docs.tooljet.com/docs/data-sources/sample-data-sources'
: selectedDataSource?.pluginId && selectedDataSource.pluginId.trim() !== ''
@ -1234,6 +1261,13 @@ class DataSourceManagerComponent extends React.Component {
>
{this.props.t('globals.save', 'Save')}
</ButtonSolid>
{showSaveHint && (
<div className="text-center mt-1">
<span className="text-muted" style={{ fontSize: '11px', fontStyle: 'italic' }}>
Fill all <span style={{ color: 'var(--tomato9)', fontStyle: 'normal' }}>*</span> required fields to save
</span>
</div>
)}
</div>
)}
</Modal.Footer>
@ -1278,6 +1312,13 @@ class DataSourceManagerComponent extends React.Component {
? this.props.t('editor.queryManager.dataSourceManager.saving' + '...', 'Saving...')
: this.props.t('globals.save', 'Save')}
</ButtonSolid>
{showSaveHint && (
<div className="text-center mt-1">
<span className="text-muted" style={{ fontSize: '11px', fontStyle: 'italic' }}>
Fill all <span style={{ color: 'var(--tomato9)', fontStyle: 'normal' }}>*</span> required fields to save
</span>
</div>
)}
</div>
</Modal.Footer>
)}