Merge remote-tracking branch 'origin/main' into dependabot/npm_and_yarn/types/lodash-4.17.17

Author: svcAPLBot

.github/workflows/pr-auto-updater.yml

@@ -0,0 +1,50 @@
+name: PR Auto Updater
+on:
+  push:
+    branches:
+      - 'main'
+      - 'release/*'
+    tags-ignore:
+      - '*'
+
+jobs:
+  pr-autoupdate:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.BOT_TOKEN }}
+
+      - name: Install GitHub CLI
+        run: |
+          sudo apt update
+          sudo apt install gh -y
+
+      - name: Configure Git
+        run: |
+          git config --global user.email ${{ vars.BOT_EMAIL }}
+          git config --global user.name ${{ vars.BOT_USERNAME }}
+
+      - name: Update PR branches
+        env:
+          GH_TOKEN: ${{ secrets.BOT_TOKEN }}
+          GH_PROMPT_DISABLED: 1
+        run: |
+          prs=$(gh pr list --state open --base main --json number,headRefName -q '.[] | [.number, .headRefName] | @tsv')
+
+          while IFS=$'\t' read -r number branch; do
+            echo "Updating PR #$number (branch: $branch)"
+
+            git fetch origin "$branch"
+            git checkout "$branch"
+
+            if git merge origin/main --no-edit; then
+              git push origin HEAD:$branch
+              echo "✅ Updated $branch"
+            else
+              echo "❌ Merge conflict on $branch — skipped."
+              git merge --abort
+            fi
+          done <<< "$prs"

src/components/Setting.tsx

@@ -65,6 +65,7 @@ export const getSettingUiSchema = (settings: GetSettingsInfoApiResponse, setting
       isMultitenant: { 'ui:widget': 'hidden' },
       isPreInstalled: { 'ui:widget': 'hidden' },
       adminPassword: { 'ui:widget': 'hidden' },
+      useORCS: { 'ui:widget': 'hidden' },
     },
     kms: {
       sops: {

src/components/Users.tsx

@@ -89,7 +89,18 @@ function UserTeamSelector({
   }
   return (
     <Box sx={{ display: 'flex', alignItems: 'center' }}>
-      <Checkbox disabled={isDisabled} checked={row?.teams?.includes(teamId)} onChange={handleUserTeamToggle} />
+      <Tooltip
+        title={
+          isDisabled
+            ? 'Team admins are permitted to add or remove users only within the teams they manage. However, they cannot remove themselves or other team admins from those teams.'
+            : ''
+        }
+        placement='right'
+      >
+        <span>
+          <Checkbox disabled={isDisabled} checked={row?.teams?.includes(teamId)} onChange={handleUserTeamToggle} />
+        </span>
+      </Tooltip>
     </Box>
   )
 }
@@ -105,9 +116,10 @@ const updateUsers = (onClick: () => void, disabled: boolean) => {
 interface Props {
   users: GetAllUsersApiResponse
   teamId?: string
+  refetch: () => void
 }
 
-export default function ({ users: inUsers, teamId }: Props): React.ReactElement {
+export default function ({ users: inUsers, teamId, refetch }: Props): React.ReactElement {
   const [users, setUsers] = useState<GetAllUsersApiResponse>(inUsers)
   const {
     user: sessionUser,
@@ -157,7 +169,13 @@ export default function ({ users: inUsers, teamId }: Props): React.ReactElement
   ]
 
   const handleUpdateUsers = () => {
-    update({ teamId, body: users })
+    const body = users.map((user) => ({
+      id: user.id,
+      teams: user.teams || [],
+    }))
+    update({ teamId, body }).then(() => {
+      refetch()
+    })
   }
 
   if (hasExternalIDP) {

src/pages/Users.tsx

@@ -30,6 +30,6 @@ export default function ({
 
   const { t } = useTranslation()
   // END HOOKS
-  const comp = allUsers && <Users users={allUsers} teamId={teamId} />
+  const comp = allUsers && <Users users={allUsers} refetch={refetchAllUsers} teamId={teamId} />
   return <PaperLayout loading={isLoadingAllUsers} comp={comp} title={t('TITLE_USERS', { scope: getRole(teamId) })} />
 }

src/pages/services/create-edit/index.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable dot-notation */
-import { Box, Button, Divider, Grid } from '@mui/material'
+import { Box, Divider, Grid } from '@mui/material'
 import { LandingHeader } from 'components/LandingHeader'
 import PaperLayout from 'layouts/Paper'
 import React, { useEffect, useMemo, useState } from 'react'
@@ -27,11 +27,12 @@ import { MenuItem } from 'components/List'
 import { Typography } from 'components/Typography'
 import KeyValue from 'components/forms/KeyValue'
 import ControlledCheckbox from 'components/forms/ControlledCheckbox'
-import { isEmpty } from 'lodash'
+import { cloneDeep, isEmpty, isEqual } from 'lodash'
 import LinkedNumberField from 'components/forms/LinkedNumberField'
 import AdvancedSettings from 'components/AdvancedSettings'
 import font from 'theme/font'
 import { Autocomplete } from 'components/forms/Autocomplete'
+import { LoadingButton } from '@mui/lab'
 import { useStyles } from './create-edit.styles'
 import { serviceApiResponseSchema } from './create-edit.validator'
 
@@ -143,6 +144,8 @@ export default function ({
         if (path.includes('/')) setValue(`spec.paths.${index}`, path.replace(/^\/+/, ''))
       })
     }
+
+    if (teamId !== 'admin' && !serviceName) setValue('spec.namespace', `team-${teamId}`)
   }, [data, setValue])
 
   useEffect(() => {
@@ -181,17 +184,20 @@ export default function ({
     }
   }
   const onSubmit = (submitData: CreateAplServiceApiResponse) => {
-    if (!isEmpty(submitData.spec?.paths)) {
-      submitData.spec?.paths.forEach((path, index) => {
-        submitData.spec.paths[index] = `/${path}`
+    const body = cloneDeep(submitData)
+    if (!isEmpty(body.spec?.paths)) {
+      body.spec?.paths.forEach((path, index) => {
+        body.spec.paths[index] = `/${path}`
       })
     }
-    if (submitData.spec?.cname?.tlsSecretName === '') submitData.spec.cname.tlsSecretName = undefined
-    if (submitData.spec?.ingressClassName === '') submitData.spec.ingressClassName = undefined
-    if (isPreInstalled) submitData.spec.ingressClassName = 'platform'
-    // eslint-disable-next-line object-shorthand
-    if (serviceName) update({ teamId, serviceName: serviceName, body: submitData })
-    else create({ teamId, body: submitData })
+    if (body.spec?.cname?.tlsSecretName === '') {
+      body.spec.cname.tlsSecretName = undefined
+      body.spec.useCname = false
+    } else if (body.spec?.cname?.tlsSecretName) body.spec.useCname = true
+
+    if (body.spec?.ingressClassName === '') body.spec.ingressClassName = undefined
+    if (serviceName) update({ teamId, serviceName, body })
+    else create({ teamId, body })
   }
   const mutating = isLoadingCreate || isLoadingUpdate || isLoadingDelete
   if (!mutating && (isSuccessCreate || isSuccessUpdate || isSuccessDelete))
@@ -202,7 +208,7 @@ export default function ({
   const error = isError || isErrorK8sServices || isErrorTeamSecrets || isErrorSettingsInfo
 
   if (loading || fetching) return <PaperLayout loading title={t('TITLE_SERVICE')} />
-  if (teamId !== 'admin') setValue('spec.namespace', `team-${teamId}`)
+
   return (
     <Grid className={classes.root}>
       <PaperLayout loading={loading || error} title={t('TITLE_SERVICE')}>
@@ -454,17 +460,20 @@ export default function ({
                   resourceType='service'
                   data-cy='button-delete-service'
                   sx={{ marginRight: '10px', textTransform: 'capitalize', ml: 2 }}
+                  loading={isLoadingDelete}
+                  disabled={isLoadingDelete || isLoadingCreate || isLoadingUpdate}
                 />
               )}
-              <Button
-                disabled={isEmpty(service)}
+              <LoadingButton
                 type='submit'
                 variant='contained'
                 color='primary'
                 sx={{ textTransform: 'none' }}
+                loading={isLoadingCreate || isLoadingUpdate}
+                disabled={isLoadingCreate || isLoadingUpdate || isLoadingDelete || isEqual(watch(), data)}
               >
                 {serviceName ? 'Save Changes' : 'Create Service'}
-              </Button>
+              </LoadingButton>
             </Box>
           </form>
         </FormProvider>

src/providers/Session.tsx

@@ -105,7 +105,7 @@ export default function SessionProvider({ children }: Props): React.ReactElement
     }),
     [appsEnabled, oboTeamId, session, settings],
   )
-  const { corrupt, editor, user } = ctx
+  const { editor, user } = ctx
   const { isPlatformAdmin, teams } = user || {}
   const { t } = useTranslation()
   const [keys] = useState<Record<string, SnackbarKey | undefined>>({})
@@ -114,20 +114,6 @@ export default function SessionProvider({ children }: Props): React.ReactElement
     snack.close(keys[key])
     delete keys[key]
   }
-  // special one for corrupt state
-  useEffect(() => {
-    if (corrupt) {
-      keys.conflict = snack.error(
-        `${t('Git conflict detected due to upstream changes. The database has been restored.')}`,
-        {
-          persist: true,
-          onClick: () => {
-            closeKey('conflict')
-          },
-        },
-      )
-    } else closeKey('conflict')
-  }, [corrupt])
   // separate one for isDirty so we can be sure only that has changed
   useEffect(() => {
     if (isDirty === undefined) return

src/redux/otomiApi.ts

@@ -4477,23 +4477,14 @@ export type DeleteUserApiArg = {
 }
 export type EditTeamUsersApiResponse = /** status 200 Successfully edited a team user */ {
   id?: string
-  email: string
-  firstName: string
-  lastName: string
-  isPlatformAdmin?: boolean
-  isTeamAdmin?: boolean
   teams?: string[]
-  initialPassword?: string
 }[]
 export type EditTeamUsersApiArg = {
   /** ID of team */
   teamId: string
   /** User object that contains updated values */
   body: {
     id?: string
-    email?: string
-    isPlatformAdmin?: boolean
-    isTeamAdmin?: boolean
     teams?: string[]
   }[]
 }