diff options
Diffstat (limited to 'app/assets/javascripts/issue_show')
5 files changed, 3 insertions, 43 deletions
diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue index bcf5dc2aaaf..992d87a969f 100644 --- a/app/assets/javascripts/issue_show/components/app.vue +++ b/app/assets/javascripts/issue_show/components/app.vue @@ -2,7 +2,7 @@ import { GlIcon, GlIntersectionObserver } from '@gitlab/ui'; import Visibility from 'visibilityjs'; import { __, s__, sprintf } from '~/locale'; -import createFlash from '~/flash'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import { visitUrl } from '~/lib/utils/url_utility'; import Poll from '~/lib/utils/poll'; import eventHub from '../event_hub'; diff --git a/app/assets/javascripts/issue_show/components/description.vue b/app/assets/javascripts/issue_show/components/description.vue index f2462e50093..abb63f606ae 100644 --- a/app/assets/javascripts/issue_show/components/description.vue +++ b/app/assets/javascripts/issue_show/components/description.vue @@ -1,7 +1,7 @@ <script> import $ from 'jquery'; import { s__, sprintf } from '~/locale'; -import createFlash from '~/flash'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import animateMixin from '../mixins/animate'; import TaskList from '../../task_list'; import recaptchaModalImplementor from '../../vue_shared/mixins/recaptcha_modal_implementor'; diff --git a/app/assets/javascripts/issue_show/components/issuable_header_warnings.vue b/app/assets/javascripts/issue_show/components/issuable_header_warnings.vue deleted file mode 100644 index b6816be9eb8..00000000000 --- a/app/assets/javascripts/issue_show/components/issuable_header_warnings.vue +++ /dev/null @@ -1,28 +0,0 @@ -<script> -import { mapState } from 'vuex'; -import Icon from '~/vue_shared/components/icon.vue'; - -export default { - components: { - Icon, - }, - computed: { - ...mapState({ - confidential: ({ noteableData }) => noteableData.confidential, - dicussionLocked: ({ noteableData }) => noteableData.discussion_locked, - }), - }, -}; -</script> - -<template> - <div class="gl-display-inline-block"> - <div v-if="confidential" class="issuable-warning-icon inline"> - <icon class="icon" name="eye-slash" data-testid="confidential" /> - </div> - - <div v-if="dicussionLocked" class="issuable-warning-icon inline"> - <icon class="icon" name="lock" data-testid="locked" /> - </div> - </div> -</template> diff --git a/app/assets/javascripts/issue_show/index.js b/app/assets/javascripts/issue_show/index.js index fe4ff133145..e170d338408 100644 --- a/app/assets/javascripts/issue_show/index.js +++ b/app/assets/javascripts/issue_show/index.js @@ -1,8 +1,6 @@ import Vue from 'vue'; import issuableApp from './components/app.vue'; -import IssuableHeaderWarnings from './components/issuable_header_warnings.vue'; import { parseIssuableData } from './utils/parse_data'; -import { store } from '~/notes/stores'; export default function initIssueableApp() { return new Vue({ @@ -17,13 +15,3 @@ export default function initIssueableApp() { }, }); } - -export function issuableHeaderWarnings() { - return new Vue({ - el: document.getElementById('js-issuable-header-warnings'), - store, - render(createElement) { - return createElement(IssuableHeaderWarnings); - }, - }); -} diff --git a/app/assets/javascripts/issue_show/utils/parse_data.js b/app/assets/javascripts/issue_show/utils/parse_data.js index 05e384adad3..8cd1c1b0e56 100644 --- a/app/assets/javascripts/issue_show/utils/parse_data.js +++ b/app/assets/javascripts/issue_show/utils/parse_data.js @@ -1,4 +1,4 @@ -import sanitize from 'sanitize-html'; +import { sanitize } from 'dompurify'; export const parseIssuableData = () => { try { |