Read about our upcoming Code of Conduct on this issue

This instance will be upgraded to Heptapod 0.28.1 on 2022-01-26 at 16:00 UTC+1 (a few minutes of down time)

Commit 4da3cec9 authored by GitLab Bot's avatar GitLab Bot
Browse files

Add latest changes from gitlab-org/gitlab@master

parent 7a4cdfb07e13
<script>
import { GlButton, GlFormGroup, GlFormInput, GlModal, GlModalDirective } from '@gitlab/ui';
import _ from 'underscore';
import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
import ToggleButton from '~/vue_shared/components/toggle_button.vue';
import axios from '~/lib/utils/axios_utils';
import { s__, __, sprintf } from '~/locale';
import createFlash from '~/flash';
export default {
COPY_TO_CLIPBOARD: __('Copy'),
RESET_KEY: __('Reset key'),
components: {
GlButton,
GlFormGroup,
GlFormInput,
GlModal,
ClipboardButton,
ToggleButton,
},
directives: {
'gl-modal': GlModalDirective,
},
props: {
initialAuthorizationKey: {
type: String,
required: false,
default: '',
},
formPath: {
type: String,
required: true,
},
url: {
type: String,
required: true,
},
learnMoreUrl: {
type: String,
required: false,
default: '',
},
initialActivated: {
type: Boolean,
required: true,
},
},
data() {
return {
activated: this.initialActivated,
loadingActivated: false,
authorizationKey: this.initialAuthorizationKey,
};
},
computed: {
learnMoreDescription() {
return sprintf(
s__(
'AlertService|%{linkStart}Learn more%{linkEnd} about configuring this endpoint to receive alerts.',
),
{
linkStart: `<a href="${_.escape(
this.learnMoreUrl,
)}" target="_blank" rel="noopener noreferrer">`,
linkEnd: '</a>',
},
false,
);
},
sectionDescription() {
const desc = s__(
'AlertService|Each alert source must be authorized using the following URL and authorization key.',
);
const learnMoreDesc = this.learnMoreDescription ? ` ${this.learnMoreDescription}` : '';
return `${desc}${learnMoreDesc}`;
},
},
watch: {
activated() {
this.updateIcon();
},
},
methods: {
updateIcon() {
return document.querySelectorAll('.js-service-active-status').forEach(icon => {
if (icon.dataset.value === this.activated.toString()) {
icon.classList.remove('d-none');
} else {
icon.classList.add('d-none');
}
});
},
resetKey() {
return axios
.put(this.formPath, { service: { token: '' } })
.then(res => {
this.authorizationKey = res.data.token;
})
.catch(() => {
createFlash(__('Failed to reset key. Please try again.'));
});
},
toggleActivated(value) {
this.loadingActivated = true;
return axios
.put(this.formPath, { service: { active: value } })
.then(() => {
this.activated = value;
this.loadingActivated = false;
})
.catch(() => {
createFlash(__('Update failed. Please try again.'));
this.loadingActivated = false;
});
},
},
};
</script>
<template>
<div>
<p v-html="sectionDescription"></p>
<gl-form-group :label="__('Active')" label-for="activated" label-class="label-bold">
<toggle-button
id="activated"
:disabled-input="loadingActivated"
:is-loading="loadingActivated"
:value="activated"
@change="toggleActivated"
/>
</gl-form-group>
<gl-form-group :label="__('URL')" label-for="url" label-class="label-bold">
<div class="input-group">
<gl-form-input id="url" :readonly="true" :value="url" />
<span class="input-group-append">
<clipboard-button :text="url" :title="$options.COPY_TO_CLIPBOARD" />
</span>
</div>
</gl-form-group>
<gl-form-group
:label="__('Authorization key')"
label-for="authorization-key"
label-class="label-bold"
>
<div class="input-group">
<gl-form-input id="authorization-key" :readonly="true" :value="authorizationKey" />
<span class="input-group-append">
<clipboard-button :text="authorizationKey" :title="$options.COPY_TO_CLIPBOARD" />
</span>
</div>
<gl-button v-gl-modal.authKeyModal class="mt-2">{{ $options.RESET_KEY }}</gl-button>
<gl-modal
modal-id="authKeyModal"
:title="$options.RESET_KEY"
:ok-title="$options.RESET_KEY"
ok-variant="danger"
@ok="resetKey"
>
{{
__(
'Resetting the authorization key for this project will require updating the authorization key in every alert source it is enabled in.',
)
}}
</gl-modal>
</gl-form-group>
</div>
</template>
import Vue from 'vue';
import { parseBoolean } from '~/lib/utils/common_utils';
import AlertsServiceForm from './components/alerts_service_form.vue';
export default el => {
if (!el) {
return null;
}
const { activated: activatedStr, formPath, authorizationKey, url, learnMoreUrl } = el.dataset;
const activated = parseBoolean(activatedStr);
return new Vue({
el,
render(createElement) {
return createElement(AlertsServiceForm, {
props: {
initialActivated: activated,
formPath,
learnMoreUrl,
initialAuthorizationKey: authorizationKey,
url,
},
});
},
});
};
import { editor as monacoEditor, languages as monacoLanguages, Uri } from 'monaco-editor';
import gitlabTheme from '~/ide/lib/themes/gl_theme';
import whiteTheme from '~/ide/lib/themes/white';
import { defaultEditorOptions } from '~/ide/lib/editor_options';
import { clearDomElement } from './utils';
......@@ -19,8 +19,8 @@ export default class Editor {
}
static setupMonacoTheme() {
monacoEditor.defineTheme(gitlabTheme.themeName, gitlabTheme.monacoTheme);
monacoEditor.setTheme('gitlab');
monacoEditor.defineTheme('white', whiteTheme);
monacoEditor.setTheme('white');
}
createInstance({ el = undefined, blobPath = '', blobContent = '' } = {}) {
......
......@@ -38,6 +38,7 @@ export default {
'panelResizing',
'currentActivityView',
'renderWhitespaceInCode',
'editorTheme',
]),
...mapGetters([
'currentMergeRequest',
......@@ -85,6 +86,7 @@ export default {
editorOptions() {
return {
renderWhitespace: this.renderWhitespaceInCode ? 'all' : 'none',
theme: this.editorTheme,
};
},
},
......
......@@ -7,6 +7,7 @@ import store from './stores';
import router from './ide_router';
import { parseBoolean } from '../lib/utils/common_utils';
import { resetServiceWorkersPublicPath } from '../lib/utils/webpack';
import { DEFAULT_THEME } from './lib/themes';
Vue.use(Translate);
......@@ -51,6 +52,7 @@ export function initIde(el, options = {}) {
this.setInitialData({
clientsidePreviewEnabled: parseBoolean(el.dataset.clientsidePreviewEnabled),
renderWhitespaceInCode: parseBoolean(el.dataset.renderWhitespaceInCode),
editorTheme: window.gon?.user_color_scheme || DEFAULT_THEME,
});
},
methods: {
......
......@@ -6,13 +6,14 @@ import DirtyDiffController from './diff/controller';
import Disposable from './common/disposable';
import ModelManager from './common/model_manager';
import editorOptions, { defaultEditorOptions } from './editor_options';
import gitlabTheme from './themes/gl_theme';
import { themes } from './themes';
import keymap from './keymap.json';
import { clearDomElement } from '~/editor/utils';
function setupMonacoTheme() {
monacoEditor.defineTheme(gitlabTheme.themeName, gitlabTheme.monacoTheme);
monacoEditor.setTheme('gitlab');
function setupThemes() {
themes.forEach(theme => {
monacoEditor.defineTheme(theme.name, theme.data);
});
}
export default class Editor {
......@@ -35,7 +36,7 @@ export default class Editor {
...options,
};
setupMonacoTheme();
setupThemes();
this.debouncedUpdate = _.debounce(() => {
this.updateDimensions();
......
/*
https://github.com/brijeshb42/monaco-themes/blob/master/themes/Tomorrow-Night.json
The MIT License (MIT)
Copyright (c) Brijesh Bittu
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
export default {
base: 'vs-dark',
inherit: true,
rules: [
{
foreground: '969896',
token: 'comment',
},
{
foreground: 'ced1cf',
token: 'keyword.operator.class',
},
{
foreground: 'ced1cf',
token: 'constant.other',
},
{
foreground: 'ced1cf',
token: 'source.php.embedded.line',
},
{
foreground: 'cc6666',
token: 'variable',
},
{
foreground: 'cc6666',
token: 'support.other.variable',
},
{
foreground: 'cc6666',
token: 'string.other.link',
},
{
foreground: 'cc6666',
token: 'string.regexp',
},
{
foreground: 'cc6666',
token: 'entity.name.tag',
},
{
foreground: 'cc6666',
token: 'entity.other.attribute-name',
},
{
foreground: 'cc6666',
token: 'meta.tag',
},
{
foreground: 'cc6666',
token: 'declaration.tag',
},
{
foreground: 'cc6666',
token: 'markup.deleted.git_gutter',
},
{
foreground: 'de935f',
token: 'constant.numeric',
},
{
foreground: 'de935f',
token: 'constant.language',
},
{
foreground: 'de935f',
token: 'support.constant',
},
{
foreground: 'de935f',
token: 'constant.character',
},
{
foreground: 'de935f',
token: 'variable.parameter',
},
{
foreground: 'de935f',
token: 'punctuation.section.embedded',
},
{
foreground: 'de935f',
token: 'keyword.other.unit',
},
{
foreground: 'f0c674',
token: 'entity.name.class',
},
{
foreground: 'f0c674',
token: 'entity.name.type.class',
},
{
foreground: 'f0c674',
token: 'support.type',
},
{
foreground: 'f0c674',
token: 'support.class',
},
{
foreground: 'b5bd68',
token: 'string',
},
{
foreground: 'b5bd68',
token: 'constant.other.symbol',
},
{
foreground: 'b5bd68',
token: 'entity.other.inherited-class',
},
{
foreground: 'b5bd68',
token: 'markup.heading',
},
{
foreground: 'b5bd68',
token: 'markup.inserted.git_gutter',
},
{
foreground: '8abeb7',
token: 'keyword.operator',
},
{
foreground: '8abeb7',
token: 'constant.other.color',
},
{
foreground: '81a2be',
token: 'entity.name.function',
},
{
foreground: '81a2be',
token: 'meta.function-call',
},
{
foreground: '81a2be',
token: 'support.function',
},
{
foreground: '81a2be',
token: 'keyword.other.special-method',
},
{
foreground: '81a2be',
token: 'meta.block-level',
},
{
foreground: '81a2be',
token: 'markup.changed.git_gutter',
},
{
foreground: 'b294bb',
token: 'keyword',
},
{
foreground: 'b294bb',
token: 'storage',
},
{
foreground: 'b294bb',
token: 'storage.type',
},
{
foreground: 'b294bb',
token: 'entity.name.tag.css',
},
{
foreground: 'ced2cf',
background: 'df5f5f',
token: 'invalid',
},
{
foreground: 'ced2cf',
background: '82a3bf',
token: 'meta.separator',
},
{
foreground: 'ced2cf',
background: 'b798bf',
token: 'invalid.deprecated',
},
{
foreground: 'ffffff',
token: 'markup.inserted.diff',
},
{
foreground: 'ffffff',
token: 'markup.deleted.diff',
},
{
foreground: 'ffffff',
token: 'meta.diff.header.to-file',
},
{
foreground: 'ffffff',
token: 'meta.diff.header.from-file',
},
{
foreground: '718c00',
token: 'markup.inserted.diff',
},
{
foreground: '718c00',
token: 'meta.diff.header.to-file',
},
{
foreground: 'c82829',
token: 'markup.deleted.diff',
},
{
foreground: 'c82829',
token: 'meta.diff.header.from-file',
},
{
foreground: 'ffffff',
background: '4271ae',
token: 'meta.diff.header.from-file',
},
{
foreground: 'ffffff',
background: '4271ae',
token: 'meta.diff.header.to-file',
},
{
foreground: '3e999f',
fontStyle: 'italic',
token: 'meta.diff.range',
},
],
colors: {
'editor.foreground': '#C5C8C6',
'editor.background': '#1D1F21',
'editor.selectionBackground': '#373B41',
'editor.lineHighlightBackground': '#282A2E',
'editorCursor.foreground': '#AEAFAD',
'editorWhitespace.foreground': '#4B4E55',
},
};
export default {
themeName: 'gitlab',
monacoTheme: {
base: 'vs',
inherit: true,
rules: [],
colors: {
'editorLineNumber.foreground': '#CCCCCC',
'diffEditor.insertedTextBackground': '#ddfbe6',
'diffEditor.removedTextBackground': '#f9d7dc',
'editor.selectionBackground': '#aad6f8',
'editorIndentGuide.activeBackground': '#cccccc',
},
},
};
import white from './white';
import dark from './dark';
export const themes = [
{
name: 'white',
data: white,
},
{
name: 'dark',
data: dark,
},
];
export const DEFAULT_THEME = 'white';
export default {
base: 'vs',
inherit: true,
rules: [],
colors: {
'editorLineNumber.foreground': '#CCCCCC',
'diffEditor.insertedTextBackground': '#A0F5B420',
'diffEditor.removedTextBackground': '#f9d7dc20',
'editor.selectionBackground': '#aad6f8',
'editorIndentGuide.activeBackground': '#cccccc',
},
};