plop

Signed-off-by: Julien Veyssier <[email protected]>

lib/Listener/BeforeTemplateRenderedListener.php

@@ -34,6 +34,6 @@ public function handle(Event $event): void {
 			return;
 		}
 
-		Util::addScript(Application::APP_ID, Application::APP_ID . '-assistant');
+		Util::addScript(Application::APP_ID, Application::APP_ID . '-main');
 	}
 }

lib/Listener/TaskFailedListener.php

@@ -2,15 +2,19 @@
 
 namespace OCA\TPAssistant\Listener;
 
+use OCA\TPAssistant\AppInfo\Application;
+use OCA\TPAssistant\Event\BeforeAssistantNotificationEvent;
 use OCA\TPAssistant\Service\AssistantService;
 use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\EventDispatcher\IEventListener;
 use OCP\TextProcessing\Events\TaskFailedEvent;
 
 class TaskFailedListener implements IEventListener {
 
 	public function __construct(
 		private AssistantService $assistantService,
+		private IEventDispatcher $eventDispatcher,
 	) {
 	}
 
@@ -20,7 +24,24 @@ public function handle(Event $event): void {
 		}
 
 		$task = $event->getTask();
-		$this->assistantService->sendNotification($task);
-		error_log('Task failed');
+		error_log('Task failed ' . $task->getId());
+		if ($task->getUserId() === null) {
+			return;
+		}
+
+		$notificationTarget = null;
+
+		// we dispatch an event to ask the app that scheduled the task if it wants a notification
+		// and what the target should be
+		if ($task->getAppId() !== Application::APP_ID) {
+			$beforeAssistantNotificationEvent = new BeforeAssistantNotificationEvent($task);
+			$this->eventDispatcher->dispatchTyped($beforeAssistantNotificationEvent);
+			if (!$beforeAssistantNotificationEvent->getWantsNotification()) {
+				return;
+			}
+			$notificationTarget = $beforeAssistantNotificationEvent->getNotificationTarget();
+		}
+
+		$this->assistantService->sendNotification($task, $notificationTarget);
 	}
 }

lib/Listener/TaskSuccessfulListener.php

@@ -24,6 +24,11 @@ public function handle(Event $event): void {
 		}
 
 		$task = $event->getTask();
+		error_log('Task successful ' . $task->getId());
+		if ($task->getUserId() === null) {
+			return;
+		}
+
 		$notificationTarget = null;
 
 		// we dispatch an event to ask the app that scheduled the task if it wants a notification
@@ -38,6 +43,5 @@ public function handle(Event $event): void {
 		}
 
 		$this->assistantService->sendNotification($task, $notificationTarget);
-		error_log('Task successful');
 	}
 }

lib/Notification/Notifier.php

@@ -84,6 +84,25 @@ public function prepare(INotification $notification, string $languageCode): INot
 				return $notification;
 
 			case 'failure':
+				$subject = $l->t('Assistant Task for app %1$s has failed', [$params['appId']]);
+				$content = $l->t('The input was: %1$s', [$params['input']]);
+				$link = $params['target'] ?? $this->url->linkToRouteAbsolute(Application::APP_ID . '.assistant.getTaskResultPage', ['taskId' => $params['id']]);
+
+				$notification
+					->setParsedSubject($subject)
+					->setParsedMessage($content)
+					->setLink($link)
+					->setIcon($iconUrl);
+
+				$actionLabel = $l->t('View results');
+				$action = $notification->createAction();
+				$action->setLabel($actionLabel)
+					->setParsedLabel($actionLabel)
+					->setLink($notification->getLink(), IAction::TYPE_WEB)
+					->setPrimary(true);
+
+				$notification->addParsedAction($action);
+
 				return $notification;
 
 			default:

src/assistant.js

@@ -22,7 +22,7 @@ __webpack_public_path__ = linkTo('textprocessing_assistant', 'js/') // eslint-di
  * @return {Promise<unknown>}
  */
 export async function openAssistantForm({ appId, identifier = '', taskType = null, input = '', isInsideViewer = undefined }) {
-	const { default: Vue } = await import(/* webpackChunkName: "vue-lazy" */'vue')
+	const { default: Vue } = await import(/* webpackChunkName: "vue-lazy1" */'vue')
 	const { default: AssistantModal } = await import(/* webpackChunkName: "assistant-modal-lazy" */'./components/AssistantModal.vue')
 	Vue.mixin({ methods: { t, n } })
 
@@ -68,7 +68,7 @@ export async function openAssistantForm({ appId, identifier = '', taskType = nul
  * @param {string} input the task input text
  * @return {Promise<*>}
  */
-async function scheduleTask(appId, identifier, taskType, input) {
+export async function scheduleTask(appId, identifier, taskType, input) {
 	const { default: axios } = await import(/* webpackChunkName: "axios-lazy" */'@nextcloud/axios')
 	const { generateOcsUrl } = await import(/* webpackChunkName: "router-lazy" */'@nextcloud/router')
 	const url = generateOcsUrl('textprocessing/schedule', 2)
@@ -104,7 +104,7 @@ function handleNotification(event) {
  *
  * @return {Promise<void>}
  */
-async function subscribeToNotifications() {
+export async function subscribeToNotifications() {
 	const { subscribe } = await import(/* webpackChunkName: "router-lazy" */'@nextcloud/event-bus')
 	subscribe('notifications:action:execute', handleNotification)
 }
@@ -133,7 +133,7 @@ async function showResults(taskId) {
  * @return {Promise<void>}
  */
 async function openAssistantResult(task) {
-	const { default: Vue } = await import(/* webpackChunkName: "vue-lazy" */'vue')
+	const { default: Vue } = await import(/* webpackChunkName: "vue-lazy2" */'vue')
 	const { default: AssistantModal } = await import(/* webpackChunkName: "assistant-modal-lazy" */'./components/AssistantModal.vue')
 	Vue.mixin({ methods: { t, n } })
 
@@ -167,13 +167,13 @@ async function openAssistantResult(task) {
 	})
 }
 
-async function addAssistantMenuEntry() {
+export async function addAssistantMenuEntry() {
 	const headerRight = document.querySelector('#header .header-right')
 	const menuEntry = document.createElement('div')
 	menuEntry.id = 'assistant'
 	headerRight.prepend(menuEntry)
 
-	const { default: Vue } = await import(/* webpackChunkName: "vue-lazy" */'vue')
+	const { default: Vue } = await import(/* webpackChunkName: "vue-lazy3" */'vue')
 	const { default: AssistantHeaderMenuEntry } = await import(/* webpackChunkName: "assistant-modal-lazy" */'./components/AssistantHeaderMenuEntry.vue')
 	Vue.mixin({ methods: { t, n } })
 
@@ -189,22 +189,3 @@ async function addAssistantMenuEntry() {
 			})
 	})
 }
-
-/**
- * Expose OCA.TPAssistant.openTextProcessingModal to let apps use the assistant
- * and add a header right menu entry
- */
-function init() {
-	if (!OCA.TPAssistant) {
-		/**
-		 * @namespace
-		 */
-		OCA.TPAssistant = {
-			openAssistantForm,
-		}
-	}
-	addAssistantMenuEntry()
-}
-
-init()
-subscribeToNotifications()

src/main.js

@@ -0,0 +1,20 @@
+import { subscribeToNotifications, addAssistantMenuEntry, openAssistantForm } from './assistant.js'
+
+/**
+ * Expose OCA.TPAssistant.openTextProcessingModal to let apps use the assistant
+ * and add a header right menu entry
+ */
+function init() {
+	if (!OCA.TPAssistant) {
+		/**
+		 * @namespace
+		 */
+		OCA.TPAssistant = {
+			openAssistantForm,
+		}
+		subscribeToNotifications()
+		addAssistantMenuEntry()
+	}
+}
+
+init()

src/views/TaskResultPage.vue

@@ -7,7 +7,8 @@
 					class="form"
 					:input="task.input"
 					:output="task.output"
-					:selected-task-type-id="task.type" />
+					:selected-task-type-id="task.type"
+					@submit="onSubmit" />
 			</div>
 		</NcAppContent>
 	</NcContent>
@@ -20,6 +21,7 @@ import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
 import AssistantForm from '../components/AssistantForm.vue'
 
 import { loadState } from '@nextcloud/initial-state'
+import { scheduleTask } from '../assistant.js'
 
 export default {
 	name: 'TaskResultPage',
@@ -43,10 +45,18 @@ export default {
 	},
 
 	mounted() {
-		console.debug('aaaaa MOUNTED', this.task)
 	},
 
 	methods: {
+		onSubmit(data) {
+			scheduleTask(this.task.appId, this.task.identifier, data.taskTypeId, data.input)
+				.then((response) => {
+					console.debug('scheduled task', response.data?.ocs?.data?.task)
+				})
+				.catch(error => {
+					console.error('Assistant scheduling error', error)
+				})
+		},
 	},
 }
 </script>

webpack.js

@@ -17,7 +17,7 @@ const appId = 'textprocessing_assistant'
 webpackConfig.entry = {
 	personalSettings: { import: path.join(__dirname, 'src', 'personalSettings.js'), filename: appId + '-personalSettings.js' },
 	adminSettings: { import: path.join(__dirname, 'src', 'adminSettings.js'), filename: appId + '-adminSettings.js' },
-	assistant: { import: path.join(__dirname, 'src', 'assistant.js'), filename: appId + '-assistant.js' },
+	main: { import: path.join(__dirname, 'src', 'main.js'), filename: appId + '-main.js' },
 	taskResultPage: { import: path.join(__dirname, 'src', 'taskResultPage.js'), filename: appId + '-taskResultPage.js' },
 }