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

Data table actions different cases #2027

Merged
merged 14 commits into from
Aug 28, 2024
Merged

Data table actions different cases #2027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b5467f3
fix: refactor in kup-data
EmanueleCitarella Aug 22, 2024
953fa74
refactor: build actions in one function
EmanueleCitarella Aug 22, 2024
dd86928
refactor: name vo cod row actions
EmanueleCitarella Aug 22, 2024
4bfbd6c
refactor: builder for row actions in kup-data
EmanueleCitarella Aug 22, 2024
d6da9c4
feat: refactor & single action case
EmanueleCitarella Aug 22, 2024
a47d727
feat: FimageProp builder
EmanueleCitarella Aug 22, 2024
c1f0417
fix: general
EmanueleCitarella Aug 23, 2024
fc850b8
fix: minor
EmanueleCitarella Aug 23, 2024
c45efbb
fix: test no commands corresponding e2e
EmanueleCitarella Aug 28, 2024
eafd217
fix: reorganized function in kup data
EmanueleCitarella Aug 28, 2024
f7a27d9
fix: codver name or current column name
EmanueleCitarella Aug 28, 2024
2ceef4a
fix: unit test fix for no matching commands
EmanueleCitarella Aug 28, 2024
e353305
fix: condition & test fix
EmanueleCitarella Aug 28, 2024
fe9997f
fix: semantics for kup data
EmanueleCitarella Aug 28, 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
120 changes: 78 additions & 42 deletions packages/ketchup/src/components/kup-data-table/kup-data-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3291,14 +3291,6 @@ export class KupDataTable {
return this.rowActions !== undefined;
}

#rowActionsAdapter(): KupDataRowAction[] {
return this.rowActions.map((rowAction, index) => ({
...rowAction,
type: DropDownAction.ROWACTION,
index: index,
}));
}

#removeGroup(index: number) {
if (index >= 0) {
// removing group from prop
Expand Down Expand Up @@ -3510,7 +3502,7 @@ export class KupDataTable {
const totalFixedColumns =
this.fixedColumns +
(this.#hasRowActions() ||
this.#kupManager.data.hasCodVerColumn(this.data.columns)
this.#kupManager.data.column.hasCodVer(this.data.columns)
? 1
: 0) +
(this.selection === SelectionMode.MULTIPLE_CHECKBOX ? 1 : 0);
Expand Down Expand Up @@ -3949,7 +3941,7 @@ export class KupDataTable {

if (
this.#hasRowActions() ||
this.#kupManager.data.hasCodVerColumn(this.data.columns)
this.#kupManager.data.column.hasCodVer(this.data.columns)
) {
colSpan += 1;
}
Expand Down Expand Up @@ -4164,7 +4156,7 @@ export class KupDataTable {
let actionsColumn = null;
if (
this.#hasRowActions() ||
this.#kupManager.data.hasCodVerColumn(this.data.columns)
this.#kupManager.data.column.hasCodVer(this.data.columns)
) {
specialExtraCellsCount++;
const selectionStyleAndClass = this.#composeFixedCellStyleAndClass(
Expand Down Expand Up @@ -4355,7 +4347,7 @@ export class KupDataTable {
let actionsColumn = null;
if (
this.#hasRowActions() ||
this.#kupManager.data.hasCodVerColumn(this.data.columns)
this.#kupManager.data.column.hasCodVer(this.data.columns)
) {
specialExtraCellsCount++;
const selectionStyleAndClass = this.#composeFixedCellStyleAndClass(
Expand Down Expand Up @@ -4491,7 +4483,7 @@ export class KupDataTable {
let actionsCell = null;
if (
this.#hasRowActions() ||
this.#kupManager.data.hasCodVerColumn(this.data.columns)
this.#kupManager.data.column.hasCodVer(this.data.columns)
) {
extraCells++;
const selectionStyleAndClass = this.#composeFixedCellStyleAndClass(
Expand Down Expand Up @@ -4773,7 +4765,7 @@ export class KupDataTable {
const cells = [];
if (
this.#hasRowActions() ||
this.#kupManager.data.hasCodVerColumn(this.data.columns)
this.#kupManager.data.column.hasCodVer(this.data.columns)
) {
cells.push(<td></td>);
}
Expand Down Expand Up @@ -4970,7 +4962,7 @@ export class KupDataTable {
let rowActionsCell = null;
if (
this.#hasRowActions() ||
this.#kupManager.data.hasCodVerColumn(this.data.columns)
this.#kupManager.data.column.hasCodVer(this.data.columns)
) {
// Increments
specialExtraCellsCount++;
Expand All @@ -4983,40 +4975,82 @@ export class KupDataTable {

rowActionsCount += this.rowActions?.length || 0;

let rowActionExpander = null;
const actionsOnRow: FImageProps[] = [];
if (row.actions) {
rowActionsCount += row.actions.length;
} else {
const voCodRowActions =
this.#kupManager.data.createActionsFromVoCodRow(
const rowActions =
this.#kupManager.data.row.buildRowActions(
row,
this.data.columns,
this.commands ?? []
this.rowActions,
this.commands
);
const rowActionsWithCodVer = this.#hasRowActions()
? [...this.#rowActionsAdapter(), ...voCodRowActions]
: [...voCodRowActions];

// adding expander
const props: FImageProps = {
color: `var(${KupThemeColorValues.PRIMARY})`,
resource: 'chevron-down',
sizeX: '1.5em',
sizeY: '1.5em',
title: this.#kupManager.language.translate(
KupLanguageGeneric.EXPAND
),
wrapperClass: 'expander',
onClick: (e: MouseEvent) => {
this.#onRowActionExpanderClick(
e,
row,
rowActionsWithCodVer

if (rowActions.length === 1) {
const singleAction = rowActions[0];
const imageProp: FImageProps =
this.#kupManager.data.action.buildImageProp(
singleAction.icon ?? '',
singleAction.text ?? '',
'action',
() => {
this.#onDefaultRowActionClick({
action: singleAction,
row,
index: 0,
type: 'default',
});
}
);
},
};
actionsOnRow.push(imageProp);
}

if (rowActions.length > 1) {
if (
this.#kupManager.data.action.checkEveryActionHasOnlyIcon(
rowActions
)
) {
rowActions.forEach((action, index) => {
const imageProp: FImageProps =
this.#kupManager.data.action.buildImageProp(
action.icon,
'',
'action',
() =>
this.#onDefaultRowActionClick({
action,
row,
index,
type: 'default',
})
);
actionsOnRow.push(imageProp);
});
} else {
const imageProp: FImageProps =
this.#kupManager.data.action.buildImageProp(
'chevron-down',
this.#kupManager.language.translate(
KupLanguageGeneric.EXPAND
),
'expander',

(e) => {
this.#onRowActionExpanderClick(
e,
row,
rowActions
);
}
);

actionsOnRow.push(imageProp);
}
}

rowActionsCount++;
rowActionExpander = <FImage {...props} />;
}

rowActionsCell = (
Expand All @@ -5033,7 +5067,9 @@ export class KupDataTable {
: null
}
>
{rowActionExpander}
{actionsOnRow.map((action) => (
<FImage {...action}></FImage>
))}
</td>
);
}
Expand Down
Loading