Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Action redesign: Updating the config for Firestore plugin to use sections and zones format #36097

Merged
merged 5 commits into from
Sep 11, 2024
Merged

feat: Action redesign: Updating the config for Firestore plugin to use sections and zones format #36097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4611186
updating the form config for Firestore plugin to use sections and zones
ankitakinger Sep 3, 2024
16e84cc
updating styles for dynamic input text field
ankitakinger Sep 3, 2024
668bb08
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Sep 5, 2024
2a1d36a
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Sep 9, 2024
97a6327
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 36 additions & 18 deletions app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/addToCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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\" ]"
}
]
}
]
}
54 changes: 36 additions & 18 deletions app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/createDocument.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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\" ]"
}
]
}
]
}
22 changes: 14 additions & 8 deletions app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/deleteDocument.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": ""
}
]
}
]
}
188 changes: 109 additions & 79 deletions app/server/appsmith-plugins/firestorePlugin/src/main/resources/editor/getCollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
]
}
Loading
Loading