Commit 808e4b8c authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'ph/341049/widgetExtensionLevel2Actions' into 'master'

Added support for actions level 2 in the widget extension

See merge request gitlab-org/gitlab!72770
parents d756bf25 38145c3c
...@@ -209,17 +209,25 @@ export default { ...@@ -209,17 +209,25 @@ export default {
<status-icon v-if="data.icon" :icon-name="data.icon.name" :size="12" class="gl-pl-0" /> <status-icon v-if="data.icon" :icon-name="data.icon.name" :size="12" class="gl-pl-0" />
<gl-intersection-observer <gl-intersection-observer
:options="{ rootMargin: '100px', thresholds: 0.1 }" :options="{ rootMargin: '100px', thresholds: 0.1 }"
class="gl-flex-wrap gl-align-self-center gl-display-flex" class="gl-flex-wrap gl-display-flex gl-w-full"
@appear="appear(index)" @appear="appear(index)"
@disappear="disappear(index)" @disappear="disappear(index)"
> >
<div v-safe-html="data.text" class="gl-mr-4"></div> <div
v-safe-html="data.text"
class="gl-mr-4 gl-display-flex gl-align-items-center"
></div>
<div v-if="data.link"> <div v-if="data.link">
<gl-link :href="data.link.href">{{ data.link.text }}</gl-link> <gl-link :href="data.link.href">{{ data.link.text }}</gl-link>
</div> </div>
<gl-badge v-if="data.badge" :variant="data.badge.variant || 'info'"> <gl-badge v-if="data.badge" :variant="data.badge.variant || 'info'">
{{ data.badge.text }} {{ data.badge.text }}
</gl-badge> </gl-badge>
<actions
:widget="$options.label || $options.name"
:tertiary-buttons="data.actions"
class="gl-ml-auto"
/>
</gl-intersection-observer> </gl-intersection-observer>
</li> </li>
</smart-virtual-list> </smart-virtual-list>
......
...@@ -67,6 +67,7 @@ export default { ...@@ -67,6 +67,7 @@ export default {
// href: 'https://google.com', // Required: href for the link // href: 'https://google.com', // Required: href for the link
// text: 'Link text', // Required: Text to be used inside the link // text: 'Link text', // Required: Text to be used inside the link
// }, // },
actions: [{ text: 'Full report', href: 'https://gitlab.com', target: '_blank' }],
})); }));
}); });
}, },
......
import { GlBadge, GlLink, GlIcon, GlDropdown } from '@gitlab/ui'; import { GlBadge, GlLink, GlIcon, GlButton, GlDropdown } from '@gitlab/ui';
import { mount } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import MockAdapter from 'axios-mock-adapter'; import MockAdapter from 'axios-mock-adapter';
import Vue, { nextTick } from 'vue'; import Vue, { nextTick } from 'vue';
...@@ -947,6 +947,9 @@ describe('MrWidgetOptions', () => { ...@@ -947,6 +947,9 @@ describe('MrWidgetOptions', () => {
// Renders a link in the row // Renders a link in the row
expect(collapsedSection.find(GlLink).exists()).toBe(true); expect(collapsedSection.find(GlLink).exists()).toBe(true);
expect(collapsedSection.find(GlLink).text()).toBe('GitLab.com'); expect(collapsedSection.find(GlLink).text()).toBe('GitLab.com');
expect(collapsedSection.find(GlButton).exists()).toBe(true);
expect(collapsedSection.find(GlButton).text()).toBe('Full report');
}); });
}); });
}); });
...@@ -31,6 +31,7 @@ export default { ...@@ -31,6 +31,7 @@ export default {
href: 'https://gitlab.com', href: 'https://gitlab.com',
text: 'GitLab.com', text: 'GitLab.com',
}, },
actions: [{ text: 'Full report', href: 'https://gitlab.com', target: '_blank' }],
}, },
]); ]);
}, },
......
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