Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
piveau-ui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
Maintenance 17:00 - 20:00 today
Wartungsarbeiten heute 17:00 - 20:00
Show more breadcrumbs
Till Riedel
piveau-ui
Commits
35ffa830
Commit
35ffa830
authored
2 months ago
by
Duy Minh Vo
Browse files
Options
Downloads
Patches
Plain Diff
fix(dpi): fix dataset id validation reacting to uniqueness response
parent
3a9fe78e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
packages/piveau-hub-ui-modules/lib/data-provider-interface/components/UniqueIdentifierInput.vue
+27
-29
27 additions, 29 deletions
...a-provider-interface/components/UniqueIdentifierInput.vue
with
27 additions
and
29 deletions
packages/piveau-hub-ui-modules/lib/data-provider-interface/components/UniqueIdentifierInput.vue
+
27
−
29
View file @
35ffa830
...
@@ -11,9 +11,8 @@ let env = getCurrentInstance().appContext.app.config.globalProperties.$env;
...
@@ -11,9 +11,8 @@ let env = getCurrentInstance().appContext.app.config.globalProperties.$env;
const
store
=
useStore
();
const
store
=
useStore
();
const
dpiContext
=
useDpiContext
();
const
dpiContext
=
useDpiContext
();
const
isDuplicate
=
ref
();
const
isDuplicate
=
ref
(
localStorage
.
getItem
(
'
dpi_duplicate
'
)
||
false
);
const
isEditMode
=
computed
(()
=>
!!
dpiContext
.
value
.
edit
?.
enabled
)
const
isEditMode
=
computed
(()
=>
!!
dpiContext
.
value
.
edit
?.
enabled
)
isDuplicate
.
value
=
localStorage
.
getItem
(
'
dpi_duplicate
'
);
const
{
t
,
locale
}
=
useI18n
({
useScope
:
'
global
'
});
const
{
t
,
locale
}
=
useI18n
({
useScope
:
'
global
'
});
...
@@ -31,34 +30,33 @@ onMounted(() => {
...
@@ -31,34 +30,33 @@ onMounted(() => {
validationMessages
.
value
.
required
=
t
(
'
message.dataupload.datasets.datasetID.required
'
);
validationMessages
.
value
.
required
=
t
(
'
message.dataupload.datasets.datasetID.required
'
);
});
});
const
draftIDs
=
store
.
getters
[
'
auth/getUserDraftIds
'
];
watchEffect
(()
=>
{
const
hubUrl
=
env
.
api
.
hubUrl
;
function
idunique
(
node
)
{
const
id
=
node
?.
value
;
});
return
new
Promise
(
async
(
resolve
)
=>
{
// resolve(true) -> datasetId is unique
// resolve(false) -> datasetId is not unique
async
function
idunique
(
node
)
{
let
isUniqueID
=
true
;
if
(
isNil
(
id
)
||
id
===
''
||
id
===
undefined
)
resolve
(
true
)
let
hubUrl
=
env
.
api
.
hubUrl
;
const
draftIDs
=
store
.
getters
[
'
auth/getUserDraftIds
'
];
const
existIdInUserDrafts
=
draftIDs
?.
includes
(
id
)
if
(
existIdInUserDrafts
)
resolve
(
false
)
new
Promise
(()
=>
{
if
(
isNil
(
node
.
value
)
||
node
.
value
===
''
||
node
.
value
===
undefined
)
isUniqueID
=
true
;
const
request
=
`
${
hubUrl
}
datasets/
${
id
}
?useNormalizedId=true`
;
else
if
(
draftIDs
.
includes
(
node
.
value
))
isUniqueID
=
false
;
try
{
else
{
const
res
=
await
axios
.
head
(
request
);
const
request
=
`
${
hubUrl
}
datasets/
${
node
.
value
}
?useNormalizedId=true`
;
// if 2xx -> datsetId is not unique -> validation error
axios
.
head
(
request
)
const
isNotUnique
=
!
(
res
.
status
>=
200
&&
res
.
status
<
300
);
.
then
(()
=>
{
if
(
isNotUnique
)
resolve
(
false
)
isUniqueID
=
false
;
}
catch
(
error
)
{
})
// if 404 -> datasetId is unique
.
catch
((
e
)
=>
{
resolve
(
true
);
isUniqueID
=
true
;
});
}
}
resolve
(
false
)
});
});
return
isUniqueID
;
}
}
function
idformatvalid
(
node
)
{
function
idformatvalid
(
node
)
{
...
@@ -73,7 +71,7 @@ function idformatvalid(node) {
...
@@ -73,7 +71,7 @@ function idformatvalid(node) {
<FormKit
v-if=
"!isEditMode || isDuplicate"
type=
"text"
name=
"datasetID"
id=
"datasetID"
<FormKit
v-if=
"!isEditMode || isDuplicate"
type=
"text"
name=
"datasetID"
id=
"datasetID"
:placeholder=
"$t(`message.dataupload.datasets.datasetID.label`)"
:placeholder=
"$t(`message.dataupload.datasets.datasetID.label`)"
:info=
"$t(`message.dataupload.datasets.datasetID.info`)"
:help=
"$t(`message.dataupload.datasets.datasetID.help`)"
:info=
"$t(`message.dataupload.datasets.datasetID.info`)"
:help=
"$t(`message.dataupload.datasets.datasetID.help`)"
:validation-rules=
"
{ idformatvalid, idunique }" validation="idformatvalid|idunique
|required
"
:validation-rules=
"
{ idformatvalid, idunique }" validation="
required|
idformatvalid|
(900)
idunique"
validation-visibility="live" :validation-messages="validationMessages" outer-class="formkitCmpWrap p-3">
validation-visibility="live" :validation-messages="validationMessages" outer-class="formkitCmpWrap p-3">
</FormKit>
</FormKit>
<FormKit
v-else
type=
"text"
name=
"datasetID"
id=
"datasetID"
:disabled=
"true"
<FormKit
v-else
type=
"text"
name=
"datasetID"
id=
"datasetID"
:disabled=
"true"
...
...
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