Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
c9fc4a16
Unverified
Commit
c9fc4a16
authored
Aug 05, 2022
by
Nicolas Giard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: admin storage page display issues
parent
7fe7fbb3
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
11 deletions
+17
-11
authentication.js
server/graph/resolvers/authentication.js
+0
-1
storage.js
server/graph/resolvers/storage.js
+2
-2
definition.yml
server/modules/storage/git/definition.yml
+1
-0
components.js
ux/src/boot/components.js
+2
-0
app.scss
ux/src/css/app.scss
+2
-0
AdminStorage.vue
ux/src/pages/AdminStorage.vue
+10
-8
No files found.
server/graph/resolvers/authentication.js
View file @
c9fc4a16
...
...
@@ -12,7 +12,6 @@ module.exports = {
*/
async
apiKeys
(
obj
,
args
,
context
)
{
const
keys
=
await
WIKI
.
models
.
apiKeys
.
query
().
orderBy
([
'isRevoked'
,
'name'
])
console
.
info
(
keys
)
return
keys
.
map
(
k
=>
({
id
:
k
.
id
,
name
:
k
.
name
,
...
...
server/graph/resolvers/storage.js
View file @
c9fc4a16
...
...
@@ -32,7 +32,6 @@ module.exports = {
// }), ['title', 'key'])
return
_
.
sortBy
(
WIKI
.
storage
.
defs
.
map
(
md
=>
{
const
dbTarget
=
dbTargets
.
find
(
tg
=>
tg
.
module
===
md
.
key
)
console
.
info
(
md
.
actions
)
return
{
id
:
dbTarget
?.
id
??
uuid
(),
isEnabled
:
dbTarget
?.
isEnabled
??
false
,
...
...
@@ -93,7 +92,8 @@ module.exports = {
}
}
},
{}),
actions
:
md
.
actions
actions
:
{}
// actions: md.actions
}
}),
[
'title'
])
}
...
...
server/modules/storage/git/definition.yml
View file @
c9fc4a16
...
...
@@ -79,6 +79,7 @@ props:
sensitive
:
true
order
:
13
if
:
-
{
key
:
'
authType'
,
eq
:
'
ssh'
}
-
{
key
:
'
sshPrivateKeyMode'
,
eq
:
'
inline'
}
verifySSL
:
type
:
Boolean
...
...
ux/src/boot/components.js
View file @
c9fc4a16
import
{
boot
}
from
'quasar/wrappers'
import
BlueprintIcon
from
'../components/BlueprintIcon.vue'
import
VNetworkGraph
from
'v-network-graph'
export
default
boot
(({
app
})
=>
{
app
.
component
(
'BlueprintIcon'
,
BlueprintIcon
)
app
.
use
(
VNetworkGraph
)
})
ux/src/css/app.scss
View file @
c9fc4a16
...
...
@@ -214,6 +214,8 @@ body::-webkit-scrollbar-thumb {
@import
'./animation.scss'
;
@import
'v-network-graph/lib/style.css'
//
@
import
'~codemirror/lib/codemirror.css'
;
// @import '~codemirror/theme/elegant.css';
// @import '~codemirror/theme/material-ocean.css';
ux/src/pages/AdminStorage.vue
View file @
c9fc4a16
...
...
@@ -417,7 +417,7 @@ q-page.admin-storage
q-card-section
.text-subtitle1
{{
state
.
target
.
title
}}
q-img.q-mt-sm.rounded-borders(
:src='target.banner'
:src='
state.
target.banner'
fit='cover'
no-spinner
)
...
...
@@ -585,7 +585,7 @@ q-page.admin-storage
<
script
setup
>
import
{
cloneDeep
,
find
,
transform
}
from
'lodash-es'
import
gql
from
'graphql-tag'
import
*
as
VN
etworkGraph
from
'v-network-graph'
import
*
as
VN
G
from
'v-network-graph'
import
{
useI18n
}
from
'vue-i18n'
import
{
useMeta
,
useQuasar
}
from
'quasar'
...
...
@@ -645,9 +645,9 @@ const state = reactive({
nodes
:
{}
},
deliveryPaths
:
[],
deliveryConfig
:
VN
etworkGraph
.
defineConfigs
({
deliveryConfig
:
VN
G
.
defineConfigs
({
view
:
{
layoutHandler
:
new
VN
etworkGraph
.
GridLayout
({
grid
:
15
}),
layoutHandler
:
new
VN
G
.
GridLayout
({
grid
:
15
}),
fit
:
true
,
mouseWheelZoomEnabled
:
false
,
grid
:
{
...
...
@@ -736,13 +736,13 @@ watch(() => state.targets, (newValue) => {
}
})
watch
(()
=>
route
.
params
.
id
,
(
to
,
from
)
=>
{
if
(
!
to
.
params
.
id
)
{
if
(
!
to
)
{
return
}
if
(
state
.
targets
.
length
<
1
)
{
state
.
desiredTarget
=
to
.
params
.
id
state
.
desiredTarget
=
to
}
else
{
state
.
selectedTarget
=
to
.
params
.
id
state
.
selectedTarget
=
to
}
})
...
...
@@ -1165,7 +1165,7 @@ function generateGraph () {
for
(
const
[
i
,
tp
]
of
types
.
entries
())
{
state
.
deliveryNodes
[
tp
.
key
]
=
{
name
:
tp
.
label
,
color
:
'#3f51b5'
,
icon
:
tp
.
icon
,
iconText
:
tp
.
iconText
}
state
.
deliveryEdges
[
`user_
${
tp
.
key
}
`
]
=
{
source
:
'user'
,
target
:
t
.
key
}
state
.
deliveryEdges
[
`user_
${
tp
.
key
}
`
]
=
{
source
:
'user'
,
target
:
t
p
.
key
}
state
.
deliveryLayouts
.
nodes
[
tp
.
key
]
=
{
x
:
0
,
y
:
(
i
+
1
)
*
15
}
// -> Find target with direct access
...
...
@@ -1218,6 +1218,8 @@ function generateGraph () {
state
.
deliveryPaths
.
push
({
edges
:
[
`
${
tp
.
key
}
_db_in`
],
color
:
'#f03a4755'
})
}
}
console
.
info
(
state
.
deliveryEdges
)
}
// MOUNTED
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment