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

Jump to bottom

FIX: Added missing keyboard shortcuts to form view 2023.1 #1989

Merged
merged 3 commits into from
Oct 2, 2023
Merged

FIX: Added missing keyboard shortcuts to form view 2023.1 #1989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f199e35
Added missing keyboard shortcuts to form view
JindrichSusen Sep 28, 2023
a355099
Filler shortcut was not working in form view
JindrichSusen Oct 2, 2023
54eb026
Filler shortcut and filter button did not always open the filter when…
JindrichSusen Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 26 additions & 1 deletion frontend-html/src/gui/Workbench/ScreenArea/FormView/FormViewEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,18 @@ import { runInFlowWithHandler } from "utils/runInFlowWithHandler";
import ColorEditor from "gui/Components/ScreenElements/Editors/ColorEditor";
import { CellAlignment } from "gui/Components/ScreenElements/Table/TableRendering/cells/cellAlignment";
import { flashColor2htmlColor, htmlColor2FlashColor } from "@origam/utils";
import { isAddRecordShortcut } from "utils/keyShortcuts";
import {
isAddRecordShortcut,
isDeleteRecordShortcut,
isDuplicateRecordShortcut, isFilterRecordShortcut,
isSaveShortcut
} from "utils/keyShortcuts";
import { onCreateRowClick } from "model/actions-ui/DataView/onCreateRowClick";
import { onEscapePressed } from "model/actions-ui/DataView/onEscapePressed";
import { flushCurrentRowData } from "model/actions/DataView/TableView/flushCurrentRowData";
import { onDeleteRowClick } from "model/actions-ui/DataView/onDeleteRowClick";
import { onCopyRowClick } from "model/actions-ui/DataView/onCopyRowClick";
import { onFilterButtonClick } from "model/actions-ui/DataView/onFilterButtonClick";


@inject(({property, formPanelView}) => {
Expand Down Expand Up @@ -338,6 +347,22 @@ export class FormViewEditor extends React.Component<{
await onCreateRowClick(dataView)(event);
return;
}
if (isAddRecordShortcut(event)) {
await onCreateRowClick(dataView)(event);
return;
}
if (isDeleteRecordShortcut(event)) {
await onDeleteRowClick(dataView)(event);
return;
}
if (isDuplicateRecordShortcut(event)) {
await onCopyRowClick(dataView)(event);
return;
}
if (isFilterRecordShortcut(event)) {
await onFilterButtonClick(dataView)(event);
return;
}
if (event.key === "Escape") {
await onEscapePressed(dataView, event);
return;
Expand Down
6 changes: 5 additions & 1 deletion frontend-html/src/model/actions-ui/DataView/onFilterButtonClick.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,14 @@ export function onFilterButtonClick(ctx: any) {
return flow(function*onFilterButtonClick(event: any) {
try {
const dataView = getDataView(ctx);
const filterConfiguration = getFilterConfiguration(ctx);
if (dataView.isFormViewActive()) {
dataView.activateTableView?.();
if(filterConfiguration.isFilterControlsDisplayed){
return;
}
}
getFilterConfiguration(ctx).onFilterDisplayClick(event);
filterConfiguration.onFilterDisplayClick(event);
} catch (e) {
yield*handleError(ctx)(e);
throw e;
Expand Down