Merge pull request #826 from eisbuk/fix/slot-form-action-buttons

Make the slot form action buttons always visible
eisbuk · Sep 18, 2023 · 00ddc09 · 00ddc09
2 parents a730168 + f1b22cc
commit 00ddc09
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -62,7 +62,7 @@
     "test:triggers": "bash -c '(trap \"kill 0\" SIGINT; ../functions/build_scripts/watch.js & firebase -c ../../firebase-testing.json  emulators:exec --project eisbuk -- \" vitest dataTriggers\")'",
     "test:rules": "bash -c '(trap \"kill 0\" SIGINT; ../functions/build_scripts/watch.js & firebase -c ../../firebase-testing.json  emulators:exec --project eisbuk -- \" vitest firestoreRules\")'",
     "test:integrations": "bash -c '(trap \"kill 0\" SIGINT; ../functions/build_scripts/watch.js & firebase -c ../../firebase-testing.json  emulators:exec --project eisbuk -- \" vitest integrations\")'",
-    "test:emulators:ci": "export CI=true && export VITEST_JUNIT_SUITE_NAME=\"Client tests\" && bash -c '(trap \"kill 0\" SIGINT; ../functions/build_scripts/watch.js & firebase -c ../../firebase-testing.json  emulators:exec --project eisbuk -- \" vitest run --coverage --reporter=junit --reporter=html --outputFile.junit=junit.xml/\")'",
+    "test:emulators:ci": "CI=true VITEST_JUNIT_SUITE_NAME=\"Client tests\" bash -c '(trap \"kill 0\" SIGINT; ../functions/build_scripts/watch.js & firebase -c ../../firebase-testing.json  emulators:exec --project eisbuk -- \" vitest run --coverage --reporter=junit --reporter=html --outputFile.junit=junit.xml/\")' || true # We always exit with code 0: a subsequent CI step will fail if a test fails.",
     "test:quicktest": "echo Running tests with no emulators support && vitest --ui",
     "test": "echo 'Running all tests; using emulators.' && rushx test:emulators:ui",
     "storybook": "storybook dev -p 6006",

diff --git a/packages/ui/src/Forms/SlotForm/SlotForm.tsx b/packages/ui/src/Forms/SlotForm/SlotForm.tsx
@@ -227,23 +227,23 @@ const SlotForm: React.FC<SlotFormProps> = ({
                 multiline
                 label={"Notes"}
               />
+            </div>
 
-              <div className="flex items-center justify-end">
-                <Button
-                  onClick={onClose}
-                  className="text-cyan-700"
-                  size={ButtonSize.LG}
-                >
-                  {t(ActionButton.Cancel)}
-                </Button>
-                <Button
-                  type="submit"
-                  className="bg-cyan-700"
-                  size={ButtonSize.LG}
-                >
-                  {t(ActionButton.Save)}
-                </Button>
-              </div>
+            <div className="flex px-6 py-3 border-t items-center justify-end">
+              <Button
+                onClick={onClose}
+                className="text-cyan-700"
+                size={ButtonSize.LG}
+              >
+                {t(ActionButton.Cancel)}
+              </Button>
+              <Button
+                type="submit"
+                className="bg-cyan-700"
+                size={ButtonSize.LG}
+              >
+                {t(ActionButton.Save)}
+              </Button>
             </div>
           </Form>
         );