From 7b88151156be2bd83f1736d8a8c34ba20722082c Mon Sep 17 00:00:00 2001
From: Ilia Babanov <ilia.babanov@databricks.com>
Date: Tue, 29 Oct 2024 12:24:12 +0100
Subject: [PATCH] Correctly render variables panel with overridden lookup vars
 (#1412)

## Changes
Correctly render variables panel with overridden lookup vars

Fixes https://github.com/databricks/databricks-vscode/issues/1410

## Tests
Manually
---
 .../src/bundle/models/BundleVariableModel.ts                | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/databricks-vscode/src/bundle/models/BundleVariableModel.ts b/packages/databricks-vscode/src/bundle/models/BundleVariableModel.ts
index f9bbd7511..a0f215047 100644
--- a/packages/databricks-vscode/src/bundle/models/BundleVariableModel.ts
+++ b/packages/databricks-vscode/src/bundle/models/BundleVariableModel.ts
@@ -13,7 +13,6 @@ import {WorkspaceFolderManager} from "../../vscode-objs/WorkspaceFolderManager";
 export type BundleVariable = Required<BundleSchema>["variables"][string] & {
     valueInTarget?: string;
     vscodeOverrideValue?: string;
-    required: boolean;
 };
 
 export type BundleVariableModelState = {
@@ -180,8 +179,8 @@ export class BundleVariableModel extends BaseModelWithStateCache<BundleVariableM
             variables[key] = {
                 ...definition,
                 lookup:
-                    typeof inTargetVariable === "object"
-                        ? inTargetVariable
+                    typeof inTargetVariable?.lookup === "object"
+                        ? inTargetVariable.lookup
                         : definition.lookup,
 
                 // If the value is not required based on our heuristic check, we use the value from the validate
@@ -194,7 +193,6 @@ export class BundleVariableModel extends BaseModelWithStateCache<BundleVariableM
                           : inTargetPostValidateVariables[key]?.value ??
                             definition.default,
                 vscodeOverrideValue: overrides[key],
-                required: isRequired,
             };
         }