## Description Remove specific cycle dependencies created because a file was both importing and exporting items it does not modify. By reducing cycle dependencies here, I am buying credits that allow adding cycle dependencies in another PR but very hard to avoid This PR reduces the deps by 4 EE PR: https://github.com/appsmithorg/appsmith-ee/pull/6214 PR which adds the cycle deps: https://github.com/appsmithorg/appsmith/pull/39100 ## Automation /ok-to-test tags="@tag.Sanity" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/13324385763> > Commit: 34a0f459b27963531adf851f198903cf0831b719 > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=13324385763&attempt=1" target="_blank">Cypress dashboard</a>. > Tags: `@tag.Sanity` > Spec: > <hr>Fri, 14 Feb 2025 07:54:00 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Introduced a “Show More” option in the code editor’s command palette for additional suggestions. - Enabled default expansion for table widget panels to improve content visibility. - **Refactor** - Consolidated entity and type management for a more consistent and maintainable platform. - **Improvements** - Enhanced widget behavior with dynamic updates in dropdowns, file pickers, and map styling for a smoother user experience. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
326 lines
12 KiB
TypeScript
326 lines
12 KiB
TypeScript
import type { Action } from "entities/Action/index";
|
|
import _ from "lodash";
|
|
import { EvaluationSubstitutionType } from "ee/entities/DataTree/types";
|
|
import {
|
|
alternateViewTypeInputConfig,
|
|
isHidden,
|
|
ViewTypes,
|
|
} from "components/formControls/utils";
|
|
import {
|
|
PaginationSubComponent,
|
|
SortingSubComponent,
|
|
WhereClauseSubComponent,
|
|
allowedControlTypes,
|
|
getViewType,
|
|
} from "components/formControls/utils";
|
|
import formControlTypes from "utils/formControl/formControlTypes";
|
|
import { getAllBindingPathsForGraphqlPagination } from "utils/editor/EditorBindingPaths";
|
|
import EditorControlTypes from "utils/editor/EditorControlTypes";
|
|
import type { DynamicPath } from "utils/DynamicBindingUtils";
|
|
|
|
const dynamicFields = [
|
|
formControlTypes.QUERY_DYNAMIC_TEXT,
|
|
formControlTypes.QUERY_DYNAMIC_INPUT_TEXT,
|
|
];
|
|
|
|
type ReactivePaths = Record<string, EvaluationSubstitutionType>;
|
|
type BindingPaths = ReactivePaths;
|
|
const getCorrectEvaluationSubstitutionType = (substitutionType?: string) => {
|
|
if (substitutionType) {
|
|
if (substitutionType === EvaluationSubstitutionType.SMART_SUBSTITUTE) {
|
|
return EvaluationSubstitutionType.SMART_SUBSTITUTE;
|
|
} else if (substitutionType === EvaluationSubstitutionType.PARAMETER) {
|
|
return EvaluationSubstitutionType.PARAMETER;
|
|
}
|
|
}
|
|
|
|
return EvaluationSubstitutionType.TEMPLATE;
|
|
};
|
|
|
|
export const getBindingAndReactivePathsOfAction = (
|
|
action: Action,
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
formConfig?: any[],
|
|
dynamicBindingPathList?: DynamicPath[],
|
|
): { reactivePaths: ReactivePaths; bindingPaths: BindingPaths } => {
|
|
let reactivePaths: ReactivePaths = {
|
|
data: EvaluationSubstitutionType.TEMPLATE,
|
|
isLoading: EvaluationSubstitutionType.TEMPLATE,
|
|
datasourceUrl: EvaluationSubstitutionType.TEMPLATE,
|
|
};
|
|
const bindingPaths: BindingPaths = {};
|
|
|
|
if (!formConfig) {
|
|
dynamicBindingPathList?.forEach((dynamicPath) => {
|
|
reactivePaths[dynamicPath.key] = EvaluationSubstitutionType.TEMPLATE;
|
|
});
|
|
reactivePaths = {
|
|
...reactivePaths,
|
|
config: EvaluationSubstitutionType.TEMPLATE,
|
|
};
|
|
|
|
return {
|
|
reactivePaths,
|
|
bindingPaths,
|
|
};
|
|
}
|
|
|
|
// NOTE:
|
|
// there's a difference in how the bindingPaths should look when in component and json viewType mode.
|
|
// for example in json mode, sorting component bindingPath should be formData.sortBy.data.(column | order)
|
|
// in component mode, the sorting component binding path should be more specific e.g. formData.sortBy.data[0].(column | order)
|
|
// the condition below checks if the viewType of the config and computes the binding path respectively
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
const recursiveFindBindingPaths = (formConfig: any) => {
|
|
if (formConfig.children) {
|
|
formConfig.children.forEach(recursiveFindBindingPaths);
|
|
} else {
|
|
const configPath = getDataTreeActionConfigPath(formConfig.configProperty);
|
|
|
|
if (dynamicFields.includes(formConfig.controlType)) {
|
|
if (!isHidden(action, formConfig.hidden)) {
|
|
bindingPaths[configPath] = getCorrectEvaluationSubstitutionType(
|
|
formConfig.evaluationSubstitutionType,
|
|
);
|
|
}
|
|
} else if (
|
|
// this else if checks the viewType and computes the binding path respectively(as explained above),
|
|
// while the other else-ifs below checks specifically for component viewType mode.
|
|
"alternateViewTypes" in formConfig &&
|
|
Array.isArray(formConfig.alternateViewTypes) &&
|
|
formConfig.alternateViewTypes.length > 0 &&
|
|
formConfig.alternateViewTypes.includes(ViewTypes.JSON) &&
|
|
getViewType(action, formConfig.configProperty) === ViewTypes.JSON
|
|
) {
|
|
bindingPaths[configPath] = getCorrectEvaluationSubstitutionType(
|
|
alternateViewTypeInputConfig().evaluationSubstitutionType,
|
|
);
|
|
} else if (formConfig.controlType === formControlTypes.ARRAY_FIELD) {
|
|
let actionValue = _.get(action, formConfig.configProperty);
|
|
|
|
if (Array.isArray(actionValue)) {
|
|
actionValue = actionValue.filter((val) => val);
|
|
|
|
for (let i = 0; i < actionValue.length; i++) {
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
formConfig.schema.forEach((schemaField: any) => {
|
|
if (
|
|
schemaField.key in actionValue[i] &&
|
|
dynamicFields.includes(schemaField.controlType)
|
|
) {
|
|
const arrayConfigPath = `${configPath}[${i}].${schemaField.key}`;
|
|
|
|
bindingPaths[arrayConfigPath] =
|
|
getCorrectEvaluationSubstitutionType(
|
|
formConfig.evaluationSubstitutionType,
|
|
);
|
|
}
|
|
});
|
|
}
|
|
}
|
|
} else if (formConfig.controlType === formControlTypes.WHERE_CLAUSE) {
|
|
const recursiveFindBindingPathsForWhereClause = (
|
|
newConfigPath: string,
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
actionValue: any,
|
|
) => {
|
|
if (
|
|
actionValue &&
|
|
actionValue.hasOwnProperty("children") &&
|
|
Array.isArray(actionValue.children)
|
|
) {
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
actionValue.children.forEach((value: any, index: number) => {
|
|
const childrenPath = getBindingOrConfigPathsForWhereClauseControl(
|
|
newConfigPath,
|
|
WhereClauseSubComponent.Children,
|
|
index,
|
|
);
|
|
|
|
recursiveFindBindingPathsForWhereClause(childrenPath, value);
|
|
});
|
|
} else {
|
|
if (actionValue.hasOwnProperty("key")) {
|
|
const keyPath = getBindingOrConfigPathsForWhereClauseControl(
|
|
newConfigPath,
|
|
WhereClauseSubComponent.Key,
|
|
undefined,
|
|
);
|
|
|
|
bindingPaths[keyPath] = getCorrectEvaluationSubstitutionType(
|
|
formConfig.evaluationSubstitutionType,
|
|
);
|
|
}
|
|
|
|
if (actionValue.hasOwnProperty("value")) {
|
|
const valuePath = getBindingOrConfigPathsForWhereClauseControl(
|
|
newConfigPath,
|
|
WhereClauseSubComponent.Value,
|
|
undefined,
|
|
);
|
|
|
|
bindingPaths[valuePath] = getCorrectEvaluationSubstitutionType(
|
|
formConfig.evaluationSubstitutionType,
|
|
);
|
|
}
|
|
}
|
|
};
|
|
|
|
const actionValue = _.get(action, formConfig.configProperty);
|
|
|
|
if (
|
|
actionValue &&
|
|
actionValue.hasOwnProperty("children") &&
|
|
Array.isArray(actionValue.children)
|
|
) {
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
actionValue.children.forEach((value: any, index: number) => {
|
|
const childrenPath = getBindingOrConfigPathsForWhereClauseControl(
|
|
configPath,
|
|
WhereClauseSubComponent.Children,
|
|
index,
|
|
);
|
|
|
|
recursiveFindBindingPathsForWhereClause(childrenPath, value);
|
|
});
|
|
}
|
|
} else if (formConfig.controlType === formControlTypes.PAGINATION) {
|
|
const limitPath = getBindingOrConfigPathsForPaginationControl(
|
|
PaginationSubComponent.Offset,
|
|
configPath,
|
|
);
|
|
const offsetPath = getBindingOrConfigPathsForPaginationControl(
|
|
PaginationSubComponent.Limit,
|
|
configPath,
|
|
);
|
|
|
|
bindingPaths[limitPath] = getCorrectEvaluationSubstitutionType(
|
|
formConfig.evaluationSubstitutionType,
|
|
);
|
|
bindingPaths[offsetPath] = getCorrectEvaluationSubstitutionType(
|
|
formConfig.evaluationSubstitutionType,
|
|
);
|
|
} else if (formConfig.controlType === formControlTypes.SORTING) {
|
|
const actionValue = _.get(action, formConfig.configProperty);
|
|
|
|
if (Array.isArray(actionValue)) {
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
actionValue.forEach((fieldConfig: any, index: number) => {
|
|
const columnPath = getBindingOrConfigPathsForSortingControl(
|
|
SortingSubComponent.Column,
|
|
configPath,
|
|
index,
|
|
);
|
|
|
|
bindingPaths[columnPath] = getCorrectEvaluationSubstitutionType(
|
|
formConfig.evaluationSubstitutionType,
|
|
);
|
|
const OrderPath = getBindingOrConfigPathsForSortingControl(
|
|
SortingSubComponent.Order,
|
|
configPath,
|
|
index,
|
|
);
|
|
|
|
bindingPaths[OrderPath] = getCorrectEvaluationSubstitutionType(
|
|
formConfig.evaluationSubstitutionType,
|
|
);
|
|
});
|
|
}
|
|
} else if (formConfig.controlType === formControlTypes.ENTITY_SELECTOR) {
|
|
if (Array.isArray(formConfig.schema)) {
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
formConfig.schema.forEach((schemaField: any) => {
|
|
let columnPath = "";
|
|
|
|
if (
|
|
allowedControlTypes.includes(schemaField.controlType) &&
|
|
!!schemaField.configProperty
|
|
) {
|
|
columnPath = getBindingOrConfigPathsForEntitySelectorControl(
|
|
schemaField.configProperty,
|
|
);
|
|
}
|
|
|
|
bindingPaths[columnPath] = getCorrectEvaluationSubstitutionType(
|
|
formConfig.evaluationSubstitutionType,
|
|
);
|
|
});
|
|
}
|
|
} else if (
|
|
formConfig.controlType === EditorControlTypes.E_GRAPHQL_PAGINATION
|
|
) {
|
|
const allPaths = getAllBindingPathsForGraphqlPagination(configPath);
|
|
|
|
allPaths.forEach(({ key, value }) => {
|
|
if (key && value) {
|
|
bindingPaths[key] = value as EvaluationSubstitutionType;
|
|
}
|
|
});
|
|
}
|
|
}
|
|
};
|
|
|
|
formConfig.forEach(recursiveFindBindingPaths);
|
|
reactivePaths = {
|
|
...reactivePaths,
|
|
...bindingPaths,
|
|
};
|
|
|
|
return { reactivePaths, bindingPaths };
|
|
};
|
|
|
|
export const getBindingOrConfigPathsForSortingControl = (
|
|
fieldName: SortingSubComponent.Order | SortingSubComponent.Column,
|
|
baseConfigProperty: string,
|
|
index?: number,
|
|
): string => {
|
|
if (_.isNumber(index)) {
|
|
return `${baseConfigProperty}[${index}].${fieldName}`;
|
|
} else {
|
|
return `${baseConfigProperty}.${fieldName}`;
|
|
}
|
|
};
|
|
|
|
export const getBindingOrConfigPathsForPaginationControl = (
|
|
fieldName: PaginationSubComponent.Limit | PaginationSubComponent.Offset,
|
|
baseConfigProperty: string,
|
|
): string => {
|
|
return `${baseConfigProperty}.${fieldName}`;
|
|
};
|
|
|
|
export const getBindingOrConfigPathsForWhereClauseControl = (
|
|
configPath: string,
|
|
fieldName:
|
|
| WhereClauseSubComponent.Children
|
|
| WhereClauseSubComponent.Condition
|
|
| WhereClauseSubComponent.Key
|
|
| WhereClauseSubComponent.Value,
|
|
index?: number,
|
|
): string => {
|
|
if (fieldName === "children" && _.isNumber(index)) {
|
|
return `${configPath}.${fieldName}[${index}]`;
|
|
} else if (configPath && fieldName) {
|
|
return `${configPath}.${fieldName}`;
|
|
}
|
|
|
|
return "";
|
|
};
|
|
|
|
export const getBindingOrConfigPathsForEntitySelectorControl = (
|
|
baseConfigProperty: string,
|
|
): string => {
|
|
// Entity selector schemas/components have their own distinct configProperties and have little to do with their parents(They are independent entities).
|
|
return getDataTreeActionConfigPath(baseConfigProperty);
|
|
};
|
|
|
|
export const getDataTreeActionConfigPath = (propertyPath: string) =>
|
|
propertyPath.replace("actionConfiguration.", "config.");
|