From 0f59b55f3e0453d8a9e1489da371fb6e600f979b Mon Sep 17 00:00:00 2001
From: Marcin Maciaszczyk <marcin9yk@icloud.com>
Date: Thu, 19 Dec 2024 15:37:51 +0100
Subject: [PATCH 1/4] s/Service Accounts/Service accounts

---
 assets/src/components/kubernetes/rbac/Rbac.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/src/components/kubernetes/rbac/Rbac.tsx b/assets/src/components/kubernetes/rbac/Rbac.tsx
index 2ba4e960b8..3164b5a9b4 100644
--- a/assets/src/components/kubernetes/rbac/Rbac.tsx
+++ b/assets/src/components/kubernetes/rbac/Rbac.tsx
@@ -35,7 +35,7 @@ const directory = [
   { path: ROLE_BINDINGS_REL_PATH, label: 'Role bindings' },
   { path: CLUSTER_ROLES_REL_PATH, label: 'Cluster roles' },
   { path: CLUSTER_ROLE_BINDINGS_REL_PATH, label: 'Cluster role bindings' },
-  { path: SERVICE_ACCOUNTS_REL_PATH, label: 'Service Accounts' },
+  { path: SERVICE_ACCOUNTS_REL_PATH, label: 'Service accounts' },
 ] as const
 
 export default function Rbac() {

From bb8d23031e498d1b09efe15e1d5a7914d30172c3 Mon Sep 17 00:00:00 2001
From: Marcin Maciaszczyk <marcin9yk@icloud.com>
Date: Fri, 20 Dec 2024 11:45:22 +0100
Subject: [PATCH 2/4] hide configuration step if there are no configuration
 fields

---
 .../pr/automations/CreatePrModal.tsx          | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/assets/src/components/pr/automations/CreatePrModal.tsx b/assets/src/components/pr/automations/CreatePrModal.tsx
index a3ecf1982e..98d5ce23c6 100644
--- a/assets/src/components/pr/automations/CreatePrModal.tsx
+++ b/assets/src/components/pr/automations/CreatePrModal.tsx
@@ -30,6 +30,7 @@ import { Body1BoldP, Body1P } from 'components/utils/typography/Text'
 
 import { PrConfigurationFields } from './PrConfigurationFields'
 import { validateAndFilterConfig } from './prConfigurationUtils'
+import { isEmpty } from 'lodash'
 
 function CreateSuccess({ pr }: { pr: PullRequestFragment }) {
   const theme = useTheme()
@@ -60,7 +61,10 @@ function CreatePrModalBase({
   onClose: Nullable<() => void>
 }) {
   const configuration = prAutomation.configuration || []
-  const [currentStep, setCurrentStep] = useState<StepKey>('config')
+  const hasConfiguration = !isEmpty(configuration)
+  const [currentStep, setCurrentStep] = useState<StepKey>(
+    hasConfiguration ? 'config' : 'review'
+  )
   const stepIndex = steps.findIndex((s) => s.key === currentStep)
   const [configVals, setConfigVals] = useState(
     Object.fromEntries(
@@ -184,12 +188,14 @@ function CreatePrModalBase({
               >
                 Create
               </Button>
-              <Button
-                secondary
-                onClick={() => setCurrentStep('config')}
-              >
-                Back
-              </Button>
+              {hasConfiguration && (
+                <Button
+                  secondary
+                  onClick={() => setCurrentStep('config')}
+                >
+                  Back
+                </Button>
+              )}
               <Button
                 secondary
                 onClick={() => onClose?.()}
@@ -225,7 +231,7 @@ function CreatePrModalBase({
           gap: theme.spacing.large,
         }}
       >
-        {currentStep !== 'success' && (
+        {currentStep !== 'success' && hasConfiguration && (
           <div css={{ display: 'flex' }}>
             <Stepper
               compact
@@ -274,17 +280,19 @@ function CreatePrModalBase({
               </Card>
             )}
 
-            <FormField
-              label="Configuration review"
-              name="configuration"
-            >
-              <Code
-                language="json"
-                showHeader={false}
+            {hasConfiguration && (
+              <FormField
+                label="Configuration review"
+                name="configuration"
               >
-                {configJson || ''}
-              </Code>
-            </FormField>
+                <Code
+                  language="json"
+                  showHeader={false}
+                >
+                  {configJson || ''}
+                </Code>
+              </FormField>
+            )}
             <FormField
               label="Repository"
               required

From 2074c8143bd4a42a431100d56f77c2cc09479678 Mon Sep 17 00:00:00 2001
From: Marcin Maciaszczyk <marcin9yk@icloud.com>
Date: Fri, 20 Dec 2024 12:07:26 +0100
Subject: [PATCH 3/4] add hints

---
 assets/src/components/pr/automations/CreatePrModal.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/assets/src/components/pr/automations/CreatePrModal.tsx b/assets/src/components/pr/automations/CreatePrModal.tsx
index 98d5ce23c6..7769b81870 100644
--- a/assets/src/components/pr/automations/CreatePrModal.tsx
+++ b/assets/src/components/pr/automations/CreatePrModal.tsx
@@ -132,6 +132,7 @@ function CreatePrModalBase({
             })
         }
       }}
+      size="large"
       open={open}
       onClose={onClose || undefined}
       header={
@@ -297,6 +298,7 @@ function CreatePrModalBase({
               label="Repository"
               required
               name="repository"
+              hint={'Repository slug, i.e. username/infra-repo.'}
             >
               <Input2
                 value={identifier}
@@ -307,6 +309,7 @@ function CreatePrModalBase({
               label="Branch"
               required
               name="branch"
+              hint="Pull request source branch name. Avoid using existing branches."
             >
               <Input2
                 value={branch}

From 4ddbe7770d60b283cb63d36a82735f372873c3a3 Mon Sep 17 00:00:00 2001
From: Marcin Maciaszczyk <marcin9yk@icloud.com>
Date: Fri, 20 Dec 2024 12:12:34 +0100
Subject: [PATCH 4/4] set cooldown to 15s

---
 assets/src/components/utils/KickButton.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/src/components/utils/KickButton.tsx b/assets/src/components/utils/KickButton.tsx
index 64bfb6e5b0..2945cc9d3b 100644
--- a/assets/src/components/utils/KickButton.tsx
+++ b/assets/src/components/utils/KickButton.tsx
@@ -28,7 +28,7 @@ export default function KickButton({
 } & ButtonProps) {
   const [mutation, { loading, error }] = kickMutationHook({ variables })
   const [lastSync, setLastSync] = useState<Date | undefined>(undefined)
-  const { disabled, secondsRemaining } = useSyncCooldown(lastSync, 5 * 1000)
+  const { disabled, secondsRemaining } = useSyncCooldown(lastSync, 15 * 1000)
   const onClick = useCallback(() => {
     setLastSync(new Date())
     mutation()