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: UpdateObject was not run before workflow next #2431

Merged
merged 3 commits into from Jan 26, 2024
Merged

FIX: UpdateObject was not run before workflow next #2431

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
4bf356e
UpdateObject was not run before workflow next
JindrichSusen Jan 25, 2024
b4114c0
Code formatting
JindrichSusen Jan 25, 2024
fddc306
Function name fixed
JindrichSusen Jan 26, 2024
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
12 changes: 7 additions & 5 deletions frontend-html/src/gui/Workbench/ScreenArea/FormView/FormViewEditor.tsx
View file
Open in desktop
Expand Up @@ -63,7 +63,7 @@ import { getFormScreenLifecycle } from "model/selectors/FormScreen/getFormScreen
import { getIsAddButtonVisible } from "model/selectors/DataView/getIsAddButtonVisible";
import { getIsDelButtonVisible } from "model/selectors/DataView/getIsDelButtonVisible";
import { getIsCopyButtonVisible } from "model/selectors/DataView/getIsCopyButtonVisible";
import { geScreenActionButtonsState } from "model/actions-ui/ScreenToolbar/saveButtonVisible";
import { getScreenActionButtonsState } from "model/actions-ui/ScreenToolbar/saveButtonVisible";
import { getOpenedScreen } from "model/selectors/getOpenedScreen";
import { makeOnAddNewRecordClick, onSaveClick } from "gui/connections/NewRecordScreen";
import { onScreenTabCloseClick } from "model/actions-ui/ScreenTabHandleRow/onScreenTabCloseClick";
Expand Down Expand Up @@ -357,18 +357,20 @@ export class FormViewEditor extends React.Component<{
}
return;
}
if (isSaveShortcut(event) && geScreenActionButtonsState(dataView)?.isSaveButtonVisible) {
if (isSaveShortcut(event)) {
await runGeneratorInFlowWithHandler({
ctx: dataView,
generator: function*() {
yield*flushCurrentRowData(dataView)();
const formScreenLifecycle = getFormScreenLifecycle(dataView);
yield*formScreenLifecycle.onSaveSession();
if (getScreenActionButtonsState(dataView)?.isSaveButtonVisible) {
const formScreenLifecycle = getFormScreenLifecycle(dataView);
yield*formScreenLifecycle.onSaveSession();
}
}()
});
return;
}
if (isRefreshShortcut(event) && geScreenActionButtonsState(dataView)?.isRefreshButtonVisible) {
if (isRefreshShortcut(event) && getScreenActionButtonsState(dataView)?.isRefreshButtonVisible) {
await runGeneratorInFlowWithHandler({
ctx: dataView,
generator: function*() {
Expand Down
4 changes: 2 additions & 2 deletions frontend-html/src/gui/connections/CScreenToolbar.tsx
View file
Open in desktop
Expand Up @@ -51,7 +51,7 @@ import { getAbout } from "model/selectors/getAbout";
import { About } from "model/entities/AboutInfo";
import { showDialog } from "model/selectors/getDialogStack";
import { AboutDialog } from "gui/Components/Dialogs/AboutDialog";
import { geScreenActionButtonsState } from "model/actions-ui/ScreenToolbar/saveButtonVisible";
import { getScreenActionButtonsState } from "model/actions-ui/ScreenToolbar/saveButtonVisible";
import { isRefreshShortcut, isSaveShortcut } from "utils/keyShortcuts";

@observer
Expand Down Expand Up @@ -203,7 +203,7 @@ export class CScreenToolbar extends React.Component<{}> {
}

renderForFormScreen() {
const actionButtonsState = geScreenActionButtonsState(this.application);
const actionButtonsState = getScreenActionButtonsState(this.application);
if(!actionButtonsState){
return null;
}
Expand Down
4 changes: 2 additions & 2 deletions frontend-html/src/gui/connections/MobileComponents/BottomToolBar/BottomToolBar.tsx
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ import "gui/connections/MobileComponents/BottomToolBar/BottomToolBar.module.scss
import { BottomIcon } from "gui/connections/MobileComponents/BottomToolBar/BottomIcon";
import { MobileState } from "model/entities/MobileState/MobileState";
import { MobXProviderContext, observer } from "mobx-react";
import { geScreenActionButtonsState } from "model/actions-ui/ScreenToolbar/saveButtonVisible";
import { getScreenActionButtonsState } from "model/actions-ui/ScreenToolbar/saveButtonVisible";
import { onSaveSessionClick } from "model/actions-ui/ScreenToolbar/onSaveSessionClick";
import { onRefreshSessionClick } from "model/actions-ui/ScreenToolbar/onRefreshSessionClick";
import { computed } from "mobx";
Expand Down Expand Up @@ -56,7 +56,7 @@ export class BottomToolBar extends React.Component<{
}

render() {
const actionButtonsState = geScreenActionButtonsState(this.props.ctx);
const actionButtonsState = getScreenActionButtonsState(this.props.ctx);
const buttons = [];
if (this.props.mobileState.layoutState.showCloseButton(!!this.activeScreen)) {
{ this.props.mobileState.layoutState.showBackButton &&
Expand Down
12 changes: 7 additions & 5 deletions frontend-html/src/model/actions-ui/DataView/TableView/onFieldKeyDown.ts
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@ import { onCopyRowClick } from "model/actions-ui/DataView/onCopyRowClick";
import { onFilterButtonClick } from "model/actions-ui/DataView/onFilterButtonClick";
import { onEscapePressed } from "model/actions-ui/DataView/onEscapePressed";
import { getFormScreenLifecycle } from "model/selectors/FormScreen/getFormScreenLifecycle";
import { geScreenActionButtonsState } from "model/actions-ui/ScreenToolbar/saveButtonVisible";
import { getScreenActionButtonsState } from "model/actions-ui/ScreenToolbar/saveButtonVisible";
import { getIsAddButtonVisible } from "model/selectors/DataView/getIsAddButtonVisible";
import { getIsDelButtonVisible } from "model/selectors/DataView/getIsDelButtonVisible";
import { getIsCopyButtonVisible } from "model/selectors/DataView/getIsCopyButtonVisible";
Expand Down Expand Up @@ -135,12 +135,14 @@ export function onFieldKeyDown(ctx: any) {
break;
}
default: {
if (isSaveShortcut(event) && geScreenActionButtonsState(ctx)?.isSaveButtonVisible) {
if (isSaveShortcut(event)) {
yield*flushCurrentRowData(ctx)();
const formScreenLifecycle = getFormScreenLifecycle(ctx);
yield*formScreenLifecycle.onSaveSession();
if (getScreenActionButtonsState(ctx)?.isSaveButtonVisible) {
const formScreenLifecycle = getFormScreenLifecycle(ctx);
yield*formScreenLifecycle.onSaveSession();
}
}
else if (isRefreshShortcut(event) && geScreenActionButtonsState(ctx)?.isRefreshButtonVisible) {
else if (isRefreshShortcut(event) && getScreenActionButtonsState(ctx)?.isRefreshButtonVisible) {
tablePanelView.setEditing(false);
yield*flushCurrentRowData(ctx)();
const formScreenLifecycle = getFormScreenLifecycle(ctx);
Expand Down
2 changes: 1 addition & 1 deletion frontend-html/src/model/actions-ui/ScreenToolbar/saveButtonVisible.ts
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ import { IFormScreen } from "model/entities/types/IFormScreen";
import { getIsSuppressSave } from "model/selectors/FormScreen/getIsSuppressSave";
import { getIsSuppressRefresh } from "model/selectors/FormScreen/getIsSuppressRefresh";

export function geScreenActionButtonsState(ctx: any): IScreenActionButtonsState | undefined{
export function getScreenActionButtonsState(ctx: any): IScreenActionButtonsState | undefined{
const activeScreen = getActiveScreen(ctx);
if (activeScreen && !activeScreen.content) return undefined;
const formScreen =
Expand Down