diff --git a/deadlock-plugins/deadlock-extension/resources/dark/help.svg b/deadlock-plugins/deadlock-extension/resources/dark/help.svg index 87a05d2aee68aec706cc1c02179671239f210d43..7d115def191648731c120ebc40a7c742792ffeb5 100644 --- a/deadlock-plugins/deadlock-extension/resources/dark/help.svg +++ b/deadlock-plugins/deadlock-extension/resources/dark/help.svg @@ -1 +1,3 @@ -<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable-background="new 0 0 48 48" height="48px" id="Layer_3" version="1.1" viewBox="0 0 48 48" width="48px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g><path d="M26.456,8.366c1.152,0,2.209-0.407,3.161-1.22c0.943-0.812,1.523-1.799,1.731-2.951 c0.195-1.16-0.048-2.138-0.764-2.951c-0.714-0.821-1.648-1.228-2.803-1.228c-1.159,0-2.214,0.407-3.158,1.228 c-0.955,0.813-1.535,1.792-1.732,2.951c-0.143,1.151,0.133,2.139,0.812,2.951C24.384,7.959,25.305,8.366,26.456,8.366z" fill="#241F20"/><path d="M36.68,37.971c0-0.352-0.462-0.712-1.361-1.088c-0.105,0.152-0.211,0.282-0.316,0.435 c-0.627,0.798-2.965,3.613-6.008,5.3c-0.02,0.008-0.036,0.016-0.048,0.027c-0.265,0.141-0.536,0.246-0.808,0.371 c-0.803,0.286-1.552,0.36-1.793,0.38c-0.683-0.09-1.053-0.567-1.053-1.471c0-0.747,0.219-2.222,0.663-4.439l0.51-2.237 l2.083-10.001c0.339-1.705,0.521-2.649,0.562-2.835l0.454-2.339c0.268-1.449,0.404-2.406,0.404-2.873 c0-0.894-0.224-1.572-0.579-2.124c-0.031-0.08-0.074-0.161-0.133-0.245c-0.054-0.064-0.107-0.121-0.164-0.18 c-0.062-0.066-0.095-0.129-0.179-0.198c-0.888-0.726-1.715-0.933-2.287-0.979l0.01-0.016c0,0-3.759-0.286-9.326,3.383 c-0.081,0.054-0.13,0.09-0.204,0.141c-1.507,0.954-2.712,1.913-3.547,2.681c-0.642,0.547-1.135,1.058-1.5,1.533 c0,0.002-0.018,0.021-0.018,0.021l0.004-0.002c-0.476,0.624-0.726,1.193-0.726,1.695c0,0.397,0.32,0.794,0.958,1.189 c0,0,2.392-3.086,6.41-5.096c0.304-0.131,1.076-0.45,1.755-0.627c0.316-0.073,0.915-0.129,1.298,0.187 c0.274,0.284,0.456,0.683,0.456,1.301c0,0.563-0.085,1.243-0.256,2.061l-0.407,1.926l-0.507,2.407l-1.984,9.517 c-1.015,4.916-1.523,7.857-1.523,8.815c0,2.261,1.237,3.392,3.71,3.392c1.12,0,2.274-0.203,3.455-0.566 c0.008,0,0.012,0.004,0.02,0.007c0.081-0.027,0.155-0.059,0.232-0.085c0.196-0.063,0.394-0.138,0.59-0.213 c5.578-2.076,9.248-6.257,10.359-7.657c0.098-0.118,0.18-0.23,0.262-0.337c0.062-0.086,0.102-0.145,0.102-0.145h-0.004 C36.527,38.573,36.68,38.229,36.68,37.971z" fill="#241F20"/></g></svg> \ No newline at end of file +<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'> +<svg enable-background="new 0 0 48 48" height="48px" id="Layer_3" version="1.1" viewBox="0 0 48 48" width="48px" + xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g><path d="M26.456,8.366c1.152,0,2.209-0.407,3.161-1.22c0.943-0.812,1.523-1.799,1.731-2.951 c0.195-1.16-0.048-2.138-0.764-2.951c-0.714-0.821-1.648-1.228-2.803-1.228c-1.159,0-2.214,0.407-3.158,1.228 c-0.955,0.813-1.535,1.792-1.732,2.951c-0.143,1.151,0.133,2.139,0.812,2.951C24.384,7.959,25.305,8.366,26.456,8.366z" fill="#241F20"/><path d="M36.68,37.971c0-0.352-0.462-0.712-1.361-1.088c-0.105,0.152-0.211,0.282-0.316,0.435 c-0.627,0.798-2.965,3.613-6.008,5.3c-0.02,0.008-0.036,0.016-0.048,0.027c-0.265,0.141-0.536,0.246-0.808,0.371 c-0.803,0.286-1.552,0.36-1.793,0.38c-0.683-0.09-1.053-0.567-1.053-1.471c0-0.747,0.219-2.222,0.663-4.439l0.51-2.237 l2.083-10.001c0.339-1.705,0.521-2.649,0.562-2.835l0.454-2.339c0.268-1.449,0.404-2.406,0.404-2.873 c0-0.894-0.224-1.572-0.579-2.124c-0.031-0.08-0.074-0.161-0.133-0.245c-0.054-0.064-0.107-0.121-0.164-0.18 c-0.062-0.066-0.095-0.129-0.179-0.198c-0.888-0.726-1.715-0.933-2.287-0.979l0.01-0.016c0,0-3.759-0.286-9.326,3.383 c-0.081,0.054-0.13,0.09-0.204,0.141c-1.507,0.954-2.712,1.913-3.547,2.681c-0.642,0.547-1.135,1.058-1.5,1.533 c0,0.002-0.018,0.021-0.018,0.021l0.004-0.002c-0.476,0.624-0.726,1.193-0.726,1.695c0,0.397,0.32,0.794,0.958,1.189 c0,0,2.392-3.086,6.41-5.096c0.304-0.131,1.076-0.45,1.755-0.627c0.316-0.073,0.915-0.129,1.298,0.187 c0.274,0.284,0.456,0.683,0.456,1.301c0,0.563-0.085,1.243-0.256,2.061l-0.407,1.926l-0.507,2.407l-1.984,9.517 c-1.015,4.916-1.523,7.857-1.523,8.815c0,2.261,1.237,3.392,3.71,3.392c1.12,0,2.274-0.203,3.455-0.566 c0.008,0,0.012,0.004,0.02,0.007c0.081-0.027,0.155-0.059,0.232-0.085c0.196-0.063,0.394-0.138,0.59-0.213 c5.578-2.076,9.248-6.257,10.359-7.657c0.098-0.118,0.18-0.23,0.262-0.337c0.062-0.086,0.102-0.145,0.102-0.145h-0.004 C36.527,38.573,36.68,38.229,36.68,37.971z" fill="#241F20"/></g></svg> \ No newline at end of file diff --git a/deadlock-plugins/deadlock-extension/resources/light/help.svg b/deadlock-plugins/deadlock-extension/resources/light/help.svg index 87a05d2aee68aec706cc1c02179671239f210d43..7d115def191648731c120ebc40a7c742792ffeb5 100644 --- a/deadlock-plugins/deadlock-extension/resources/light/help.svg +++ b/deadlock-plugins/deadlock-extension/resources/light/help.svg @@ -1 +1,3 @@ -<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable-background="new 0 0 48 48" height="48px" id="Layer_3" version="1.1" viewBox="0 0 48 48" width="48px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g><path d="M26.456,8.366c1.152,0,2.209-0.407,3.161-1.22c0.943-0.812,1.523-1.799,1.731-2.951 c0.195-1.16-0.048-2.138-0.764-2.951c-0.714-0.821-1.648-1.228-2.803-1.228c-1.159,0-2.214,0.407-3.158,1.228 c-0.955,0.813-1.535,1.792-1.732,2.951c-0.143,1.151,0.133,2.139,0.812,2.951C24.384,7.959,25.305,8.366,26.456,8.366z" fill="#241F20"/><path d="M36.68,37.971c0-0.352-0.462-0.712-1.361-1.088c-0.105,0.152-0.211,0.282-0.316,0.435 c-0.627,0.798-2.965,3.613-6.008,5.3c-0.02,0.008-0.036,0.016-0.048,0.027c-0.265,0.141-0.536,0.246-0.808,0.371 c-0.803,0.286-1.552,0.36-1.793,0.38c-0.683-0.09-1.053-0.567-1.053-1.471c0-0.747,0.219-2.222,0.663-4.439l0.51-2.237 l2.083-10.001c0.339-1.705,0.521-2.649,0.562-2.835l0.454-2.339c0.268-1.449,0.404-2.406,0.404-2.873 c0-0.894-0.224-1.572-0.579-2.124c-0.031-0.08-0.074-0.161-0.133-0.245c-0.054-0.064-0.107-0.121-0.164-0.18 c-0.062-0.066-0.095-0.129-0.179-0.198c-0.888-0.726-1.715-0.933-2.287-0.979l0.01-0.016c0,0-3.759-0.286-9.326,3.383 c-0.081,0.054-0.13,0.09-0.204,0.141c-1.507,0.954-2.712,1.913-3.547,2.681c-0.642,0.547-1.135,1.058-1.5,1.533 c0,0.002-0.018,0.021-0.018,0.021l0.004-0.002c-0.476,0.624-0.726,1.193-0.726,1.695c0,0.397,0.32,0.794,0.958,1.189 c0,0,2.392-3.086,6.41-5.096c0.304-0.131,1.076-0.45,1.755-0.627c0.316-0.073,0.915-0.129,1.298,0.187 c0.274,0.284,0.456,0.683,0.456,1.301c0,0.563-0.085,1.243-0.256,2.061l-0.407,1.926l-0.507,2.407l-1.984,9.517 c-1.015,4.916-1.523,7.857-1.523,8.815c0,2.261,1.237,3.392,3.71,3.392c1.12,0,2.274-0.203,3.455-0.566 c0.008,0,0.012,0.004,0.02,0.007c0.081-0.027,0.155-0.059,0.232-0.085c0.196-0.063,0.394-0.138,0.59-0.213 c5.578-2.076,9.248-6.257,10.359-7.657c0.098-0.118,0.18-0.23,0.262-0.337c0.062-0.086,0.102-0.145,0.102-0.145h-0.004 C36.527,38.573,36.68,38.229,36.68,37.971z" fill="#241F20"/></g></svg> \ No newline at end of file +<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'> +<svg enable-background="new 0 0 48 48" height="48px" id="Layer_3" version="1.1" viewBox="0 0 48 48" width="48px" + xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g><path d="M26.456,8.366c1.152,0,2.209-0.407,3.161-1.22c0.943-0.812,1.523-1.799,1.731-2.951 c0.195-1.16-0.048-2.138-0.764-2.951c-0.714-0.821-1.648-1.228-2.803-1.228c-1.159,0-2.214,0.407-3.158,1.228 c-0.955,0.813-1.535,1.792-1.732,2.951c-0.143,1.151,0.133,2.139,0.812,2.951C24.384,7.959,25.305,8.366,26.456,8.366z" fill="#241F20"/><path d="M36.68,37.971c0-0.352-0.462-0.712-1.361-1.088c-0.105,0.152-0.211,0.282-0.316,0.435 c-0.627,0.798-2.965,3.613-6.008,5.3c-0.02,0.008-0.036,0.016-0.048,0.027c-0.265,0.141-0.536,0.246-0.808,0.371 c-0.803,0.286-1.552,0.36-1.793,0.38c-0.683-0.09-1.053-0.567-1.053-1.471c0-0.747,0.219-2.222,0.663-4.439l0.51-2.237 l2.083-10.001c0.339-1.705,0.521-2.649,0.562-2.835l0.454-2.339c0.268-1.449,0.404-2.406,0.404-2.873 c0-0.894-0.224-1.572-0.579-2.124c-0.031-0.08-0.074-0.161-0.133-0.245c-0.054-0.064-0.107-0.121-0.164-0.18 c-0.062-0.066-0.095-0.129-0.179-0.198c-0.888-0.726-1.715-0.933-2.287-0.979l0.01-0.016c0,0-3.759-0.286-9.326,3.383 c-0.081,0.054-0.13,0.09-0.204,0.141c-1.507,0.954-2.712,1.913-3.547,2.681c-0.642,0.547-1.135,1.058-1.5,1.533 c0,0.002-0.018,0.021-0.018,0.021l0.004-0.002c-0.476,0.624-0.726,1.193-0.726,1.695c0,0.397,0.32,0.794,0.958,1.189 c0,0,2.392-3.086,6.41-5.096c0.304-0.131,1.076-0.45,1.755-0.627c0.316-0.073,0.915-0.129,1.298,0.187 c0.274,0.284,0.456,0.683,0.456,1.301c0,0.563-0.085,1.243-0.256,2.061l-0.407,1.926l-0.507,2.407l-1.984,9.517 c-1.015,4.916-1.523,7.857-1.523,8.815c0,2.261,1.237,3.392,3.71,3.392c1.12,0,2.274-0.203,3.455-0.566 c0.008,0,0.012,0.004,0.02,0.007c0.081-0.027,0.155-0.059,0.232-0.085c0.196-0.063,0.394-0.138,0.59-0.213 c5.578-2.076,9.248-6.257,10.359-7.657c0.098-0.118,0.18-0.23,0.262-0.337c0.062-0.086,0.102-0.145,0.102-0.145h-0.004 C36.527,38.573,36.68,38.229,36.68,37.971z" fill="#241F20"/></g></svg> \ No newline at end of file diff --git a/deadlock-plugins/deadlock-extension/src/core/callApi.service.ts b/deadlock-plugins/deadlock-extension/src/core/callApi.service.ts index 3bfdad638b9384f40e7a66c44eefff8431e82d81..cdd72e12d5029aa42a59648b5b0d216ec46c0321 100644 --- a/deadlock-plugins/deadlock-extension/src/core/callApi.service.ts +++ b/deadlock-plugins/deadlock-extension/src/core/callApi.service.ts @@ -1,7 +1,7 @@ import { GiteaPublicProperties } from './../customTypings/giteaPublicProperties.model'; import { SshKeyPair } from './../customTypings/sshKeyPair.model'; import axios, { AxiosInstance } from 'axios'; -import { API_URL, API_QUERY_REFERER } from '../config'; +import { API_QUERY_REFERER, API_URL } from '../config'; import { User } from '../customTypings/user.model'; import Controller from './controller'; import ExtensionStore from './extensionStore'; diff --git a/deadlock-plugins/deadlock-extension/src/core/controller.ts b/deadlock-plugins/deadlock-extension/src/core/controller.ts index 2f4ea94875cfaa923f8546e55567437d8314cddf..c3f8e51925c5b4bb69be9a384f8089fdc66b40b1 100644 --- a/deadlock-plugins/deadlock-extension/src/core/controller.ts +++ b/deadlock-plugins/deadlock-extension/src/core/controller.ts @@ -19,6 +19,7 @@ import Mission from './mission'; import CallApiService from './callApi.service'; import KeycloakOAuth2DeviceFlowConnectionVSCodeImpl from './keycloakOAuth2DeviceFlowConnectionVSCodeImpl'; import SshKeyManager from './sshKeyManager'; + export default class Controller { public connection: KeycloakOAuth2DeviceFlowConnection; private commandHandler: CommandHandler; diff --git a/deadlock-plugins/deadlock-extension/src/core/sshKeyManager.ts b/deadlock-plugins/deadlock-extension/src/core/sshKeyManager.ts index 38579ba740436debccada5f4704afc7632b78cd3..62f6aa2e6f8ef479be835e71935eb79f71707030 100644 --- a/deadlock-plugins/deadlock-extension/src/core/sshKeyManager.ts +++ b/deadlock-plugins/deadlock-extension/src/core/sshKeyManager.ts @@ -1,4 +1,3 @@ -import ExtensionStore from './extensionStore'; import * as fs from 'fs'; import { userSshKeyFolderPath } from './config'; diff --git a/deadlock-plugins/deadlock-extension/src/core/userConfig.ts b/deadlock-plugins/deadlock-extension/src/core/userConfig.ts index 0b6906cfc0b95c932a24b5b52e575bf925602943..80d0317d2142eb23a9e25568e788dfa8ceb5d9ce 100644 --- a/deadlock-plugins/deadlock-extension/src/core/userConfig.ts +++ b/deadlock-plugins/deadlock-extension/src/core/userConfig.ts @@ -1,4 +1,3 @@ -import { log } from './../recorder/utils'; /** * Example: * { @@ -15,7 +14,6 @@ import { log } from './../recorder/utils'; * "missionId":"code_persist_cdb_crud" * } */ - import { error } from '../recorder/utils'; import { UserDetails } from '../customTypings/user.model'; diff --git a/deadlock-plugins/deadlock-extension/src/recorder/command-recorder.ts b/deadlock-plugins/deadlock-extension/src/recorder/command-recorder.ts index f770af06dd3e4335945826a93a80f79f1f524590..1a68a0b8ea208688101e267ae24b329a31885af6 100644 --- a/deadlock-plugins/deadlock-extension/src/recorder/command-recorder.ts +++ b/deadlock-plugins/deadlock-extension/src/recorder/command-recorder.ts @@ -1,5 +1,5 @@ import GitMission from '../core/gitMission'; -import { error, CommitFrom, updateRemote } from './utils'; +import { CommitFrom, error, updateRemote } from './utils'; import * as async from 'async'; import * as fs from 'fs'; diff --git a/deadlock-plugins/deadlock-extension/src/recorder/index.ts b/deadlock-plugins/deadlock-extension/src/recorder/index.ts index b513b15bc3f093fe9c68617c56925c6d0326c005..157d18f4b1604fedc96f92ff8f339c33362ca41a 100644 --- a/deadlock-plugins/deadlock-extension/src/recorder/index.ts +++ b/deadlock-plugins/deadlock-extension/src/recorder/index.ts @@ -3,13 +3,13 @@ import { ENABLE_AUTOMATIC_SAVE } from './../config'; import CommandRecorder from './command-recorder'; import GitMission from '../core/gitMission'; import UserConfigNode from './userConfigNode'; -import { PROJECT_SRC_PATH, PROJECT_DEADLOCK_DESKTOP_PATH } from '../core/config'; -import { copyProjectSources, clearFilesExceptGit, log, error, renameTempToUserGitFiles } from './utils'; +import { PROJECT_DEADLOCK_DESKTOP_PATH, PROJECT_SRC_PATH } from '../core/config'; +import { clearFilesExceptGit, copyProjectSources, error, log, renameTempToUserGitFiles } from './utils'; import UserConfig from '../core/userConfig'; import HttpServer from './services/http-server'; import { ENABLE_RECORDER_HTTP_SERVER } from '../config'; -import FileWatcher from './services/file-watcher'; import AutomaticSave from './services/automatic-save'; + export default class Recorder { async setupProject(userConfig: UserConfig, gitMission?: GitMission) { log('Setup user project..'); diff --git a/deadlock-plugins/deadlock-extension/src/recorder/preStop.ts b/deadlock-plugins/deadlock-extension/src/recorder/preStop.ts index d4d84eccb75c77b27f9ecf0924b7c123958dcf78..a6f754c6bac81e0303b956b013ecb2eeda77a3ed 100644 --- a/deadlock-plugins/deadlock-extension/src/recorder/preStop.ts +++ b/deadlock-plugins/deadlock-extension/src/recorder/preStop.ts @@ -1,8 +1,9 @@ import UserConfigNode from './userConfigNode'; import GitMission from '../core/gitMission'; -import { PROJECT_SRC_PATH, PROJECT_DEADLOCK_DESKTOP_PATH } from '../core/config'; +import { PROJECT_DEADLOCK_DESKTOP_PATH, PROJECT_SRC_PATH } from '../core/config'; + +import { CommitFrom, error, log, updateRemote } from './utils'; -import { log, error, updateRemote, CommitFrom } from './utils'; const util = require('util'); const exec = util.promisify(require('child_process').exec); diff --git a/deadlock-plugins/deadlock-extension/src/recorder/services/automatic-save.ts b/deadlock-plugins/deadlock-extension/src/recorder/services/automatic-save.ts index 9be2e04fc9e1777b40d097e6bfe44c185f3e053d..42bcb2a8a9f70b520239fe48d8f3f450fa135fed 100644 --- a/deadlock-plugins/deadlock-extension/src/recorder/services/automatic-save.ts +++ b/deadlock-plugins/deadlock-extension/src/recorder/services/automatic-save.ts @@ -1,7 +1,5 @@ import { CommitFrom, getIgnorePatternFromIgnoreFile } from './../utils'; -import { FSWatcher } from 'chokidar'; import FileWatcher from './file-watcher'; -import * as fs from 'fs'; import { updateRemote } from '../utils'; import GitMission from '../../core/gitMission'; diff --git a/deadlock-plugins/deadlock-extension/src/recorder/services/http-server.ts b/deadlock-plugins/deadlock-extension/src/recorder/services/http-server.ts index 99623646ff5e937d46a87fee30abbc146254ba24..53cdd2a6e3159c1ead4289360489d631c47cb372 100644 --- a/deadlock-plugins/deadlock-extension/src/recorder/services/http-server.ts +++ b/deadlock-plugins/deadlock-extension/src/recorder/services/http-server.ts @@ -1,7 +1,8 @@ import GitMission from '../../core/gitMission'; import { Express } from 'express'; -import { updateRemote, CommitFrom, log } from '../utils'; +import { CommitFrom, log, updateRemote } from '../utils'; import { RECORDER_HTTP_SERVER_PORT } from '../../config'; + const express = require('express'); export default class HttpServer { app: Express; diff --git a/deadlock-plugins/deadlock-extension/src/recorder/utils.ts b/deadlock-plugins/deadlock-extension/src/recorder/utils.ts index 5b8585bb99de212ecd8867f3eeb5e5243144f1f4..aad779a410064e9e17955cc4d9694af067592a22 100644 --- a/deadlock-plugins/deadlock-extension/src/recorder/utils.ts +++ b/deadlock-plugins/deadlock-extension/src/recorder/utils.ts @@ -1,11 +1,9 @@ import { Branch } from './../core/gitMission'; import GitMission from '../core/gitMission'; -import { PROJECT_SRC_PATH, PROJECT_DEADLOCK_DESKTOP_PATH } from '../core/config'; +import { PROJECT_DEADLOCK_DESKTOP_PATH, PROJECT_SRC_PATH } from '../core/config'; import { format } from 'date-fns'; import { execSync } from 'child_process'; -import { existsSync, renameSync, copyFileSync, PathLike } from 'fs'; -import KeycloakOAuth2DeviceFlowConnection from '../core/keycloakOAuth2DeviceFlowConnection'; -import ExtensionStore from '../core/extensionStore'; +import { copyFileSync, existsSync, PathLike, renameSync } from 'fs'; const util = require('util'); const unlink = util.promisify(require('fs').unlink); diff --git a/deadlock-plugins/deadlock-extension/src/theia/command.ts b/deadlock-plugins/deadlock-extension/src/theia/command.ts index 53638bd941e7cc69623287b76f5670be8e78cb2c..d8fd787c7e2289c7ee84215df89509b5ba0f19f4 100644 --- a/deadlock-plugins/deadlock-extension/src/theia/command.ts +++ b/deadlock-plugins/deadlock-extension/src/theia/command.ts @@ -1,4 +1,5 @@ import { Command as VscodeComand } from 'vscode'; + export class Command { constructor(private _title: string, private command: string) {}