Revert "Move json fields processing at meta fetching stage"

This reverts commit 1e8c0b4.

Author: pbe-axelor

axelor-front/src/services/client/meta-utils.ts

@@ -520,18 +520,13 @@ export function processView(
       }
     }
 
-    [
-      "canNew",
-      "canView",
-      "canEdit",
-      "canRemove",
-      "canSelect",
-      "canDelete",
-    ].forEach((name) => {
-      if (item[name] === "false" || item[name] === "true") {
-        item[name] = item[name] === "true";
-      }
-    });
+    ["canNew", "canView", "canEdit", "canRemove", "canSelect", "canDelete"].forEach(
+      (name) => {
+        if (item[name] === "false" || item[name] === "true") {
+          item[name] = item[name] === "true";
+        }
+      },
+    );
 
     if (item.items) {
       processView(meta, item, view);
@@ -583,20 +578,13 @@ export function processView(
       };
       let panel: Schema | null = null;
       let panelTab: Schema | null = null;
-
-      let jsonFields: JsonField[] = item.jsonFields ?? [];
-
-      jsonFields = item.jsonFields.filter(
+      item.jsonFields = item.jsonFields.filter(
         (x: JsonField) => !(x as JsonField).forceHidden,
       );
-      jsonFields.sort((x: Schema, y: Schema) => {
+      item.jsonFields.sort((x: Schema, y: Schema) => {
         return x.sequence - y.sequence;
       });
-      jsonFields.forEach((field: Schema) => {
-        if (field.nameField) {
-          field.nameColumn = field.nameField;
-        }
-
+      item.jsonFields.forEach((field: Schema) => {
         if (field.widgetAttrs) {
           if (typeof field.widgetAttrs === "string") {
             field.widgetAttrs = JSON.parse(field.widgetAttrs);
@@ -665,11 +653,6 @@ export function processView(
         }
       });
 
-      item.jsonFields = jsonFields.reduce(
-        (acc, x) => ({ ...acc, [x.name]: x }),
-        {},
-      );
-
       if (panelTab) {
         editor.items?.push(panelTab);
       }

axelor-front/src/services/client/meta.types.ts

@@ -423,8 +423,6 @@ export interface JsonField extends Omit<Field, "type"> {
   columnSequence: number;
   visibleInGrid?: boolean;
 
-  nameField?: boolean;
-
   jsonTarget?: string;
   jsonField?: string;
   jsonPath?: string;

axelor-front/src/views/form/builder/form-editors.tsx

@@ -1,11 +1,11 @@
 import { Box, clsx } from "@axelor/ui";
-import { ScopeProvider } from "bunshi/react";
 import { SetStateAction, atom, useAtom, useAtomValue, useSetAtom } from "jotai";
+import { ScopeProvider } from "bunshi/react";
 import { atomFamily, selectAtom, useAtomCallback } from "jotai/utils";
-import filter from "lodash/filter";
 import getObjValue from "lodash/get";
 import isEqual from "lodash/isEqual";
 import isNumber from "lodash/isNumber";
+import filter from "lodash/filter";
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
 
 import { MaterialIcon } from "@axelor/ui/icons/material-icon";
@@ -18,8 +18,8 @@ import { i18n } from "@/services/client/i18n";
 import { ViewData } from "@/services/client/meta";
 import {
   Editor,
+  Field,
   FormView,
-  JsonField,
   Panel,
   Property,
   Schema,
@@ -1149,7 +1149,7 @@ function JsonEditor({
   );
   const model = useAtomValue(modelAtom);
   const jsonModel = schema.jsonModel;
-  const jsonFields: Record<string, JsonField> = schema.jsonFields ?? {};
+  const jsonFields = processJsonFields(schema);
   const jsonNameField = Object.values(jsonFields).find((x) => x.nameColumn);
   const jsonValueRef = useRef<DataRecord>();
 
@@ -1241,6 +1241,17 @@ function JsonEditor({
   );
 }
 
+function processJsonFields(schema: Schema) {
+  const fields: Record<string, Schema> = schema.jsonFields ?? {};
+  return Object.entries(fields).reduce((acc, [k, v]) => {
+    const { nameField: nameColumn, ...field } = v;
+    return {
+      ...acc,
+      [k]: nameColumn ? { ...field, nameColumn } : field,
+    };
+  }, {}) as Record<string, Field>;
+}
+
 function processJsonView(schema: Schema, jsonFields: any) {
   const result = { ...schema, $json: true } as Schema;
 

axelor-front/src/views/form/builder/utils.ts

@@ -1,7 +1,7 @@
+import uniqueId from "lodash/uniqueId";
 import isUndefined from "lodash/isUndefined";
 import pick from "lodash/pick";
 import uniq from "lodash/uniq";
-import uniqueId from "lodash/uniqueId";
 
 import { DataContext, DataRecord } from "@/services/client/data.types";
 import {
@@ -15,8 +15,8 @@ import {
   View,
   Widget,
 } from "@/services/client/meta.types";
-import { getJSON } from "@/utils/data-record";
 import { toCamelCase, toKebabCase, toSnakeCase } from "@/utils/names";
+import { getJSON } from "@/utils/data-record";
 
 import {
   getBaseDummy,
@@ -27,8 +27,8 @@ import { moment } from "@/services/client/l10n.ts";
 import { MetaData, ViewData } from "@/services/client/meta";
 import { LoadingCache } from "@/utils/cache";
 import convert from "@/utils/convert";
-import { findViewItems } from "@/utils/schema";
 import { Attrs, DEFAULT_ATTRS, FormState } from "./types";
+import { findViewItems } from "@/utils/schema";
 
 import * as WIDGETS from "../widgets";
 
@@ -251,21 +251,19 @@ export function processContextValues(
         values[fieldName] = value
           ? compactJson(value, {
               findItem: (jsonPath: string) => {
-                function findTargetNames(schema: Schema): string[] {
+                function findTargetNames(schema: Schema): Schema[] {
                   const items =
                     schema.type !== "panel-related" ? (schema.items ?? []) : [];
                   const nested = items.flatMap((item) => findTargetNames(item));
                   return [
                     ...items
                       .filter((item) => item.json && item.name === fieldName)
-                      .map((item) => {
-                        const itemFields: Record<string, JsonField> =
-                          item.jsonFields ?? {};
-                        return Object.values(itemFields).find(
-                          (jsonItem: JsonField) => jsonItem.name === jsonPath,
-                        )?.targetName as string;
-                      })
-                      .filter(Boolean),
+                      .map(
+                        (item) =>
+                          item.jsonFields?.find(
+                            (jsonItem: JsonField) => jsonItem.name === jsonPath,
+                          )?.targetName,
+                      ),
                     ...nested,
                   ];
                 }
@@ -435,6 +433,13 @@ export function processView(
     );
   }
 
+  if (Array.isArray(res.jsonFields)) {
+    res.jsonFields = res.jsonFields.reduce(
+      (prev, field) => ({ ...prev, [field.name!]: field }),
+      {},
+    );
+  }
+
   return res;
 }
 

changelogs/unreleased/revert-json-field-improvements.yml

@@ -0,0 +1,5 @@
+title: Revert json field processing improvements
+type: fix
+description: |
+  Previous version introduce json field processing improvements. Due to the nature of the change, this introduced 
+  issue in json fields behavior. This has been reverted and will be re-added on further version.