Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "13.17.x patch" #1239

Merged
merged 1 commit into from
Sep 27, 2023
+32 −24
Merged

Revert "13.17.x patch" #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
48 changes: 30 additions & 18 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/common/src/sites/HubSite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 1 addition & 4 deletions packages/common/test/sites/HubSite.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down