feat: service page using form components

package.json

@@ -78,6 +78,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/json-schema": "^7.0.15",
     "@types/lodash": "^4.17.15",
+    "@types/ramda": "^0.30.2",
     "@types/react": "18.3.18",
     "@types/react-dom": "18.3.5",
     "@types/react-helmet": "5.0.20",

src/App.tsx

@@ -18,8 +18,6 @@ import Catalog from 'pages/Catalog'
 import Error from 'pages/Error'
 import SealedSecret from 'pages/SealedSecret'
 import SealedSecrets from 'pages/SealedSecrets'
-import Service from 'pages/Service'
-import Services from 'pages/Services'
 import Setting from 'pages/Setting'
 import SettingsOverview from 'pages/SettingsOverview'
 import Team from 'pages/teams/create-edit'
@@ -51,6 +49,8 @@ import Policy from 'pages/Policy'
 import Maintenance from 'pages/Maintenance'
 import PrivateRoute from 'components/AuthzRoute'
 import Logout from 'pages/Logout'
+import Service from 'pages/services/create-edit'
+import Services from 'pages/services/overview'
 import CodeRepository from 'pages/code-repositories/create-edit'
 import CodeRepositories from 'pages/code-repositories/overview'
 import { HttpErrorBadRequest } from './utils/error'

src/components/AdvancedSettings.tsx

@@ -46,18 +46,19 @@ interface Props {
   title?: string
   children?: React.ReactNode
   noPaddingTop?: boolean
+  closed?: boolean
 }
 
 export default function AdvancedSettings(props: Props) {
-  const { title = 'Advanced Settings', description, children, noPaddingTop } = props
+  const { title = 'Advanced Settings', description, children, noPaddingTop, closed = false } = props
   const [expanded, setExpanded] = useState(true)
 
   const handleAccordionChange = () => {
     setExpanded((prev) => !prev)
   }
 
   return (
-    <StyledAccordion disableGutters expanded={expanded} onChange={handleAccordionChange}>
+    <StyledAccordion defaultExpanded={!closed} disableGutters onChange={handleAccordionChange}>
       <StyledAccordionSummary
         expandIcon={<KeyboardArrowRight />}
         sx={{

src/components/Header.tsx

@@ -143,11 +143,11 @@ export default function Header({ onOpenSidebar, isCollapse = false, verticalLayo
           <Select
             size='small'
             color='secondary'
-            value={(teams.length && oboTeamId) || ''}
+            value={(teams?.length && oboTeamId) || ''}
             onChange={handleChangeTeam}
             data-cy='select-oboteam'
           >
-            {teams.map((teamName) => (
+            {teams?.map((teamName) => (
               <MenuItem key={teamName} value={teamName} data-cy={`select-oboteam-${teamName}`}>
                 {teamName}
               </MenuItem>

src/components/Service.tsx

@@ -25,11 +25,11 @@ export const addDomainEnumField = (
   formData: GetServiceApiResponse,
 ): void => {
   const { cluster, dns } = settings
-  if (['cluster', 'tlsPass'].includes(formData?.ingress?.type)) return
+  // if (['cluster', 'tlsPass'].includes(formData?.ingress?.type)) return
   const ing = formData?.ingress as any
-  const idx = idxMap[formData?.ingress?.type]
+  // const idx = idxMap[formData?.ingress?.type]
   if (!formData || isEmpty(ing)) return
-  const ingressSchemaPath = getIngressSchemaPath(idx)
+  const ingressSchemaPath = getIngressSchemaPath(1)
   const ingressSchema = getStrict(schema, ingressSchemaPath)
   const zones = [cluster.domainSuffix, ...(dns?.zones || [])]
   if (!ingressSchema) return
@@ -85,7 +85,7 @@ export const getServiceSchema = (
   if (teamId !== 'admin') addServiceNameEnumField(schema, k8sServices, formData)
   addDomainEnumField(schema, settings, formData)
   const ing = formData?.ingress as Record<string, any>
-  const idx = idxMap[formData?.ingress?.type]
+  const idx = 1
   set(schema, 'properties.ingress.oneOf[1].allOf[0].properties.ingressClassName.enum', [
     'platform',
     ...settings.ingressClassNames,

src/components/Services.tsx

@@ -26,6 +26,7 @@ const renderHost = ({ ingress, teamId, name }): React.ReactElement | string => {
   if (!ingress) return ''
   if (ingress.type === 'cluster') return `${name}.team-${teamId}`
   const { subdomain, domain, paths } = ingress
+  // TODO: Replace functionality in apl-core so that / is not needed on path or domain
   const url = `${subdomain ? `${subdomain}.` : ''}${domain}${paths?.[0] || ''}`
   return (
     <MuiLink href={`https://${url}`} target='_blank' rel='noopener'>

src/components/forms/Autocomplete.tsx

@@ -28,6 +28,7 @@ export interface EnhancedAutocompleteProps<
   /** Label for the "select all" option. */
   selectAllLabel?: string
   textFieldProps?: Partial<TextFieldProps>
+  width?: 'small' | 'medium' | 'large'
 }
 
 /**
@@ -70,6 +71,7 @@ export function Autocomplete<
     textFieldProps,
     value,
     onChange,
+    width = 'medium',
     ...rest
   } = props
   const [inPlaceholder, setInPlaceholder] = useState('')
@@ -82,7 +84,7 @@ export function Autocomplete<
         ((params) => (
           <TextField
             label={label}
-            width='medium'
+            width={width}
             loading={loading}
             placeholder={inPlaceholder || (placeholder ?? 'Select an option')}
             {...params}

src/components/forms/FormRow.tsx

@@ -14,7 +14,7 @@ export default function FormRow(props: FormRowProps) {
     <Box
       display='flex'
       flexDirection='row'
-      alignItems='flex-end'
+      alignItems='baseline'
       sx={{
         '& > *:not(:last-child)': {
           marginRight: `${spacing}px`,

src/components/forms/KeyValue.tsx

@@ -150,7 +150,12 @@ export default function KeyValue(props: KeyValueProps) {
       ))}
       {addLabel && (
         <Button
-          sx={{ fontSize: '10px', color: `${error ? 'red' : ''}` }}
+          sx={{
+            paddingLeft: 'inherit',
+            fontSize: '10px',
+            color: `${error ? 'red' : ''}`,
+            ':hover': { backgroundColor: 'transparent' },
+          }}
           className={classes.addItemButton}
           onClick={handleAddItem}
         >

src/components/forms/KeyValueSingle.tsx

@@ -0,0 +1,88 @@
+import React, { useState } from 'react'
+import { Box } from '@mui/material'
+import { TextField } from 'components/forms/TextField'
+import { makeStyles } from '@mui/styles'
+import { Typography } from 'components/Typography'
+import { InputLabel } from 'components/InputLabel'
+import { useFieldArray, useFormContext } from 'react-hook-form'
+import FormRow from './FormRow'
+
+const useStyles = makeStyles({
+  container: {
+    padding: '16px',
+    backgroundColor: '#424242',
+    borderRadius: '8px',
+  },
+  itemRow: {
+    marginBottom: '20px',
+    display: 'flex',
+    alignItems: 'center',
+  },
+  addItemButton: {
+    marginLeft: '-10px',
+    display: 'flex',
+    alignItems: 'center',
+    textTransform: 'none',
+  },
+})
+
+interface registers {
+  registerA: any
+  registerB: any
+}
+
+interface KeyValueProps {
+  title: string
+  subTitle?: string
+  keyLabel: string
+  keyValue?: string
+  keyDisabled?: boolean
+  showLabel?: boolean
+  valueLabel: string
+  valueDisabled?: boolean
+  name: string
+  registers?: registers
+}
+
+export default function KeyValue(props: KeyValueProps) {
+  const classes = useStyles()
+  const { control, register } = useFormContext()
+
+  const {
+    title,
+    subTitle,
+    keyLabel,
+    valueLabel,
+    name,
+    keyValue,
+    keyDisabled = false,
+    showLabel = true,
+    valueDisabled = false,
+    registers,
+  } = props
+
+  const [items, setItems] = useState([{ [keyLabel.toLowerCase()]: '', [valueLabel.toLowerCase()]: '' }])
+
+  const { fields, append, remove } = useFieldArray({
+    control,
+    name,
+  })
+
+  return (
+    <Box>
+      <InputLabel sx={{ fontWeight: 'bold', fontSize: '14px' }}>{title}</InputLabel>
+      {subTitle && <Typography sx={{ color: '#ABABAB' }}>{subTitle}</Typography>}
+
+      <FormRow spacing={10}>
+        <TextField
+          sx={{ color: '#B5B5BC' }}
+          disabled={keyDisabled}
+          value={keyValue}
+          label={showLabel ? keyLabel : ''}
+          {...registers.registerA}
+        />
+        <TextField disabled={valueDisabled} label={showLabel ? valueLabel : ''} {...registers.registerB} />
+      </FormRow>
+    </Box>
+  )
+}

src/components/forms/LinkedNumberField.tsx

@@ -0,0 +1,93 @@
+import { Box, FormHelperText } from '@mui/material'
+import { TextField } from './TextField'
+import FormRow from './FormRow'
+
+interface Registers {
+  registerA: any
+  registerB: any
+  setValue: (name: string, value: any) => void
+  watch: (name: string) => any
+}
+
+interface LinkedNumberFieldProps {
+  labelA: string
+  labelB: string
+  valueMax: number
+  disabled: boolean
+  registers: Registers
+  helperText?: string
+  error?: boolean
+}
+
+export default function LinkedNumberField({
+  labelA,
+  labelB,
+  valueMax,
+  disabled,
+  registers,
+  error,
+  helperText,
+}: LinkedNumberFieldProps) {
+  const { setValue, watch } = registers
+  const defaultValue = valueMax / 2
+  const rawA = watch(registers.registerA.name)
+  const rawB = watch(registers.registerB.name)
+
+  const valueA: number = Math.min(Math.max(rawA ?? defaultValue, 0), valueMax)
+  const valueB: number = Math.min(Math.max(rawB ?? defaultValue, 0), valueMax)
+
+  function calculateValues(updatedValue: number, isValueA: boolean) {
+    const clamped = Math.min(Math.max(updatedValue, 0), valueMax)
+    const complementary = valueMax - clamped
+
+    if (isValueA) {
+      setValue(registers.registerA.name, clamped)
+      setValue(registers.registerB.name, complementary)
+    } else {
+      setValue(registers.registerA.name, complementary)
+      setValue(registers.registerB.name, clamped)
+    }
+  }
+
+  // Increment/Decrement helpers
+  const incrementA = () => calculateValues(valueA + 1, true)
+  const decrementA = () => calculateValues(valueA - 1, true)
+  const incrementB = () => calculateValues(valueB + 1, false)
+  const decrementB = () => calculateValues(valueB - 1, false)
+
+  return (
+    <Box>
+      <FormRow spacing={10}>
+        <TextField
+          {...registers.registerA}
+          width='small'
+          label={labelA}
+          value={valueA}
+          type='number'
+          inputProps={{ min: 0, max: valueMax }}
+          onChange={(e) => calculateValues(Number(e.target.value), true)}
+          onIncrement={incrementA}
+          onDecrement={decrementA}
+          suffixSymbol='%'
+          disabled={disabled}
+          error={error}
+        />
+        <TextField
+          {...registers.registerB}
+          width='small'
+          label={labelB}
+          value={valueB}
+          type='number'
+          inputProps={{ min: 0, max: valueMax }}
+          onChange={(e) => calculateValues(Number(e.target.value), false)}
+          onIncrement={incrementB}
+          onDecrement={decrementB}
+          suffixSymbol='%'
+          disabled={disabled}
+          error={error}
+        />
+      </FormRow>
+      {helperText && <FormHelperText data-qa-textfield-helper-text>{helperText}</FormHelperText>}
+    </Box>
+  )
+}