Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

…o fix-36080/selectedRowIndex-getting-updated-unnecessarily
appsmithorg · Sep 19, 2024 · 69b58b5 · 69b58b5
2 parents 3f030d8 + 163bde4
commit 69b58b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/...t/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts b/...t/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts
@@ -12780,7 +12780,6 @@ export const defaultAppState = {
           ab_ds_binding_enabled: true,
           ask_ai_js: false,
           license_connection_pool_size_enabled: false,
-          release_widgetdiscovery_enabled: false,
           ab_ai_js_function_completion_enabled: true,
           release_workflows_enabled: false,
           license_scim_enabled: false,

diff --git a/app/client/src/plugins/Linting/utils/getLintingErrors.ts b/app/client/src/plugins/Linting/utils/getLintingErrors.ts
@@ -36,8 +36,6 @@ import setters from "workers/Evaluation/setters";
 import { isMemberExpressionNode } from "@shared/ast/src";
 import { generate } from "astring";
 import getInvalidModuleInputsError from "ee/plugins/Linting/utils/getInvalidModuleInputsError";
-import { startAndEndSpanForFn } from "UITelemetry/generateTraces";
-import { objectKeys } from "@appsmith/utils";
 
 const EvaluationScriptPositions: Record<string, Position> = {};
 
@@ -69,7 +67,7 @@ function generateLintingGlobalData(data: Record<string, unknown>) {
 
   libAccessors.forEach((accessor) => (globalData[accessor] = true));
   // Add all supported web apis
-  objectKeys(SUPPORTED_WEB_APIS).forEach(
+  Object.keys(SUPPORTED_WEB_APIS).forEach(
     (apiName) => (globalData[apiName] = true),
   );
 
@@ -197,16 +195,7 @@ export default function getLintingErrors({
   const lintingGlobalData = generateLintingGlobalData(data);
   const lintingOptions = lintOptions(lintingGlobalData);
 
-  startAndEndSpanForFn(
-    "Linter",
-    // adding some metrics to compare the performance changes with eslint
-    {
-      linter: "JSHint",
-      linesOfCodeLinted: originalBinding.split("\n").length,
-      codeSizeInChars: originalBinding.length,
-    },
-    () => jshint(script, lintingOptions),
-  );
+  jshint(script, lintingOptions);
   const sanitizedJSHintErrors = sanitizeJSHintErrors(jshint.errors, scriptPos);
   const jshintErrors: LintError[] = sanitizedJSHintErrors.map((lintError) =>
     convertJsHintErrorToAppsmithLintError(