diff --git a/.version b/.version index 555bd6c928..57c32dea2e 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.50.2 +2.50.3 diff --git a/frontend/.version b/frontend/.version index 555bd6c928..57c32dea2e 100644 --- a/frontend/.version +++ b/frontend/.version @@ -1 +1 @@ -2.50.2 +2.50.3 diff --git a/frontend/src/Editor/CodeEditor/CodeHinter.jsx b/frontend/src/Editor/CodeEditor/CodeHinter.jsx index b3a491a334..0629f52149 100644 --- a/frontend/src/Editor/CodeEditor/CodeHinter.jsx +++ b/frontend/src/Editor/CodeEditor/CodeHinter.jsx @@ -18,7 +18,7 @@ const CODE_EDITOR_TYPE = { extendedSingleLine: SingleLineCodeEditor, }; -const CodeHinter = ({ type = 'basic', initialValue, componentName, ...restProps }) => { +const CodeHinter = ({ type = 'basic', initialValue, componentName, disabled, ...restProps }) => { const { suggestions } = useResolveStore( (state) => ({ suggestions: state.suggestions, @@ -75,6 +75,7 @@ const CodeHinter = ({ type = 'basic', initialValue, componentName, ...restProps forceUpdate, }} componentName={componentName} + disabled={disabled} {...restProps} /> ); @@ -136,6 +137,7 @@ CodeHinter.DepericatedAlert = DepericatedAlertForWorkspaceVariable; CodeHinter.propTypes = { type: PropTypes.string.isRequired, + disabled: PropTypes.bool, }; export default CodeHinter; diff --git a/frontend/src/Editor/CodeEditor/SingleLineCodeEditor.jsx b/frontend/src/Editor/CodeEditor/SingleLineCodeEditor.jsx index b20bb63f9e..fad2684660 100644 --- a/frontend/src/Editor/CodeEditor/SingleLineCodeEditor.jsx +++ b/frontend/src/Editor/CodeEditor/SingleLineCodeEditor.jsx @@ -136,6 +136,7 @@ const EditorInput = ({ type, delayOnChange = true, // Added this prop to immediately update the onBlurUpdate callback paramLabel = '', + disabled = false, }) => { function autoCompleteExtensionConfig(context) { let word = context.matchBefore(/\w*/); @@ -224,6 +225,7 @@ const EditorInput = ({ focused: isFocused, 'focus-box-shadow-active': firstTimeFocus, 'widget-code-editor': componentId, + 'disabled-pointerevents': disabled, }); const currentEditorHeightRef = useRef(null); @@ -241,7 +243,7 @@ const EditorInput = ({ return (
{usePortalEditor && ( @@ -292,6 +294,7 @@ const EditorInput = ({ className={customClassNames} theme={theme} indentWithTab={true} + readOnly={disabled} /> diff --git a/frontend/src/Editor/CodeEditor/styles.scss b/frontend/src/Editor/CodeEditor/styles.scss index e63c817f2e..f224014f38 100644 --- a/frontend/src/Editor/CodeEditor/styles.scss +++ b/frontend/src/Editor/CodeEditor/styles.scss @@ -531,4 +531,11 @@ max-width: 100% !important; } } +} + +.disabled-cursor{ + cursor: not-allowed; +} +.disabled-pointerevents{ + pointer-events: none; } \ No newline at end of file diff --git a/frontend/src/TooljetDatabase/Forms/TableKeyRelations.jsx b/frontend/src/TooljetDatabase/Forms/TableKeyRelations.jsx index 9ec2422059..5d1db94e3c 100644 --- a/frontend/src/TooljetDatabase/Forms/TableKeyRelations.jsx +++ b/frontend/src/TooljetDatabase/Forms/TableKeyRelations.jsx @@ -265,7 +265,7 @@ function SourceKeyRelation({ onTableClick={false} />
-
+
diff --git a/frontend/src/_components/DynamicForm.jsx b/frontend/src/_components/DynamicForm.jsx index b8f6ef91f3..bb9dae0228 100644 --- a/frontend/src/_components/DynamicForm.jsx +++ b/frontend/src/_components/DynamicForm.jsx @@ -195,6 +195,7 @@ const DynamicForm = ({ encrypted, editorType = 'basic', placeholders = {}, + disabled = false, }) => { const source = schema?.source?.kind; const darkMode = localStorage.getItem('darkMode') === 'true'; @@ -340,6 +341,7 @@ const DynamicForm = ({ componentName: queryName ? `${queryName}::${key ?? ''}` : null, cyLabel: key ? `${String(key).toLocaleLowerCase().replace(/\s+/g, '-')}` : '', delayOnChange: false, + disabled, }; case 'react-component-openapi-validator': return { diff --git a/marketplace/plugins/salesforce/lib/index.ts b/marketplace/plugins/salesforce/lib/index.ts index 1c442321bf..d6e7a3b7d6 100644 --- a/marketplace/plugins/salesforce/lib/index.ts +++ b/marketplace/plugins/salesforce/lib/index.ts @@ -38,28 +38,27 @@ export default class Salesforce implements QueryService { } case 'crud': { const actiontype = queryOptions.actiontype; - const resource_name = queryOptions.resource_name; const resource_id = queryOptions.resource_id; const resource_body = queryOptions.resource_body; switch (actiontype) { case 'retrieve': - response = await conn.sobject(resource_name).retrieve(resource_id); + response = await conn.sobject('Account').retrieve(resource_id); result = response; break; case 'create': - response = await conn.sobject(resource_name).create(resource_body); + response = await conn.sobject('Account').create(resource_body); result = response; break; case 'update': - response = await conn.sobject(resource_name).update({ Id: resource_id, ...resource_body }); + response = await conn.sobject('Account').update({ Id: resource_id, ...resource_body }); result = response; break; case 'delete': - response = await conn.sobject(resource_name).destroy(resource_id); + response = await conn.sobject('Account').destroy(resource_id); result = response; break; diff --git a/marketplace/plugins/salesforce/lib/manifest.json b/marketplace/plugins/salesforce/lib/manifest.json index 48e9d63afc..9130a71004 100644 --- a/marketplace/plugins/salesforce/lib/manifest.json +++ b/marketplace/plugins/salesforce/lib/manifest.json @@ -13,11 +13,31 @@ "rawData": {} }, "options": { - "api_version":{ - "type":"string" + "client_id": { + "type": "string" }, - "redirect_url":{ - "type":"string" + "client_secret": { + "type": "string", + "encrypted": true + }, + "code": { + "type": "string", + "encrypted": true + }, + "redirect_url": { + "type": "string" + }, + "api_version": { + "type": "string" + }, + "provider": { + "type": "string" + }, + "oauth2": { + "type": "boolean" + }, + "plugin_id": { + "type": "string" } }, "customTesting": true, @@ -38,4 +58,4 @@ }, "required": [] -} \ No newline at end of file +} diff --git a/marketplace/plugins/salesforce/lib/operations.json b/marketplace/plugins/salesforce/lib/operations.json index b1c6858813..f975d8c02b 100644 --- a/marketplace/plugins/salesforce/lib/operations.json +++ b/marketplace/plugins/salesforce/lib/operations.json @@ -73,24 +73,19 @@ "resource_name": { "label": "Resource Name", "key": "resource_name", - "type": "dropdown", + "type": "codehinter", "lineNumbers": false, "height": "36px", "className": "codehinter-plugins", "placeholder": "Account", - "list": [ - { - "value": "Account", - "name": "Account" - } - ] + "disabled": true }, "resource_body": { "label": "Resource Body", "key": "resource_body", "type": "codehinter", "lineNumbers": true, - "placeholder": "{{ name : “ToolJet” }}", + "placeholder": "{{ {name: “ToolJet”} }}", "description": "Enter the resource body", "height": "100px" } @@ -103,13 +98,14 @@ "lineNumbers": false, "height": "36px", "className": "codehinter-plugins", - "placeholder": "Account" + "placeholder": "Account", + "disabled": true }, "resource_body": { "label": "Resource Body", "key": "resource_body", "type": "codehinter", - "placeholder": "{{ Id:”0012F3E4R56487900N” , name : “ToolJet” }}", + "placeholder": "{{ {Id:”0012F3E4R56487900N”, name: “ToolJet”} }}", "description": "Enter the resource body", "height": "100px" } @@ -122,7 +118,8 @@ "lineNumbers": false, "height": "36px", "className": "codehinter-plugins", - "placeholder": "Account" + "placeholder": "Account", + "disabled": true }, "resource_id": { "label": "Resource ID", @@ -143,7 +140,8 @@ "lineNumbers": false, "height": "36px", "className": "codehinter-plugins", - "placeholder": "Account" + "placeholder": "Account", + "disabled": true }, "resource_id": { "label": "Resource ID", diff --git a/server/.version b/server/.version index 555bd6c928..57c32dea2e 100644 --- a/server/.version +++ b/server/.version @@ -1 +1 @@ -2.50.2 +2.50.3