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: Deleting active work queue entry caused an error #2412

Merged
merged 2 commits into from Jan 22, 2024
Merged

FIX: Deleting active work queue entry caused an error #2412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fdaf33
Created Wf for create one row in WQ.
JiriPrajz Jan 16, 2024
64a5aad
Deleting active work queue entry caused an error
JindrichSusen Jan 18, 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
29 changes: 24 additions & 5 deletions frontend-html/src/model/entities/DataView.ts
View file
Open in desktop
Expand Up @@ -90,7 +90,10 @@ import { ScreenFocusManager } from "model/entities/ScreenFocusManager";
import {TabIndex} from "./TabIndexOwner";

class SavedViewState {
constructor(public selectedRowId: string | undefined) {
constructor(
public selectedRowId: string | undefined,
public selectedRowIndex: number | undefined
) {
}
}

Expand Down Expand Up @@ -740,7 +743,6 @@ export class DataView implements IDataView {
yield*this.setSelectedRowId(this.dataTable.getRowId(row));
}


*setSelectedRowId(id: string | undefined): Generator {
if (this.selectedRowId === id) {
return;
Expand All @@ -761,16 +763,33 @@ export class DataView implements IDataView {

@action.bound
saveViewState(): void {
this.viewStateStack.push(new SavedViewState(this.selectedRowId));
this.viewStateStack.push(
new SavedViewState(
this.selectedRowId,
this.getRowIndexById(this.selectedRowId)
)
);
}

@action.bound
*restoreViewState() {
const state = this.viewStateStack.pop();
if (state && state.selectedRowId) {
yield*this.setSelectedRowId(state.selectedRowId);
const row = this.dataTable.getRowById(state.selectedRowId);
if(row) {
yield*this.setSelectedRowId(state.selectedRowId);
}
else if (state.selectedRowIndex) {
const nextRow = this.tableRows[state.selectedRowIndex];
const isDataRow = Array.isArray(nextRow);
if(isDataRow){
const nextRowId = this.dataTable.getRowId(nextRow);
yield*this.setSelectedRowId(nextRowId);
return;
}
}
if (!getSelectedRow(this)) {
this.selectFirstRow();
yield*this.reselectOrSelectFirst();
}
getTablePanelView(this).scrollToCurrentCell();
}
Expand Down
5 changes: 2 additions & 3 deletions frontend-html/src/model/entities/FormScreenLifecycle/FormScreenLifecycle.tsx
View file
Open in desktop
Expand Up @@ -922,7 +922,6 @@ export class FormScreenLifecycle02 implements IFormScreenLifecycle02 {
}): any {
const rootDataView = args.rootDataView;
const api = getApi(this);
yield*rootDataView.setSelectedRowId(undefined);
rootDataView.lifecycle.stopSelectedRowReaction();
try {
this.monitor.inFlow++;
Expand Down Expand Up @@ -956,9 +955,9 @@ export class FormScreenLifecycle02 implements IFormScreenLifecycle02 {
if (this.initialSelectedRowId) {
yield*rootDataView.setSelectedRowId(this.initialSelectedRowId);
} else {
yield*rootDataView.reselectOrSelectFirst();
yield*rootDataView.restoreViewState();
}
yield*rootDataView.restoreViewState();
getTablePanelView(rootDataView).scrollToCurrentCell();
} finally {
yield*rootDataView.lifecycle.startSelectedRowReaction(!args.preloadIsDirty);
this.monitor.inFlow--;
Expand Down
11 changes: 11 additions & 0 deletions model-tests/model/Widgets/Menu/Menu.origam
View file
Open in desktop
Expand Up @@ -590,6 +590,17 @@
x:parentId="147775f5-451d-4efd-8634-7f27a2cf50a6"
ami:roles="*"
wrmi:workflow="Widgets/Workflow/Widgets/TestOAuthRequest.origam#TestOAuthRequest/4af5f7a5-3fbe-459b-aa6c-6ac2e7613b4f" />
<wrmi:MenuItem
asi:abstract="false"
ami:alwaysOpenNew="false"
ami:displayName="New TestQueue1_Row"
x:id="d84de70e-ab86-468a-96e2-a619a6f37600"
asi:name="CreateWQRow_TestQueue1"
ami:openExclusively="false"
ami:order="100"
x:parentId="147775f5-451d-4efd-8634-7f27a2cf50a6"
ami:roles="*"
wrmi:workflow="Widgets/Workflow/Widgets/CreateWQRow_TestQueue1.origam#CreateWQRow_TestQueue1/8ec8b363-d365-41b8-b076-207750bafa14" />
<wrmi:MenuItem
asi:abstract="false"
ami:alwaysOpenNew="false"
Expand Down
13 changes: 13 additions & 0 deletions model-tests/model/Widgets/Transformation/Widgets/New_Record_TestQueue1.origam
View file
Open in desktop
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<x:file
xmlns:x="http://schemas.origam.com/model-persistence/1.0.0"
xmlns:asi="http://schemas.origam.com/Origam.Schema.AbstractSchemaItem/6.0.0"
xmlns:at="http://schemas.origam.com/Origam.Schema.EntityModel.AbstractTransformation/6.0.0"
xmlns:xt="http://schemas.origam.com/Origam.Schema.EntityModel.XslTransformation/6.0.0">
<xt:Transformation
asi:abstract="false"
xt:engineType="XslCompiledTransform"
x:id="b4c78415-29fc-4bdb-a9c6-2351f9403703"
asi:name="New_Record_TestQueue1"
xt:text="-***-ExternalFile:New_Record_TestQueue1.origam___text___b4c78415-29fc-4bdb-a9c6-2351f9403703.xslt" />
</x:file>
14 changes: 14 additions & 0 deletions ...n/Widgets/New_Record_TestQueue1.origam___text___b4c78415-29fc-4bdb-a9c6-2351f9403703.xslt
View file
Open in desktop
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:AS="http://schema.advantages.cz/AsapFunctions"
xmlns:date="http://exslt.org/dates-and-times" exclude-result-prefixes="AS date">

<xsl:template match="ROOT">
<ROOT>
<WorkQueueEntry Id="{AS:GenerateId()}"
refWorkQueueId="751BD582-2604-4259-B560-6AFB8A772FCA"

/>
</ROOT>
</xsl:template>
</xsl:stylesheet>
115 changes: 115 additions & 0 deletions model-tests/model/Widgets/Workflow/Widgets/CreateWQRow_TestQueue1.origam
View file
Open in desktop
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="utf-8"?>
<x:file
xmlns:x="http://schemas.origam.com/model-persistence/1.0.0"
xmlns:asi="http://schemas.origam.com/Origam.Schema.AbstractSchemaItem/6.0.0"
xmlns:aws="http://schemas.origam.com/Origam.Schema.WorkflowModel.AbstractWorkflowStep/6.0.2"
xmlns:cr="http://schemas.origam.com/Origam.Schema.WorkflowModel.ContextReference/6.0.0"
xmlns:cs="http://schemas.origam.com/Origam.Schema.WorkflowModel.ContextStore/6.0.0"
xmlns:dsr="http://schemas.origam.com/Origam.Schema.EntityModel.DataStructureReference/6.0.0"
xmlns:smcp="http://schemas.origam.com/Origam.Schema.WorkflowModel.ServiceMethodCallParameter/6.0.0"
xmlns:smct="http://schemas.origam.com/Origam.Schema.WorkflowModel.ServiceMethodCallTask/6.0.0"
xmlns:tr="http://schemas.origam.com/Origam.Schema.EntityModel.TransformationReference/6.0.0"
xmlns:w="http://schemas.origam.com/Origam.Schema.WorkflowModel.Workflow/6.0.2"
xmlns:wt="http://schemas.origam.com/Origam.Schema.WorkflowModel.WorkflowTask/6.0.0"
xmlns:wtd="http://schemas.origam.com/Origam.Schema.WorkflowModel.WorkflowTaskDependency/6.0.0">
<w:Workflow
asi:abstract="false"
x:id="8ec8b363-d365-41b8-b076-207750bafa14"
asi:name="CreateWQRow_TestQueue1"
w:transactionBehavior="InheritExisting">
<cs:ContextStore
asi:abstract="false"
cs:dataType="Xml"
cs:disableConstraints="false"
x:id="afa0bfa6-b693-4846-9e33-3fea710399ef"
cs:isReturnValue="false"
asi:name="WQ_TestQueue1"
cs:structure="Widgets/DataStructure/Widgets/WQ_TestQueue1.origam#WQ_TestQueue1/f5bb7dc4-8216-4c43-8c96-cacae3a61ee7" />
<smct:WorkflowTask
asi:abstract="false"
x:id="2eaaedc9-f802-440d-95bb-c51fa954adde"
asi:name="02_Transform_WQ_TestQueue1"
aws:onFailure="WorkflowFails"
wt:outputContextStore="Widgets/Workflow/Widgets/CreateWQRow_TestQueue1.origam#CreateWQRow_TestQueue1/WQ_TestQueue1/afa0bfa6-b693-4846-9e33-3fea710399ef"
wt:outputMethod="AppendMergeExisting"
aws:roles="*"
smct:service="Root/Service/DataTransformationService.origam#DataTransformationService/600930a5-102b-43e8-8af1-677c6d7e79f3"
smct:serviceMethod="Root/Service/DataTransformationService.origam#DataTransformationService/Transform/a215c2d6-e7aa-4b2f-97d9-03a8d019d4c6">
<smcp:ServiceMethodCallParameter
asi:abstract="false"
x:id="45720813-dc1e-4847-9637-ec97bf2d7e05"
asi:name="XslScript"
smcp:serviceMethodParameter="Root/Service/DataTransformationService.origam#DataTransformationService/Transform/XslScript/7eecc204-f38e-49fc-8875-fd6b4ba019fd">
<tr:TransformationReference
asi:abstract="false"
x:id="42258f7d-244e-4c7b-b87e-ed4c69a98f27"
asi:name="New_Record_TestQueue1"
tr:transformation="Widgets/Transformation/Widgets/New_Record_TestQueue1.origam#New_Record_TestQueue1/b4c78415-29fc-4bdb-a9c6-2351f9403703" />
</smcp:ServiceMethodCallParameter>
<smcp:ServiceMethodCallParameter
asi:abstract="false"
x:id="847b94dc-8dc1-4ba5-879c-eb293b10347c"
asi:name="Data"
smcp:serviceMethodParameter="Root/Service/DataTransformationService.origam#DataTransformationService/Transform/Data/3e94d691-e045-426a-bc79-febc3562fa15">
<cr:WorkflowContextReference
asi:abstract="false"
cr:castToDataType="String"
cr:contextStore="Widgets/Workflow/Widgets/CreateWQRow_TestQueue1.origam#CreateWQRow_TestQueue1/WQ_TestQueue1/afa0bfa6-b693-4846-9e33-3fea710399ef"
x:id="760ac952-39e0-42cb-9d33-fa54524d3aed"
asi:name="WQ_TestQueue1"
cr:xPath="/" />
</smcp:ServiceMethodCallParameter>
<smcp:ServiceMethodCallParameter
asi:abstract="false"
x:id="f27d579e-8783-451a-b8ba-388affd2a3c0"
asi:name="Parameters"
smcp:serviceMethodParameter="Root/Service/DataTransformationService.origam#DataTransformationService/Transform/Parameters/ce3ebb59-6528-4157-b51a-500f84a635f0" />
</smct:WorkflowTask>
<smct:WorkflowTask
asi:abstract="false"
x:id="4e7fc7b9-696b-4cc5-9e87-7025d0b7d707"
asi:name="03_StoreData_WQ_TestQueue1"
aws:onFailure="WorkflowFails"
wt:outputContextStore="Widgets/Workflow/Widgets/CreateWQRow_TestQueue1.origam#CreateWQRow_TestQueue1/WQ_TestQueue1/afa0bfa6-b693-4846-9e33-3fea710399ef"
wt:outputMethod="AppendMergeExisting"
aws:roles="*"
smct:service="Root/Service/DataService.origam#DataService/bbd7bd32-d40b-441a-bb5b-0b0fa89169d4"
smct:serviceMethod="Root/Service/DataService.origam#DataService/StoreData/3c1c855d-3c06-49e1-bfbf-cf234134d083">
<smcp:ServiceMethodCallParameter
asi:abstract="false"
x:id="217d144e-ded3-4557-9797-165080c3cbbd"
asi:name="ForceBulkInsert"
smcp:serviceMethodParameter="Root/Service/DataService.origam#DataService/StoreData/ForceBulkInsert/010bc65c-5867-41d6-a3f0-8daa9b2377cd" />
<smcp:ServiceMethodCallParameter
asi:abstract="false"
x:id="c8b9bc41-06d4-46d1-a94b-9008e4242b17"
asi:name="DataStructure"
smcp:serviceMethodParameter="Root/Service/DataService.origam#DataService/StoreData/DataStructure/c229b1e0-cb1e-4c79-ad99-488775df3b19">
<dsr:DataStructureReference
asi:abstract="false"
dsr:dataStructure="Widgets/DataStructure/Widgets/WQ_TestQueue1.origam#WQ_TestQueue1/f5bb7dc4-8216-4c43-8c96-cacae3a61ee7"
x:id="de13937d-769a-4242-b4eb-9ba2c32a9f2c"
asi:name="WQ_TestQueue1" />
</smcp:ServiceMethodCallParameter>
<smcp:ServiceMethodCallParameter
asi:abstract="false"
x:id="ec3e3427-a19c-4698-941c-03290b097d61"
asi:name="Data"
smcp:serviceMethodParameter="Root/Service/DataService.origam#DataService/StoreData/Data/d4d7ec83-a1e8-458e-9900-36562b201ffc">
<cr:WorkflowContextReference
asi:abstract="false"
cr:castToDataType="String"
cr:contextStore="Widgets/Workflow/Widgets/CreateWQRow_TestQueue1.origam#CreateWQRow_TestQueue1/WQ_TestQueue1/afa0bfa6-b693-4846-9e33-3fea710399ef"
x:id="cff9efae-e12b-4f0e-baab-36b2c9f09853"
asi:name="WQ_TestQueue1"
cr:xPath="/" />
</smcp:ServiceMethodCallParameter>
<wtd:WorkflowTaskDependency
asi:abstract="false"
x:id="a0823ec3-f7bf-4319-893d-17b822046153"
asi:name="After_02_Transform_WQ_TestQueue1"
wtd:startEvent="Success"
wtd:task="Widgets/Workflow/Widgets/CreateWQRow_TestQueue1.origam#CreateWQRow_TestQueue1/02_Transform_WQ_TestQueue1/2eaaedc9-f802-440d-95bb-c51fa954adde" />
</smct:WorkflowTask>
</w:Workflow>
</x:file>