merge v0.23.0-rc changes

ui/src/components/records/fields/JsonField.svelte

@@ -1,8 +1,8 @@
 <script>
     import { onMount } from "svelte";
     import tooltip from "@/actions/tooltip";
-    import CommonHelper from "@/utils/CommonHelper";
     import Field from "@/components/base/Field.svelte";
+    import FieldLabel from "@/components/records/fields/FieldLabel.svelte";
 
     export let field;
     export let value = undefined;
@@ -45,9 +45,7 @@
 </script>
 
 <Field class="form-field {field.required ? 'required' : ''}" name={field.name} let:uniqueId>
-    <label for={uniqueId}>
-        <i class={CommonHelper.getFieldTypeIcon(field.type)} />
-        <span class="txt">{field.name}</span>
+    <FieldLabel {uniqueId} {field}>
         <span
             class="json-state"
             use:tooltip={{ position: "left", text: isValid ? "Valid JSON" : "Invalid JSON" }}
@@ -58,7 +56,8 @@
                 <i class="ri-error-warning-fill txt-danger" />
             {/if}
         </span>
-    </label>
+    </FieldLabel>
+
     {#if editorComponent}
         <svelte:component
             this={editorComponent}