QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 05:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

CE-1955 Fix to re-set the position of the review step, upon going back

Browse Source
This commit is contained in:
darin.kelkhoff
2024-12-04 14:58:34 -06:00
parent 434d158776
commit c4583f16a9
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/BulkInsertPrepareFileMappingStep.java
View File

@ -65,7 +65,7 @@ public class BulkInsertPrepareFileMappingStep implements BackendStep
{ {
needSuggestedMapping = false; needSuggestedMapping = false;
StreamedETLWithFrontendProcess.resetValidationFields(runBackendStepInput); StreamedETLWithFrontendProcess.resetValidationFields(runBackendStepInput, runBackendStepOutput);
} }
if(needSuggestedMapping) if(needSuggestedMapping)

2
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/BulkInsertPrepareValueMappingStep.java
View File

@ -78,7 +78,7 @@ public class BulkInsertPrepareValueMappingStep implements BackendStep
{ {
if(runBackendStepOutput.getProcessState().getIsStepBack()) if(runBackendStepOutput.getProcessState().getIsStepBack())
{ {
StreamedETLWithFrontendProcess.resetValidationFields(runBackendStepInput); StreamedETLWithFrontendProcess.resetValidationFields(runBackendStepInput, runBackendStepOutput);
} }
///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////

18
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/StreamedETLWithFrontendProcess.java
View File

@ -23,11 +23,14 @@ package com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwit
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.kingsrook.qqq.backend.core.logging.QLogger;
import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput;
import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference; import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference;
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
@ -70,6 +73,8 @@ import com.kingsrook.qqq.backend.core.processes.implementations.basepull.Basepul
*******************************************************************************/ *******************************************************************************/
public class StreamedETLWithFrontendProcess public class StreamedETLWithFrontendProcess
{ {
private static final QLogger LOG = QLogger.getLogger(StreamedETLWithFrontendProcess.class);
public static final String STEP_NAME_PREVIEW = "preview"; public static final String STEP_NAME_PREVIEW = "preview";
public static final String STEP_NAME_REVIEW = "review"; public static final String STEP_NAME_REVIEW = "review";
public static final String STEP_NAME_VALIDATE = "validate"; public static final String STEP_NAME_VALIDATE = "validate";
@ -197,11 +202,22 @@ public class StreamedETLWithFrontendProcess
/*************************************************************************** /***************************************************************************
** useful for a process step to call upon 'back' ** useful for a process step to call upon 'back'
***************************************************************************/ ***************************************************************************/
public static void resetValidationFields(RunBackendStepInput runBackendStepInput) public static void resetValidationFields(RunBackendStepInput runBackendStepInput, RunBackendStepOutput runBackendStepOutput)
{ {
runBackendStepInput.addValue(FIELD_DO_FULL_VALIDATION, null); runBackendStepInput.addValue(FIELD_DO_FULL_VALIDATION, null);
runBackendStepInput.addValue(FIELD_VALIDATION_SUMMARY, null); runBackendStepInput.addValue(FIELD_VALIDATION_SUMMARY, null);
runBackendStepInput.addValue(FIELD_PROCESS_SUMMARY, null); runBackendStepInput.addValue(FIELD_PROCESS_SUMMARY, null);
//////////////////////////////////////////////////////////////////////////////////////////////////
// in case, on the first time forward, the review step got moved after the validation step //
// (see BaseStreamedETLStep.moveReviewStepAfterValidateStep) - then un-do that upon going back. //
//////////////////////////////////////////////////////////////////////////////////////////////////
ArrayList<String> stepList = new ArrayList<>(runBackendStepOutput.getProcessState().getStepList());
LOG.debug("Resetting step list. It was:" + stepList);
stepList.removeIf(s -> s.equals(StreamedETLWithFrontendProcess.STEP_NAME_REVIEW));
stepList.add(stepList.indexOf(StreamedETLWithFrontendProcess.STEP_NAME_PREVIEW) + 1, StreamedETLWithFrontendProcess.STEP_NAME_REVIEW);
runBackendStepOutput.getProcessState().setStepList(stepList);
LOG.debug("... and now step list is: " + stepList);
} }