fix: remove troublesome migration that was not really needed (#1725)

Esri · Nov 7, 2024 · a075492 · a075492
1 parent 9828d17
commit a075492
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 114 deletions.
diff --git a/packages/common/src/sites/_internal/_ensureLegacySiteCatalog.ts b/packages/common/src/sites/_internal/_ensureLegacySiteCatalog.ts
diff --git a/packages/common/src/sites/upgrade-site-schema.ts b/packages/common/src/sites/upgrade-site-schema.ts
@@ -14,7 +14,6 @@ import { migrateBadBasemap } from "./_internal/migrateBadBasemap";
 import { ensureBaseTelemetry } from "./_internal/ensureBaseTelemetry";
 import { migrateWebMappingApplicationSites } from "./_internal/migrateWebMappingApplicationSites";
 import { _migrateLinkUnderlinesCapability } from "./_internal/_migrate-link-underlines-capability";
-import { _ensureLegacySiteCatalog } from "./_internal/_ensureLegacySiteCatalog";
 
 /**
  * Upgrades the schema upgrades
@@ -44,7 +43,6 @@ export function upgradeSiteSchema(model: IModel) {
   model = ensureBaseTelemetry(model);
   model = migrateWebMappingApplicationSites(model);
   model = _migrateLinkUnderlinesCapability(model);
-  // This will only make changes to sites with schemaVersion 1.5 or lower
-  model = _ensureLegacySiteCatalog(model);
+
   return model;
 }
diff --git a/packages/common/test/sites/_internal/_ensureLegacySiteCatalog.test.ts b/packages/common/test/sites/_internal/_ensureLegacySiteCatalog.test.ts
diff --git a/packages/common/test/sites/upgrade-site-schema.test.ts b/packages/common/test/sites/upgrade-site-schema.test.ts
@@ -11,7 +11,7 @@ import * as _migrateTelemetryConfig from "../../src/sites/_internal/_migrate-tel
 import * as _migrateLinkUnderlinesCapability from "../../src/sites/_internal/_migrate-link-underlines-capability";
 import * as migrateBadBasemapModule from "../../src/sites/_internal/migrateBadBasemap";
 import * as ensureBaseTelemetry from "../../src/sites/_internal/ensureBaseTelemetry";
-import * as _ensureLegacySiteCatalog from "../../src/sites/_internal/_ensureLegacySiteCatalog";
+
 import { IModel } from "../../src";
 import { SITE_SCHEMA_VERSION } from "../../src/sites/site-schema-version";
 import { expectAllCalled, expectAll } from "./test-helpers.test";
@@ -29,7 +29,7 @@ describe("upgradeSiteSchema", () => {
   let migrateLinkUnderlinesCapabilitySpy: jasmine.Spy;
   let migrateBadBasemapSpy: jasmine.Spy;
   let ensureBaseTelemetrySpy: jasmine.Spy;
-  let ensureLegacySiteCatalog: jasmine.Spy;
+
   beforeEach(() => {
     applySpy = spyOn(_applySiteSchemaModule, "_applySiteSchema").and.callFake(
       (model: IModel) => model
@@ -78,10 +78,6 @@ describe("upgradeSiteSchema", () => {
       ensureBaseTelemetry,
       "ensureBaseTelemetry"
     ).and.callFake((model: IModel) => model);
-    ensureLegacySiteCatalog = spyOn(
-      _ensureLegacySiteCatalog,
-      "_ensureLegacySiteCatalog"
-    ).and.callFake((model: IModel) => model);
   });
 
   it("runs schema upgrades", async () => {