Commit 489d669a authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'add-exportlabel' into 'master'

Replace deprecated button

See merge request gitlab-org/gitlab!38189
parents 9b94d4e7 972aadda
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import { mapActions, mapState } from 'vuex'; import { mapActions, mapState } from 'vuex';
import { import {
GlDeprecatedButton, GlDeprecatedButton,
GlButton,
GlDeprecatedDropdown, GlDeprecatedDropdown,
GlDeprecatedDropdownItem, GlDeprecatedDropdownItem,
GlIcon, GlIcon,
...@@ -14,6 +15,7 @@ export default { ...@@ -14,6 +15,7 @@ export default {
name: 'DependenciesActions', name: 'DependenciesActions',
components: { components: {
GlDeprecatedButton, GlDeprecatedButton,
GlButton,
GlDeprecatedDropdown, GlDeprecatedDropdown,
GlDeprecatedDropdownItem, GlDeprecatedDropdownItem,
GlIcon, GlIcon,
...@@ -97,14 +99,15 @@ export default { ...@@ -97,14 +99,15 @@ export default {
<gl-icon :name="sortOrderIcon" /> <gl-icon :name="sortOrderIcon" />
</gl-deprecated-button> </gl-deprecated-button>
</div> </div>
<gl-deprecated-button <gl-button
v-gl-tooltip v-gl-tooltip
:href="downloadEndpoint" :href="downloadEndpoint"
download="dependencies.json" download="dependencies.json"
:title="s__('Dependencies|Export as JSON')" :title="s__('Dependencies|Export as JSON')"
class="js-download" class="js-download"
icon="export"
> >
<gl-icon name="export" /> {{ __('Export') }}
</gl-deprecated-button> </gl-button>
</div> </div>
</template> </template>
---
title: Add text to export button
merge_request: 38189
author:
type: other
...@@ -69,18 +69,19 @@ exports[`DependenciesActions component matches the snapshot 1`] = ` ...@@ -69,18 +69,19 @@ exports[`DependenciesActions component matches the snapshot 1`] = `
</gl-deprecated-button-stub> </gl-deprecated-button-stub>
</div> </div>
<gl-deprecated-button-stub <gl-button-stub
category="tertiary"
class="js-download" class="js-download"
download="dependencies.json" download="dependencies.json"
href="http://test.host/dependencies.json" href="http://test.host/dependencies.json"
size="md" icon="export"
size="medium"
title="Export as JSON" title="Export as JSON"
variant="secondary" variant="default"
> >
<gl-icon-stub
name="export" Export
size="16"
/> </gl-button-stub>
</gl-deprecated-button-stub>
</div> </div>
`; `;
...@@ -9889,6 +9889,9 @@ msgstr "" ...@@ -9889,6 +9889,9 @@ msgstr ""
msgid "Explore public groups" msgid "Explore public groups"
msgstr "" msgstr ""
msgid "Export"
msgstr ""
msgid "Export as CSV" msgid "Export as CSV"
msgstr "" msgstr ""
......
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