Default to displaying form in ToggleJson.vue

Signed-off-by: Gavin Jaeger-Freeborn <[email protected]>
bcgov · Apr 8, 2024 · cd5ac72 · cd5ac72
1 parent ea0d06f
commit cd5ac72
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/services/tenant-ui/frontend/src/components/common/ToggleJson.vue b/services/tenant-ui/frontend/src/components/common/ToggleJson.vue
@@ -2,12 +2,12 @@
   <div class="mt-2">
     <div class="flex justify-content-end">
       {{ $t('common.json') }}
-      <InputSwitch v-model="showRawJson" class="ml-1" @input="toggleJson" />
+      <InputSwitch v-model="displayAsForm" class="ml-1" @input="toggleJson" />
     </div>
-    <div v-show="!showRawJson">
+    <div v-show="displayAsForm">
       <slot></slot>
     </div>
-    <div v-show="showRawJson">
+    <div v-show="!displayAsForm">
       <Textarea
         id="credentialValuesEdit"
         v-model="valuesJson"
@@ -27,7 +27,7 @@ import { ref } from 'vue';
 import InputSwitch from 'primevue/inputswitch';
 import Textarea from 'primevue/textarea';
 
-const showRawJson = ref<boolean>(false);
+const displayAsForm = ref<boolean>(true);
 const valuesJson = ref<string>('');
 
 // Undefined indicates that the conversion was a failure
@@ -39,21 +39,21 @@ const props = defineProps<{
 }>();
 
 defineExpose({
-  showRawJson,
+  displayAsForm,
   valuesJson,
 });
 
 const toggleJson = () => {
-  if (showRawJson.value) {
+  if (displayAsForm.value) {
     const res = props.toJson();
     if (res) {
       valuesJson.value = res;
     } else {
-      showRawJson.value = !showRawJson.value;
+      displayAsForm.value = !displayAsForm.value;
     }
   } else {
     if (!props.fromJson(valuesJson.value)) {
-      showRawJson.value = !showRawJson.value;
+      displayAsForm.value = !displayAsForm.value;
     }
   }
 };

diff --git a/services/tenant-ui/frontend/src/components/issuance/credentials/EnterCredentialValues.vue b/services/tenant-ui/frontend/src/components/issuance/credentials/EnterCredentialValues.vue
@@ -88,7 +88,7 @@ function jsonToCredentialValue(
     credentialValuesRaw.value = parsed;
     return parsed;
   } else {
-    toast.warning('The JSON you inputted has invalid syntax');
+    toast.warning('This JSON is invalid syntax');
     return undefined;
   }
 }

diff --git a/services/tenant-ui/frontend/src/components/issuance/schemas/CreateSchemaForm.vue b/services/tenant-ui/frontend/src/components/issuance/schemas/CreateSchemaForm.vue
@@ -204,7 +204,7 @@ function jsonToSchema(jsonString: string): SchemaSendRequest | undefined {
     formFields.version = parsed.schema_version;
     return parsed;
   } else {
-    toast.error('The JSON you inputted has invalid syntax');
+    toast.error('Invalid JSON detected');
     return undefined;
   }
 }