Skip to content

Commit 3a8813a

Browse files
authored
Merge pull request #16 from flow-build/fix/DAT-479
Fix/DAT-479
2 parents 1298a5e + dc2dd02 commit 3a8813a

File tree

7 files changed

+15
-7313
lines changed

7 files changed

+15
-7313
lines changed

.github/workflows/auto-labeler-pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ name: Labeler
22
on:
33
- pull_request_target
44
jobs:
5-
pattern-labaler:
5+
pattern-labeler:
66
runs-on: ubuntu-latest
77
steps:
88
- uses: actions/labeler@v2
99
with:
1010
configuration-path: .github/label-settings/labeler.yml
1111
repo-token: ${{ secrets.GH_TOKEN }}
1212
branch-name-labeler:
13-
runs-on: ubuntu-18.04
13+
runs-on: ubuntu-latest
1414
steps:
15-
- uses: TimonVS/pr-labeler-action@v3
15+
- uses: TimonVS/pr-labeler-action@v4
1616
with:
1717
configuration-path: .github/label-settings/name-pattern-labeler.yml
1818
env:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ dist
66
esbuild-why*.html
77
.env
88
.npmrc
9-
yarn.lock
9+
**/yarn.lock
1010

app/examples/Basic/store.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { configureStore, createSlice } from '@reduxjs/toolkit';
22

3-
import { workflowManagerReducer } from '../../../dist';
3+
import { workflowManagerInternalReducer } from '../../../dist';
44

55
const basicSlice = createSlice({
66
name: '@basic',
@@ -9,6 +9,6 @@ const basicSlice = createSlice({
99
});
1010

1111
export const store = configureStore({
12-
reducer: { workflowManagerReducer, basic: basicSlice.reducer },
12+
reducer: { workflowManagerInternalReducer, basic: basicSlice.reducer },
1313
devTools: process.env.NODE_ENV !== 'production',
1414
});

app/yarn.lock

Lines changed: 0 additions & 7300 deletions
This file was deleted.

src/WorkflowManagerConfig.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@ class WorkflowManagerConfig implements WorkflowManagerConfigProps {
4848
if (isMatched) {
4949
const store = WorkflowManagerConfig._store;
5050
const dispatch = store?.dispatch as Store['dispatch'];
51-
const payload = JSON.parse(message.toString());
52-
const action = payload?.props?.action || '';
53-
const result = payload?.props?.result || {};
51+
const parsedMessage = JSON.parse(message.toString());
52+
const process_id = parsedMessage?.process_id || '';
53+
const action = parsedMessage?.props?.action || '';
54+
const result = parsedMessage?.props?.result || {};
55+
const payload = { process_id, result };
5456

55-
dispatch(createWorkflowAction(action, result));
57+
dispatch(createWorkflowAction(action, payload));
5658
}
5759
};
5860
}

src/ducks/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
export { default as workflowManagerInternalReducer } from './workflowManagerInternal.slice';
2-
export const prefix = '@@workflowManagerExternal';
2+
export const WORFLOW_MANAGER_EXTERNAL_PREFFIX = '@@workflowManagerExternal';

src/ducks/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { createAction } from '@reduxjs/toolkit';
22

3-
import { prefix } from '.';
3+
import { WORFLOW_MANAGER_EXTERNAL_PREFFIX } from '.';
44

55
export const createWorkflowAction = (
66
workflowAction: string,
77
payload: Record<string, unknown>,
88
) => {
9-
const actionName = `${prefix}/${workflowAction}`;
9+
const actionName = `${WORFLOW_MANAGER_EXTERNAL_PREFFIX}/${workflowAction}`;
1010

1111
return createAction<typeof payload>(actionName)(payload);
1212
};

0 commit comments

Comments
 (0)