Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validation fixes for Create Project #142

Merged
merged 5 commits into from
Feb 6, 2024
Merged

Validation fixes for Create Project #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
53c7f33
Revert "Revert "warning for no target name, error handling, ra and de…
LTDakin Feb 2, 2024
73ea961
added trim method to name checks
LTDakin Feb 2, 2024
d92d0fc
added field name
LTDakin Feb 6, 2024
3dc7bcf
removed console log
LTDakin Feb 6, 2024
79ebc07
Merge branch 'dev' into fix/createProjectForm-target-validation
LTDakin Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 62 additions & 36 deletions src/components/projects/CreateProjectForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,39 +174,60 @@
<b-field
label="Name"
style="width: 230px;"
:type="{'is-warning': warn.target_name}"
>
<b-field>
<b-input
v-model="targets[0].name"
:disabled="!targets[0].active"
style="max-width: 130px;"
class="project-input"
/>
<p class="control">
<b-button
class="button"
:loading="object_name_search_in_progress"
@click="getCoordinatesFromName(0)"
>
<b-icon icon="magnify" />
</b-button>
</p>
</b-field>
<template #message>
<div v-if="warn.target_name">
missing value
</div>
</template>
<b-input
v-model="targets[0].name"
/>
</b-field>
<b-field
label="Object Search"
style="width: 230px;"
>
<b-input
v-model="objectSearch"
:disabled="!targets[0].active"
style="max-width: 130px;"
class="project-input"
/>
<p class="control">
<b-button
class="button"
:loading="object_name_search_in_progress"
@click="getCoordinatesFromName(0)"
>
<b-icon icon="magnify" />
</b-button>
</p>
</b-field>

<b-field
:type="{'is-danger': warn.projectRA}"
:type="{'is-warning': warn.targetRA}"
label="RA"
style="width: 230px;"
>
<template #message>
<div v-if="warn.targetRA">
missing value
</div>
</template>
<RightAscensionInput v-model="targets[0].ra" />
</b-field>

<b-field
:type="{'is-danger': warn.projectDec}"
:type="{'is-warning': warn.targetDec}"
label="Dec"
style="width: 230px;"
>
<template #message>
<div v-if="warn.targetDec">
missing value
</div>
</template>
<DeclinationInput v-model="targets[0].dec" />
</b-field>
</div>
Expand Down Expand Up @@ -838,6 +859,7 @@ export default {
conditionalStep: 0.1,
sizeInDegrees: this.camera_size_degrees,
site: this.sitecode,
objectSearch: '',
warn: {
project_name: false,
position_angle: false,
Expand All @@ -848,6 +870,7 @@ export default {
max_airmass: false,
lunar_dist_min: false,
lunar_phase_max: false,
target_name: false,
targetRA: false,
targetDec: false
},
Expand Down Expand Up @@ -978,7 +1001,7 @@ export default {
async getCoordinatesFromName () {
const target_index = 0 // legacy, eventually we want to make `targets` a dict, not an array containing the dict
this.object_name_search_in_progress = true
const name = this.targets[target_index].name
const name = this.objectSearch
const search_results = await this.get_coordinates_from_object_name(name)
this.object_name_search_in_progress = false
if (!search_results.error) {
Expand All @@ -989,10 +1012,9 @@ export default {
this.updateTargetsValue(target_index, 'dec', '')
this.$buefy.notification.open({
duration: 10000,
message: 'Could not resolve object with name ' + this.targets[target_index].name,
message: 'Could not find target ' + this.objectSearch,
position: 'is-top',
type: 'is-danger',
hasIcon: true
type: 'is-info'
})
}
},
Expand All @@ -1007,7 +1029,8 @@ export default {
},

verifyForm () {
if (this.project_name === '') { this.warn.project_name = true }
if (this.project_name.trim() === '') { this.warn.project_name = true }
if (this.targets[0].name.trim() === '') { this.warn.target_name = true }
if (this.project_name.includes('#')) {
this.warn.project_name = true
this.$buefy.toast.open({
Expand All @@ -1027,10 +1050,8 @@ export default {
this.project_sites = [this.sitecode]
}

if (this.targets[0].ra === '' || this.targets[0].dec === '') {
this.warn.targetRA = this.targets[0].ra === ''
this.warn.targetDec = this.targets[0].dec === ''
}
this.warn.targetRA = this.targets[0].ra === ''
this.warn.targetDec = this.targets[0].dec === ''
},
resetInputWarnings () {
Object.keys(this.warn).forEach(k => { this.warn[k] = false })
Expand Down Expand Up @@ -1065,13 +1086,6 @@ export default {

const project = this.projectToSend

if (!Object.values(this.warn).every(x => !x)) {
this.$buefy.toast.open({
message: 'Please fix the highlighted fields and try again',
type: 'is-warning'
})
}

// Make sure all warnings are false, otherwise don't create the project.
if (Object.values(this.warn).every(x => !x)) {
this.createProjectButtonIsLoading = true
Expand Down Expand Up @@ -1100,11 +1114,18 @@ export default {
}).finally(() => {
this.createProjectButtonIsLoading = false
})
} else {
this.$buefy.toast.open({
message: 'Please fix the highlighted fields',
type: 'is-warning'
})
}
console.log(this.warn)
},

modifyProject () {
this.resetInputWarnings()
this.verifyForm()
const url = this.projects_api_url + '/modify-project'

const project = this.projectToSend
Expand Down Expand Up @@ -1138,6 +1159,11 @@ export default {
}).finally(() => {
this.createProjectButtonIsLoading = false
})
} else {
this.$buefy.toast.open({
message: 'Please fix the highlighted fields',
type: 'is-warning'
})
}
},
refreshUserEvents () {
Expand Down
2 changes: 1 addition & 1 deletion src/mixins/target_names.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const target_names = {
return new Promise(resolve => {
axios.get(url).then(response => {
const result = JSON.parse(response.data.slice(10, -3))
if (!result.Target.Resolver || !result.Target.Resolver.jradeg || !result.Target.Resolver.jdedeg) {
if (!result.Target || !result.Target.Resolver || !result.Target.Resolver.jradeg || !result.Target.Resolver.jdedeg) {
console.error('failed to fetch coordinates for ', common_name)
error = true
} else {
Expand Down
Loading