diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/addToCollection.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/addToCollection.json index 00c1dee01838..c8394db1e544 100644 --- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/addToCollection.json +++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/addToCollection.json @@ -1,32 +1,50 @@ { + "controlType": "SECTION_V2", "identifier": "ADD_TO_COLLECTION", - "controlType": "SECTION", "conditionals": { "show": "{{actionConfiguration.formData.command.data === 'ADD_TO_COLLECTION'}}" }, "children": [ { - "label": "Collection/Document path", - "configProperty": "actionConfiguration.formData.path.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "isRequired": true, - "initialValue": "" + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "ADD-TO-COLLECTION-Z1", + "children": [ + { + "label": "Collection/Document path", + "configProperty": "actionConfiguration.formData.path.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "isRequired": true, + "initialValue": "" + } + ] }, { - "label": "Body", - "configProperty": "actionConfiguration.formData.body.data", - "controlType": "QUERY_DYNAMIC_TEXT", - "initialValue": "", - "placeholderText": "{\n \"name\": {{nameInput.text}},\n \"dob\": {{dobPicker.formattedDate}},\n \"gender\": {{genderSelect.selectedOptionValue}} \n}" + "controlType": "SINGLE_COLUMN_ZONE", + "identifier": "ADD-TO-COLLECTION-Z2", + "children": [ + { + "label": "Body", + "configProperty": "actionConfiguration.formData.body.data", + "controlType": "QUERY_DYNAMIC_TEXT", + "initialValue": "", + "placeholderText": "{\n \"name\": {{nameInput.text}},\n \"dob\": {{dobPicker.formattedDate}},\n \"gender\": {{genderSelect.selectedOptionValue}} \n}" + } + ] }, { - "label": "Timestamp Path", - "configProperty": "actionConfiguration.formData.timestampValuePath.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "initialValue": "", - "placeholderText": "[ \"checkinLog.timestampKey\" ]" + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "ADD-TO-COLLECTION-Z3", + "children": [ + { + "label": "Timestamp Path", + "configProperty": "actionConfiguration.formData.timestampValuePath.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "initialValue": "", + "placeholderText": "[ \"checkinLog.timestampKey\" ]" + } + ] } ] } diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/createDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/createDocument.json index 2da8632fd281..18fc12a2f3b5 100644 --- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/createDocument.json +++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/createDocument.json @@ -1,32 +1,50 @@ { + "controlType": "SECTION_V2", "identifier": "CREATE_DOCUMENT", - "controlType": "SECTION", "conditionals": { "show": "{{actionConfiguration.formData.command.data === 'CREATE_DOCUMENT'}}" }, "children": [ { - "label": "Collection Name", - "configProperty": "actionConfiguration.formData.path.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "isRequired": true, - "initialValue": "" + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "CREATE-DOCUMENT-Z1", + "children": [ + { + "label": "Collection Name", + "configProperty": "actionConfiguration.formData.path.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "isRequired": true, + "initialValue": "" + } + ] }, { - "label": "Body", - "configProperty": "actionConfiguration.formData.body.data", - "controlType": "QUERY_DYNAMIC_TEXT", - "initialValue": "", - "placeholderText": "{\n \"name\": {{nameInput.text}},\n \"dob\": {{dobPicker.formattedDate}},\n \"gender\": {{genderSelect.selectedOptionValue}} \n}" + "controlType": "SINGLE_COLUMN_ZONE", + "identifier": "CREATE-DOCUMENT-Z2", + "children": [ + { + "label": "Body", + "configProperty": "actionConfiguration.formData.body.data", + "controlType": "QUERY_DYNAMIC_TEXT", + "initialValue": "", + "placeholderText": "{\n \"name\": {{nameInput.text}},\n \"dob\": {{dobPicker.formattedDate}},\n \"gender\": {{genderSelect.selectedOptionValue}} \n}" + } + ] }, { - "label": "Timestamp Path", - "configProperty": "actionConfiguration.formData.timestampValuePath.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "initialValue": "", - "placeholderText": "[ \"checkinLog.timestampKey\" ]" + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "CREATE-DOCUMENT-Z3", + "children": [ + { + "label": "Timestamp Path", + "configProperty": "actionConfiguration.formData.timestampValuePath.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "initialValue": "", + "placeholderText": "[ \"checkinLog.timestampKey\" ]" + } + ] } ] } diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/deleteDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/deleteDocument.json index 651fc4cd2943..5943ec682a37 100644 --- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/deleteDocument.json +++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/deleteDocument.json @@ -1,18 +1,24 @@ { + "controlType": "SECTION_V2", "identifier": "DELETE_DOCUMENT", - "controlType": "SECTION", "conditionals": { "show": "{{actionConfiguration.formData.command.data === 'DELETE_DOCUMENT'}}" }, "children": [ { - "label": "Collection/Document path", - "configProperty": "actionConfiguration.formData.path.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "isRequired": true, - "placeholderText": "collection/{{Table1.selectedRow._ref}}", - "initialValue": "" + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "DELETE-DOCUMENT-Z1", + "children": [ + { + "label": "Collection/Document path", + "configProperty": "actionConfiguration.formData.path.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "isRequired": true, + "placeholderText": "collection/{{Table1.selectedRow._ref}}", + "initialValue": "" + } + ] } ] } diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getCollection.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getCollection.json index ef11956f380e..b1e5d07b5364 100644 --- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getCollection.json +++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getCollection.json @@ -1,101 +1,131 @@ { + "controlType": "SECTION_V2", "identifier": "GET_COLLECTION", - "controlType": "SECTION", "conditionals": { "show": "{{actionConfiguration.formData.command.data === 'GET_COLLECTION'}}" }, "children": [ { - "label": "Collection Name", - "configProperty": "actionConfiguration.formData.path.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "isRequired": true, - "initialValue": "" + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "GET-COLLECTION-Z1", + "children": [ + { + "label": "Collection Name", + "configProperty": "actionConfiguration.formData.path.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "isRequired": true, + "initialValue": "" + } + ] }, { - "label": "Where", - "configProperty": "actionConfiguration.formData.where.data", - "nestedLevels": 1, - "controlType": "WHERE_CLAUSE", - "-subtitle": "Array of Objects", - "-tooltipText": "Array of Objects", - "-alternateViewTypes": ["json"], - "logicalTypes": [ + "controlType": "SINGLE_COLUMN_ZONE", + "identifier": "GET-COLLECTION-Z2", + "children": [ { - "label": "AND", - "value": "AND" + "label": "Where", + "configProperty": "actionConfiguration.formData.where.data", + "nestedLevels": 1, + "controlType": "WHERE_CLAUSE", + "-subtitle": "Array of Objects", + "-tooltipText": "Array of Objects", + "-alternateViewTypes": ["json"], + "logicalTypes": [ + { + "label": "AND", + "value": "AND" + } + ], + "comparisonTypes": [ + { + "label": "==", + "value": "EQ" + }, + { + "label": "<", + "value": "LT" + }, + { + "label": "<=", + "value": "LTE" + }, + { + "label": ">=", + "value": "GTE" + }, + { + "label": ">", + "value": "GT" + }, + { + "label": "in", + "value": "IN" + }, + { + "label": "Contains", + "value": "ARRAY_CONTAINS" + }, + { + "label": "Contains Any", + "value": "ARRAY_CONTAINS_ANY" + } + ] } - ], - "comparisonTypes": [ - { - "label": "==", - "value": "EQ" - }, - { - "label": "<", - "value": "LT" - }, - { - "label": "<=", - "value": "LTE" - }, - { - "label": ">=", - "value": "GTE" - }, - { - "label": ">", - "value": "GT" - }, + ] + }, + { + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "GET-COLLECTION-Z3", + "children": [ { - "label": "in", - "value": "IN" - }, + "label": "Order By", + "configProperty": "actionConfiguration.formData.orderBy.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "isRequired": false, + "initialValue": "", + "placeholderText": "[\"ascKey\", \"-descKey\"]" + } + ] + }, + { + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "GET-COLLECTION-Z4", + "children": [ { - "label": "Contains", - "value": "ARRAY_CONTAINS" + "label": "Start After", + "configProperty": "actionConfiguration.formData.next.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "isRequired": false, + "initialValue": "", + "palceholderText": "" }, { - "label": "Contains Any", - "value": "ARRAY_CONTAINS_ANY" + "label": "End Before", + "configProperty": "actionConfiguration.formData.prev.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "isRequired": false, + "initialValue": "" } ] }, { - "label": "Order By", - "configProperty": "actionConfiguration.formData.orderBy.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "isRequired": false, - "initialValue": "", - "placeholderText": "[\"ascKey\", \"-descKey\"]" - }, - { - "label": "Start After", - "configProperty": "actionConfiguration.formData.next.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "isRequired": false, - "initialValue": "", - "palceholderText": "" - }, - { - "label": "End Before", - "configProperty": "actionConfiguration.formData.prev.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "isRequired": false, - "initialValue": "" - }, - { - "label": "Limit", - "configProperty": "actionConfiguration.formData.limitDocuments.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "isRequired": false, - "palceholderText": "{{Table1.pageSize}}", - "initialValue": "10" + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "GET-COLLECTION-Z5", + "children": [ + { + "label": "Limit", + "configProperty": "actionConfiguration.formData.limitDocuments.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "isRequired": false, + "palceholderText": "{{Table1.pageSize}}", + "initialValue": "10" + } + ] } ] } diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getDocument.json index 2f1aa00bfc35..8422d805738e 100644 --- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getDocument.json +++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getDocument.json @@ -1,17 +1,23 @@ { + "controlType": "SECTION_V2", "identifier": "GET_DOCUMENT", - "controlType": "SECTION", "conditionals": { "show": "{{actionConfiguration.formData.command.data === 'GET_DOCUMENT'}}" }, "children": [ { - "label": "Collection/Document path", - "configProperty": "actionConfiguration.formData.path.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "isRequired": true, - "initialValue": "" + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "GET-DOCUMENT-Z1", + "children": [ + { + "label": "Collection/Document path", + "configProperty": "actionConfiguration.formData.path.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "isRequired": true, + "initialValue": "" + } + ] } ] } diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/root.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/root.json index e15b769264c8..c0986810e99b 100644 --- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/root.json +++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/root.json @@ -1,43 +1,49 @@ { "editor": [ { - "controlType": "SECTION", + "controlType": "SECTION_V2", "identifier": "SELECTOR", "children": [ { - "label": "Command", - "description": "Choose method you would like to use", - "configProperty": "actionConfiguration.formData.command.data", - "controlType": "DROP_DOWN", - "initialValue": "GET_COLLECTION", - "options": [ + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "SELECTOR-Z1", + "children": [ { - "label": "List Documents", - "value": "GET_COLLECTION" - }, - { - "label": "Create document", - "value": "CREATE_DOCUMENT" - }, - { - "label": "Update document", - "value": "UPDATE_DOCUMENT" - }, - { - "label": "Delete document", - "value": "DELETE_DOCUMENT" - }, - { - "label": "Get Document", - "value": "GET_DOCUMENT" - }, - { - "label": "Upsert Document", - "value": "SET_DOCUMENT" - }, - { - "label": "Add document to collection", - "value": "ADD_TO_COLLECTION" + "label": "Command", + "description": "Choose method you would like to use", + "configProperty": "actionConfiguration.formData.command.data", + "controlType": "DROP_DOWN", + "initialValue": "GET_COLLECTION", + "options": [ + { + "label": "List Documents", + "value": "GET_COLLECTION" + }, + { + "label": "Create document", + "value": "CREATE_DOCUMENT" + }, + { + "label": "Update document", + "value": "UPDATE_DOCUMENT" + }, + { + "label": "Delete document", + "value": "DELETE_DOCUMENT" + }, + { + "label": "Get Document", + "value": "GET_DOCUMENT" + }, + { + "label": "Upsert Document", + "value": "SET_DOCUMENT" + }, + { + "label": "Add document to collection", + "value": "ADD_TO_COLLECTION" + } + ] } ] } diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/setDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/setDocument.json index a874402b7f94..25dd8b0da1f5 100644 --- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/setDocument.json +++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/setDocument.json @@ -1,32 +1,50 @@ { + "controlType": "SECTION_V2", "identifier": "SET_DOCUMENT", - "controlType": "SECTION", "conditionals": { "show": "{{actionConfiguration.formData.command.data === 'SET_DOCUMENT'}}" }, "children": [ { - "label": "Collection/Document path", - "configProperty": "actionConfiguration.formData.path.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "isRequired": true, - "initialValue": "" + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "SET-DOCUMENT-Z1", + "children": [ + { + "label": "Collection/Document path", + "configProperty": "actionConfiguration.formData.path.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "isRequired": true, + "initialValue": "" + } + ] }, { - "label": "Body", - "configProperty": "actionConfiguration.formData.body.data", - "controlType": "QUERY_DYNAMIC_TEXT", - "initialValue": "", - "placeholderText": "{\n \"name\": {{nameInput.text}},\n \"dob\": {{dobPicker.formattedDate}},\n \"gender\": {{genderSelect.selectedOptionValue}} \n}" + "controlType": "SINGLE_COLUMN_ZONE", + "identifier": "SET-DOCUMENT-Z2", + "children": [ + { + "label": "Body", + "configProperty": "actionConfiguration.formData.body.data", + "controlType": "QUERY_DYNAMIC_TEXT", + "initialValue": "", + "placeholderText": "{\n \"name\": {{nameInput.text}},\n \"dob\": {{dobPicker.formattedDate}},\n \"gender\": {{genderSelect.selectedOptionValue}} \n}" + } + ] }, { - "label": "Timestamp Path", - "configProperty": "actionConfiguration.formData.timestampValuePath.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "initialValue": "", - "placeholderText": "[ \"checkinLog.timestampKey\" ]" + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "SET-DOCUMENT-Z3", + "children": [ + { + "label": "Timestamp Path", + "configProperty": "actionConfiguration.formData.timestampValuePath.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "initialValue": "", + "placeholderText": "[ \"checkinLog.timestampKey\" ]" + } + ] } ] } diff --git a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/updateDocument.json b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/updateDocument.json index 6bb8ef57d3af..3cdbda305dc0 100644 --- a/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/updateDocument.json +++ b/app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/updateDocument.json @@ -1,41 +1,59 @@ { + "controlType": "SECTION_V2", "identifier": "UPDATE_DOCUMENT", - "controlType": "SECTION", "conditionals": { "show": "{{actionConfiguration.formData.command.data === 'UPDATE_DOCUMENT'}}" }, "children": [ { - "label": "Collection/Document path", - "configProperty": "actionConfiguration.formData.path.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "isRequired": true, - "initialValue": "" + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "UPDATE-DOCUMENT-Z1", + "children": [ + { + "label": "Collection/Document path", + "configProperty": "actionConfiguration.formData.path.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "isRequired": true, + "initialValue": "" + } + ] }, { - "label": "Body", - "configProperty": "actionConfiguration.formData.body.data", - "controlType": "QUERY_DYNAMIC_TEXT", - "initialValue": "", - "placeholderText": "{\n \"name\": {{nameInput.text}},\n \"dob\": {{dobPicker.formattedDate}},\n \"gender\": {{genderSelect.selectedOptionValue}} \n}" + "controlType": "SINGLE_COLUMN_ZONE", + "identifier": "UPDATE-DOCUMENT-Z2", + "children": [ + { + "label": "Body", + "configProperty": "actionConfiguration.formData.body.data", + "controlType": "QUERY_DYNAMIC_TEXT", + "initialValue": "", + "placeholderText": "{\n \"name\": {{nameInput.text}},\n \"dob\": {{dobPicker.formattedDate}},\n \"gender\": {{genderSelect.selectedOptionValue}} \n}" + } + ] }, { - "label": "Delete Key Path", - "configProperty": "actionConfiguration.formData.deleteKeyPath.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "isRequired": true, - "initialValue": "", - "placeholderText": "[\"userKey.nestedNamekey\"]" - }, - { - "label": "Timestamp Path", - "configProperty": "actionConfiguration.formData.timestampValuePath.data", - "controlType": "QUERY_DYNAMIC_INPUT_TEXT", - "evaluationSubstitutionType": "TEMPLATE", - "initialValue": "", - "placeholderText": "[ \"checkinLog.timestampKey\" ]" + "controlType": "DOUBLE_COLUMN_ZONE", + "identifier": "UPDATE-DOCUMENT-Z3", + "children": [ + { + "label": "Delete Key Path", + "configProperty": "actionConfiguration.formData.deleteKeyPath.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "isRequired": true, + "initialValue": "", + "placeholderText": "[\"userKey.nestedNamekey\"]" + }, + { + "label": "Timestamp Path", + "configProperty": "actionConfiguration.formData.timestampValuePath.data", + "controlType": "QUERY_DYNAMIC_INPUT_TEXT", + "evaluationSubstitutionType": "TEMPLATE", + "initialValue": "", + "placeholderText": "[ \"checkinLog.timestampKey\" ]" + } + ] } ] }