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

Pre-populate ops log creation from query parameters #114

Merged
merged 2 commits into from
Oct 17, 2024
Merged

Pre-populate ops log creation from query parameters #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff8e140
Make ProjectPicker value an object ALWAYS!
dave-shawley Oct 17, 2024
b62333c
Populate /operations-log/create fields from query
dave-shawley Oct 17, 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
58 changes: 45 additions & 13 deletions src/js/components/Form/ProjectPicker.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,45 @@ function ProjectPicker({
const [projects, setProjects] = useState([])
const [namespaceID, setNamespaceID] = useState(value?.namespace_id)
const [projectTypeID, setProjectTypeID] = useState(value?.project_type_id)
const [projectID, setProjectID] = useState(value?.project_id)

const { t } = useTranslation()

useEffect(() => {
if (projectID && (!projectTypeID || !namespaceID)) {
httpGet(
globalState.fetch,
new URL(`/projects/${projectID}`, globalState.baseURL),
({ data }) => {
setNamespaceID(data.namespace_id)
setProjectTypeID(data.project_type_id)
},
(error) => {
console.debug(`failed to retrieve project ${value.project_id}`, error)
setProjectID(null)
if (onChange !== undefined) {
onChange(name, null)
}
}
)
}
if (!projectTypeID || !namespaceID) {
setProjects([])
return
}

fetchProjects()
}, [namespaceID, projectTypeID])

useEffect(() => {
if (onChange !== undefined) {
onChange(name, {
project_id: projectID,
namespace_id: namespaceID,
project_type_id: projectTypeID
})
}
}, [namespaceID, projectTypeID, projectID])

function fetchProjects(offset = 0) {
const limit = 100
const projectURL = new URL('/projects', globalState.baseURL)
Expand Down Expand Up @@ -67,10 +94,12 @@ function ProjectPicker({
}}
onChange={(event) => {
event.preventDefault()
setNamespaceID(event.target.value)
setNamespaceID(
event.target.value === '' ? null : parseInt(event.target.value)
)
}}
required={required}
value={namespaceID}>
value={namespaceID ? namespaceID : ''}>
<option value="" />
{globalState.metadata.namespaces.map((n) => (
<option value={n.id} key={n.id}>
Expand All @@ -93,10 +122,12 @@ function ProjectPicker({
}}
onChange={(event) => {
event.preventDefault()
setProjectTypeID(event.target.value)
setProjectTypeID(
event.target.value === '' ? null : parseInt(event.target.value)
)
}}
required={required}
value={projectTypeID}>
value={projectTypeID ? projectTypeID : ''}>
<option value="" />
{globalState.metadata.projectTypes.map((t) => (
<option value={t.id} key={t.id}>
Expand All @@ -119,15 +150,12 @@ function ProjectPicker({
}}
onChange={(event) => {
event.preventDefault()
if (onChange !== undefined) {
const value = parseInt(event.target.value)
? parseInt(event.target.value)
: null
onChange(name, value)
}
setProjectID(
event.target.value === '' ? null : parseInt(event.target.value)
)
}}
required={required}
value={value && value.project_id}>
value={projectID ? projectID : ''}>
<option value="" />
{projects.map((p) => (
<option value={p.id} key={p.id}>
Expand All @@ -148,6 +176,10 @@ ProjectPicker.propTypes = {
onError: PropTypes.func,
readOnly: PropTypes.bool,
required: PropTypes.bool,
value: PropTypes.object
value: PropTypes.shape({
namespace_id: PropTypes.number,
project_id: PropTypes.number,
project_type_id: PropTypes.number
})
}
export { ProjectPicker }
18 changes: 10 additions & 8 deletions src/js/views/OperationsLog/Edit.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ function toSchemaValues(fieldValues) {
performed_by: fieldValues.performed_by
? fieldValues.performed_by.trim()
: null,
project_id: fieldValues.project.project_id
? parseInt(fieldValues.project.project_id.trim())
: null,
project_id: fieldValues.project.project_id,
ticket_slug: normalizeTicketSlug(fieldValues.ticket_slug),
link: fieldValues.link ? fieldValues.link.trim() : null,
notes: fieldValues.notes ? fieldValues.notes.trim() : null
Expand Down Expand Up @@ -57,17 +55,21 @@ function Edit({ onCancel, onError, onSuccess, operationsLog }) {
new URL(`/projects/${operationsLog.project_id}`, globalState.baseURL),
({ data }) => {
values.project = {
project_id: data.id.toString(),
namespace_id: data.namespace_id.toString(),
project_type_id: data.project_type_id.toString()
project_id: data.id,
namespace_id: data.namespace_id,
project_type_id: data.project_type_id
}
delete values.project_id
setFieldValues(values)
},
({ message }) => onError(message)
)
} else {
values.project = { project_id: '', namespace_id: '', project_type_id: '' }
values.project = {
project_id: null,
namespace_id: null,
project_type_id: null
}
setFieldValues(values)
}
}, [])
Expand Down Expand Up @@ -113,7 +115,7 @@ function Edit({ onCancel, onError, onSuccess, operationsLog }) {
function onValueChange(key, value) {
setFieldValues((prevValues) => ({
...prevValues,
[key]: key === 'project' ? { project_id: value } : value
[key]: value
}))
}

Expand Down
59 changes: 47 additions & 12 deletions src/js/views/OperationsLog/NewEntry.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { ErrorBoundary, Form, SavingModal } from '../../components'
import { useTranslation } from 'react-i18next'
import { metadataAsOptions } from '../../settings'
import { httpPost, ISO8601ToDatetimeLocal } from '../../utils'
import { useNavigate } from 'react-router-dom'
import { useNavigate, useSearchParams } from 'react-router-dom'
import { Error } from '../Error'
import { jsonSchema } from '../../schema/OperationsLog'
import { useValidation } from '../../components/Form/validate'
Expand All @@ -23,25 +23,42 @@ export function normalizeTicketSlug(ticketSlug) {
}

function NewEntry({ user }) {
const navigate = useNavigate()
const [params] = useSearchParams()

const [globalState, dispatch] = useContext(Context)
const [saving, setSaving] = useState(false)
const [savingComplete, setSavingComplete] = useState(false)
const [error, setError] = useState()
const [errors, validate] = useValidation('operationsLog', jsonSchema)
const [fields, setFields] = useState({
change_type: null,
environment: null,
change_type: params.get('change_type'),
environment: params.get('environment'),
occurred_at: ISO8601ToDatetimeLocal(new Date().toISOString()).slice(0, -7),
completed_at: null,
description: '',
performed_by: user.username,
project: null,
version: '',
ticket_slug: '',
link: '',
notes: ''
description: params.get('description') || '',
performed_by: params.get('performed_by') || user.username,
project:
params.has('namespace_id') ||
params.has('project_id') ||
params.has('project_type_id')
? {
namespace_id: params.has('namespace_id')
? parseInt(params.get('namespace_id'))
: null,
project_id: params.has('project_id')
? parseInt(params.get('project_id'))
: null,
project_type_id: params.has('project_type_id')
? parseInt(params.get('project_type_id'))
: null
}
: null,
version: params.get('version') || '',
ticket_slug: params.get('ticket_slug') || '',
link: params.get('link') || '',
notes: params.get('notes') || ''
})
const navigate = useNavigate()

const { t } = useTranslation()

Expand All @@ -54,6 +71,21 @@ function NewEntry({ user }) {
}
})
}, [])
useEffect(() => {
const parsedFields = {}
for (const dateField of ['occurred_at', 'completed_at']) {
try {
if (params.has(dateField)) {
parsedFields[dateField] = ISO8601ToDatetimeLocal(
params.get(dateField)
)
}
} catch (error) {
console.log(`Ignoring ${dateField} parameter: ${error.message} `)
}
}
setFields((curr) => ({ ...curr, ...parsedFields }))
}, [])

function values() {
const fieldValues = {
Expand All @@ -63,7 +95,7 @@ function NewEntry({ user }) {
completed_at: fields.completed_at
? new Date(fields.completed_at).toISOString()
: null,
project_id: fields.project ? parseInt(fields.project) : null,
project_id: fields.project ? fields.project.project_id : null,
description: fields.description ? fields.description : null,
link: fields.link ? fields.link : null,
notes: fields.notes ? fields.notes : null,
Expand Down Expand Up @@ -152,6 +184,7 @@ function NewEntry({ user }) {
}))}
required={true}
onChange={onChange}
value={fields.change_type}
errorMessage={errors.change_type}
/>
<Form.Field
Expand All @@ -165,6 +198,7 @@ function NewEntry({ user }) {
)}
required={true}
onChange={onChange}
value={fields.environment}
errorMessage={errors.environment}
/>
<Form.Field
Expand Down Expand Up @@ -202,6 +236,7 @@ function NewEntry({ user }) {
type="project"
required={false}
onChange={onChange}
value={fields.project}
onError={(error) => setError(error)}
errorMessage={errors.project}
/>
Expand Down
Loading