opengnsys
/
oggui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Mercure_URL var env
testing/ogGui-multibranch/pipeline/head This commit looks good Details
testing/ogGui-multibranch/pipeline/tag This commit looks good Details

pull/16/head opengnsys_devel-1.5.4
Manuel Aranda Rosales 2025-03-11 11:10:37 +01:00
parent 67ebc5b926
commit 7a7c3e8e0d
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ogWebconsole/.env
View File

@ -1 +1,2 @@
NG_APP_BASE_API_URL=https://127.0.0.1:8443 NG_APP_BASE_API_URL=https://127.0.0.1:8443
NG_APP_OGCORE_MERCURE_BASE_URL=http://localhost:3000/.well-known/mercure

3
ogWebconsole/src/app/components/commands/commands-task/task-logs/task-logs.component.ts
View File

@ -18,6 +18,7 @@ import {ToastrService} from "ngx-toastr";
}) })
export class TaskLogsComponent implements OnInit { export class TaskLogsComponent implements OnInit {
baseUrl: string = import.meta.env.NG_APP_BASE_API_URL; baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
mercureUrl: string = import.meta.env.NG_APP_OGCORE_MERCURE_BASE_URL;
traces: any[] = []; traces: any[] = [];
groupedTraces: any[] = []; groupedTraces: any[] = [];
commands: any[] = []; commands: any[] = [];
@ -109,7 +110,7 @@ export class TaskLogsComponent implements OnInit {
map(name => (name ? this._filterClients(name) : this.clients.slice())) map(name => (name ? this._filterClients(name) : this.clients.slice()))
); );
const eventSource = new EventSource('http://localhost:3000/.well-known/mercure?topic=' const eventSource = new EventSource(`${this.mercureUrl}?topic=`
+ encodeURIComponent(`traces`)); + encodeURIComponent(`traces`));
eventSource.onmessage = (event) => { eventSource.onmessage = (event) => {

3
ogWebconsole/src/app/components/groups/groups.component.ts
View File

@ -39,6 +39,7 @@ enum NodeType {
}) })
export class GroupsComponent implements OnInit, OnDestroy { export class GroupsComponent implements OnInit, OnDestroy {
baseUrl: string = import.meta.env.NG_APP_BASE_API_URL; baseUrl: string = import.meta.env.NG_APP_BASE_API_URL;
mercureUrl: string = import.meta.env.NG_APP_OGCORE_MERCURE_BASE_URL;
organizationalUnits: UnidadOrganizativa[] = []; organizationalUnits: UnidadOrganizativa[] = [];
selectedUnidad: UnidadOrganizativa | null = null; selectedUnidad: UnidadOrganizativa | null = null;
selectedDetail: UnidadOrganizativa | null = null; selectedDetail: UnidadOrganizativa | null = null;
@ -138,7 +139,7 @@ export class GroupsComponent implements OnInit, OnDestroy {
this.arrayClients = this.selectedClients.data; this.arrayClients = this.selectedClients.data;
const eventSource = new EventSource('http://localhost:3000/.well-known/mercure?topic=' const eventSource = new EventSource(`${this.mercureUrl}?topic=`
+ encodeURIComponent(`clients`)); + encodeURIComponent(`clients`));
eventSource.onmessage = (event) => { eventSource.onmessage = (event) => {

3
ogWebconsole/src/env.d.ts vendored
View File

@ -1,5 +1,6 @@
interface ImportMetaEnv { interface ImportMetaEnv {
readonly NG_APP_BASE_API_URL: string; // Define aquí todas las variables que necesitas readonly NG_APP_BASE_API_URL: string;
readonly NG_APP_OGCORE_MERCURE_BASE_URL: string;
} }
interface ImportMeta { interface ImportMeta {