- add compose poll hero

- adapt CreatePollHandler to the new data structure (similar to edit)
- add translations

js/src/forum/components/ComposePollHero.tsx

@@ -0,0 +1,46 @@
+import Mithril from "mithril";
+import app from "flarum/forum/app";
+import Component from "flarum/common/Component";
+import {slug} from "../../common";
+import LinkButton from "flarum/common/components/LinkButton";
+
+const t = app.translator.trans.bind(app.translator);
+const prfx = `${slug}.forum.compose`;
+
+export default class ComposePollHero extends Component {
+    view(): Mithril.Children {
+        const { poll } = this.attrs;
+
+        return (
+            <div className='ComposeGoodieCollectionHero Hero IndexPageHero'>
+                <div className='container'>
+                    <div className='containerNarrow'>
+                        <h2 className='Hero-title'>
+                            {t(`${prfx}.${!!poll.id() ? 'edit' : 'add'}_title`)}
+                        </h2>
+                        <div className='IndexPageHero-controls'>
+                            <LinkButton
+                                icon='far fa-edit'
+                                className='Button Button--primary IndexPage-newDiscussion GoodiesManagerLink'
+                                itemClassName='App-primaryControl'
+                                href={app.route('fof_polls_directory')}>
+                                {t(`${prfx}.polls_manager`)}
+                            </LinkButton>
+                            {poll.exists && (
+                                <LinkButton
+                                    icon='far fa-arrow-up-right-from-square'
+                                    className='Button Button--primary IndexPage-newDiscussion GoodiePreviewLink'
+                                    itemClassName='App-primaryControl'
+                                    href={app.route('goodie-collection', { id: poll.id() })}
+                                    external={true}
+                                    target='_blank'>
+                                    {t(`${prfx}.goodie_preview`)}
+                                </LinkButton>
+                            )}
+                        </div>
+                    </div>
+                </div>
+            </div>
+        );
+    }
+}

js/src/forum/components/ComposePollPage.tsx

@@ -7,6 +7,7 @@ import PollForm from "./PollForm";
 import Acl from "../../common/Acl";
 import PollFormState from "../states/PollFormState";
 import {slug} from "../../common";
+import ComposePollHero from "./ComposePollHero";
 
 const t = app.translator.trans.bind(app.translator);
 const prfx = `${slug}.forum.compose`;
@@ -56,6 +57,7 @@ export default class ComposePollPage extends Page {
 
         return (
             <div className='ComposeGoodieCollectionPage'>
+                <ComposePollHero poll={this.poll} />
                 <div className='container'>
                     <PollForm poll={this.poll} />
                 </div>

resources/locale/en.yml

@@ -37,6 +37,10 @@ fof-polls:
       edit_poll: => fof-polls.forum.moderation.edit
       no_permission_alert: You do not have permission to start a poll.
 
+    compose:
+      add_title: Add a Poll
+      polls_manager: Polls Manager
+
     modal:
       add_title: Add a Poll
       add_option_label: Add an Option

src/Commands/CreatePollHandler.php

@@ -78,8 +78,8 @@ public function handle(CreatePoll $command)
         if (is_array($rawOptionsData)) {
             foreach ($rawOptionsData as $rawOptionData) {
                 $optionsData[] = [
-                    'answer'   => Arr::get($rawOptionData, 'answer'),
-                    'imageUrl' => Arr::get($rawOptionData, 'imageUrl') ?: null,
+                    'answer'   => Arr::get($rawOptionData, 'attributes.answer'),
+                    'imageUrl' => Arr::get($rawOptionData, 'attributes.imageUrl') ?: null,
                 ];
             }
         }