Commit aab0b23b authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch '217485-simplify-analytics-borders-padding-and-margins' into 'master'

Clean up VSA base template conditions

See merge request gitlab-org/gitlab!78189
parents f1b202b6 6c0dcfd6
...@@ -162,7 +162,7 @@ export default { ...@@ -162,7 +162,7 @@ export default {
" "
:svg-path="emptyStateSvgPath" :svg-path="emptyStateSvgPath"
/> />
<div v-if="!shouldRenderEmptyState" class="gl-max-w-full"> <div v-else class="gl-max-w-full">
<path-navigation <path-navigation
v-if="selectedStageReady" v-if="selectedStageReady"
data-testid="vsa-path-navigation" data-testid="vsa-path-navigation"
...@@ -181,11 +181,9 @@ export default { ...@@ -181,11 +181,9 @@ export default {
@selectProject="onProjectsSelect" @selectProject="onProjectsSelect"
@setDateRange="onSetDateRange" @setDateRange="onSetDateRange"
/> />
</div>
<div v-if="!shouldRenderEmptyState" class="gl-mt-2">
<gl-empty-state <gl-empty-state
v-if="hasNoAccessError" v-if="hasNoAccessError"
class="js-empty-state" class="js-empty-state gl-mt-2"
:title="__('You don’t have access to Value Stream Analytics for this group')" :title="__('You don’t have access to Value Stream Analytics for this group')"
:svg-path="noAccessSvgPath" :svg-path="noAccessSvgPath"
:description=" :description="
...@@ -195,6 +193,7 @@ export default { ...@@ -195,6 +193,7 @@ export default {
" "
/> />
<template v-else> <template v-else>
<div class="gl-mt-2">
<template v-if="isOverviewStageSelected"> <template v-if="isOverviewStageSelected">
<value-stream-metrics <value-stream-metrics
:request-path="currentGroupPath" :request-path="currentGroupPath"
...@@ -216,6 +215,7 @@ export default { ...@@ -216,6 +215,7 @@ export default {
include-project-name include-project-name
@handleUpdatePagination="onHandleUpdatePagination" @handleUpdatePagination="onHandleUpdatePagination"
/> />
</div>
<url-sync v-if="selectedStageReady" :query="query" /> <url-sync v-if="selectedStageReady" :query="query" />
</template> </template>
</div> </div>
......
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