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

table edit default behavior #1530

Merged
merged 21 commits into from
Jul 17, 2024
Merged

table edit default behavior #1530

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dc3fab9
Default behavior for table edit, delete, add
Jul 16, 2024
b7b75ff
test
Jul 16, 2024
d17a212
manage on_add, on_delete with editable
Jul 16, 2024
b3e2dbb
update dependencies
Jul 16, 2024
9a5dbb4
not ready for react-jsx-parser with jest
Jul 16, 2024
f118c59
tests
Jul 16, 2024
3023990
fix small things reported by tests as warning
Jul 17, 2024
7be7424
Merge branch 'develop' into feature/#557-table-edit-default-behavior
FredLL-Avaiga Jul 17, 2024
47a9145
test coverage
Jul 17, 2024
dcd5a0f
test coverage
Jul 17, 2024
2977145
Merge branch 'develop' into feature/#557-table-edit-default-behavior
FredLL-Avaiga Jul 17, 2024
66df34d
test coverage
Jul 17, 2024
e733607
test coverage with more permissions
Jul 17, 2024
1cbb0a0
test coverage with a bit less permissions
Jul 17, 2024
a462d56
start the coverage process
Jul 17, 2024
a9f62b6
fix
Jul 17, 2024
6ebdf82
test coverage with a bit less permissions
Jul 17, 2024
30e6a25
double quotes
FredLL-Avaiga Jul 17, 2024
16ed16d
double quotes
FredLL-Avaiga Jul 17, 2024
d7ffcf7
double quotes
FredLL-Avaiga Jul 17, 2024
71e8d31
make table_on_* public
Jul 17, 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
705 changes: 442 additions & 263 deletions frontend/taipy-gui/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/taipy-gui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"react-dom": "^18.2.0",
"react-error-boundary": "^4.0.3",
"react-helmet-async": "^2.0.1",
"react-jsx-parser": "^1.28.4",
"react-jsx-parser": "^1.29.0",
"react-markdown": "^9.0.1",
"react-plotly.js": "^2.5.1",
"react-router-dom": "^6.0.1",
Expand Down
4 changes: 2 additions & 2 deletions frontend/taipy-gui/src/components/Taipy/AutoLoadingTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ const AutoLoadingTable = (props: TaipyTableProps) => {

const className = useClassNames(props.libClassName, props.dynamicClassName, props.className);
const active = useDynamicProperty(props.active, props.defaultActive, true);
const editable = useDynamicProperty(props.editable, props.defaultEditable, true);
const editable = useDynamicProperty(props.editable, props.defaultEditable, false);
const hover = useDynamicProperty(props.hoverText, props.defaultHoverText, undefined);
const baseColumns = useDynamicJsonProperty(props.columns, props.defaultColumns, defaultColumns);

Expand Down Expand Up @@ -292,7 +292,7 @@ const AutoLoadingTable = (props: TaipyTableProps) => {
}
});
addDeleteColumn(
(active && (onAdd || onDelete) ? 1 : 0) +
(active && editable && (onAdd || onDelete) ? 1 : 0) +
(active && filter ? 1 : 0) +
(active && downloadable ? 1 : 0),
baseColumns
Expand Down
11 changes: 7 additions & 4 deletions frontend/taipy-gui/src/components/Taipy/PaginatedTable.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ describe("PaginatedTable Component", () => {
const state: TaipyState = INITIAL_STATE;
const { getAllByTestId, queryAllByTestId, rerender } = render(
<TaipyContext.Provider value={{ state, dispatch }}>
<PaginatedTable data={undefined} defaultColumns={editableColumns} onEdit="onEdit" showAll={true} />
<PaginatedTable data={undefined} defaultColumns={editableColumns} editable={true} onEdit="onEdit" showAll={true} />
</TaipyContext.Provider>
);

Expand All @@ -384,6 +384,7 @@ describe("PaginatedTable Component", () => {
<PaginatedTable
data={editableValue as TableValueType}
defaultColumns={editableColumns}
editable={true}
onEdit="onEdit"
showAll={true}
/>
Expand All @@ -400,7 +401,7 @@ describe("PaginatedTable Component", () => {
const state: TaipyState = INITIAL_STATE;
const { getByTestId, queryAllByTestId, getAllByTestId, rerender } = render(
<TaipyContext.Provider value={{ state, dispatch }}>
<PaginatedTable data={undefined} defaultColumns={editableColumns} onEdit="onEdit" showAll={true} />
<PaginatedTable data={undefined} defaultColumns={editableColumns} editable={true} onEdit="onEdit" showAll={true} />
</TaipyContext.Provider>
);

Expand All @@ -409,6 +410,7 @@ describe("PaginatedTable Component", () => {
<PaginatedTable
data={editableValue as TableValueType}
defaultColumns={editableColumns}
editable={true}
onEdit="onEdit"
showAll={true}
/>
Expand Down Expand Up @@ -497,7 +499,7 @@ describe("PaginatedTable Component", () => {
const state: TaipyState = INITIAL_STATE;
const { getByTestId } = render(
<TaipyContext.Provider value={{ state, dispatch }}>
<PaginatedTable data={undefined} defaultColumns={editableColumns} showAll={true} onAdd="onAdd" />
<PaginatedTable data={undefined} defaultColumns={editableColumns} showAll={true} editable={true} onAdd="onAdd" />
</TaipyContext.Provider>
);

Expand All @@ -519,7 +521,7 @@ describe("PaginatedTable Component", () => {
const state: TaipyState = INITIAL_STATE;
const { getAllByTestId, getByTestId, queryAllByTestId, rerender } = render(
<TaipyContext.Provider value={{ state, dispatch }}>
<PaginatedTable data={undefined} defaultColumns={editableColumns} showAll={true} onDelete="onDelete" />
<PaginatedTable data={undefined} defaultColumns={editableColumns} showAll={true} editable={true} onDelete="onDelete" />
</TaipyContext.Provider>
);

Expand All @@ -528,6 +530,7 @@ describe("PaginatedTable Component", () => {
<PaginatedTable
data={editableValue as TableValueType}
defaultColumns={editableColumns}
editable={true}
showAll={true}
onDelete="onDelete"
/>
Expand Down
4 changes: 2 additions & 2 deletions frontend/taipy-gui/src/components/Taipy/PaginatedTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ const PaginatedTable = (props: TaipyPaginatedTableProps) => {
const refresh = typeof props.data === "number";
const className = useClassNames(props.libClassName, props.dynamicClassName, props.className);
const active = useDynamicProperty(props.active, props.defaultActive, true);
const editable = useDynamicProperty(props.editable, props.defaultEditable, true);
const editable = useDynamicProperty(props.editable, props.defaultEditable, false);
const hover = useDynamicProperty(props.hoverText, props.defaultHoverText, undefined);
const baseColumns = useDynamicJsonProperty(props.columns, props.defaultColumns, defaultColumns);

Expand All @@ -149,7 +149,7 @@ const PaginatedTable = (props: TaipyPaginatedTableProps) => {
}
});
addDeleteColumn(
(active && (onAdd || onDelete) ? 1 : 0) +
(active && editable && (onAdd || onDelete) ? 1 : 0) +
(active && filter ? 1 : 0) +
(active && downloadable ? 1 : 0),
baseColumns
Expand Down
Loading
Loading