Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
siibra-explorer
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Xiao Gui
siibra-explorer
Commits
2103cc27
Commit
2103cc27
authored
5 years ago
by
Xiao Gui
Browse files
Options
Downloads
Patches
Plain Diff
fix trailing slash issue
parent
38bfb6ed
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.github/workflows/e2e.yml
+1
-2
1 addition, 2 deletions
.github/workflows/e2e.yml
e2e/src/iv.e2e-spec.js
+1
-1
1 addition, 1 deletion
e2e/src/iv.e2e-spec.js
src/atlasViewer/atlasViewer.constantService.service.ts
+1
-1
1 addition, 1 deletion
src/atlasViewer/atlasViewer.constantService.service.ts
with
3 additions
and
4 deletions
.github/workflows/e2e.yml
+
1
−
2
View file @
2103cc27
...
...
@@ -11,7 +11,7 @@ env:
DOCKER_CONTAINER_NAME
:
gha-iav-built-${{ github.sha }}
DOCKER_E2E_PPTR
:
gha-iav-e2e-pptr-${{ github.sha }}
DOCKER_E2E_NETWORK
:
gha-dkr-network-${{ github.sha }}
ATLAS_URL
:
http://gha-iav-built-${{ github.sha }}:3000
ATLAS_URL
:
http://gha-iav-built-${{ github.sha }}:3000
/
jobs
:
buildimage
:
...
...
@@ -38,7 +38,6 @@ jobs:
docker run \
--rm \
--name ${DOCKER_CONTAINER_NAME} \
-p 13000:3000 \
--env HBP_CLIENTID=${{ secrets.HBP_CLIENTID }} \
--env HBP_CLIENTSECRET=${{ secrets.HBP_CLIENTSECRET }} \
--env REFRESH_TOKEN=${{ secrets.REFRESH_TOKEN }} \
...
...
This diff is collapsed.
Click to expand it.
e2e/src/iv.e2e-spec.js
+
1
−
1
View file @
2103cc27
...
...
@@ -13,7 +13,7 @@ describe('protractor works', () => {
})
const
pptr
=
require
(
'
puppeteer
'
)
const
ATLAS_URL
=
process
.
env
.
ATLAS_URL
||
'
http://localhost:3000
'
const
ATLAS_URL
=
(
process
.
env
.
ATLAS_URL
||
'
http://localhost:3000
'
).
replace
(
/
\/
$/
,
''
)
if
(
ATLAS_URL
.
length
===
0
)
throw
new
Error
(
`ATLAS_URL must either be left unset or defined.`
)
if
(
ATLAS_URL
[
ATLAS_URL
.
length
-
1
]
===
'
/
'
)
throw
new
Error
(
`ATLAS_URL should not trail with a slash:
${
ATLAS_URL
}
`
)
...
...
This diff is collapsed.
Click to expand it.
src/atlasViewer/atlasViewer.constantService.service.ts
+
1
−
1
View file @
2103cc27
...
...
@@ -52,7 +52,7 @@ export class AtlasViewerConstantsServices implements OnDestroy {
}
// instead of using window.location.href, which includes query param etc
public
backendUrl
=
BACKEND_URL
||
`
${
window
.
location
.
origin
}${
window
.
location
.
pathname
}
`
public
backendUrl
=
`
${
BACKEND_URL
}
/`
.
replace
(
/
\/\/
$/
,
'
\
/
'
)
||
`
${
window
.
location
.
origin
}${
window
.
location
.
pathname
}
`
private
fetchTemplate
=
(
templateUrl
)
=>
this
.
http
.
get
(
`
${
this
.
backendUrl
}${
templateUrl
}
`
,
{
responseType
:
'
json
'
}).
pipe
(
switchMap
((
template
:
any
)
=>
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment