DEVPROD-789: Fix spacing bug in ArrayFieldTemplate (#2170)

evergreen-ci · Nov 28, 2023 · dfda0a8 · dfda0a8
1 parent 1a03b39
commit dfda0a8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/src/components/SpruceForm/FieldTemplates/ArrayFieldTemplates/index.tsx b/src/components/SpruceForm/FieldTemplates/ArrayFieldTemplates/index.tsx
@@ -199,23 +199,22 @@ export const ArrayFieldTemplate: React.FC<ArrayFieldTemplateProps> = ({
         hasChildren={!!items?.length}
         data-cy={arrayDataCy}
       >
-        {items.length === 0 ? (
+        {items.length === 0 && placeholder && (
           <Placeholder>{placeholder}</Placeholder>
-        ) : (
-          items.map((p, i) => (
-            <ArrayItem
-              {...p}
-              key={p.key}
-              border={border}
-              title={
-                formData?.[i]?.displayTitle ??
-                uiSchema?.items?.["ui:displayTitle"]
-              }
-              topAlignDelete={topAlignDelete}
-              useExpandableCard={useExpandableCard}
-            />
-          ))
         )}
+        {items.map((p, i) => (
+          <ArrayItem
+            {...p}
+            key={p.key}
+            border={border}
+            title={
+              formData?.[i]?.displayTitle ??
+              uiSchema?.items?.["ui:displayTitle"]
+            }
+            topAlignDelete={topAlignDelete}
+            useExpandableCard={useExpandableCard}
+          />
+        ))}
         {buttonAtEnd && (
           <AddButtonContainer>
             {addButton}

diff --git a/src/gql/generated/types.ts b/src/gql/generated/types.ts
@@ -1692,6 +1692,7 @@ export type Project = {
   repotrackerError?: Maybe<RepotrackerError>;
   restricted?: Maybe<Scalars["Boolean"]["output"]>;
   spawnHostScriptPath: Scalars["String"]["output"];
+  stepbackBisect?: Maybe<Scalars["Boolean"]["output"]>;
   stepbackDisabled?: Maybe<Scalars["Boolean"]["output"]>;
   taskAnnotationSettings: TaskAnnotationSettings;
   taskSync: TaskSyncOptions;
@@ -1824,6 +1825,7 @@ export type ProjectInput = {
   repotrackerDisabled?: InputMaybe<Scalars["Boolean"]["input"]>;
   restricted?: InputMaybe<Scalars["Boolean"]["input"]>;
   spawnHostScriptPath?: InputMaybe<Scalars["String"]["input"]>;
+  stepbackBisect?: InputMaybe<Scalars["Boolean"]["input"]>;
   stepbackDisabled?: InputMaybe<Scalars["Boolean"]["input"]>;
   taskAnnotationSettings?: InputMaybe<TaskAnnotationSettingsInput>;
   taskSync?: InputMaybe<TaskSyncOptionsInput>;
@@ -2144,6 +2146,7 @@ export type RepoRef = {
   repotrackerDisabled: Scalars["Boolean"]["output"];
   restricted: Scalars["Boolean"]["output"];
   spawnHostScriptPath: Scalars["String"]["output"];
+  stepbackBisect?: Maybe<Scalars["Boolean"]["output"]>;
   stepbackDisabled: Scalars["Boolean"]["output"];
   taskAnnotationSettings: TaskAnnotationSettings;
   taskSync: RepoTaskSyncOptions;
@@ -2186,6 +2189,7 @@ export type RepoRefInput = {
   repotrackerDisabled?: InputMaybe<Scalars["Boolean"]["input"]>;
   restricted?: InputMaybe<Scalars["Boolean"]["input"]>;
   spawnHostScriptPath?: InputMaybe<Scalars["String"]["input"]>;
+  stepbackBisect?: InputMaybe<Scalars["Boolean"]["input"]>;
   stepbackDisabled?: InputMaybe<Scalars["Boolean"]["input"]>;
   taskAnnotationSettings?: InputMaybe<TaskAnnotationSettingsInput>;
   taskSync?: InputMaybe<TaskSyncOptionsInput>;