Commit 49bbf5d0 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'remove-ff-import-requirements' into 'master'

Remove feature flag for import requirements

See merge request gitlab-org/gitlab!53129
parents ae95ccc1 27b92e2d
...@@ -26,11 +26,6 @@ export default { ...@@ -26,11 +26,6 @@ export default {
type: Boolean, type: Boolean,
required: true, required: true,
}, },
showUploadCsv: {
type: Boolean,
required: false,
default: false,
},
}, },
computed: { computed: {
emptyStateTitle() { emptyStateTitle() {
...@@ -62,7 +57,6 @@ export default { ...@@ -62,7 +57,6 @@ export default {
__('New requirement') __('New requirement')
}}</gl-button> }}</gl-button>
<gl-button <gl-button
v-if="showUploadCsv"
category="secondary" category="secondary"
variant="default" variant="default"
@click="$emit('click-import-requirements')" @click="$emit('click-import-requirements')"
......
...@@ -11,7 +11,6 @@ import { updateHistory, setUrlParams } from '~/lib/utils/url_utility'; ...@@ -11,7 +11,6 @@ import { updateHistory, setUrlParams } from '~/lib/utils/url_utility';
import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
import AuthorToken from '~/vue_shared/components/filtered_search_bar/tokens/author_token.vue'; import AuthorToken from '~/vue_shared/components/filtered_search_bar/tokens/author_token.vue';
import { DEFAULT_LABEL_ANY } from '~/vue_shared/components/filtered_search_bar/constants'; import { DEFAULT_LABEL_ANY } from '~/vue_shared/components/filtered_search_bar/constants';
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import projectRequirements from '../queries/projectRequirements.query.graphql'; import projectRequirements from '../queries/projectRequirements.query.graphql';
import projectRequirementsCount from '../queries/projectRequirementsCount.query.graphql'; import projectRequirementsCount from '../queries/projectRequirementsCount.query.graphql';
...@@ -47,7 +46,7 @@ export default { ...@@ -47,7 +46,7 @@ export default {
ImportRequirementsModal, ImportRequirementsModal,
ExportRequirementsModal, ExportRequirementsModal,
}, },
mixins: [glFeatureFlagsMixin(), Tracking.mixin()], mixins: [Tracking.mixin()],
props: { props: {
projectPath: { projectPath: {
type: String, type: String,
...@@ -633,7 +632,6 @@ export default { ...@@ -633,7 +632,6 @@ export default {
:filter-by="filterBy" :filter-by="filterBy"
:requirements-count="requirementsCount" :requirements-count="requirementsCount"
:show-create-form="showRequirementCreateDrawer" :show-create-form="showRequirementCreateDrawer"
:show-upload-csv="glFeatures.importRequirementsCsv"
:can-create-requirement="canCreateRequirement" :can-create-requirement="canCreateRequirement"
@click-tab="handleTabClick" @click-tab="handleTabClick"
@click-new-requirement="handleNewRequirementClick" @click-new-requirement="handleNewRequirementClick"
...@@ -674,7 +672,6 @@ export default { ...@@ -674,7 +672,6 @@ export default {
:empty-state-path="emptyStatePath" :empty-state-path="emptyStatePath"
:requirements-count="requirementsCount" :requirements-count="requirementsCount"
:can-create-requirement="canCreateRequirement" :can-create-requirement="canCreateRequirement"
:show-upload-csv="glFeatures.importRequirementsCsv"
@click-new-requirement="handleNewRequirementClick" @click-new-requirement="handleNewRequirementClick"
@click-import-requirements="handleImportRequirementsClick" @click-import-requirements="handleImportRequirementsClick"
/> />
...@@ -710,14 +707,8 @@ export default { ...@@ -710,14 +707,8 @@ export default {
class="gl-pagination gl-mt-3" class="gl-pagination gl-mt-3"
@input="handlePageChange" @input="handlePageChange"
/> />
<import-requirements-modal <import-requirements-modal ref="modal" :project-path="projectPath" @import="importCsv" />
v-if="glFeatures.importRequirementsCsv"
ref="modal"
:project-path="projectPath"
@import="importCsv"
/>
<export-requirements-modal <export-requirements-modal
v-if="glFeatures.importRequirementsCsv"
ref="exportModal" ref="exportModal"
:requirement-count="totalRequirementsForCurrentTab" :requirement-count="totalRequirementsForCurrentTab"
:email="currentUserEmail" :email="currentUserEmail"
......
...@@ -32,11 +32,6 @@ export default { ...@@ -32,11 +32,6 @@ export default {
type: Boolean, type: Boolean,
required: false, required: false,
}, },
showUploadCsv: {
type: Boolean,
required: false,
default: false,
},
}, },
computed: { computed: {
isOpenTab() { isOpenTab() {
...@@ -91,7 +86,6 @@ export default { ...@@ -91,7 +86,6 @@ export default {
<div v-if="isOpenTab && canCreateRequirement" class="nav-controls"> <div v-if="isOpenTab && canCreateRequirement" class="nav-controls">
<gl-button-group> <gl-button-group>
<gl-button <gl-button
v-if="showUploadCsv"
v-gl-tooltip v-gl-tooltip
:title="__('Export as CSV')" :title="__('Export as CSV')"
category="secondary" category="secondary"
...@@ -100,7 +94,6 @@ export default { ...@@ -100,7 +94,6 @@ export default {
@click="$emit('click-export-requirements')" @click="$emit('click-export-requirements')"
/> />
<gl-button <gl-button
v-if="showUploadCsv"
v-gl-tooltip v-gl-tooltip
:title="__('Import requirements')" :title="__('Import requirements')"
category="secondary" category="secondary"
......
...@@ -11,7 +11,6 @@ const createComponent = ({ ...@@ -11,7 +11,6 @@ const createComponent = ({
requirementsCount = mockRequirementsCount, requirementsCount = mockRequirementsCount,
showCreateForm = false, showCreateForm = false,
canCreateRequirement = true, canCreateRequirement = true,
showUploadCsv = true,
} = {}) => } = {}) =>
shallowMount(RequirementsTabs, { shallowMount(RequirementsTabs, {
propsData: { propsData: {
...@@ -19,7 +18,6 @@ const createComponent = ({ ...@@ -19,7 +18,6 @@ const createComponent = ({
requirementsCount, requirementsCount,
showCreateForm, showCreateForm,
canCreateRequirement, canCreateRequirement,
showUploadCsv,
}, },
stubs: { stubs: {
GlTabs, GlTabs,
......
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