Merge branch 'main' into test/forms-1478

nimya-aot · Oct 15, 2024 · 4d10a95 · 4d10a95
2 parents ff5e354 + 3e90c52
commit 4d10a95
Show file tree

Hide file tree

Showing 56 changed files with 7,761 additions and 3,422 deletions.
diff --git a/app/frontend/package-lock.json b/app/frontend/package-lock.json
diff --git a/app/frontend/package.json b/app/frontend/package.json
@@ -35,6 +35,7 @@
     "@fortawesome/fontawesome-svg-core": "^6.4.2",
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@fortawesome/vue-fontawesome": "^3.0.3",
+    "@vueuse/core": "^11.1.0",
     "axios": "^1.4.0",
     "bootstrap-scss": "^5.3.1",
     "crypto-js": "^4.1.1",

diff --git a/app/frontend/src/components/admin/AddOwner.vue b/app/frontend/src/components/admin/AddOwner.vue
@@ -1,48 +1,40 @@
-<script>
-import { mapActions } from 'pinia';
+<script setup>
 import { version as uuidVersion, validate as uuidValidate } from 'uuid';
 import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
 
 import { useAdminStore } from '~/store/admin';
 import { FormRoleCodes } from '~/utils/constants';
 
-export default {
-  props: {
-    formId: {
-      type: String,
-      required: true,
-    },
-  },
-  setup() {
-    const { locale } = useI18n({ useScope: 'global' });
+const { locale } = useI18n({ useScope: 'global' });
 
-    return { locale };
-  },
-  data() {
-    return {
-      userGuid: '',
-      valid: false,
-      userGuidRules: [
-        (v) => !!v || 'User ID required',
-        (v) =>
-          (uuidValidate(v) && uuidVersion(v) === 4) ||
-          'Enter a valid User ID GUID',
-      ],
-    };
-  },
-  methods: {
-    ...mapActions(useAdminStore, ['addFormUser', 'readRoles']),
-    async addOwner() {
-      if (this.$refs.addUserForm.validate()) {
-        await this.addFormUser({
-          userId: this.userGuid,
-          formId: this.formId,
-          roles: [FormRoleCodes.OWNER],
-        });
-      }
-    },
+const properties = defineProps({
+  formId: {
+    type: String,
+    required: true,
   },
-};
+});
+
+const addUserForm = ref(null);
+const userGuid = ref('');
+const valid = ref(false);
+const userGuidRules = ref([
+  (v) => !!v || 'User ID required',
+  (v) =>
+    (uuidValidate(v) && uuidVersion(v) === 4) || 'Enter a valid User ID GUID',
+]);
+
+const adminStore = useAdminStore();
+
+async function addOwner() {
+  if (addUserForm.value.validate()) {
+    await adminStore.addFormUser({
+      userId: userGuid.value,
+      formId: properties.formId,
+      roles: [FormRoleCodes.OWNER],
+    });
+  }
+}
 </script>
 
 <template>