feat: Simplified Google Sheets queries (#14869)
* Client changes 1
* add DSL functionality
* Temp commit for refactoring changes
* Do I even know what I'm doing here?
* chore: Second GS layout
* Update: Visibility conditional outputs for schemas
- Added the output from conditional outputs for schema children too
* Update: Entity selector visibility control
- Added logic for controlling visibility of sub components via the JS expressions system
* Update: Passing disabled prop to toggle button
* Update: Passing disabled prop to toggle btn
* Update: Styled component for toggle button
- Added disabled styles based on the disabled prop sent to the toggle form view JSON button
* Update: configProperty role in Entity Selector
- Removed dependance of the configProperty of the entity selector children to it's parent component
* Update: type of placeholder key
- Made placeholder key from form config JSON to accept either string or an object
- Earlier only string was accepted
- This is for pagination component
* Update: Added placeholder control for pagination
* Client changes 1
* add DSL functionality
* Do I even know what I'm doing here?
* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design
* fix: updated tooltip component for wrong ui on entity explore
* temp triggers
* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design (#12395)
* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design
* fix: updated tooltip component for wrong ui on entity explore
* fix: updated tooltip ui, where condition placement, sort by ui
* temp form data access logic
* fix: updated sorting type width ui
* fix: updated ui for spacing, width and text issues
* Update: Type for tooltip of UQI forms
- Added option to send an object to the tooltipText object.
- This allows for composite components like pagination to have tooltips for each sub component
* Update: tooltip for pagination component
- Added handling to parse the tooltip for multiple components.
- This allows for composite components like pagination to have tooltips for each sub component
* Update: Type cast for tooltip component
- Made the content passed to tooltip component as a string only
* Update: Fixed tooltip component CSS
* Update: Dropdown option component
- Added a tooltip wrapper to each option
- This is to show on hover text like disabled state
* fix: updated ẇhere clause broken ui for condition
* Add: functions to check and extract expressions
- Loop through the formConfig and find any keys that have a value that is bindable
- Used pre defined regex to check if value is a moustache binding
* Add: Types for evaluated form configs
- Added types for the form configs to be evaluated and their output post eval
* Add: Flow to run the form config
- Run the form config and update the result to the redux state
* Update: Name of the type for formconfigs
- Updated since it was clashing with a component of the same name
* Add: Function to enforce config type checks
- This is done so that the improper configs can be weeded out and the rest of the form can be shown
* Add: Function to update evaluated config
- Added option to update the config if it's values needed evaluation
* Add: Type check for schema sections
* Update: Error handling for invalid control type
- We were throwing an exception till now, changed it to a warning text
* Add: Exposed tooltip for dropdown option disabled state
* Update: switch to json mode functionality
- Added logic to convert data to a string rather than an object when the first switch to JSON mode happens
* Update: Added key to tooltip for dropdown options
* Trigger API modification
* Add: function to fetch default trigger URL
* Update: Made URL optional in dynamic trigger config
* Update: Dynamic trigger API call
- Made the API call for dynamic triggers have URL as optional field
- Added type check to the response of the API call
* Update: resp type for trigger APIs
* Update: Moved code to utils folder
- Moved functions for UQI form eval processing to utils file
* Update: passing original controltype to JS switch
* Update: config for JSON editor mode
- Updated the config to have different options for JSON mode depending on the original control type
* Update: Connected line numbers flag to config
* Revert: CSS changes for tooltip
* Refactor: Removed consle
* Add: type for the config of dynamic values
* Add: Feature to evaluate config for triggers
* Refactor: fix type check errors
* fix: dropdown ui width with text alignment
* Update: fixed selector for dynamic values
* Update: selector call for fetchDynamicValues
* Add table header index prop for columns selector
* migration partial commit
* migration partial commit
* Refactor: removed unused import
* Update: reused function for checking dynamic value
* Update: removed unused import
* Fix format JSON issues
* Retrieve binding paths from entity selector components
* Fixes 6 remaining issues with UQI implementation
* Fix dropdown issues
* Fix dropdown height issues and fixes triggering of APIs when option is deselected
* Migration changes
* Fix QA generated UQI issues
* Fix projection component height and route change logic
* Fix multi select dropdown placeholder text issue and json stringify issue with switching view types
* Reset entity type value when command value changes
* Test changes
* Review comments
* Moved migrations around
* Corrected import statement
* Added JSON schema migration
* Updated schema version
* perf improvements and filter dropdown options feature
* Fix Code mirror component config for toggleComponentToJson input fields.
* Fix prettier issues
* fix prettier issues
* Fix style issues as a result of the merged conflicts
* Fix failing test case
* Fixed a few other flows (#14225)
* Fixed a few other flows
* Review comments
* Fix generate CRUD, fix evaluation of dynamic bindings and fix various styling issues.
* More fixes (#14367)
* Factor in the root formconfig parent key.
* Fix flickering issues, and evaluatedFormConfig issues
* fix: Teeny bugs (#14455)
* Teeny bugs
* Added previous functionality as is
* Improvements in the way we fetch dynamic values
* Fix stringiification issue and cyclic dependency issues
* Resolve projection component values deletion
* Resolve merge conflicts and fix prettier issues
* fix: Tsc issues
* Fix property pane connection navigation
* updating ee locator
* updating inputfield locator
* dropdown locator update
* Merge conflict not properly resolved.
* Fix s3 spec
* Fix Mongo Spec
* Fix some more tests
* fix: prevent cyclic dependency when switching to js mode (#14668)
* add delete events for change from array to string in diff
* add test to assert absence of cyclic dependency error when switching to js in switchgroup widget
* Assert that evaluation is not disabled when no cyclic dependency happens
* Cypress test preparations for google sheets and form controls
* Fixed a few test errors (#14874)
* Add: unit tests for uqi UI updates
- view type tests
- conditional output extraction
- processing conditional output to handle view/enabled state of the component
* Add: completed isValidFormConfig test
* Update: improved tests for update config
- These tests cover the functionality to update a section config after it's components are done evaluating
* Fix failing cypress tests and cyclic dependency issue
* Fixes some more tests
* Fixed migration of row objects (#14896)
* Bumped the version of design system package
* Update: reverted change to EE selector
* Fix deletion pointer
* Update: selector for js on load spec
- Synced with changes related to ADS dropdown
* Fix mongoDBShoppingCart spec
* Remove comments
* Fix: mongo shopping cart test failures
* fix: mongo shopping cart spec
* Dummy push to retrigger vercel
* fix: mongo shopping cart spec
* Update MongoDBShoppingCart_spec.js
* fix: removed unused click away
* dummy commit
* Update: moved helper functions to separate file
* Add: added tests for saga functions
- Worked on testing for
- extractFetchDynamicValueFormConfigs
- extractQueueOfValuesToBeFetched
* Add if check for queueOfValuesToBeFetched
* Resolve review comments
* Empty-Commit
Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Ayush Pahwa <ayush@appsmith.com>
Co-authored-by: Aman Agarwal <aman@appsmith.com>
Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
Co-authored-by: Favour Ohanekwu <fohanekwu@gmail.com>
Co-authored-by: Albin <albin@appsmith.com>
2022-07-04 05:43:27 +00:00
|
|
|
import { get, set } from "lodash";
|
|
|
|
|
import { Diff } from "deep-diff";
|
|
|
|
|
|
|
|
|
|
import { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
|
|
|
|
|
|
|
|
|
|
export type DSLDiff = Diff<CanvasWidgetsReduxState, CanvasWidgetsReduxState>;
|
|
|
|
|
|
|
|
|
|
const positionProps = [
|
|
|
|
|
"leftColumn",
|
|
|
|
|
"rightColumn",
|
|
|
|
|
"topRow",
|
|
|
|
|
"bottomRow",
|
|
|
|
|
"minHeight",
|
|
|
|
|
"parentColumnSpace",
|
|
|
|
|
"parentRowSpace",
|
|
|
|
|
"children",
|
|
|
|
|
"parentId",
|
|
|
|
|
"renderMode",
|
|
|
|
|
"detachFromLayout",
|
|
|
|
|
"noContainerOffset",
|
|
|
|
|
"isCanvas",
|
2022-11-23 09:48:23 +00:00
|
|
|
"height",
|
feat: Simplified Google Sheets queries (#14869)
* Client changes 1
* add DSL functionality
* Temp commit for refactoring changes
* Do I even know what I'm doing here?
* chore: Second GS layout
* Update: Visibility conditional outputs for schemas
- Added the output from conditional outputs for schema children too
* Update: Entity selector visibility control
- Added logic for controlling visibility of sub components via the JS expressions system
* Update: Passing disabled prop to toggle button
* Update: Passing disabled prop to toggle btn
* Update: Styled component for toggle button
- Added disabled styles based on the disabled prop sent to the toggle form view JSON button
* Update: configProperty role in Entity Selector
- Removed dependance of the configProperty of the entity selector children to it's parent component
* Update: type of placeholder key
- Made placeholder key from form config JSON to accept either string or an object
- Earlier only string was accepted
- This is for pagination component
* Update: Added placeholder control for pagination
* Client changes 1
* add DSL functionality
* Do I even know what I'm doing here?
* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design
* fix: updated tooltip component for wrong ui on entity explore
* temp triggers
* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design (#12395)
* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design
* fix: updated tooltip component for wrong ui on entity explore
* fix: updated tooltip ui, where condition placement, sort by ui
* temp form data access logic
* fix: updated sorting type width ui
* fix: updated ui for spacing, width and text issues
* Update: Type for tooltip of UQI forms
- Added option to send an object to the tooltipText object.
- This allows for composite components like pagination to have tooltips for each sub component
* Update: tooltip for pagination component
- Added handling to parse the tooltip for multiple components.
- This allows for composite components like pagination to have tooltips for each sub component
* Update: Type cast for tooltip component
- Made the content passed to tooltip component as a string only
* Update: Fixed tooltip component CSS
* Update: Dropdown option component
- Added a tooltip wrapper to each option
- This is to show on hover text like disabled state
* fix: updated ẇhere clause broken ui for condition
* Add: functions to check and extract expressions
- Loop through the formConfig and find any keys that have a value that is bindable
- Used pre defined regex to check if value is a moustache binding
* Add: Types for evaluated form configs
- Added types for the form configs to be evaluated and their output post eval
* Add: Flow to run the form config
- Run the form config and update the result to the redux state
* Update: Name of the type for formconfigs
- Updated since it was clashing with a component of the same name
* Add: Function to enforce config type checks
- This is done so that the improper configs can be weeded out and the rest of the form can be shown
* Add: Function to update evaluated config
- Added option to update the config if it's values needed evaluation
* Add: Type check for schema sections
* Update: Error handling for invalid control type
- We were throwing an exception till now, changed it to a warning text
* Add: Exposed tooltip for dropdown option disabled state
* Update: switch to json mode functionality
- Added logic to convert data to a string rather than an object when the first switch to JSON mode happens
* Update: Added key to tooltip for dropdown options
* Trigger API modification
* Add: function to fetch default trigger URL
* Update: Made URL optional in dynamic trigger config
* Update: Dynamic trigger API call
- Made the API call for dynamic triggers have URL as optional field
- Added type check to the response of the API call
* Update: resp type for trigger APIs
* Update: Moved code to utils folder
- Moved functions for UQI form eval processing to utils file
* Update: passing original controltype to JS switch
* Update: config for JSON editor mode
- Updated the config to have different options for JSON mode depending on the original control type
* Update: Connected line numbers flag to config
* Revert: CSS changes for tooltip
* Refactor: Removed consle
* Add: type for the config of dynamic values
* Add: Feature to evaluate config for triggers
* Refactor: fix type check errors
* fix: dropdown ui width with text alignment
* Update: fixed selector for dynamic values
* Update: selector call for fetchDynamicValues
* Add table header index prop for columns selector
* migration partial commit
* migration partial commit
* Refactor: removed unused import
* Update: reused function for checking dynamic value
* Update: removed unused import
* Fix format JSON issues
* Retrieve binding paths from entity selector components
* Fixes 6 remaining issues with UQI implementation
* Fix dropdown issues
* Fix dropdown height issues and fixes triggering of APIs when option is deselected
* Migration changes
* Fix QA generated UQI issues
* Fix projection component height and route change logic
* Fix multi select dropdown placeholder text issue and json stringify issue with switching view types
* Reset entity type value when command value changes
* Test changes
* Review comments
* Moved migrations around
* Corrected import statement
* Added JSON schema migration
* Updated schema version
* perf improvements and filter dropdown options feature
* Fix Code mirror component config for toggleComponentToJson input fields.
* Fix prettier issues
* fix prettier issues
* Fix style issues as a result of the merged conflicts
* Fix failing test case
* Fixed a few other flows (#14225)
* Fixed a few other flows
* Review comments
* Fix generate CRUD, fix evaluation of dynamic bindings and fix various styling issues.
* More fixes (#14367)
* Factor in the root formconfig parent key.
* Fix flickering issues, and evaluatedFormConfig issues
* fix: Teeny bugs (#14455)
* Teeny bugs
* Added previous functionality as is
* Improvements in the way we fetch dynamic values
* Fix stringiification issue and cyclic dependency issues
* Resolve projection component values deletion
* Resolve merge conflicts and fix prettier issues
* fix: Tsc issues
* Fix property pane connection navigation
* updating ee locator
* updating inputfield locator
* dropdown locator update
* Merge conflict not properly resolved.
* Fix s3 spec
* Fix Mongo Spec
* Fix some more tests
* fix: prevent cyclic dependency when switching to js mode (#14668)
* add delete events for change from array to string in diff
* add test to assert absence of cyclic dependency error when switching to js in switchgroup widget
* Assert that evaluation is not disabled when no cyclic dependency happens
* Cypress test preparations for google sheets and form controls
* Fixed a few test errors (#14874)
* Add: unit tests for uqi UI updates
- view type tests
- conditional output extraction
- processing conditional output to handle view/enabled state of the component
* Add: completed isValidFormConfig test
* Update: improved tests for update config
- These tests cover the functionality to update a section config after it's components are done evaluating
* Fix failing cypress tests and cyclic dependency issue
* Fixes some more tests
* Fixed migration of row objects (#14896)
* Bumped the version of design system package
* Update: reverted change to EE selector
* Fix deletion pointer
* Update: selector for js on load spec
- Synced with changes related to ADS dropdown
* Fix mongoDBShoppingCart spec
* Remove comments
* Fix: mongo shopping cart test failures
* fix: mongo shopping cart spec
* Dummy push to retrigger vercel
* fix: mongo shopping cart spec
* Update MongoDBShoppingCart_spec.js
* fix: removed unused click away
* dummy commit
* Update: moved helper functions to separate file
* Add: added tests for saga functions
- Worked on testing for
- extractFetchDynamicValueFormConfigs
- extractQueueOfValuesToBeFetched
* Add if check for queueOfValuesToBeFetched
* Resolve review comments
* Empty-Commit
Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Ayush Pahwa <ayush@appsmith.com>
Co-authored-by: Aman Agarwal <aman@appsmith.com>
Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
Co-authored-by: Favour Ohanekwu <fohanekwu@gmail.com>
Co-authored-by: Albin <albin@appsmith.com>
2022-07-04 05:43:27 +00:00
|
|
|
];
|
|
|
|
|
|
|
|
|
|
export const TOASTS = "toasts";
|
|
|
|
|
export const FOCUSES = "needsFocus";
|
|
|
|
|
export const UPDATES = "propertyUpdates";
|
|
|
|
|
|
|
|
|
|
export const WIDGETS = "widgets";
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* this function update the replay object that holds info about change happened in widgets
|
|
|
|
|
* also, it creates toast for new/deleted widgets on undo/redo
|
|
|
|
|
*
|
|
|
|
|
* @param dsl
|
|
|
|
|
* @param diff
|
|
|
|
|
* @param replay
|
|
|
|
|
* @param isUndo
|
|
|
|
|
* @returns
|
|
|
|
|
*/
|
|
|
|
|
export function processDiff(
|
|
|
|
|
dsl: CanvasWidgetsReduxState,
|
|
|
|
|
diff: DSLDiff,
|
|
|
|
|
replay: any,
|
|
|
|
|
isUndo: boolean,
|
|
|
|
|
) {
|
|
|
|
|
if (!diff || !diff.path || !diff.path.length || diff.path[0] === "0") return;
|
|
|
|
|
|
|
|
|
|
const widgetId = diff.path[0];
|
|
|
|
|
|
|
|
|
|
switch (diff.kind) {
|
|
|
|
|
// new elements is added in dsl
|
|
|
|
|
case "N":
|
|
|
|
|
if (diff.path.length == 1) {
|
|
|
|
|
const toast = createToast(
|
|
|
|
|
diff.rhs,
|
|
|
|
|
dsl[widgetId],
|
|
|
|
|
widgetId,
|
|
|
|
|
isUndo,
|
|
|
|
|
!isUndo,
|
|
|
|
|
);
|
|
|
|
|
addToArray(replay, TOASTS, toast);
|
|
|
|
|
} else {
|
|
|
|
|
setPropertyUpdate(replay, [WIDGETS, widgetId, UPDATES], diff.path);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
// element is deleted in dsl
|
|
|
|
|
case "D":
|
|
|
|
|
if (diff.path.length == 1) {
|
|
|
|
|
const toast = createToast(
|
|
|
|
|
diff.lhs,
|
|
|
|
|
dsl[widgetId],
|
|
|
|
|
widgetId,
|
|
|
|
|
isUndo,
|
|
|
|
|
isUndo,
|
|
|
|
|
);
|
|
|
|
|
addToArray(replay, TOASTS, toast);
|
|
|
|
|
} else {
|
|
|
|
|
setPropertyUpdate(replay, [WIDGETS, widgetId, UPDATES], diff.path);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
// element is edited
|
|
|
|
|
case "E":
|
|
|
|
|
if (isPositionUpdate(diff.path[diff.path.length - 1])) {
|
|
|
|
|
set(replay, [WIDGETS, widgetId, FOCUSES], true);
|
|
|
|
|
} else {
|
|
|
|
|
setPropertyUpdate(replay, [WIDGETS, widgetId, UPDATES], diff.path);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* creates toast on undo/redo ( most used in addition/deletion of widgets )
|
|
|
|
|
*
|
|
|
|
|
* @param diffWidget
|
|
|
|
|
* @param dslWidget
|
|
|
|
|
* @param widgetId
|
|
|
|
|
* @param isUndo
|
|
|
|
|
* @param isCreated
|
|
|
|
|
* @returns
|
|
|
|
|
*/
|
|
|
|
|
function createToast(
|
|
|
|
|
diffWidget: CanvasWidgetsReduxState,
|
|
|
|
|
dslWidget: CanvasWidgetsReduxState | undefined,
|
|
|
|
|
widgetId: string,
|
|
|
|
|
isUndo: boolean,
|
|
|
|
|
isCreated: boolean,
|
|
|
|
|
) {
|
|
|
|
|
const widgetName = isCreated ? diffWidget.widgetName : dslWidget?.widgetName;
|
|
|
|
|
return {
|
|
|
|
|
isCreated,
|
|
|
|
|
isUndo,
|
|
|
|
|
widgetName,
|
|
|
|
|
widgetId,
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* checks property changed is a positional property
|
|
|
|
|
*
|
|
|
|
|
* @param widgetProperty
|
|
|
|
|
* @returns
|
|
|
|
|
*/
|
|
|
|
|
function isPositionUpdate(widgetProperty: string) {
|
|
|
|
|
return positionProps.indexOf(widgetProperty) !== -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* checks the existing value and sets he propertyUpdate if required
|
|
|
|
|
*
|
|
|
|
|
* @param replay
|
|
|
|
|
* @param path
|
|
|
|
|
* @param value
|
|
|
|
|
* @returns
|
|
|
|
|
*/
|
|
|
|
|
function setPropertyUpdate(replay: any, path: string[], value: string[]) {
|
|
|
|
|
const existingPathValue = get(replay, path);
|
|
|
|
|
|
|
|
|
|
if (!existingPathValue || existingPathValue.length > 2) {
|
|
|
|
|
set(replay, path, value);
|
|
|
|
|
set(replay, UPDATES, true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* pushes value to array element in array of objects
|
|
|
|
|
*
|
|
|
|
|
* @param obj
|
|
|
|
|
* @param key
|
|
|
|
|
* @param value
|
|
|
|
|
* @returns
|
|
|
|
|
*/
|
|
|
|
|
function addToArray(obj: any, key: string, value: any) {
|
|
|
|
|
if (!obj) return;
|
|
|
|
|
|
|
|
|
|
if (obj[key] && Array.isArray(obj[key])) {
|
|
|
|
|
obj[key].push(value);
|
|
|
|
|
} else {
|
|
|
|
|
obj[key] = [value];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* creates paths changed from diffs array
|
|
|
|
|
*
|
|
|
|
|
* @param diffs
|
|
|
|
|
* @returns
|
|
|
|
|
*/
|
|
|
|
|
export function getPathsFromDiff(diffs: any) {
|
|
|
|
|
const paths = [];
|
|
|
|
|
|
|
|
|
|
for (const diff of diffs) {
|
|
|
|
|
paths.push(diff.path.join("."));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return paths;
|
|
|
|
|
}
|