diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-28 21:08:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-28 21:08:52 +0300 |
commit | 3e49ae159acbb703f005f5014772072cd90ef97b (patch) | |
tree | a65e942c5e207461419c4a266ebe6952733c8520 /app/assets/javascripts/design_management | |
parent | 77d49e6a73b3a1e142ec865d05dc3dd9a708ab6a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/design_management')
5 files changed, 25 insertions, 25 deletions
diff --git a/app/assets/javascripts/design_management/components/upload/design_dropzone.vue b/app/assets/javascripts/design_management/components/upload/design_dropzone.vue index 6694b0dab8d..44f6b8bf32d 100644 --- a/app/assets/javascripts/design_management/components/upload/design_dropzone.vue +++ b/app/assets/javascripts/design_management/components/upload/design_dropzone.vue @@ -1,6 +1,6 @@ <script> import { GlIcon, GlLink, GlSprintf } from '@gitlab/ui'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import createFlash from '~/flash'; import uploadDesignMutation from '../../graphql/mutations/upload_design.mutation.graphql'; import { UPLOAD_DESIGN_INVALID_FILETYPE_ERROR } from '../../utils/error_messages'; import { isValidDesignFile } from '../../utils/design_management_utils'; @@ -56,7 +56,7 @@ export default { const { files } = dataTransfer; if (!this.isValidUpload(Array.from(files))) { - createFlash(UPLOAD_DESIGN_INVALID_FILETYPE_ERROR); + createFlash({ message: UPLOAD_DESIGN_INVALID_FILETYPE_ERROR }); return; } diff --git a/app/assets/javascripts/design_management/mixins/all_designs.js b/app/assets/javascripts/design_management/mixins/all_designs.js index 62bcf216add..3f25b753933 100644 --- a/app/assets/javascripts/design_management/mixins/all_designs.js +++ b/app/assets/javascripts/design_management/mixins/all_designs.js @@ -1,5 +1,5 @@ import { propertyOf } from 'lodash'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import createFlash, { FLASH_TYPES } from '~/flash'; import { s__ } from '~/locale'; import getDesignListQuery from '../graphql/queries/get_design_list.query.graphql'; import allVersionsMixin from './all_versions'; @@ -36,20 +36,20 @@ export default { }, result() { if (this.$route.query.version && !this.hasValidVersion) { - createFlash( - s__( + createFlash({ + message: s__( 'DesignManagement|Requested design version does not exist. Showing latest version instead', ), - ); + }); this.$router.replace({ name: DESIGNS_ROUTE_NAME, query: { version: undefined } }); } if (this.designCollection.copyState === 'ERROR') { - createFlash( - s__( + createFlash({ + message: s__( 'DesignManagement|There was an error moving your designs. Please upload your designs below.', ), - 'warning', - ); + type: FLASH_TYPES.WARNING, + }); } }, }, diff --git a/app/assets/javascripts/design_management/pages/design/index.vue b/app/assets/javascripts/design_management/pages/design/index.vue index 642d51fbc7a..f410a976676 100644 --- a/app/assets/javascripts/design_management/pages/design/index.vue +++ b/app/assets/javascripts/design_management/pages/design/index.vue @@ -2,7 +2,7 @@ import Mousetrap from 'mousetrap'; import { GlLoadingIcon, GlAlert } from '@gitlab/ui'; import { ApolloMutation } from 'vue-apollo'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import createFlash from '~/flash'; import { fetchPolicies } from '~/lib/graphql'; import allVersionsMixin from '../../mixins/all_versions'; import Toolbar from '../../components/toolbar/index.vue'; @@ -230,7 +230,7 @@ export default { onQueryError(message) { // because we redirect user to /designs (the issue page), // we want to create these flashes on the issue page - createFlash(message); + createFlash({ message }); this.$router.push({ name: this.$options.DESIGNS_ROUTE_NAME }); }, onError(message, e) { diff --git a/app/assets/javascripts/design_management/pages/index.vue b/app/assets/javascripts/design_management/pages/index.vue index 6e71dca41e9..36f1c619ecf 100644 --- a/app/assets/javascripts/design_management/pages/index.vue +++ b/app/assets/javascripts/design_management/pages/index.vue @@ -1,7 +1,7 @@ <script> import { GlLoadingIcon, GlButton, GlAlert } from '@gitlab/ui'; import VueDraggable from 'vuedraggable'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import createFlash, { FLASH_TYPES } from '~/flash'; import { s__, sprintf } from '~/locale'; import { getFilename } from '~/lib/utils/file_upload'; import UploadButton from '../components/upload/button.vue'; @@ -139,8 +139,8 @@ export default { if (!this.canCreateDesign) return false; if (files.length > MAXIMUM_FILE_UPLOAD_LIMIT) { - createFlash( - sprintf( + createFlash({ + message: sprintf( s__( 'DesignManagement|The maximum number of designs allowed to be uploaded is %{upload_limit}. Please try again.', ), @@ -148,7 +148,7 @@ export default { upload_limit: MAXIMUM_FILE_UPLOAD_LIMIT, }, ), - ); + }); return false; } @@ -191,7 +191,7 @@ export default { const skippedFiles = res?.data?.designManagementUpload?.skippedDesigns || []; const skippedWarningMessage = designUploadSkippedWarning(this.filesToBeSaved, skippedFiles); if (skippedWarningMessage) { - createFlash(skippedWarningMessage, 'warning'); + createFlash({ message: skippedWarningMessage, types: FLASH_TYPES.WARNING }); } // if this upload resulted in a new version being created, redirect user to the latest version @@ -214,7 +214,7 @@ export default { }, onUploadDesignError() { this.resetFilesToBeSaved(); - createFlash(UPLOAD_DESIGN_ERROR); + createFlash({ message: UPLOAD_DESIGN_ERROR }); }, changeSelectedDesigns(filename) { if (this.isDesignSelected(filename)) { @@ -245,18 +245,18 @@ export default { }, onDesignDeleteError() { const errorMessage = designDeletionError({ singular: this.selectedDesigns.length === 1 }); - createFlash(errorMessage); + createFlash({ message: errorMessage }); }, onExistingDesignDropzoneChange(files, existingDesignFilename) { const filesArr = Array.from(files); if (filesArr.length > 1) { - createFlash(EXISTING_DESIGN_DROP_MANY_FILES_MESSAGE); + createFlash({ message: EXISTING_DESIGN_DROP_MANY_FILES_MESSAGE }); return; } if (!filesArr.some(({ name }) => existingDesignFilename === name)) { - createFlash(EXISTING_DESIGN_DROP_INVALID_FILENAME_MESSAGE); + createFlash({ message: EXISTING_DESIGN_DROP_INVALID_FILENAME_MESSAGE }); return; } @@ -307,7 +307,7 @@ export default { optimisticResponse: moveDesignOptimisticResponse(this.reorderedDesigns), }) .catch(() => { - createFlash(MOVE_DESIGN_ERROR); + createFlash({ message: MOVE_DESIGN_ERROR }); }) .finally(() => { this.isReorderingInProgress = false; diff --git a/app/assets/javascripts/design_management/utils/cache_update.js b/app/assets/javascripts/design_management/utils/cache_update.js index fc0530ff977..ac4763853ef 100644 --- a/app/assets/javascripts/design_management/utils/cache_update.js +++ b/app/assets/javascripts/design_management/utils/cache_update.js @@ -2,7 +2,7 @@ import { differenceBy } from 'lodash'; import produce from 'immer'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import createFlash from '~/flash'; import { extractCurrentDiscussion, extractDesign, extractDesigns } from './design_management_utils'; import { ADD_IMAGE_DIFF_NOTE_ERROR, @@ -237,7 +237,7 @@ export const deletePendingTodoFromStore = (store, todoMarkDone, query, queryVari }; const onError = (data, message) => { - createFlash(message); + createFlash({ message }); throw new Error(data.errors); }; @@ -286,7 +286,7 @@ export const updateStoreAfterUploadDesign = (store, data, query) => { export const updateDesignsOnStoreAfterReorder = (store, data, query) => { if (hasErrors(data)) { - createFlash(data.errors[0]); + createFlash({ message: data.errors[0] }); } else { moveDesignInStore(store, data, query); } |