Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Adding new service discovery react components with flow types
  • Loading branch information
Damian Peralta committed May 22, 2019
commit be69900b5d54280106dc2b6bd9cf0f13a3427105
2 changes: 1 addition & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
[options]
module.name_mapper.extension='scss' -> 'empty/object'
module.system=haste
module.name_mapper='\(Applications\|Dashboard\|Navigation\|Onboarding\|Policies\|services\|Stats\|Types\|Users\|utilities\)\(.*\)$' -> '<PROJECT_ROOT>/app/javascript/src/\1/\2'
module.name_mapper='\(Applications\|Dashboard\|Navigation\|Onboarding\|Policies\|services\|Stats\|Types\|Users\|utilities\|NewService\)\(.*\)$' -> '<PROJECT_ROOT>/app/javascript/src/\1/\2'
Comment thread
damianpm marked this conversation as resolved.
Outdated
8 changes: 8 additions & 0 deletions app/assets/stylesheets/provider/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -529,3 +529,11 @@ form.formtastic fieldset > ol > li fieldset legend.label label {
li.hidden {
display: none;
}

.errorMessage {
color: $error-color;
}

.new-service-source-input {
padding-left: line-height-times(5 / 10);
}
9 changes: 9 additions & 0 deletions app/javascript/packs/new_service.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import {NewServiceFormWrapper} from 'NewService'
import {safeFromJsonString} from 'utilities/json-utils'

document.addEventListener('DOMContentLoaded', () => {
const newServiceWrapper = document.getElementById('new_service_wrapper')
const newServiceFormProps = safeFromJsonString(newServiceWrapper.dataset.newServiceData)

NewServiceFormWrapper(newServiceFormProps, 'new_service_wrapper')
})
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// @flow

import React from 'react'

const ErrorMessage = ({fetchErrorMessage}: {
fetchErrorMessage: string
}) => <p className='errorMessage'>
{`Sorry, your request has failed with the error: ${fetchErrorMessage}`}
</p>

export {
ErrorMessage
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// @flow

import React from 'react'
import type {FormProps} from 'NewService/types'
Comment thread
damianpm marked this conversation as resolved.
Outdated
import {CSRFToken} from 'utilities/utils'
import {HiddenServiceDiscoveryInput} from 'NewService/components/FormElements'

const FormWrapper = (props: FormProps) => {
const {id, formActionPath, hasHiddenServiceDiscoveryInput, submitText} = props
return (
<form
className='formtastic service'
id={id}
action={formActionPath}
acceptCharset="UTF-8"
method="post"
>
<input name="utf8" type="hidden" value="✓"/>
<CSRFToken />
{hasHiddenServiceDiscoveryInput && <HiddenServiceDiscoveryInput />}
<fieldset className="inputs" name="Service">
<legend><span>Service</span></legend>
<ol>
{props.children}
Comment thread
damianpm marked this conversation as resolved.
Outdated
</ol>
</fieldset>
<fieldset className="buttons">
<input
type="submit"
name="commit"
value={submitText}
className="important-button create"/>
</fieldset>
</form>
)
}

export {FormWrapper}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// @flow

import React from 'react'

const HiddenServiceDiscoveryInput = () =>
<input
value='discover'
type='hidden'
name='service[source]'
id='service_source'
/>

export {HiddenServiceDiscoveryInput}
17 changes: 17 additions & 0 deletions app/javascript/src/NewService/components/FormElements/Label.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// @flow

import React from 'react'

type Props = {
htmlFor: string,
label: string,
required?: boolean
}
const Label = (props: Props) => {
const {htmlFor, label, required} = props
return <label htmlFor={htmlFor}>{label}
{required && <abbr title="required">*</abbr>}
</label>
}

export {Label}
35 changes: 35 additions & 0 deletions app/javascript/src/NewService/components/FormElements/Select.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// @flow

import React from 'react'

type Option = {
metadata: {
name: string
}
}

type Props = {
name: string,
id: string,
onChange?: (event: SyntheticEvent<HTMLSelectElement>) => void,
options: Array<Option>
}

const Options = ({options}) => {
return options.map(option => {
const { name } = option.metadata
return <option key={name} value={name}>{name}</option>
})
}

const Select = ({name, id, onChange, options}: Props) =>
<select
required="required"
name={name}
id={id}
onChange={onChange}
>
{<Options options={options}/>}
</select>

export {Select}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// @flow

import React from 'react'
import {Label, Select} from 'NewService/components/FormElements'

type Props = {
fetchServices: (namespace: string) => Promise<void>,
projects: string[],
Comment thread
damianpm marked this conversation as resolved.
Outdated
services: string[]
}

const ServiceDiscoveryListItems = (props: Props) => {
const {fetchServices, projects, services} = props
return (
<React.Fragment>
<li id="service_name_input" className="string required">
<Label
htmlFor='namespace'
label='Namespace'
/>
<Select
name='service[namespace]'
id='service_namespace'
onChange={(e) => fetchServices(e.currentTarget.value)}
options={projects}
/>
</li>
<li>
<Label
htmlFor='service_name'
label='Name'
/>
<Select
name='service[name]'
id='service_name'
options={services}
/>
</li>
</React.Fragment>
)
}

export {ServiceDiscoveryListItems}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// @flow

import React from 'react'
import {Label} from 'NewService/components/FormElements'

const ServiceManualListItems = () =>
<React.Fragment>
<li id="service_name_input" className="string required">
<Label
htmlFor='service_name'
label='Name'
required
/>
<input maxLength="255" id="service_name" type="text" name="service[name]" autoFocus="autoFocus"/>
</li>
<li id="service_system_name_input" className="string required">
<Label
htmlFor='service_system_name'
label='System name'
required
/>
<input maxLength="255" id="service_system_name" type="text" name="service[system_name]"/>
<p className="inline-hints">
Only ASCII letters, numbers, dashes and underscores are allowed.
</p>
</li>
<li id="service_description_input" className="text optional">
<Label
htmlFor='service_description'
label='Description'
/>
<textarea rows="3" id="service_description" name="service[description]"></textarea>
</li>
</React.Fragment>

export {ServiceManualListItems}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export {FormWrapper} from 'NewService/components/FormElements/FormWrapper'
export {HiddenServiceDiscoveryInput} from 'NewService/components/FormElements/HiddenServiceDiscoveryInput'
export {Label} from 'NewService/components/FormElements/Label'
export {Select} from 'NewService/components/FormElements/Select'
export {ErrorMessage} from 'NewService/components/FormElements/ErrorMessage'
export {ServiceDiscoveryListItems} from 'NewService/components/FormElements/ServiceDiscoveryListItems'
export {ServiceManualListItems} from 'NewService/components/FormElements/ServiceManualListItems'
45 changes: 45 additions & 0 deletions app/javascript/src/NewService/components/NewServiceForm.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// @flow

import React, {useState} from 'react'

import {ServiceSourceForm, ServiceDiscoveryForm, ServiceManualForm} from 'NewService'
import {createReactWrapper} from 'utilities/createReactWrapper'

type Props = {
isServiceDiscoveryUsable: boolean,
serviceDiscoveryAuthenticateUrl: string,
providerAdminServiceDiscoveryServicesPath: string,
adminServicesPath: string
}

const NewServiceForm = (props: Props) => {
Comment thread
damianpm marked this conversation as resolved.
Outdated
const {isServiceDiscoveryUsable, serviceDiscoveryAuthenticateUrl,
providerAdminServiceDiscoveryServicesPath, adminServicesPath} = props

const [formMode, setFormMode] = useState('manual')

const handleFormsVisibility = (event: SyntheticEvent<HTMLSelectElement>) => {
setFormMode(event.currentTarget.value)
}

const formToRender = () => formMode === 'manual'
? <ServiceManualForm formActionPath={adminServicesPath}/>
: <ServiceDiscoveryForm formActionPath={providerAdminServiceDiscoveryServicesPath}/>

return (
<React.Fragment>
<h1>New API</h1>
<ServiceSourceForm
isServiceDiscoveryUsable={isServiceDiscoveryUsable}
serviceDiscoveryAuthenticateUrl={serviceDiscoveryAuthenticateUrl}
handleFormsVisibility={handleFormsVisibility}
/>
{formToRender()}
</React.Fragment>
)
}

const NewServiceFormWrapper = (props: Props, containerId: string) =>
createReactWrapper(<NewServiceForm {...props} />, containerId)

export {NewServiceForm, NewServiceFormWrapper}
63 changes: 63 additions & 0 deletions app/javascript/src/NewService/components/ServiceDiscoveryForm.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// @flow

import React from 'react'
import {useState, useEffect} from 'react'

import {FormWrapper, ErrorMessage,
ServiceDiscoveryListItems} from 'NewService/components/FormElements'
import {fetchData} from 'utilities/utils'
import type {FormProps} from 'NewService/types'

const BASE_PATH = '/p/admin/service_discovery'
const PROJECTS_PATH = `${BASE_PATH}/projects.json`

const ServiceDiscoveryForm = ({formActionPath}: {formActionPath: string}) => {
const [projects, setProjects] = useState([])
const [services, setServices] = useState([])
const [fetchErrorMessage, setFetchErrorMessage] = useState('')

const fetchProjects = async () => {
Comment thread
damianpm marked this conversation as resolved.
Outdated
try {
const data = await fetchData(PROJECTS_PATH)
setProjects(data['projects'])
fetchServices(data.projects[0].metadata.name)
} catch (error) {
setFetchErrorMessage(error.message)
}
}

const fetchServices = async (namespace: string) => {
Comment thread
damianpm marked this conversation as resolved.
Outdated
try {
const data = await fetchData(`${BASE_PATH}/namespaces/${namespace}/services.json`)
setServices(data['services'])
} catch (error) {
setFetchErrorMessage(error.message)
}
}

const listItemsProps = {fetchServices, projects, services}

useEffect(() => {
fetchProjects()
}, [])

const formProps: FormProps = {
id: 'service_source',
formActionPath,
hasHiddenServiceDiscoveryInput: true,
submitText: 'Create Service'
}

return (
<React.Fragment>
{fetchErrorMessage && <ErrorMessage fetchErrorMessage={fetchErrorMessage}/>}
<FormWrapper {...formProps}>
<ServiceDiscoveryListItems {...listItemsProps}/>
</FormWrapper>
</React.Fragment>
)
}

export {
ServiceDiscoveryForm
}
23 changes: 23 additions & 0 deletions app/javascript/src/NewService/components/ServiceManualForm.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// @flow

import React from 'react'
import {FormWrapper, ServiceManualListItems} from 'NewService/components/FormElements'
import type {FormProps} from 'NewService/types'

const ServiceManualForm = ({formActionPath}: {formActionPath: string}) => {
const formProps: FormProps = {
Comment thread
damianpm marked this conversation as resolved.
Outdated
id: 'new_service',
formActionPath,
submitText: 'Add API'
}

return (
<FormWrapper {...formProps}>
<ServiceManualListItems/>
</FormWrapper>
)
}

export {
ServiceManualForm
}
Loading