Revert "13.17.x patch (#1238)" (#1239)

This reverts commit 58f160b.
Esri · Sep 27, 2023 · 344e5e2 · 344e5e2
1 parent 58f160b
commit 344e5e2
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 24 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,6 @@ on:
       - beta
       # - alpha disabled to allow push to alpha then merge to master w/o incurring a release
       - next
-      - [0-9]+.[0-9]+.x
     # Dont run if it's just markdown or doc files
     paths-ignore:
       - "**.md"

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/common/src/sites/HubSite.ts b/packages/common/src/sites/HubSite.ts
@@ -142,7 +142,7 @@ export class HubSite
   ): IHubSite {
     // ensure we have the orgUrlKey
     if (!partialSite.orgUrlKey) {
-      partialSite.orgUrlKey = context.portal?.urlKey;
+      partialSite.orgUrlKey = context.portal.urlKey;
     }
     // extend the partial over the defaults
     const pojo = { ...DEFAULT_SITE, ...partialSite } as IHubSite;

diff --git a/packages/common/test/sites/HubSite.test.ts b/packages/common/test/sites/HubSite.test.ts
@@ -52,10 +52,7 @@ describe("HubSite Class:", () => {
   describe("static methods:", () => {
     it("loads from minimal json", () => {
       const createSpy = spyOn(HubSitesModule, "createSite");
-      const chk = HubSite.fromJson(
-        { name: "Test Site" },
-        unauthdCtxMgr.context
-      );
+      const chk = HubSite.fromJson({ name: "Test Site" }, authdCtxMgr.context);
 
       expect(createSpy).not.toHaveBeenCalled();
       expect(chk.toJson().name).toEqual("Test Site");