Commit cfdd662c authored by Fernando's avatar Fernando

Add in feature flag logic and fix alignment

* CSS tweaks
* Add in feature flag
* Remove hard coded conditional logic from debugging sessions
parent d9fdbde1
...@@ -48,6 +48,9 @@ export default { ...@@ -48,6 +48,9 @@ export default {
showLoadingSpinner() { showLoadingSpinner() {
return this.isLoadingManagedLicenses && !this.hasPendingLicenses; return this.isLoadingManagedLicenses && !this.hasPendingLicenses;
}, },
isTooltipEnabled() {
return gon.features.licenseComplianceDeniesMr;
}
}, },
watch: { watch: {
isAddingNewLicense(isAddingNewLicense) { isAddingNewLicense(isAddingNewLicense) {
...@@ -79,13 +82,13 @@ export default { ...@@ -79,13 +82,13 @@ export default {
<template> <template>
<gl-loading-icon v-if="showLoadingSpinner" /> <gl-loading-icon v-if="showLoadingSpinner" />
<div v-else class="license-management"> <div v-else class="license-management">
<delete-confirmation-modal v-if="false && isAdmin" /> <delete-confirmation-modal v-if="isAdmin" />
<paginated-list <paginated-list
:list="managedLicenses" :list="managedLicenses"
:empty-search-message="$options.emptySearchMessage" :empty-search-message="$options.emptySearchMessage"
:empty-message="$options.emptyMessage" :empty-message="$options.emptyMessage"
:filterable="false && isAdmin" :filterable="isAdmin"
filter="name" filter="name"
data-qa-selector="license_compliance_list" data-qa-selector="license_compliance_list"
> >
...@@ -106,7 +109,7 @@ export default { ...@@ -106,7 +109,7 @@ export default {
<template v-else> <template v-else>
<div <div
class="table-section" class="table-section d-flex pl-2"
:class="tableHeaders[0].className" :class="tableHeaders[0].className"
role="rowheader" role="rowheader"
> >
...@@ -115,9 +118,10 @@ export default { ...@@ -115,9 +118,10 @@ export default {
<gl-icon <gl-icon
ref="reportInfo" ref="reportInfo"
name="question" name="question"
class="text-info" class="text-info ml-1"
:aria-label="__('help')" :aria-label="__('help')"
:size="14" :size="14"
:v-if="isTooltipEnabled"
/> />
<gl-popover <gl-popover
:target="() => $refs.reportInfo.$el" :target="() => $refs.reportInfo.$el"
...@@ -156,7 +160,7 @@ export default { ...@@ -156,7 +160,7 @@ export default {
<template #default="{ listItem }"> <template #default="{ listItem }">
<admin-license-management-row <admin-license-management-row
v-if="false && isAdmin" v-if="isAdmin"
:license="listItem" :license="listItem"
:loading="isLicenseBeingUpdated(listItem.id)" :loading="isLicenseBeingUpdated(listItem.id)"
/> />
......
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