Add latest changes from gitlab-org/gitlab@master

4 files changed, 83 insertions, 84 deletions

diff --git a/app/assets/javascripts/issues/list/components/empty_state_signed_out.vue b/app/assets/javascripts/issues/list/components/empty_state_signed_out.vue
deleted file mode 100644
index b9b452e0c25..00000000000
--- a/app/assets/javascripts/issues/list/components/empty_state_signed_out.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<script>
-import { GlEmptyState, GlLink, GlTooltipDirective } from '@gitlab/ui';
-import { helpPagePath } from '~/helpers/help_page_helper';
-import { i18n } from '../constants';
-
-export default {
-  i18n,
-  issuesHelpPagePath: helpPagePath('user/project/issues/index'),
-  components: {
-    GlEmptyState,
-    GlLink,
-  },
-  directives: {
-    GlTooltip: GlTooltipDirective,
-  },
-  inject: ['emptyStateSvgPath', 'signInPath'],
-};
-</script>
-
-<template>
-  <gl-empty-state
-    :title="$options.i18n.noIssuesTitle"
-    :svg-path="emptyStateSvgPath"
-    :primary-button-text="$options.i18n.noIssuesSignedOutButtonText"
-    :primary-button-link="signInPath"
-  >
-    <template #description>
-      <gl-link :href="$options.issuesHelpPagePath">
-        {{ $options.i18n.noIssuesDescription }}
-      </gl-link>
-    </template>
-  </gl-empty-state>
-</template>
diff --git a/app/assets/javascripts/issues/list/components/empty_state_with_any_issues.vue b/app/assets/javascripts/issues/list/components/empty_state_with_any_issues.vue
new file mode 100644
index 00000000000..8aece24de0c
--- /dev/null
+++ b/app/assets/javascripts/issues/list/components/empty_state_with_any_issues.vue
@@ -0,0 +1,53 @@
+<script>
+import { GlButton, GlEmptyState } from '@gitlab/ui';
+import { i18n } from '../constants';
+
+export default {
+  i18n,
+  components: {
+    GlButton,
+    GlEmptyState,
+  },
+  inject: ['emptyStateSvgPath', 'newIssuePath', 'showNewIssueLink'],
+  props: {
+    hasSearch: {
+      type: Boolean,
+      required: true,
+    },
+    isOpenTab: {
+      type: Boolean,
+      required: true,
+    },
+  },
+};
+</script>
+
+<template>
+  <gl-empty-state
+    v-if="hasSearch"
+    :description="$options.i18n.noSearchResultsDescription"
+    :title="$options.i18n.noSearchResultsTitle"
+    :svg-path="emptyStateSvgPath"
+  >
+    <template #actions>
+      <gl-button v-if="showNewIssueLink" :href="newIssuePath" variant="confirm">
+        {{ $options.i18n.newIssueLabel }}
+      </gl-button>
+    </template>
+  </gl-empty-state>
+
+  <gl-empty-state
+    v-else-if="isOpenTab"
+    :description="$options.i18n.noOpenIssuesDescription"
+    :title="$options.i18n.noOpenIssuesTitle"
+    :svg-path="emptyStateSvgPath"
+  >
+    <template #actions>
+      <gl-button v-if="showNewIssueLink" :href="newIssuePath" variant="confirm">
+        {{ $options.i18n.newIssueLabel }}
+      </gl-button>
+    </template>
+  </gl-empty-state>
+
+  <gl-empty-state v-else :title="$options.i18n.noClosedIssuesTitle" :svg-path="emptyStateSvgPath" />
+</template>
diff --git a/app/assets/javascripts/issues/list/components/empty_state_signed_in.vue b/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue
index aff611197ac..5a37751410a 100644
--- a/app/assets/javascripts/issues/list/components/empty_state_signed_in.vue
+++ b/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlButton, GlEmptyState, GlLink, GlSprintf, GlTooltipDirective } from '@gitlab/ui';
+import { GlButton, GlEmptyState, GlLink, GlSprintf } from '@gitlab/ui';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import CsvImportExportButtons from '~/issuable/components/csv_import_export_buttons.vue';
 import { i18n } from '../constants';
@@ -16,16 +16,15 @@ export default {
     GlSprintf,
     NewIssueDropdown,
   },
-  directives: {
-    GlTooltip: GlTooltipDirective,
-  },
   inject: [
     'canCreateProjects',
     'emptyStateSvgPath',
+    'isSignedIn',
     'jiraIntegrationPath',
     'newIssuePath',
     'newProjectPath',
     'showNewIssueLink',
+    'signInPath',
   ],
   props: {
     currentTabCount: {
@@ -53,7 +52,7 @@ export default {
 </script>
 
 <template>
-  <div>
+  <div v-if="isSignedIn">
     <gl-empty-state :title="$options.i18n.noIssuesTitle" :svg-path="emptyStateSvgPath">
       <template #description>
         <gl-link :href="$options.issuesHelpPagePath">
@@ -94,4 +93,18 @@ export default {
       {{ $options.i18n.jiraIntegrationSecondaryMessage }}
     </p>
   </div>
+
+  <gl-empty-state
+    v-else
+    :title="$options.i18n.noIssuesTitle"
+    :svg-path="emptyStateSvgPath"
+    :primary-button-text="$options.i18n.noIssuesSignedOutButtonText"
+    :primary-button-link="signInPath"
+  >
+    <template #description>
+      <gl-link :href="$options.issuesHelpPagePath">
+        {{ $options.i18n.noIssuesDescription }}
+      </gl-link>
+    </template>
+  </gl-empty-state>
 </template>
diff --git a/app/assets/javascripts/issues/list/components/issues_list_app.vue b/app/assets/javascripts/issues/list/components/issues_list_app.vue
index 29faf6ed16c..dd7c7d5590b 100644
--- a/app/assets/javascripts/issues/list/components/issues_list_app.vue
+++ b/app/assets/javascripts/issues/list/components/issues_list_app.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlButton, GlEmptyState, GlFilteredSearchToken, GlTooltipDirective } from '@gitlab/ui';
+import { GlButton, GlFilteredSearchToken, GlTooltipDirective } from '@gitlab/ui';
 import * as Sentry from '@sentry/browser';
 import fuzzaldrinPlus from 'fuzzaldrin-plus';
 import IssueCardStatistics from 'ee_else_ce/issues/list/components/issue_card_statistics.vue';
@@ -83,8 +83,8 @@ import {
   getSortOptions,
   isSortKey,
 } from '../utils';
-import EmptyStateSignedIn from './empty_state_signed_in.vue';
-import EmptyStateSignedOut from './empty_state_signed_out.vue';
+import EmptyStateWithAnyIssues from './empty_state_with_any_issues.vue';
+import EmptyStateWithoutAnyIssues from './empty_state_without_any_issues.vue';
 import NewIssueDropdown from './new_issue_dropdown.vue';
 
 const AuthorToken = () =>
@@ -107,10 +107,9 @@ export default {
   IssuableListTabs,
   components: {
     CsvImportExportButtons,
-    EmptyStateSignedIn,
-    EmptyStateSignedOut,
+    EmptyStateWithAnyIssues,
+    EmptyStateWithoutAnyIssues,
     GlButton,
-    GlEmptyState,
     IssuableByEmail,
     IssuableList,
     IssueCardStatistics,
@@ -127,7 +126,6 @@ export default {
     'canBulkUpdate',
     'canReadCrmContact',
     'canReadCrmOrganization',
-    'emptyStateSvgPath',
     'exportCsvPath',
     'fullPath',
     'hasAnyIssues',
@@ -260,11 +258,11 @@ export default {
       return this.glFeatures.orIssuableQueries;
     },
     hasSearch() {
-      return (
+      return Boolean(
         this.searchQuery ||
-        Object.keys(this.urlFilterParams).length ||
-        this.pageParams.afterCursor ||
-        this.pageParams.beforeCursor
+          Object.keys(this.urlFilterParams).length ||
+          this.pageParams.afterCursor ||
+          this.pageParams.beforeCursor,
       );
     },
     isBulkEditButtonDisabled() {
@@ -853,37 +851,7 @@ export default {
       </template>
 
       <template #empty-state>
-        <gl-empty-state
-          v-if="hasSearch"
-          :description="$options.i18n.noSearchResultsDescription"
-          :title="$options.i18n.noSearchResultsTitle"
-          :svg-path="emptyStateSvgPath"
-        >
-          <template #actions>
-            <gl-button v-if="showNewIssueLink" :href="newIssuePath" variant="confirm">
-              {{ $options.i18n.newIssueLabel }}
-            </gl-button>
-          </template>
-        </gl-empty-state>
-
-        <gl-empty-state
-          v-else-if="isOpenTab"
-          :description="$options.i18n.noOpenIssuesDescription"
-          :title="$options.i18n.noOpenIssuesTitle"
-          :svg-path="emptyStateSvgPath"
-        >
-          <template #actions>
-            <gl-button v-if="showNewIssueLink" :href="newIssuePath" variant="confirm">
-              {{ $options.i18n.newIssueLabel }}
-            </gl-button>
-          </template>
-        </gl-empty-state>
-
-        <gl-empty-state
-          v-else
-          :title="$options.i18n.noClosedIssuesTitle"
-          :svg-path="emptyStateSvgPath"
-        />
+        <empty-state-with-any-issues :has-search="hasSearch" :is-open-tab="isOpenTab" />
       </template>
 
       <template #list-body>
@@ -891,16 +859,14 @@ export default {
       </template>
     </issuable-list>
 
-    <empty-state-signed-in
-      v-else-if="isSignedIn"
+    <empty-state-without-any-issues
+      v-else
       :current-tab-count="currentTabCount"
       :export-csv-path-with-query="exportCsvPathWithQuery"
       :show-csv-buttons="showCsvButtons"
       :show-new-issue-dropdown="showNewIssueDropdown"
     />
 
-    <empty-state-signed-out v-else />
-
     <issuable-by-email v-if="showIssuableByEmail" class="gl-text-center gl-pt-5 gl-pb-7" />
   </div>
 </template>