Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Dokumentation
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FIT-Connect
Dokumentation
Commits
1c692c0e
Commit
1c692c0e
authored
2 years ago
by
Mark Kane
Browse files
Options
Downloads
Patches
Plain Diff
add logic to verify and handle wrong versions
(
planning#679
)
parent
4d2a974d
No related branches found
No related tags found
1 merge request
!304
add version query param to ApiSpec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/VersionSelect.js
+1
-12
1 addition, 12 deletions
src/components/VersionSelect.js
src/views/ApiSpec.js
+33
-12
33 additions, 12 deletions
src/views/ApiSpec.js
with
34 additions
and
24 deletions
src/components/VersionSelect.js
+
1
−
12
View file @
1c692c0e
import
React
,
{
useEffect
}
from
"
react
"
import
React
,
{
useEffect
}
from
"
react
"
import
useAsync
from
'
@hooks/useAsync
'
import
getVersionList
from
"
@lib/utils/getVersionList
"
;
import
{
useHistory
}
from
'
@docusaurus/router
'
;
import
{
useHistory
}
from
'
@docusaurus/router
'
;
export
default
({
version
,
setVersion
,
gitlabId
,
includePrerelease
=
false
})
=>
{
export
default
({
version
,
versions
,
setVersion
,
gitlabId
,
includePrerelease
=
false
})
=>
{
const
{
execute
,
status
,
error
,
value
:
versions
}
=
useAsync
(
getVersionList
,
{
projectId
:
gitlabId
,
includePrerelease
,
},
false
)
const
selectStyle
=
{
const
selectStyle
=
{
border
:
"
1px solid rgba(128, 126, 163, 0.8)
"
,
border
:
"
1px solid rgba(128, 126, 163, 0.8)
"
,
...
@@ -20,10 +13,6 @@ export default ({ version, setVersion, gitlabId, includePrerelease = false }) =>
...
@@ -20,10 +13,6 @@ export default ({ version, setVersion, gitlabId, includePrerelease = false }) =>
const
history
=
useHistory
()
const
history
=
useHistory
()
const
params
=
new
URLSearchParams
()
const
params
=
new
URLSearchParams
()
useEffect
(()
=>
{
execute
()
},
[])
return
<
div
>
return
<
div
>
API
Version
anzeigen
:
<
select
API
Version
anzeigen
:
<
select
style
=
{
selectStyle
}
style
=
{
selectStyle
}
...
...
This diff is collapsed.
Click to expand it.
src/views/ApiSpec.js
+
33
−
12
View file @
1c692c0e
import
React
,
{
useEffect
,
useState
}
from
'
react
'
import
React
,
{
useEffect
,
useState
}
from
'
react
'
import
semver
from
"
semver
"
;
import
semver
from
'
semver
'
import
ExecutionEnvironment
from
'
@docusaurus/ExecutionEnvironment
'
import
ExecutionEnvironment
from
'
@docusaurus/ExecutionEnvironment
'
import
BrowserOnly
from
'
@docusaurus/BrowserOnly
'
import
BrowserOnly
from
'
@docusaurus/BrowserOnly
'
import
{
useLocation
}
from
'
@docusaurus/router
'
;
import
{
useLocation
}
from
'
@docusaurus/router
'
import
useAsync
from
'
@hooks/useAsync
'
import
useAsync
from
'
@hooks/useAsync
'
import
getLatestVersion
from
"
@lib/utils/getLatestVersion
"
;
import
getLatestVersion
from
'
@lib/utils/getLatestVersion
'
import
DownloadLabel
from
"
@components/DownloadLabel
"
;
import
getVersionList
from
'
@lib/utils/getVersionList
'
import
VersionSelect
from
"
@components/VersionSelect
"
;
import
DownloadLabel
from
'
@components/DownloadLabel
'
import
VersionSelect
from
'
@components/VersionSelect
'
const
SCHEMA_BASE_URL
=
'
https://schema.fitko.de/fit-connect
'
const
SCHEMA_BASE_URL
=
'
https://schema.fitko.de/fit-connect
'
...
@@ -17,14 +18,16 @@ export default function ApiSpec(props) {
...
@@ -17,14 +18,16 @@ export default function ApiSpec(props) {
let
{
version
}
=
props
let
{
version
}
=
props
const
search
=
useLocation
().
search
;
const
search
=
useLocation
().
search
;
const
queryVersion
=
new
URLSearchParams
(
search
).
get
(
'
version
'
);
const
queryVersion
=
new
URLSearchParams
(
search
).
get
(
'
version
'
);
if
(
queryVersion
&&
semver
.
valid
(
queryVersion
))
{
version
=
queryVersion
;
}
const
[
selectedVersion
,
setSelectedVersion
]
=
useState
(
''
)
const
[
selectedVersion
,
setSelectedVersion
]
=
useState
(
''
)
const
isInBrowser
=
ExecutionEnvironment
.
canUseDOM
const
isInBrowser
=
ExecutionEnvironment
.
canUseDOM
const
{
execute
,
status
,
error
,
value
:
latestVersion
}
=
useAsync
(
getLatestVersion
,
{
const
{
execute
:
executeList
,
status
:
statusList
,
value
:
versions
}
=
useAsync
(
getVersionList
,
{
projectId
:
gitlabProjectId
,
includePrerelease
,
},
false
)
const
{
execute
,
status
,
value
:
latestVersion
}
=
useAsync
(
getLatestVersion
,
{
siteVersion
:
version
===
undefined
?
'
*
'
:
version
,
siteVersion
:
version
===
undefined
?
'
*
'
:
version
,
projectId
:
gitlabProjectId
,
projectId
:
gitlabProjectId
,
includePrerelease
:
!!
includePrereleaseVersion
includePrerelease
:
!!
includePrereleaseVersion
...
@@ -32,12 +35,22 @@ export default function ApiSpec(props) {
...
@@ -32,12 +35,22 @@ export default function ApiSpec(props) {
if
(
isInBrowser
)
{
if
(
isInBrowser
)
{
useEffect
(()
=>
{
useEffect
(()
=>
{
execute
()
execute
List
()
},
[])
},
[])
useEffect
(
async
()
=>
{
if
(
statusList
===
'
success
'
)
{
execute
()
}
},
[
statusList
])
useEffect
(
async
()
=>
{
useEffect
(
async
()
=>
{
if
(
status
===
'
success
'
)
{
if
(
status
===
'
success
'
)
{
setSelectedVersion
(
version
&&
version
!==
'
*
'
?
version
:
latestVersion
)
if
(
semver
.
valid
(
queryVersion
)
&&
versions
.
includes
(
queryVersion
))
{
setSelectedVersion
(
queryVersion
)
}
else
{
setSelectedVersion
(
version
&&
version
!==
'
*
'
?
version
:
latestVersion
)
}
}
}
},
[
status
])
},
[
status
])
}
}
...
@@ -52,7 +65,15 @@ export default function ApiSpec(props) {
...
@@ -52,7 +65,15 @@ export default function ApiSpec(props) {
<
p
>
Diese
API
-
Spezifikation
{
status
===
'
success
'
&&
<
p
>
Diese
API
-
Spezifikation
{
status
===
'
success
'
&&
<
DownloadLabel
baseURL
=
{
`
${
SCHEMA_BASE_URL
}
/
${
path
}
`
}
version
=
{
selectedVersion
}
artifact
=
{
artifact
}
label
=
"
OpenAPI
"
/>
}.
<
DownloadLabel
baseURL
=
{
`
${
SCHEMA_BASE_URL
}
/
${
path
}
`
}
version
=
{
selectedVersion
}
artifact
=
{
artifact
}
label
=
"
OpenAPI
"
/>
}.
<
/p
>
<
/p
>
<
VersionSelect
version
=
{
selectedVersion
}
setVersion
=
{
setSelectedVersion
}
gitlabId
=
{
gitlabProjectId
}
includePrerelease
=
{
includePrerelease
}
/><br/
>
{
statusList
===
'
success
'
&&
selectedVersion
&&
<
VersionSelect
versions
=
{
versions
}
version
=
{
selectedVersion
}
setVersion
=
{
setSelectedVersion
}
gitlabId
=
{
gitlabProjectId
}
includePrerelease
=
{
includePrerelease
}
/>
}
<
br
/>
{
status
===
'
success
'
&&
selectedVersion
&&
<
rapi
-
doc
{
status
===
'
success
'
&&
selectedVersion
&&
<
rapi
-
doc
render
-
style
=
"
view
"
render
-
style
=
"
view
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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