## Description ### Fixes - [x] https://github.com/appsmithorg/appsmith/issues/19383 - [x] https://github.com/appsmithorg/appsmith/issues/19384 - [x] https://github.com/appsmithorg/appsmith/issues/19385 - [x] https://github.com/appsmithorg/appsmith/issues/19386 - [x] https://github.com/appsmithorg/appsmith/issues/19387 - [x] https://github.com/appsmithorg/appsmith/issues/19388 - [x] https://github.com/appsmithorg/appsmith/issues/19389 - [x] https://github.com/appsmithorg/appsmith/issues/19390 - [x] https://github.com/appsmithorg/appsmith/issues/19391 - [x] https://github.com/appsmithorg/appsmith/issues/19392 - [x] https://github.com/appsmithorg/appsmith/issues/19393 - [x] https://github.com/appsmithorg/appsmith/issues/19394 - [x] https://github.com/appsmithorg/appsmith/issues/19395 - [x] https://github.com/appsmithorg/appsmith/issues/19396 - [x] https://github.com/appsmithorg/appsmith/issues/19397 - [x] https://github.com/appsmithorg/appsmith/issues/19398 - [x] https://github.com/appsmithorg/appsmith/issues/19399 - [x] https://github.com/appsmithorg/appsmith/issues/19400 - [x] https://github.com/appsmithorg/appsmith/issues/19401 - [x] https://github.com/appsmithorg/appsmith/issues/19402 - [x] https://github.com/appsmithorg/appsmith/issues/19403 - [x] https://github.com/appsmithorg/appsmith/issues/19404 - [x] https://github.com/appsmithorg/appsmith/issues/19405 - [x] https://github.com/appsmithorg/appsmith/issues/19406 - [x] https://github.com/appsmithorg/appsmith/issues/19407 - [x] https://github.com/appsmithorg/appsmith/issues/19408 - [x] https://github.com/appsmithorg/appsmith/issues/19409 Fixes # (issue) > if no issue exists, please create an issue and ask the maintainers about this first Media > A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video ## Type of change > Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) - Breaking change (fix or feature that would cause existing functionality to not work as expected) - Chore (housekeeping or task changes that don't impact user perception) - This change requires a documentation update ## How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Provide instructions, so we can reproduce. > Please also list any relevant details for your test configuration. > Delete anything that is not important - Manual - Jest - Cypress ### Test Plan > Add Testsmith test cases links that relate to this PR ### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) ## Checklist: ### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag ### QA activity: - [ ] Test plan has been approved by relevant developers - [ ] Test plan has been peer reviewed by QA - [ ] Cypress test cases have been added and approved by either SDET or manual QA - [ ] Organized project review call with relevant stakeholders after Round 1/2 of QA - [ ] Added Test Plan Approved label after reveiwing all Cypress test --------- Co-authored-by: Ankita Kinger <ankita@appsmith.com> Co-authored-by: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvi@appsmith.com> Co-authored-by: Arsalan <arsalanyaldram0211@outlook.com> Co-authored-by: Aman Agarwal <aman@appsmith.com> Co-authored-by: Rohit Agarwal <rohit_agarwal@live.in> Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com> Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvibhakta@gmail.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local> Co-authored-by: Vijetha-Kaja <vijetha@appsmith.com> Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com> Co-authored-by: Apple <nandan@thinkify.io> Co-authored-by: Saroj <43822041+sarojsarab@users.noreply.github.com> Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com> Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com> Co-authored-by: rahulramesha <rahul@appsmith.com> Co-authored-by: Aswath K <aswath.sana@gmail.com> Co-authored-by: Preet Sidhu <preetsidhu.bits@gmail.com> Co-authored-by: Vijetha-Kaja <119562824+Vijetha-Kaja@users.noreply.github.com> Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
469 lines
13 KiB
TypeScript
469 lines
13 KiB
TypeScript
import { Alignment } from "@blueprintjs/core";
|
|
import type { ColumnProperties } from "../component/Constants";
|
|
import type { TableWidgetProps } from "../constants";
|
|
import { Colors } from "constants/Colors";
|
|
import { get } from "lodash";
|
|
import {
|
|
combineDynamicBindings,
|
|
getDynamicBindings,
|
|
} from "utils/DynamicBindingUtils";
|
|
import { IconNames } from "@blueprintjs/icons";
|
|
|
|
export enum ColumnTypes {
|
|
TEXT = "text",
|
|
URL = "url",
|
|
NUMBER = "number",
|
|
IMAGE = "image",
|
|
VIDEO = "video",
|
|
DATE = "date",
|
|
BUTTON = "button",
|
|
ICON_BUTTON = "iconButton",
|
|
MENU_BUTTON = "menuButton",
|
|
}
|
|
|
|
export function defaultSelectedRowValidation(
|
|
value: unknown,
|
|
props: TableWidgetProps,
|
|
_: any,
|
|
) {
|
|
if (props) {
|
|
if (props.multiRowSelection) {
|
|
if (_.isString(value)) {
|
|
const trimmed = (value as string).trim();
|
|
try {
|
|
const parsedArray = JSON.parse(trimmed);
|
|
if (Array.isArray(parsedArray)) {
|
|
const sanitized = parsedArray.filter((entry) => {
|
|
return (
|
|
Number.isInteger(parseInt(entry, 10)) &&
|
|
parseInt(entry, 10) > -1
|
|
);
|
|
});
|
|
return { isValid: true, parsed: sanitized };
|
|
} else {
|
|
throw Error("Not a stringified array");
|
|
}
|
|
} catch (e) {
|
|
// If cannot be parsed as an array
|
|
const arrayEntries = trimmed.split(",");
|
|
const result: number[] = [];
|
|
arrayEntries.forEach((entry: string) => {
|
|
if (
|
|
Number.isInteger(parseInt(entry, 10)) &&
|
|
parseInt(entry, 10) > -1
|
|
) {
|
|
if (!_.isNil(entry)) result.push(parseInt(entry, 10));
|
|
}
|
|
});
|
|
return { isValid: true, parsed: result };
|
|
}
|
|
}
|
|
if (Array.isArray(value)) {
|
|
const sanitized = value.filter((entry) => {
|
|
return (
|
|
Number.isInteger(parseInt(entry, 10)) && parseInt(entry, 10) > -1
|
|
);
|
|
});
|
|
return { isValid: true, parsed: sanitized };
|
|
}
|
|
if (Number.isInteger(value) && (value as number) > -1) {
|
|
return { isValid: true, parsed: [value] };
|
|
}
|
|
return {
|
|
isValid: false,
|
|
parsed: [],
|
|
message: `This value does not match type: number[]`,
|
|
};
|
|
} else {
|
|
try {
|
|
const _value: string = value as string;
|
|
|
|
if (_value === "") {
|
|
return {
|
|
isValid: true,
|
|
parsed: undefined,
|
|
};
|
|
}
|
|
if (Number.isInteger(parseInt(_value, 10)) && parseInt(_value, 10) > -1)
|
|
return { isValid: true, parsed: parseInt(_value, 10) };
|
|
|
|
return {
|
|
isValid: true,
|
|
parsed: -1,
|
|
};
|
|
} catch (e) {
|
|
return {
|
|
isValid: true,
|
|
parsed: -1,
|
|
};
|
|
}
|
|
}
|
|
}
|
|
return {
|
|
isValid: true,
|
|
parsed: value,
|
|
};
|
|
}
|
|
|
|
export function totalRecordsCountValidation(
|
|
value: unknown,
|
|
props: TableWidgetProps,
|
|
_?: any,
|
|
) {
|
|
if (_.isNil(value) || value === "") {
|
|
return {
|
|
isValid: true,
|
|
parsed: 0,
|
|
message: "",
|
|
};
|
|
}
|
|
if (!Number.isFinite(value) && !_.isString(value)) {
|
|
return {
|
|
isValid: false,
|
|
parsed: 0,
|
|
message: "This value must be a number",
|
|
};
|
|
}
|
|
if (_.isString(value) && !/^\d+\.?\d*$/.test(value as string)) {
|
|
return {
|
|
isValid: false,
|
|
parsed: 0,
|
|
message: "This value must be a number",
|
|
};
|
|
}
|
|
return {
|
|
isValid: true,
|
|
parsed: Number(value),
|
|
message: "",
|
|
};
|
|
}
|
|
|
|
export function uniqueColumnNameValidation(
|
|
value: unknown,
|
|
props: TableWidgetProps,
|
|
_?: any,
|
|
) {
|
|
const tableColumns = _.map(value, "label");
|
|
const duplicates = tableColumns.filter(
|
|
(val: string, index: number, arr: string[]) => arr.indexOf(val) !== index,
|
|
);
|
|
const hasError = !!duplicates.length;
|
|
if (value && hasError) {
|
|
return {
|
|
isValid: false,
|
|
parsed: value,
|
|
messages: ["Column names should be unique."],
|
|
};
|
|
}
|
|
return {
|
|
isValid: true,
|
|
parsed: value,
|
|
messages: [],
|
|
};
|
|
}
|
|
|
|
// A hook to update all column styles when global table styles are updated
|
|
export const updateColumnStyles = (
|
|
props: TableWidgetProps,
|
|
propertyPath: string,
|
|
propertyValue: any,
|
|
): Array<{ propertyPath: string; propertyValue: any }> | undefined => {
|
|
const { primaryColumns, derivedColumns = {} } = props;
|
|
const propertiesToUpdate: Array<{
|
|
propertyPath: string;
|
|
propertyValue: any;
|
|
}> = [];
|
|
const tokens = propertyPath.split("."); // horizontalAlignment/textStyle
|
|
const currentStyleName = tokens[0];
|
|
// TODO: Figure out how propertyPaths will work when a nested property control is updating another property
|
|
if (primaryColumns && currentStyleName) {
|
|
// The style being updated currently
|
|
|
|
// for each primary column
|
|
Object.values(primaryColumns).map((column: ColumnProperties) => {
|
|
// Current column property path
|
|
const propertyPath = `primaryColumns.${column.id}.${currentStyleName}`;
|
|
// Is current column a derived column
|
|
const isDerived = primaryColumns[column.id].isDerived;
|
|
|
|
// If it is a derived column and it exists in derivedColumns
|
|
if (isDerived && derivedColumns[column.id]) {
|
|
propertiesToUpdate.push({
|
|
propertyPath: `derivedColumns.${column.id}.${currentStyleName}`,
|
|
propertyValue: propertyValue,
|
|
});
|
|
}
|
|
// Is this a dynamic binding property?
|
|
const notADynamicBinding =
|
|
!props.dynamicBindingPathList ||
|
|
props.dynamicBindingPathList.findIndex(
|
|
(item) => item.key === propertyPath,
|
|
) === -1;
|
|
|
|
if (notADynamicBinding) {
|
|
propertiesToUpdate.push({
|
|
propertyPath: `primaryColumns.${column.id}.${currentStyleName}`,
|
|
propertyValue: propertyValue,
|
|
});
|
|
}
|
|
});
|
|
if (propertiesToUpdate.length > 0) return propertiesToUpdate;
|
|
}
|
|
return;
|
|
};
|
|
|
|
// Select default Icon Name if column type is Icon button
|
|
export function updateIconNameHook(
|
|
props: TableWidgetProps,
|
|
propertyPath: string,
|
|
propertyValue: string,
|
|
) {
|
|
const property = getBasePropertyPath(propertyPath);
|
|
let propertiesToUpdate = [{ propertyPath, propertyValue }];
|
|
const updateDerivedColumnsHookArr = updateDerivedColumnsHook(
|
|
props,
|
|
propertyPath,
|
|
propertyValue,
|
|
);
|
|
if (updateDerivedColumnsHookArr) {
|
|
propertiesToUpdate = [
|
|
...updateDerivedColumnsHookArr,
|
|
...propertiesToUpdate,
|
|
];
|
|
}
|
|
|
|
if (propertyValue === "iconButton") {
|
|
propertiesToUpdate.push({
|
|
propertyPath: `${property}.iconName`,
|
|
propertyValue: IconNames.ADD,
|
|
});
|
|
} else {
|
|
propertiesToUpdate.push({
|
|
propertyPath: `${property}.iconName`,
|
|
propertyValue: "",
|
|
});
|
|
}
|
|
|
|
return propertiesToUpdate;
|
|
}
|
|
|
|
// Select default Icon Alignment when an icon is chosen
|
|
export function updateIconAlignmentHook(
|
|
props: TableWidgetProps,
|
|
propertyPath: string,
|
|
propertyValue: string,
|
|
) {
|
|
const property = getBasePropertyPath(propertyPath);
|
|
const iconAlign = get(props, `${property}.iconAlign`, "");
|
|
let propertiesToUpdate = [{ propertyPath, propertyValue }];
|
|
const updateDerivedColumnsHookArr = updateDerivedColumnsHook(
|
|
props,
|
|
propertyPath,
|
|
propertyValue,
|
|
);
|
|
if (updateDerivedColumnsHookArr) {
|
|
propertiesToUpdate = [
|
|
...updateDerivedColumnsHookArr,
|
|
...propertiesToUpdate,
|
|
];
|
|
}
|
|
|
|
if (iconAlign) {
|
|
propertiesToUpdate.push({
|
|
propertyPath: "iconAlign",
|
|
propertyValue: Alignment.LEFT,
|
|
});
|
|
}
|
|
|
|
return propertiesToUpdate;
|
|
}
|
|
|
|
// A hook for handling property updates when the primaryColumns
|
|
// has changed and it is supposed to update the derivedColumns
|
|
// For example, when we add a new column or update a derived column's name
|
|
// The propertyPath will be of the type `primaryColumns.columnId`
|
|
// Handling BindingProperty of derived columns
|
|
const addColumnRegex = /^primaryColumns\.\w+$/; // primaryColumns.customColumn1
|
|
const updateColumnRegex = /^primaryColumns\.(\w+)\.(.*)$/; // primaryColumns.customColumn1.computedValue
|
|
|
|
export const updateDerivedColumnsHook = (
|
|
props: TableWidgetProps,
|
|
propertyPath: string,
|
|
propertyValue: any,
|
|
): Array<{ propertyPath: string; propertyValue: any }> | undefined => {
|
|
if (propertyValue && addColumnRegex.test(propertyPath)) {
|
|
if (propertyValue.id) {
|
|
const propertiesToUpdate = [];
|
|
// sets default value for some properties
|
|
propertyValue.labelColor = Colors.WHITE;
|
|
propertiesToUpdate.push({
|
|
propertyPath: `derivedColumns.${propertyValue.id}`,
|
|
propertyValue,
|
|
});
|
|
const oldColumnOrder = props.columnOrder || [];
|
|
const newColumnOrder = [...oldColumnOrder, propertyValue.id];
|
|
propertiesToUpdate.push({
|
|
propertyPath: "columnOrder",
|
|
propertyValue: newColumnOrder,
|
|
});
|
|
return propertiesToUpdate;
|
|
}
|
|
}
|
|
|
|
const matches = propertyPath.match(updateColumnRegex);
|
|
if (matches && matches.length === 3) {
|
|
const propertiesToUpdate = [];
|
|
const columnId = matches[1];
|
|
const columnProperty = matches[2];
|
|
const { derivedColumns = {} } = props;
|
|
// only change derived properties of custom columns
|
|
if (derivedColumns[columnId]) {
|
|
propertiesToUpdate.push({
|
|
propertyPath: `derivedColumns.${columnId}.${columnProperty}`,
|
|
propertyValue: propertyValue,
|
|
});
|
|
}
|
|
|
|
updateThemeStylesheetsInColumns(
|
|
props,
|
|
propertyValue,
|
|
columnId,
|
|
columnProperty,
|
|
propertiesToUpdate,
|
|
);
|
|
|
|
return propertiesToUpdate.length > 0 ? propertiesToUpdate : undefined;
|
|
}
|
|
};
|
|
|
|
/**
|
|
* updates theme stylesheets
|
|
*
|
|
* @param props
|
|
* @param propertyPath
|
|
* @param propertyValue
|
|
*/
|
|
function updateThemeStylesheetsInColumns(
|
|
props: TableWidgetProps,
|
|
propertyValue: any,
|
|
columnId: string,
|
|
columnProperty: string,
|
|
propertiesToUpdate: Array<{ propertyPath: string; propertyValue: any }>,
|
|
) {
|
|
if (columnProperty === "columnType") {
|
|
const oldColumnType = props.columnType;
|
|
const newColumnType = propertyValue;
|
|
|
|
const propertiesToRemove = Object.keys(
|
|
props.childStylesheet[oldColumnType] || {},
|
|
);
|
|
|
|
const propertiesToAdd = Object.keys(
|
|
props.childStylesheet[newColumnType] || {},
|
|
);
|
|
|
|
propertiesToRemove.forEach((propertyKey) => {
|
|
propertiesToUpdate.push({
|
|
propertyPath: `derivedColumns.${columnId}.${propertyKey}`,
|
|
propertyValue: undefined,
|
|
});
|
|
|
|
propertiesToUpdate.push({
|
|
propertyPath: `primaryColumns.${columnId}.${propertyKey}`,
|
|
propertyValue: undefined,
|
|
});
|
|
});
|
|
|
|
propertiesToAdd.forEach((propertyKey) => {
|
|
const { jsSnippets, stringSegments } = getDynamicBindings(
|
|
props.childStylesheet[newColumnType][propertyKey],
|
|
);
|
|
|
|
const js = combineDynamicBindings(jsSnippets, stringSegments);
|
|
|
|
propertiesToUpdate.push({
|
|
propertyPath: `derivedColumns.${columnId}.${propertyKey}`,
|
|
propertyValue: `{{${props.widgetName}.sanitizedTableData.map((currentRow) => ( ${js}))}}`,
|
|
});
|
|
|
|
propertiesToUpdate.push({
|
|
propertyPath: `primaryColumns.${columnId}.${propertyKey}`,
|
|
propertyValue: `{{${props.widgetName}.sanitizedTableData.map((currentRow) => ( ${js}))}}`,
|
|
});
|
|
});
|
|
}
|
|
}
|
|
// Gets the base property path excluding the current property.
|
|
// For example, for `primaryColumns[5].computedValue` it will return
|
|
// `primaryColumns[5]`
|
|
export const getBasePropertyPath = (
|
|
propertyPath: string,
|
|
): string | undefined => {
|
|
try {
|
|
const propertyPathRegex = /^(.*)\.\w+$/g;
|
|
const matches = [...propertyPath.matchAll(propertyPathRegex)][0];
|
|
if (matches && Array.isArray(matches) && matches.length === 2) {
|
|
return matches[1];
|
|
}
|
|
return;
|
|
} catch (e) {
|
|
return;
|
|
}
|
|
};
|
|
|
|
// Hide column which are not included in the array params
|
|
export const hideByColumnType = (
|
|
props: TableWidgetProps,
|
|
propertyPath: string,
|
|
columnTypes: ColumnTypes[],
|
|
shouldUsePropertyPath?: boolean,
|
|
) => {
|
|
const baseProperty = shouldUsePropertyPath
|
|
? propertyPath
|
|
: getBasePropertyPath(propertyPath);
|
|
const columnType = get(props, `${baseProperty}.columnType`, "");
|
|
return !columnTypes.includes(columnType);
|
|
};
|
|
|
|
/**
|
|
* A function for updateHook to remove the boxShadowColor property post migration.
|
|
* @param props
|
|
* @param propertyPath
|
|
* @param propertyValue
|
|
*/
|
|
export const removeBoxShadowColorProp = (
|
|
props: TableWidgetProps,
|
|
propertyPath: string,
|
|
) => {
|
|
const boxShadowColorPath = replacePropertyName(
|
|
propertyPath,
|
|
"boxShadowColor",
|
|
);
|
|
return [
|
|
{
|
|
propertyPath: boxShadowColorPath,
|
|
propertyValue: undefined,
|
|
},
|
|
];
|
|
};
|
|
|
|
/**
|
|
* This function will replace the property present at the end of the propertyPath with the targetPropertyName.
|
|
* e.g.
|
|
* propertyPath = primaryColumns.action.boxShadow
|
|
* Running this function will give the new propertyPath like below:
|
|
* propertyPath = primaryColumns.action.boxShadowColor
|
|
*
|
|
* @param propertyPath The property path inside a widget
|
|
* @param targetPropertyName Target property name
|
|
* @returns New property path with target property name at the end.
|
|
*/
|
|
export const replacePropertyName = (
|
|
propertyPath: string,
|
|
targetPropertyName: string,
|
|
) => {
|
|
const path = propertyPath.split(".");
|
|
path.pop();
|
|
return `${path.join(".")}.${targetPropertyName}`;
|
|
};
|