Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
177a5e69
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
177a5e69
编写于
8月 15, 2018
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed deleting new files creating wrong state in IDE
Closes #50255
上级
7ff0dbc5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
38 addition
and
1 deletion
+38
-1
app/assets/javascripts/ide/stores/mutations.js
app/assets/javascripts/ide/stores/mutations.js
+6
-1
changelogs/unreleased/ide-delete-new-files-state.yml
changelogs/unreleased/ide-delete-new-files-state.yml
+5
-0
spec/javascripts/ide/stores/mutations_spec.js
spec/javascripts/ide/stores/mutations_spec.js
+27
-0
未找到文件。
app/assets/javascripts/ide/stores/mutations.js
浏览文件 @
177a5e69
...
...
@@ -200,6 +200,7 @@ export default {
},
[
types
.
DELETE_ENTRY
](
state
,
path
)
{
const
entry
=
state
.
entries
[
path
];
const
{
tempFile
=
false
}
=
entry
;
const
parent
=
entry
.
parentPath
?
state
.
entries
[
entry
.
parentPath
]
:
state
.
trees
[
`
${
state
.
currentProjectId
}
/
${
state
.
currentBranchId
}
`
];
...
...
@@ -209,7 +210,11 @@ export default {
parent
.
tree
=
parent
.
tree
.
filter
(
f
=>
f
.
path
!==
entry
.
path
);
if
(
entry
.
type
===
'
blob
'
)
{
state
.
changedFiles
=
state
.
changedFiles
.
concat
(
entry
);
if
(
tempFile
)
{
state
.
changedFiles
=
state
.
changedFiles
.
filter
(
f
=>
f
.
path
!==
path
);
}
else
{
state
.
changedFiles
=
state
.
changedFiles
.
concat
(
entry
);
}
}
},
[
types
.
RENAME_ENTRY
](
state
,
{
path
,
name
,
entryPath
=
null
})
{
...
...
changelogs/unreleased/ide-delete-new-files-state.yml
0 → 100644
浏览文件 @
177a5e69
---
title
:
Fixed IDE deleting new files creating wrong state
merge_request
:
author
:
type
:
fixed
spec/javascripts/ide/stores/mutations_spec.js
浏览文件 @
177a5e69
...
...
@@ -213,6 +213,33 @@ describe('Multi-file store mutations', () => {
expect
(
localState
.
changedFiles
).
toEqual
([
localState
.
entries
.
filePath
]);
});
it
(
'
does not add tempFile into changedFiles
'
,
()
=>
{
localState
.
entries
.
filePath
=
{
deleted
:
false
,
type
:
'
blob
'
,
tempFile
:
true
,
};
mutations
.
DELETE_ENTRY
(
localState
,
'
filePath
'
);
expect
(
localState
.
changedFiles
).
toEqual
([]);
});
it
(
'
removes tempFile from changedFiles when deleted
'
,
()
=>
{
localState
.
entries
.
filePath
=
{
path
:
'
filePath
'
,
deleted
:
false
,
type
:
'
blob
'
,
tempFile
:
true
,
};
localState
.
changedFiles
.
push
({
...
localState
.
entries
.
filePath
});
mutations
.
DELETE_ENTRY
(
localState
,
'
filePath
'
);
expect
(
localState
.
changedFiles
).
toEqual
([]);
});
});
describe
(
'
UPDATE_FILE_AFTER_COMMIT
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录