fix: merge errors

Kanaries · Apr 1, 2024 · a32c2d4 · a32c2d4
1 parent 1f7ccee
commit a32c2d4
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/packages/graphic-walker/src/App.tsx b/packages/graphic-walker/src/App.tsx
@@ -291,7 +291,7 @@ export function VizAppWithContext(props: IVizAppProps & IComputationProps) {
         safeMetas,
         onMetaChange: safeOnMetaChange,
     } = useMemo(() => {
-        if (props.dataSource) {
+        if (data) {
             return {
                 safeMetas: fields,
                 computation: getComputation(data),

diff --git a/packages/graphic-walker/src/Renderer.tsx b/packages/graphic-walker/src/Renderer.tsx
@@ -286,7 +286,7 @@ export function RendererAppWithContext(
         safeMetas,
         onMetaChange: safeOnMetaChange,
     } = useMemo(() => {
-        if (props.dataSource) {
+        if (data) {
             return {
                 safeMetas: fields,
                 computation: getComputation(data),

diff --git a/packages/graphic-walker/src/Table.tsx b/packages/graphic-walker/src/Table.tsx
@@ -121,7 +121,7 @@ export function TableAppWithContext(props: ITableProps & IComputationProps) {
         safeMetas,
         onMetaChange: safeOnMetaChange,
     } = useMemo(() => {
-        if (props.dataSource) {
+        if (data) {
             return {
                 safeMetas: fields,
                 computation: getComputation(data),

diff --git a/packages/graphic-walker/src/components/leafletRenderer/ChoroplethRenderer.tsx b/packages/graphic-walker/src/components/leafletRenderer/ChoroplethRenderer.tsx
@@ -316,7 +316,7 @@ const ChoroplethRenderer = forwardRef<IChoroplethRendererRef, IChoroplethRendere
                                         <Tooltip>
                                             <header>{data[i][geoId.fid]}</header>
                                             {tooltipFields.map((f, j) => (
-                                                <TooltipContent key={j} allFields={allFields} vegaConfig={vegaConfig} field={f} value={row[f.key]} />
+                                                <TooltipContent key={j} vegaConfig={vegaConfig} field={f} value={row[f.key]} />
                                             ))}
                                         </Tooltip>
                                     )}
@@ -340,7 +340,7 @@ const ChoroplethRenderer = forwardRef<IChoroplethRendererRef, IChoroplethRendere
                                     <Tooltip>
                                         <header>{data[i][geoId.fid]}</header>
                                         {tooltipFields.map((f, j) => (
-                                            <TooltipContent key={j} allFields={allFields} vegaConfig={vegaConfig} field={f} value={row[f.key]} />
+                                            <TooltipContent key={j} vegaConfig={vegaConfig} field={f} value={row[f.key]} />
                                         ))}
                                     </Tooltip>
                                 </Polygon>

diff --git a/packages/graphic-walker/src/interfaces.ts b/packages/graphic-walker/src/interfaces.ts
@@ -975,7 +975,7 @@ export interface ILocalComputationProps {
     fieldKeyGuard?: boolean;
     /** @deprecated renamed to data */
     dataSource: any[] | Record<string, any[]>;
-    data?: any[];
+    data?: any[] | Record<string, any[]>;
     computationTimeout?: number;
 }
 

diff --git a/packages/graphic-walker/src/models/visSpecHistory.ts b/packages/graphic-walker/src/models/visSpecHistory.ts
@@ -456,7 +456,7 @@ const actions: {
     },
     [Methods.editAllField]: (data, fid, newData, identifier) => {
         if (Object.keys(newData).includes('name')) {
-            const originalField = data.encodings.dimensions.concat(data.encodings.measures).find((x) => x.fid === fid);
+            const originalField = data.encodings.dimensions.concat(data.encodings.measures).find(identifier ? (x) => getFieldIdentifier(x) !== identifier : (x) => x.fid !== fid);
             // if name is changed, update all computed fields
             return produce(data, (draft) => {
                 if (!originalField) return;

diff --git a/packages/graphic-walker/src/store/visualSpecStore.ts b/packages/graphic-walker/src/store/visualSpecStore.ts
@@ -41,7 +41,6 @@ import {
     IDefaultConfig,
     IJoinPath,
     FieldIdentifier,
-    FieldIdentifier,
 } from '../interfaces';
 import { GLOBAL_CONFIG } from '../config';
 import { COUNT_FIELD_ID, DATE_TIME_DRILL_LEVELS, DATE_TIME_FEATURE_LEVELS, PAINT_FIELD_ID, MEA_KEY_ID, MEA_VAL_ID, DEFAULT_DATASET } from '../constants';
@@ -582,7 +581,7 @@ export class VizSpecStore {
         if (!origianlField) {
             return;
         }
-        this.visList[this.visIndex] = performers.editAllField(this.visList[this.visIndex], origianlField.fid, { name: newName });
+        this.visList[this.visIndex] = performers.editAllField(this.visList[this.visIndex], origianlField.fid, { name: newName }, getFieldIdentifier(origianlField));
     }
 
     public createDateTimeDrilledField(