Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 0 additions & 29 deletions .github/workflows/secrets-scan.yml

This file was deleted.

12 changes: 11 additions & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
* @contentstack/security-admin
* @contentstack/ghost-pr-reviewers
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are this changes from main branch?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes


.github/workflows/sca-scan.yml @contentstack/security-admin

.github/workflows/codeql-anaylsis.yml @contentstack/security-admin

**/.snyk @contentstack/security-admin

.github/workflows/policy-scan.yml @contentstack/security-admin

.github/workflows/issues-jira.yml @contentstack/security-admin
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ describe("postMessageEvent.hooks", () => {
(Config.get as any).mockReturnValue(mockConfig);
});

it("should reload window when ssr is true and no event_type", () => {
// Set URL to include live_preview parameter so reload path is taken
mockWindow.location.href = "https://example.com?live_preview=old-hash";
it("should reload window when ssr is true and no event_type and all params present", () => {
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@contentstackMridul Just want to know that whether this test was newly added by us? or the live preview used to work like this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@KANE-99, earlier the test was checking for the live preview hash only, but ideally we should check for all the params in the SSR case

// Set URL to include all required params so reload path is taken
mockWindow.location.href = "https://example.com?live_preview=old-hash&content_type_uid=blog&entry_uid=entry-123";

const eventData: OnChangeLivePreviewPostMessageEventData = {
hash: "test-hash",
Expand Down
52 changes: 34 additions & 18 deletions src/livePreview/eventManager/postMessageEvent.hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export function useOnEntryUpdatePostMessageEvent(): void {
LIVE_PREVIEW_POST_MESSAGE_EVENTS.ON_CHANGE,
(event) => {
try {
const { ssr, onChange } = Config.get();
const { ssr, onChange, stackDetails } = Config.get();
const event_type = event.data._metadata?.event_type;
setConfigFromParams({
live_preview: event.data.hash,
Expand All @@ -59,41 +59,57 @@ export function useOnEntryUpdatePostMessageEvent(): void {
// This section will run when there is a change in the entry and the website is CSR
if (!ssr && !event_type) {
onChange();
}
}

if(isOpeningInNewTab()) {
if(!window) {
if (isOpeningInNewTab()) {
if (!window) {
PublicLogger.error("window is not defined");
return;
};

// This section will run when there is a change in the entry and the website is SSR
if(ssr && !event_type) {
if(window.location.href.includes("live_preview")) {

if (ssr && !event_type) {
const url = new URL(window.location.href);
let live_preview = url.searchParams.get("live_preview");
let content_type_uid = url.searchParams.get("content_type_uid");
let entry_uid = url.searchParams.get("entry_uid");

if (live_preview && content_type_uid && entry_uid) {
// All required params are present, just reload
window.location.reload();
} else {
const url = new URL(window.location.href);
url.searchParams.set("live_preview", event.data.hash);
url.searchParams.set("content_type_uid", Config.get().stackDetails.contentTypeUid || "");
url.searchParams.set("entry_uid", Config.get().stackDetails.entryUid || "");
live_preview = event.data.hash;
content_type_uid = event.data.content_type_uid || stackDetails.$contentTypeUid?.toString() || "";
entry_uid = event.data.entry_uid || stackDetails.$entryUid?.toString() || "";
// Set missing params and redirect
url.searchParams.set("live_preview", live_preview);
if (content_type_uid) {
url.searchParams.set(
"content_type_uid",
content_type_uid
);
}
if (entry_uid) {
url.searchParams.set(
"entry_uid",
entry_uid
);
}
window.location.href = url.toString();
}
}

// This section will run when the hash changes and the website is SSR or CSR
if(event_type === OnChangeLivePreviewPostMessageEventTypes.HASH_CHANGE){
if (event_type === OnChangeLivePreviewPostMessageEventTypes.HASH_CHANGE) {
const newUrl = new URL(window.location.href);
newUrl.searchParams.set("live_preview", event.data.hash);
window.history.pushState({}, "", newUrl.toString());
}

// This section will run when the URL of the page changes
if(event_type === OnChangeLivePreviewPostMessageEventTypes.URL_CHANGE && event.data.url){
if (event_type === OnChangeLivePreviewPostMessageEventTypes.URL_CHANGE && event.data.url) {
window.location.href = event.data.url;
}
}


} catch (error) {
PublicLogger.error("Error handling live preview update:", error);
return;
Expand Down
Loading