From f0b995bd9e416995fe693bdb277e8d76caff1bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Soba=C5=84ski?= Date: Sun, 8 Dec 2024 16:54:48 +0100 Subject: [PATCH 1/2] Add "Open in Web Browser" in file-viewer --- index.html | 3 ++- main.js | 8 +++++++ .../services/gitlab-api/models/project.ts | 1 + .../services/gitlab-web/gitlab-www.service.ts | 22 +++++++++++++++++++ .../file-viewer/file-viewer.component.html | 8 +++++++ .../file-viewer/file-viewer.component.scss | 5 +++++ .../file-viewer/file-viewer.component.ts | 12 +++++++++- 7 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 src/app/core/services/gitlab-web/gitlab-www.service.ts diff --git a/index.html b/index.html index a201e6c..f4b681e 100644 --- a/index.html +++ b/index.html @@ -18,7 +18,8 @@ active: true, webviewAttributes: { nodeintegration: true, - webPreferences: 'contextIsolation=false' + webPreferences: 'contextIsolation=false', + allowpopups: true, }, ready: (tab) => { tab.webview.addEventListener('ipc-message', (event) => { diff --git a/main.js b/main.js index 147fd42..6feb4da 100644 --- a/main.js +++ b/main.js @@ -44,6 +44,14 @@ app.on('activate', () => { } }); +// allow open external links in webview (electron-tabs) context +app.on('web-contents-created', (_, webContents) => { + webContents.setWindowOpenHandler(({url}) => { + shell.openExternal(url); + return {action : "deny"}; + }); +}); + ipcMain.on('SETTINGS_CHANGED', (event, electronSettings) => { const unsafeRequestsEnabled = store.get('enableUnsafeRequests'); if (electronSettings && electronSettings.enableUnsafeRequests !== unsafeRequestsEnabled) { diff --git a/src/app/core/services/gitlab-api/models/project.ts b/src/app/core/services/gitlab-api/models/project.ts index ea1f4e6..456da6d 100644 --- a/src/app/core/services/gitlab-api/models/project.ts +++ b/src/app/core/services/gitlab-api/models/project.ts @@ -6,4 +6,5 @@ export interface Project { name: string; name_with_namespace: string; path_with_namespace: string; + web_url: string; } diff --git a/src/app/core/services/gitlab-web/gitlab-www.service.ts b/src/app/core/services/gitlab-web/gitlab-www.service.ts new file mode 100644 index 0000000..d0823a1 --- /dev/null +++ b/src/app/core/services/gitlab-web/gitlab-www.service.ts @@ -0,0 +1,22 @@ +import { Injectable } from '@angular/core'; +import { Project } from '../gitlab-api/models/project'; + +@Injectable({ + providedIn: 'root' +}) +export class GitlabWwwService { + + public openFile(project: Project, file_with_path: string, line?: number): void { + let url = `${project.web_url}/-/blob/${project.default_branch}/${file_with_path}`; + if (line !== undefined && line !== null) { + url += `#L${line}`; + } + this.openNewWindow(new URL(url)); + } + + + private openNewWindow(url: URL): void { + window.open(url, '_blank'); + } + +} diff --git a/src/app/shared/components/file-viewer/file-viewer.component.html b/src/app/shared/components/file-viewer/file-viewer.component.html index 5e78001..f99e217 100644 --- a/src/app/shared/components/file-viewer/file-viewer.component.html +++ b/src/app/shared/components/file-viewer/file-viewer.component.html @@ -1,6 +1,14 @@

+
+
+ +
+
{{jumpedToLineIndex + 1}} of {{highlightedRanges.length}}
diff --git a/src/app/shared/components/file-viewer/file-viewer.component.scss b/src/app/shared/components/file-viewer/file-viewer.component.scss index 06e566d..c3e98fa 100644 --- a/src/app/shared/components/file-viewer/file-viewer.component.scss +++ b/src/app/shared/components/file-viewer/file-viewer.component.scss @@ -58,6 +58,11 @@ app-path-text { margin-bottom: 4px; } +.file-viewer-menu { + position: absolute; + line-height: 0; +} + .jump-lines-icons { position: absolute; line-height: 0; diff --git a/src/app/shared/components/file-viewer/file-viewer.component.ts b/src/app/shared/components/file-viewer/file-viewer.component.ts index d3dc50f..3dee21a 100644 --- a/src/app/shared/components/file-viewer/file-viewer.component.ts +++ b/src/app/shared/components/file-viewer/file-viewer.component.ts @@ -6,6 +6,7 @@ import { AceComponent, AceConfigInterface } from 'ngx-ace-wrapper'; import { Project } from 'src/app/core/services/gitlab-api/models/project'; import { SettingsService } from 'src/app/settings/settings.service'; import { Range } from 'brace'; +import { GitlabWwwService } from 'src/app/core/services/gitlab-web/gitlab-www.service'; import 'brace'; import 'brace/mode/javascript'; @@ -62,7 +63,8 @@ export class FileViewerComponent extends Modal implements On highlightedRanges: Range[] = []; jumpedToLineIndex = -1; - constructor(private filesApiService: FilesApiService, private settingsService: SettingsService) { + constructor(private filesApiService: FilesApiService, private settingsService: SettingsService, + private gitlabWwwService: GitlabWwwService) { super(); } @@ -107,6 +109,14 @@ export class FileViewerComponent extends Modal implements On this.goToHighlight(this.jumpedToLineIndex); } + openInWebBrowser() { + let line = this.ace.directiveRef.ace().getCursorPosition()?.row; + if (line !== undefined || line !== null) { + line += 1; + } + this.gitlabWwwService.openFile(this.project, this.filename, line); + } + private goToHighlight(index: number): void { const range = this.highlightedRanges[index]; const ace = this.ace.directiveRef.ace(); From b091c6d8a9c06f002a3daf457e72cd267ce96b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Soba=C5=84ski?= Date: Fri, 20 Dec 2024 00:42:46 +0100 Subject: [PATCH 2/2] Change button to link, cleanup --- .../services/gitlab-api/gitlab-www.service.ts | 16 ++++++++++++++ .../services/gitlab-web/gitlab-www.service.ts | 22 ------------------- .../file-viewer/file-viewer.component.html | 6 ++--- .../file-viewer/file-viewer.component.ts | 17 ++++++++------ 4 files changed, 29 insertions(+), 32 deletions(-) create mode 100644 src/app/core/services/gitlab-api/gitlab-www.service.ts delete mode 100644 src/app/core/services/gitlab-web/gitlab-www.service.ts diff --git a/src/app/core/services/gitlab-api/gitlab-www.service.ts b/src/app/core/services/gitlab-api/gitlab-www.service.ts new file mode 100644 index 0000000..95d499c --- /dev/null +++ b/src/app/core/services/gitlab-api/gitlab-www.service.ts @@ -0,0 +1,16 @@ +import { Injectable } from '@angular/core'; +import { Project } from './models/project'; + +@Injectable({ + providedIn: 'root' +}) +export class GitlabWwwService { + + public openFileUrl(project: Project, file_with_path: string, line?: number): string { + let url = `${project.web_url}/-/blob/${project.default_branch}/${file_with_path}`; + if (line !== undefined) { + url += `#L${line+1}`; + } + return url; + } +} diff --git a/src/app/core/services/gitlab-web/gitlab-www.service.ts b/src/app/core/services/gitlab-web/gitlab-www.service.ts deleted file mode 100644 index d0823a1..0000000 --- a/src/app/core/services/gitlab-web/gitlab-www.service.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Project } from '../gitlab-api/models/project'; - -@Injectable({ - providedIn: 'root' -}) -export class GitlabWwwService { - - public openFile(project: Project, file_with_path: string, line?: number): void { - let url = `${project.web_url}/-/blob/${project.default_branch}/${file_with_path}`; - if (line !== undefined && line !== null) { - url += `#L${line}`; - } - this.openNewWindow(new URL(url)); - } - - - private openNewWindow(url: URL): void { - window.open(url, '_blank'); - } - -} diff --git a/src/app/shared/components/file-viewer/file-viewer.component.html b/src/app/shared/components/file-viewer/file-viewer.component.html index f99e217..da4d8f3 100644 --- a/src/app/shared/components/file-viewer/file-viewer.component.html +++ b/src/app/shared/components/file-viewer/file-viewer.component.html @@ -3,10 +3,10 @@

- +
diff --git a/src/app/shared/components/file-viewer/file-viewer.component.ts b/src/app/shared/components/file-viewer/file-viewer.component.ts index 3dee21a..1d161eb 100644 --- a/src/app/shared/components/file-viewer/file-viewer.component.ts +++ b/src/app/shared/components/file-viewer/file-viewer.component.ts @@ -6,7 +6,7 @@ import { AceComponent, AceConfigInterface } from 'ngx-ace-wrapper'; import { Project } from 'src/app/core/services/gitlab-api/models/project'; import { SettingsService } from 'src/app/settings/settings.service'; import { Range } from 'brace'; -import { GitlabWwwService } from 'src/app/core/services/gitlab-web/gitlab-www.service'; +import { GitlabWwwService } from 'src/app/core/services/gitlab-api/gitlab-www.service'; import 'brace'; import 'brace/mode/javascript'; @@ -51,6 +51,7 @@ export class FileViewerComponent extends Modal implements On @ViewChild('ace', { static: true }) ace: AceComponent; aceConfig: AceConfigInterface; + aceInitialized = false; project: Project; filename: string; @@ -109,12 +110,9 @@ export class FileViewerComponent extends Modal implements On this.goToHighlight(this.jumpedToLineIndex); } - openInWebBrowser() { - let line = this.ace.directiveRef.ace().getCursorPosition()?.row; - if (line !== undefined || line !== null) { - line += 1; - } - this.gitlabWwwService.openFile(this.project, this.filename, line); + openGitLabUrl(): string { + const {row} = this.provideCursorPosition(); + return this.gitlabWwwService.openFileUrl(this.project, this.filename, row); } private goToHighlight(index: number): void { @@ -141,6 +139,7 @@ export class FileViewerComponent extends Modal implements On if (this.highlightedRanges.length > 0) { this.goToNextHighlight(); } + this.aceInitialized = true; }); } @@ -152,4 +151,8 @@ export class FileViewerComponent extends Modal implements On private decodeContent(content: string): string { return decodeURIComponent(escape(atob(content))); } + + private provideCursorPosition(): {row?: number; column?: number} { + return this.aceInitialized ? this.ace.directiveRef.ace().getCursorPosition() : {}; + } }