Commit b6cf2349 authored by Denys Mishunov's avatar Denys Mishunov

Removed loader from snippet blob view

The loader is part of the blob content component and hence is not
needed in snippet blob view
parent a30a5eb6
...@@ -3,7 +3,6 @@ import BlobEmbeddable from '~/blob/components/blob_embeddable.vue'; ...@@ -3,7 +3,6 @@ import BlobEmbeddable from '~/blob/components/blob_embeddable.vue';
import { SNIPPET_VISIBILITY_PUBLIC } from '../constants'; import { SNIPPET_VISIBILITY_PUBLIC } from '../constants';
import BlobHeader from '~/blob/components/blob_header.vue'; import BlobHeader from '~/blob/components/blob_header.vue';
import BlobContent from '~/blob/components/blob_content.vue'; import BlobContent from '~/blob/components/blob_content.vue';
import { GlLoadingIcon } from '@gitlab/ui';
import CloneDropdownButton from '~/vue_shared/components/clone_dropdown.vue'; import CloneDropdownButton from '~/vue_shared/components/clone_dropdown.vue';
import GetBlobContent from '../queries/snippet.blob.content.query.graphql'; import GetBlobContent from '../queries/snippet.blob.content.query.graphql';
...@@ -15,7 +14,6 @@ export default { ...@@ -15,7 +14,6 @@ export default {
BlobEmbeddable, BlobEmbeddable,
BlobHeader, BlobHeader,
BlobContent, BlobContent,
GlLoadingIcon,
CloneDropdownButton, CloneDropdownButton,
}, },
apollo: { apollo: {
...@@ -82,18 +80,7 @@ export default { ...@@ -82,18 +80,7 @@ export default {
/> />
</template> </template>
</blob-header> </blob-header>
<gl-loading-icon <blob-content :loading="isContentLoading" :content="blobContent" :active-viewer="viewer" />
v-if="isContentLoading"
:label="__('Loading blob')"
size="lg"
class="prepend-top-20 append-bottom-20"
/>
<blob-content
v-else
:loading="isContentLoading"
:content="blobContent"
:active-viewer="viewer"
/>
</article> </article>
</div> </div>
</template> </template>
...@@ -12186,9 +12186,6 @@ msgstr "" ...@@ -12186,9 +12186,6 @@ msgstr ""
msgid "Loading" msgid "Loading"
msgstr "" msgstr ""
msgid "Loading blob"
msgstr ""
msgid "Loading contribution stats for group members" msgid "Loading contribution stats for group members"
msgstr "" msgstr ""
......
import { mount } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import { GlLoadingIcon } from '@gitlab/ui';
import SnippetBlobView from '~/snippets/components/snippet_blob_view.vue'; import SnippetBlobView from '~/snippets/components/snippet_blob_view.vue';
import BlobHeader from '~/blob/components/blob_header.vue'; import BlobHeader from '~/blob/components/blob_header.vue';
import BlobEmbeddable from '~/blob/components/blob_embeddable.vue'; import BlobEmbeddable from '~/blob/components/blob_embeddable.vue';
...@@ -79,12 +78,6 @@ describe('Blob Embeddable', () => { ...@@ -79,12 +78,6 @@ describe('Blob Embeddable', () => {
expect(wrapper.find(BlobEmbeddable).exists()).toBe(true); expect(wrapper.find(BlobEmbeddable).exists()).toBe(true);
}); });
it('shows loading icon while blob content data is in flight', () => {
createComponent({}, dataMock, true);
expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
expect(wrapper.find(BlobContent).exists()).toBe(false);
});
it('sets simple viewer correctly', () => { it('sets simple viewer correctly', () => {
createComponent(); createComponent();
expect(wrapper.find(SimpleViewer).exists()).toBe(true); expect(wrapper.find(SimpleViewer).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