blob: 1630849b64383f3c673073147dbf80b07c741303 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
/*!
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the 'License');
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an 'AS IS' BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
import { actionTypes } from './MergeEditorConstants.js';
export default (state = [], action) => {
switch (action.type) {
case actionTypes.LOAD_CONFLICT: {
let cdata = { ...action.data };
// let data = state.conflicts ? {...state.conflicts.data} : {} ;
// data[cdata.id] = cdata;
let conflicts = state.conflicts ? { ...state.conflicts } : {};
conflicts[cdata.id] = cdata;
return {
...state,
conflicts
};
}
case actionTypes.DATA_PROCESSED: {
let conflicts = { ...state.conflicts };
let { data } = action;
if (data && data.cid) {
let yours = { ...conflicts[data.cid].yours };
let theirs = { ...conflicts[data.cid].theirs };
let { yoursField, theirsField } = data;
if (yoursField) {
yours[yoursField.name] = yoursField.value;
conflicts[data.cid].yours = yours;
}
if (theirsField) {
theirs[theirsField.name] = theirsField.value;
conflicts[data.cid].theirs = theirs;
}
}
return {
...state,
conflicts: {
...conflicts
}
};
}
case actionTypes.LOAD_CONFLICTS:
let conflictFiles = [];
if (action.data) {
conflictFiles = [...action.data.conflictInfoList];
}
return {
inMerge: conflictFiles.length > 0,
conflictFiles
};
default:
return state;
}
};
|
