2 files changed, 111 insertions, 3 deletions

diff --git a/src/components/Editor/Quest/Task/Modal/AddTaskModal.vue b/src/components/Editor/Quest/Task/Modal/AddTaskModal.vue
new file mode 100644
index 0000000..57139bb
--- /dev/null
+++ b/src/components/Editor/Quest/Task/Modal/AddTaskModal.vue
@@ -0,0 +1,90 @@
+<script setup lang="ts">
+import Modal from '@/components/Control/Modal.vue';
+import Button from '@/components/Control/Button.vue';
+import { computed, ref } from 'vue';
+import { useSessionStore } from '@/stores/session';
+import { validateTaskId } from '@/lib/util';
+
+const model = defineModel();
+
+const emit = defineEmits(['add']);
+
+const session = useSessionStore();
+
+const props = defineProps({
+  questId: {
+    type: String,
+    required: true,
+  },
+});
+
+const knownTasks = computed(() => session.getQuestById(props.questId)!.tasks);
+const knownTaskTypes = computed(() => session.getKnownTaskTypes());
+
+const newId = ref('');
+const newType = ref('');
+const unknownTaskType = computed(() => !knownTaskTypes.value.includes(newType.value));
+const invalidTaskId = computed(() => !validateTaskId(newId.value));
+const duplicateTaskId = computed(() => knownTasks.value[newId.value] !== undefined);
+
+const newTypeDescription = computed(() => session.getTaskDefinitionByTaskType(newType.value)?.description);
+</script>
+
+<template>
+  <Modal v-model="model">
+    <template v-slot:header>
+      <h2>Add new task</h2>
+    </template>
+
+    <template v-slot:body>
+      <div id="body">
+        <div class="option-group">
+          <label for="new-type">Task ID</label>
+          <input id="new-id" name="new-id" type="text" v-model="newId" />
+          <p v-if="invalidTaskId" class="error-text">Invalid task ID.</p>
+          <p v-if="duplicateTaskId" class="error-text">Task ID already exists.</p>
+        </div>
+        <div class="option-group">
+          <label for="new-type">Task type</label>
+          <multiselect
+            id="new-type"
+            v-model="newType"
+            :options="knownTaskTypes"
+            :searchable="true"
+            placeholder="Select a new type"
+          ></multiselect>
+          <p v-if="unknownTaskType" class="error-text">Invalid task type.</p>
+        </div>
+        <p v-if="newTypeDescription">{{ newTypeDescription }}</p>
+        <p>A task ID must be unique, alphanumeric, and not contain any spaces.</p>
+        <div id="confirm" class="control-group">
+          <Button
+            :icon="['fas', 'fa-times']"
+            :label="'Cancel'"
+            @click="model = false"
+          ></Button>
+          <Button
+            type="solid"
+            :icon="['fas', 'fa-check']"
+            :label="'Confirm'"
+            :disabled="unknownTaskType || invalidTaskId || duplicateTaskId"
+            @click="emit('add', newId, newType)"
+          ></Button>
+        </div>
+      </div>
+    </template>
+  </Modal>
+</template>
+
+<style scoped>
+#confirm {
+  display: flex;
+  justify-content: flex-end;
+}
+
+#body {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Editor/Quest/Task/Modal/ChangeTaskModal.vue b/src/components/Editor/Quest/Task/Modal/ChangeTaskModal.vue
index f8ffef7..c6b5921 100644
--- a/src/components/Editor/Quest/Task/Modal/ChangeTaskModal.vue
+++ b/src/components/Editor/Quest/Task/Modal/ChangeTaskModal.vue
@@ -1,17 +1,26 @@
 <script setup lang="ts">
 import Modal from '@/components/Control/Modal.vue';
 import Button from '@/components/Control/Button.vue';
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
+import { useSessionStore } from '@/stores/session';
 
 const model = defineModel();
 
 const emit = defineEmits(['update']);
 
-defineProps({
+const session = useSessionStore();
+
+const props = defineProps({
   taskId: String,
+  currentTaskType: String,
 });
 
+const knownTaskTypes = computed(() => session.getKnownTaskTypes());
+
 const newType = ref('');
+const unknownTaskType = computed(() => !knownTaskTypes.value.includes(newType.value));
+const noChange = computed(() => newType.value === props.currentTaskType);
+const newTypeDescription = computed(() => session.getTaskDefinitionByTaskType(newType.value)?.description);
 </script>
 
 <template>
@@ -24,8 +33,16 @@ const newType = ref('');
       <div id="body">
         <div class="option-group">
           <label for="new-type">New type</label>
-          <input id="new-type" name="new-type" type="text" v-model="newType" />
+          <multiselect
+            id="new-type"
+            v-model="newType"
+            :options="knownTaskTypes"
+            :searchable="true"
+            placeholder="Select a new type"
+          ></multiselect>
         </div>
+        <p v-if="unknownTaskType" class="error-text">Invalid task type.</p>
+        <p v-if="newTypeDescription">{{ newTypeDescription }}</p>
         <p>Any configured options for this task will be overwritten.</p>
         <div id="confirm" class="control-group">
           <Button
@@ -37,6 +54,7 @@ const newType = ref('');
             type="solid"
             :icon="['fas', 'fa-check']"
             :label="'Change'"
+            :disabled="unknownTaskType || noChange"
             @click="emit('update', newType)"
           ></Button>
         </div>