Merge branch 'main' into fix/ci-pipeline-refactoring

Author: AbhishekA1509

src/components/ConfigMapSecret/ConfigMap/ConfigMapList.tsx

@@ -205,16 +205,20 @@ export default function ConfigMapList({
                     </div>
                 </div>
             </div>
+
             {DraftComments && showComments && selectedDraft && (
                 <DraftComments
                     draftId={selectedDraft.draftId}
                     draftVersionId={selectedDraft.draftVersionId}
                     toggleDraftComments={toggleDraftComments}
                 />
             )}
-            <div className="variables-widget-position-cmcs">
-                <FloatingVariablesSuggestions zIndex={100} appId={appId} envId={envId} clusterId={clusterId} />
-            </div>
+
+            {window._env_.ENABLE_SCOPED_VARIABLES && (
+                <div className="variables-widget-position-cmcs">
+                    <FloatingVariablesSuggestions zIndex={100} appId={appId} envId={envId} clusterId={clusterId} />
+                </div>
+            )}
         </div>
     )
 }

src/components/ConfigMapSecret/Secret/SecretList.tsx

@@ -196,9 +196,12 @@ export default function SecretList({
                     toggleDraftComments={toggleDraftComments}
                 />
             )}
-            <div className="variables-widget-position-cmcs">
-                <FloatingVariablesSuggestions zIndex={100} appId={appId} envId={envId} clusterId={clusterId} />
-            </div>
+
+            {window._env_.ENABLE_SCOPED_VARIABLES && (
+                <div className="variables-widget-position-cmcs">
+                    <FloatingVariablesSuggestions zIndex={100} appId={appId} envId={envId} clusterId={clusterId} />
+                </div>
+            )}
         </div>
     )
 }

src/components/EnvironmentOverride/DeploymentTemplateOverrideForm.tsx

@@ -623,9 +623,12 @@ export default function DeploymentTemplateOverrideForm({
             }`}
             onSubmit={handleSaveChanges}
         >
-            <div className="variables-widget-position">
-                <FloatingVariablesSuggestions zIndex={1004} appId={appId} envId={envId} clusterId={clusterId} />
-            </div>
+            {window._env_.ENABLE_SCOPED_VARIABLES && (
+                <div className="variables-widget-position">
+                    <FloatingVariablesSuggestions zIndex={1004} appId={appId} envId={envId} clusterId={clusterId} />
+                </div>
+            )}
+
             <DeploymentTemplateOptionsTab
                 isEnvOverride={true}
                 disableVersionSelect={readOnlyPublishedMode || !state.duplicate}

src/components/deploymentConfig/DeploymentConfig.tsx

@@ -880,9 +880,12 @@ export default function DeploymentConfig({
             }`}
             onSubmit={handleSaveChanges}
         >
-            <div className="variables-widget-position">
-                <FloatingVariablesSuggestions zIndex={100} appId={appId} />
-            </div>
+            {window._env_.ENABLE_SCOPED_VARIABLES && (
+                <div className="variables-widget-position">
+                    <FloatingVariablesSuggestions zIndex={100} appId={appId} />
+                </div>
+            )}
+
             <DeploymentTemplateOptionsTab
                 codeEditorValue={readOnlyPublishedMode ? state.publishedState?.tempFormData : state.tempFormData}
                 disableVersionSelect={readOnlyPublishedMode}