Commit 88b4580b authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '38090-remove-spinner-on-approval-change' into 'master'

Remove spinner when approval require input is changed

Closes #38090

See merge request gitlab-org/gitlab!22186
parents c314b76f 26c0a705
...@@ -14,7 +14,6 @@ export default { ...@@ -14,7 +14,6 @@ export default {
computed: { computed: {
...mapState({ ...mapState({
settings: 'settings', settings: 'settings',
isLoading: state => state.approvals.isLoading,
hasLoaded: state => state.approvals.hasLoaded, hasLoaded: state => state.approvals.hasLoaded,
}), }),
createModalId() { createModalId() {
...@@ -42,7 +41,6 @@ export default { ...@@ -42,7 +41,6 @@ export default {
<slot name="rules"></slot> <slot name="rules"></slot>
</div> </div>
<div v-if="settings.canEdit && settings.allowMultiRule" class="border-bottom py-3 px-2"> <div v-if="settings.canEdit && settings.allowMultiRule" class="border-bottom py-3 px-2">
<gl-loading-icon v-if="isLoading" />
<div v-if="settings.allowMultiRule" class="d-flex"> <div v-if="settings.allowMultiRule" class="d-flex">
<gl-button <gl-button
class="ml-auto btn-info btn-inverted" class="ml-auto btn-info btn-inverted"
......
---
title: Remove spinner when approval require input is changed
merge_request: 22186
author:
type: fixed
...@@ -102,13 +102,6 @@ describe('EE Approvals App', () => { ...@@ -102,13 +102,6 @@ describe('EE Approvals App', () => {
expect(findRules().exists()).toBe(true); expect(findRules().exists()).toBe(true);
}); });
it('shows loading icon if loading', () => {
store.modules.approvals.state.isLoading = true;
factory();
expect(findLoadingIcon().exists()).toBe(true);
});
it('does not show loading icon if not loading', () => { it('does not show loading icon if not loading', () => {
store.modules.approvals.state.isLoading = false; store.modules.approvals.state.isLoading = false;
factory(); factory();
...@@ -149,14 +142,6 @@ describe('EE Approvals App', () => { ...@@ -149,14 +142,6 @@ describe('EE Approvals App', () => {
undefined, undefined,
); );
}); });
it('shows loading icon and rules if loading', () => {
store.modules.approvals.state.isLoading = true;
factory();
expect(findRules().exists()).toBe(true);
expect(findLoadingIcon().exists()).toBe(true);
});
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment