mirror of
https://github.com/cpvalente/ontime.git
synced 2026-08-18 13:44:12 +00:00
Fix link to host in local network (#1843)
* descripe testing for cloud * use base url directly * lint
This commit is contained in:
committed by
GitHub
parent
37abd3fe47
commit
ee3d38fce8
@@ -15,7 +15,6 @@ import Switch from '../../common/components/switch/Switch';
|
|||||||
import { useUpdateUrlPreset } from '../../common/hooks-query/useUrlPresets';
|
import { useUpdateUrlPreset } from '../../common/hooks-query/useUrlPresets';
|
||||||
import copyToClipboard from '../../common/utils/copyToClipboard';
|
import copyToClipboard from '../../common/utils/copyToClipboard';
|
||||||
import { preventEscape } from '../../common/utils/keyEvent';
|
import { preventEscape } from '../../common/utils/keyEvent';
|
||||||
import { linkToOtherHost } from '../../common/utils/linkUtils';
|
|
||||||
import { isUrlSafe } from '../../common/utils/regex';
|
import { isUrlSafe } from '../../common/utils/regex';
|
||||||
import { isOntimeCloud, serverURL } from '../../externals';
|
import { isOntimeCloud, serverURL } from '../../externals';
|
||||||
import * as Panel from '../app-settings/panel-utils/PanelUtils';
|
import * as Panel from '../app-settings/panel-utils/PanelUtils';
|
||||||
@@ -136,7 +135,7 @@ export default function GenerateLinkForm({ hostOptions, pathOptions, presets, is
|
|||||||
}
|
}
|
||||||
|
|
||||||
const url = await generateUrl({
|
const url = await generateUrl({
|
||||||
baseUrl: linkToOtherHost(options.baseUrl),
|
baseUrl: options.baseUrl,
|
||||||
path,
|
path,
|
||||||
authenticate: options.authenticate,
|
authenticate: options.authenticate,
|
||||||
lockConfig: options.lockConfig,
|
lockConfig: options.lockConfig,
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "turbo run dev",
|
"dev": "turbo run dev",
|
||||||
|
"dev:prefix": "cross-env ROUTER_PREFIX=test turbo run dev --filter=ontime-server",
|
||||||
"dev:electron": "turbo run dev:electron",
|
"dev:electron": "turbo run dev:electron",
|
||||||
"lint": "turbo run lint",
|
"lint": "turbo run lint",
|
||||||
"typecheck": "turbo run typecheck",
|
"typecheck": "turbo run typecheck",
|
||||||
|
|||||||
+2
-1
@@ -13,7 +13,8 @@
|
|||||||
"tasks": {
|
"tasks": {
|
||||||
"dev": {
|
"dev": {
|
||||||
"cache": false,
|
"cache": false,
|
||||||
"persistent": true
|
"persistent": true,
|
||||||
|
"env": ["ROUTER_PREFIX"]
|
||||||
},
|
},
|
||||||
"dev:electron": {
|
"dev:electron": {
|
||||||
"cache": false,
|
"cache": false,
|
||||||
|
|||||||
Reference in New Issue
Block a user