Refactor: Set form status as draft by default (impress-org#147)

* refactor: Set form status as draft by default * fix: Account for null viewing draft form as guest * fix: Prepend page URL with post type argument
jonwaldstein · Mar 31, 2023 · 731da64 · 731da64
1 parent 937aee4
commit 731da64
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 16 deletions.
diff --git a/packages/form-builder/src/containers/HeaderContainer.tsx b/packages/form-builder/src/containers/HeaderContainer.tsx
@@ -7,7 +7,7 @@ import {Button} from '@wordpress/components';
 import {__} from '@wordpress/i18n';
 import {Header} from '../components';
 import {Storage} from '../common';
-import {FormSettings} from '@givewp/form-builder/types';
+import {FormSettings, FormStatus} from '@givewp/form-builder/types';
 import {setIsDirty} from '@givewp/form-builder/stores/form-state/reducer';
 
 const Logo = () => (
@@ -39,16 +39,22 @@ const HeaderContainer = ({
 
     const {formTitle} = formSettings;
     const dispatch = useFormStateDispatch();
-    const [isSaving, setSaving] = useState(false);
+    const [isSaving, setSaving] = useState(null);
 
-    const onSave = () => {
-        setSaving(true);
-        Storage.save({blocks, formSettings})
+    const isDraftDisabled = ( isSaving || !isDirty ) && 'draft' === formSettings.formStatus;
+    const isPublishDisabled = ( isSaving || !isDirty ) && 'publish' === formSettings.formStatus;
+
+    const onSave = (formStatus: FormStatus) => {
+        setSaving(formStatus);
+
+        dispatch(setFormSettings({formStatus}))
+
+        Storage.save({blocks, formSettings: {...formSettings, formStatus}})
             .catch((error) => alert(error.message))
             .then(({pageSlug}: FormSettings) => {
                 dispatch(setFormSettings({pageSlug}));
                 dispatch(setIsDirty(false));
-                setSaving(false);
+                setSaving(null);
                 onSaveNotice();
             });
     };
@@ -85,12 +91,30 @@ const HeaderContainer = ({
             contentRight={
                 <>
                     <Button
-                        onClick={onSave}
-                        aria-disabled={isSaving || !isDirty}
-                        disabled={isSaving || !isDirty}
+                        onClick={() => onSave('draft')}
+                        aria-disabled={isDraftDisabled}
+                        disabled={isDraftDisabled}
+                        variant="tertiary"
+                    >
+                        {isSaving && 'draft' === isSaving
+                            ? __('Saving...', 'give')
+                            : 'draft' === formSettings.formStatus
+                                ? __('Save as Draft', 'give')
+                                : __('Switch to Draft', 'give')
+                        }
+                    </Button>
+                    <Button
+                        onClick={() => onSave('publish')}
+                        aria-disabled={isPublishDisabled}
+                        disabled={isPublishDisabled}
                         variant="primary"
                     >
-                        {isSaving ? __('Updating...', 'give') : __('Update', 'give')}
+                        {isSaving && 'publish' === isSaving
+                            ? __('Updating...', 'give')
+                            : 'publish' === formSettings.formStatus
+                                ? __('Update', 'give')
+                                : __('Publish', 'give')
+                        }
                     </Button>
                     <Button onClick={toggleShowSidebar} isPressed={showSidebar} icon={drawerRight} />
                 </>

diff --git a/packages/form-builder/src/types/formSettings.ts b/packages/form-builder/src/types/formSettings.ts
@@ -1,3 +1,5 @@
+import {FormStatus} from "@givewp/form-builder/types/formStatus";
+
 /**
  * @since 0.1.0
  */
@@ -19,4 +21,5 @@ export type FormSettings = {
     pageSlug: string;
     receiptHeading: string;
     receiptDescription: string;
+    formStatus: FormStatus;
 };
diff --git a/packages/form-builder/src/types/formStatus.ts b/packages/form-builder/src/types/formStatus.ts
@@ -0,0 +1 @@
+export type FormStatus = "draft" | "publish";
diff --git a/packages/form-builder/src/types/index.ts b/packages/form-builder/src/types/index.ts
@@ -4,3 +4,4 @@ export type {FormDesign} from './formDesign';
 export type {FormSettings} from './formSettings';
 export type {FormState} from './formState';
 export type {FormPageSettings} from './formPageSettings';
+export type {FormStatus} from './formStatus';
diff --git a/src/FormBuilder/Controllers/FormBuilderResourceController.php b/src/FormBuilder/Controllers/FormBuilderResourceController.php
@@ -6,6 +6,7 @@
 use Give\Framework\FieldsAPI\Form;
 use Give\NextGen\DonationForm\Models\DonationForm;
 use Give\NextGen\DonationForm\Properties\FormSettings;
+use Give\NextGen\DonationForm\ValueObjects\DonationFormStatus;
 use Give\NextGen\Framework\Blocks\BlockCollection;
 use WP_Error;
 use WP_HTTP_Response;
@@ -76,6 +77,7 @@ public function update(WP_REST_Request $request)
             return rest_ensure_response($requiredFieldsError);
         }
 
+        $form->status = $updatedSettings->formStatus;
         $form->save();
 
         return rest_ensure_response([

diff --git a/src/FormBuilder/Routes/CreateFormRoute.php b/src/FormBuilder/Routes/CreateFormRoute.php
@@ -33,7 +33,7 @@ public function __invoke()
 
                 $form = DonationForm::create([
                     'title' => __('GiveWP Donation Form', 'give'),
-                    'status' => DonationFormStatus::PUBLISHED(),
+                    'status' => DonationFormStatus::DRAFT(),
                     'settings' => FormSettings::fromArray([
                         'goalAmount' => 1000,
                     ]),

diff --git a/src/FormBuilder/ViewModels/FormBuilderViewModel.php b/src/FormBuilder/ViewModels/FormBuilderViewModel.php
@@ -36,7 +36,7 @@ public function storageData(int $donationFormId): array
             }, give(FormDesignRegistrar::class)->getDesigns()),
             'formPage' => [
                 'isEnabled' => give_is_setting_enabled(give_get_option('forms_singular')), // Note: Boolean values must be nested in an array to maintain boolean type, see \WP_Scripts::localize().
-                'permalink' => add_query_arg(['p' => $donationFormId], site_url()),
+                'permalink' => add_query_arg(['p' => $donationFormId], site_url('?post_type=give_forms')),
                 'rewriteSlug' => get_post_type_object('give_forms')->rewrite['slug'],
             ],
         ];

diff --git a/src/NextGen/DonationForm/Properties/FormSettings.php b/src/NextGen/DonationForm/Properties/FormSettings.php
@@ -5,6 +5,7 @@
 use Give\Framework\Support\Contracts\Arrayable;
 use Give\Framework\Support\Contracts\Jsonable;
 use Give\NextGen\DonationForm\FormDesigns\ClassicFormDesign\ClassicFormDesign;
+use Give\NextGen\DonationForm\ValueObjects\DonationFormStatus;
 use Give\NextGen\DonationForm\ValueObjects\GoalType;
 
 class FormSettings implements Arrayable, Jsonable
@@ -85,6 +86,11 @@ class FormSettings implements Arrayable, Jsonable
      */
     public $receiptDescription;
 
+    /**
+     * @var DonationFormStatus
+     */
+    public $formStatus;
+
     /**
      * @since 0.1.0
      */
@@ -122,6 +128,7 @@ public static function fromArray(array $array): self
             '{first_name}, your contribution means a lot and will be put to good use in making a difference. We’ve sent your donation receipt to {email}.',
             'give'
         );
+        $self->formStatus = !empty($array['formStatus']) ? new DonationFormStatus($array['formStatus']) : DonationFormStatus::DRAFT();
 
         return $self;
     }

diff --git a/src/NextGen/FormPage/TemplateHandler.php b/src/NextGen/FormPage/TemplateHandler.php
@@ -7,7 +7,7 @@
 class TemplateHandler
 {
     /**
-     * @var Post
+     * @var Post|null
      */
     private $post;
 
@@ -16,7 +16,7 @@ class TemplateHandler
      */
     private $formPageTemplatePath;
 
-    public function __construct( Post $post, string $formPageTemplatePath )
+    public function __construct( $post, string $formPageTemplatePath )
     {
         $this->post = $post;
         $this->formPageTemplatePath = $formPageTemplatePath;
@@ -31,7 +31,8 @@ public function handle($template)
 
     protected function isNextGenForm(): bool
     {
-        return 'give_forms' === $this->post->post_type
-               && $this->post->post_content;
+        return $this->post
+               && $this->post->post_content
+               &&'give_forms' === $this->post->post_type;
     }
 }