diff --git a/.github/scripts/docker-compose.yml b/.github/scripts/docker-compose.yml index a8d89941f7d0..b8f14042ced2 100644 --- a/.github/scripts/docker-compose.yml +++ b/.github/scripts/docker-compose.yml @@ -27,13 +27,3 @@ services: ports: - "6379:6379" restart: always - jaeger: - image: jaegertracing/all-in-one:1.58 - container_name: ghost-jaeger - ports: - - "4318:4318" - - "16686:16686" - - "9411:9411" - restart: always - environment: - COLLECTOR_ZIPKIN_HOST_PORT: :9411 \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 827e3931e1cb..3c77275c57dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -402,7 +402,7 @@ jobs: jq '[{ name: "Boot time", unit: "s", value: .results[0].median, range: ((.results[0].max - .results[0].min) | tostring) }]' < boot-perf.json > boot-perf-formatted.json - name: Run analysis - uses: benchmark-action/github-action-benchmark@v1.20.3 + uses: benchmark-action/github-action-benchmark@v1.20.1 with: tool: 'customSmallerIsBetter' output-file-path: ghost/core/boot-perf-formatted.json diff --git a/apps/admin-x-activitypub/package.json b/apps/admin-x-activitypub/package.json index 8431203950ef..82fcadfb30d3 100644 --- a/apps/admin-x-activitypub/package.json +++ b/apps/admin-x-activitypub/package.json @@ -25,18 +25,17 @@ "lint": "yarn run lint:code && yarn run lint:test", "lint:code": "eslint --ext .js,.ts,.cjs,.tsx --cache src", "lint:test": "eslint -c test/.eslintrc.cjs --ext .js,.ts,.cjs,.tsx --cache test", - "test:unit": "yarn nx build && vitest run", + "test:unit": "vitest run", "test:acceptance": "NODE_OPTIONS='--experimental-specifier-resolution=node --no-warnings' VITE_TEST=true playwright test", "test:acceptance:slowmo": "TIMEOUT=100000 PLAYWRIGHT_SLOWMO=100 yarn test:acceptance --headed", "test:acceptance:full": "ALL_BROWSERS=1 yarn test:acceptance", "preview": "vite preview" }, "devDependencies": { - "@playwright/test": "1.38.1", "@testing-library/react": "14.1.0", "@tryghost/admin-x-design-system": "0.0.0", "@tryghost/admin-x-framework": "0.0.0", - "@types/react": "18.3.3", + "@types/react": "18.3.2", "@types/react-dom": "18.3.0", "react": "18.3.1", "react-dom": "18.3.1" diff --git a/apps/admin-x-activitypub/public/styles/reader.css b/apps/admin-x-activitypub/public/styles/reader.css deleted file mode 100644 index 4cdaee420e1c..000000000000 --- a/apps/admin-x-activitypub/public/styles/reader.css +++ /dev/null @@ -1,1928 +0,0 @@ - -.gh-whats-new-canvas .gh-canvas-header-content { - margin-bottom: -1px; - padding: 8px 0 16px; - align-items: center; -} - -.gh-whats-new { - flex-grow: 2; - color: var(--darkgrey); - font-size: 1.5rem; - letter-spacing: 0; - margin-top: -24px; -} - -.gh-whats-new-heading { - display: flex; - align-items: center; - font-size: 1.5rem; - letter-spacing: 0; - line-height: 1.3em; - font-weight: 700; - margin: 0; -} - -.gh-whats-new-heading svg { - width: 20px; - height: 20px; - margin-top: -2px; - margin-right: 12px; -} - -.gh-whats-new-heading svg path { - fill: var(--pink); -} - -.gh-wn-header { - position: relative; - display: flex; - align-items: center; - margin: -32px -32px 0; - padding: 18px 18px 12px; - border-top-left-radius: 3px; - border-top-right-radius: 3px; - overflow: hidden; - background-position: center; - background-repeat: no-repeat; - background-size: cover; - background: var(--pink); - background: linear-gradient(135deg, color-mod(var(--pink) h(-10) s(+5%) l(-10%)) 0%, rgba(173,38,180,1) 100%); -} - -.gh-wn-header .background-img { - position: absolute; - top: -30px; - left: 0; -} - -.gh-wn-header h2 { - font-size: 1.3rem; - font-weight: 600; - text-transform: uppercase; - color: #FFF; - margin: 0 8px 4px; -} - -.gh-wn-header svg path { - fill: #fff; -} - -.gh-wn-close { - stroke: #FFF; - opacity: 0.6; - transition: all 0.2s ease-in-out; -} - -.gh-wn-close:hover { - opacity: 1.0; -} - -.gh-wn-entry { - margin: 0 0 5vmin; - padding-bottom: 5vmin; - width: 100%; - border-bottom: 1px solid var(--lightgrey-l2); - color: inherit; - text-decoration: none; -} - -.gh-wn-content { - max-width: 620px; -} - -.gh-whats-new-canvas .gh-wn-content { - margin: 0 auto; -} - -.gh-wn-entry h4 { - font-size: 1.2rem; - font-weight: 500; - letter-spacing: 0; - text-transform: uppercase; - margin: 24px 0 4px; - color: var(--midlightgrey); -} - -.gh-wn-entry h1 { - font-size: 3.7rem; - line-height: 1.3em; - font-weight: 700; - letter-spacing: -0.021em; - color: var(--black); - margin-bottom: 16px; -} - -.gh-whats-new-canvas .gh-wn-entry h1, -.gh-whats-new-canvas .gh-wn-entry h4 { - max-width: 620px; - margin-left: auto; - margin-right: auto; -} - -.gh-wn-entry h2 { - border-bottom: none; - font-size: 1.9rem; - padding-bottom: 0; - margin-bottom: 20px; -} - -.gh-wn-entry p, -.gh-wn-entry li { - line-height: 1.6em; -} - -.gh-wn-entry li { - margin-bottom: 12px; -} - -.gh-wn-entry p { - margin: 0 0 20px; - padding: 0; -} - -.gh-wn-entry figure { - margin-bottom: 24px; - overflow: hidden; -} - -.gh-wn-entry img { - height: auto; -} - -.gh-wn-entry hr { - border-top: 1px solid var(--whitegrey-l1); - margin: 24px 0; -} - - -/* Bookmark card details */ -.gh-wn-entry .kg-bookmark-card { - margin-bottom: 20px; -} - -.gh-wn-entry .kg-bookmark-container { - display: flex; - font-family: var(--font-family); - color: var(--darkgrey); - text-decoration: none; - min-height: 148px; - box-shadow: 0px 2px 5px -1px rgba(0, 0, 0, 0.15), 0 0 1px rgba(0, 0, 0, 0.09); - border-radius: 3px; -} - -.gh-wn-entry .kg-bookmark-content { - display: flex; - flex-direction: column; - flex-grow: 1; - align-items: flex-start; - justify-content: flex-start; - padding: 16px; -} - -.gh-wn-entry .kg-bookmark-title { - font-size: 1.3rem; - line-height: 1.5em; - font-weight: 600; - color: color(var(--midgrey) l(-30%)); -} - -.gh-wn-entry .kg-bookmark-container:hover .kg-bookmark-title { - color: var(--blue); -} - -.gh-wn-entry .kg-bookmark-description { - display: -webkit-box; - font-size: 1.25rem; - line-height: 1.5em; - color: color(var(--midgrey) l(-10%)); - font-weight: 400; - margin-top: 12px; - max-height: 36px; - overflow-y: hidden; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; -} - -.gh-wn-entry .kg-bookmark-thumbnail { - position: relative; - min-width: 40%; - max-height: 100%; -} - -.gh-wn-entry .kg-bookmark-thumbnail img { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - object-fit: cover; - border-radius: 0 3px 3px 0; -} - -.gh-wn-entry .kg-bookmark-metadata { - display: flex; - align-items: center; - font-size: 1.25rem; - font-weight: 400; - color: color(var(--midgrey) l(-10%)); - margin-top: 14px; - flex-wrap: wrap; -} - -.gh-wn-entry .kg-bookmark-icon { - width: 18px; - height: 18px; - margin-right: 8px; -} - -.gh-wn-entry .kg-bookmark-author { - line-height: 1.5em; -} - -.gh-wn-entry .kg-bookmark-author:after { - content: "•"; - margin: 0 6px; -} - -.gh-wn-entry .kg-bookmark-publisher { - overflow: hidden; - line-height: 1.5em; - text-overflow: ellipsis; - white-space: nowrap; - max-width: 160px; -} - -.gh-wn-entry .gh-wn-footer { - margin: 0 -32px -32px; - padding: 14px 32px 16px; - border-top: 1px solid var(--whitegrey); - justify-content: space-between; -} - -.gh-wn-footer { - position: relative; - margin-top: 14px; - margin-bottom: -13px; -} - -.gh-wn-footer:before { - position: absolute; - content: ""; - top: -14px; - left: -32px; - right: -32px; - height: 6px; - background: rgba(255,255,255,0); - box-shadow: - 0 -0.3px 1px rgba(0, 0, 0, 0.03), - 0 -4px 7px rgba(0, 0, 0, 0.06); -} - -.gh-about-container { - display: grid; - grid-template-columns: 2fr 1fr; - grid-gap: 80px; -} - -.gh-whats-new-canvas .gh-about-container { - display: flex; - grid-template-columns: unset; - grid-gap: unset; - margin: 0 auto; - max-width: 920px; - margin-top: 60px; -} - -.gh-about-container h2 { - font-size: 1.65rem; - line-height: 1.4em; - font-weight: 600; - border-bottom: 1px solid var(--lightgrey-l2); - padding-bottom: 12px; - margin-bottom: 12px; -} - -.gh-about-box { - position: sticky; - top: 96px; - right: 0; - display: flex; - flex-grow: 1; - flex-direction: column; - height: max-content; - border-radius: 3px; - min-width: 300px; -} - -.gh-about-box.grey { - border: none; - background: var(--main-color-content-greybg); -} - -@media (max-width: 1380px) { - .gh-wn-content { - max-width: 36vw; - } -} - -@media (max-width: 1120px) { - .gh-wn-content { - max-width: 680px; - } - - .gh-about-box { - position: relative; - top: unset; - right: unset; - } - - .gh-about-container { - grid-template-columns: unset; - grid-template-rows: auto; - grid-gap: 32px; - } - - .gh-whats-new { - grid-row: 3/4; - } - - - .gh-about-header-actions a { - display: none; - } - - .gh-wn-entry iframe { - max-width: 100%; - } -} - -/* Custom card styles -/* ---------------------------------------------------------- */ - -.gh-whats-new .kg-audio-card { - display: flex; - width: 100%; - min-height: 96px; - border-radius: 3px; - box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25); - margin-bottom: 1.5em; -} - -.gh-whats-new .kg-audio-card+.gh-whats-new .kg-audio-card { - margin-top: 1em; -} - -.gh-whats-new .kg-audio-thumbnail { - display: flex; - justify-content: center; - align-items: center; - width: 80px; - min-width: 80px; - margin: 8px; - background: transparent; - object-fit: cover; - aspect-ratio: 1/1; - border-radius: 2px; -} - -.gh-whats-new .kg-audio-thumbnail.placeholder { - background: var(--accent-color); -} - -.gh-whats-new .kg-audio-thumbnail.placeholder svg { - width: 24px; - height: 24px; - fill: white; -} - -.gh-whats-new .kg-audio-player-container { - position: relative; - display: flex; - flex-direction: column; - justify-content: space-between; - flex: 1; - --seek-before-width: 0%; - --volume-before-width: 100%; - --buffered-width: 0%; -} - -.gh-whats-new .kg-audio-title { - width: 100%; - margin: 8px 0 0 0; - padding: 8px 12px; - border: none; - font-family: inherit; - font-size: 1.15em; - font-weight: 700; - line-height: 1.15em; - background: transparent; -} - -.gh-whats-new .kg-audio-player { - display: flex; - flex-grow: 1; - align-items: center; - padding: 8px 12px; -} - -.gh-whats-new .kg-audio-current-time { - min-width: 38px; - padding: 0 4px; - font-family: inherit; - font-size: .85em; - font-weight: 500; - line-height: 1.4em; - white-space: nowrap; -} - -.gh-whats-new .kg-audio-time { - width: 56px; - color: #ababab; - font-family: inherit; - font-size: .85em; - font-weight: 500; - line-height: 1.4em; - white-space: nowrap; -} - -.gh-whats-new .kg-audio-duration { - padding: 0 4px; -} - -.gh-whats-new .kg-audio-play-icon, -.gh-whats-new .kg-audio-pause-icon { - position: relative; - bottom: 1px; - padding: 0px 4px 0 0; - font-size: 0; - background: transparent; -} - -.gh-whats-new .kg-audio-hide { - display: none !important; -} - -.gh-whats-new .kg-audio-play-icon svg, -.gh-whats-new .kg-audio-pause-icon svg { - width: 14px; - height: 14px; - fill: currentColor; -} - -.gh-whats-new .kg-audio-seek-slider { - flex-grow: 1; - margin: 0 4px; - width: 100%; -} - -@media (max-width: 640px) { - .gh-whats-new .kg-audio-seek-slider { - display: none; - } -} - -.gh-whats-new .kg-audio-playback-rate { - min-width: 37px; - padding: 0 4px; - font-family: inherit; - font-size: .85em; - font-weight: 600; - line-height: 1.4em; - text-align: left; - background: transparent; - white-space: nowrap; -} - -@media (max-width: 640px) { - .gh-whats-new .kg-audio-playback-rate { - padding-left: 8px; - } -} - -.gh-whats-new .kg-audio-mute-icon, -.gh-whats-new .kg-audio-unmute-icon { - position: relative; - bottom: -1px; - padding: 0 4px; - font-size: 0; - background: transparent; -} - -@media (max-width: 640px) { - .gh-whats-new .kg-audio-mute-icon, - .gh-whats-new .kg-audio-unmute-icon { - margin-left: auto; - } -} - -.gh-whats-new .kg-audio-mute-icon svg, -.gh-whats-new .kg-audio-unmute-icon svg { - width: 16px; - height: 16px; - fill: currentColor; -} - -.gh-whats-new .kg-audio-volume-slider { - flex-grow: 1; - width: 100%; - min-width: 50px; - max-width: 80px; -} - -@media (max-width: 400px) { - .gh-whats-new .kg-audio-volume-slider { - display: none; - } -} - -.gh-whats-new .kg-audio-seek-slider::before { - content: ""; - position: absolute; - left: 0; - width: var(--seek-before-width) !important; - height: 4px; - cursor: pointer; - background-color: currentColor; - border-radius: 2px; -} - -.gh-whats-new .kg-audio-volume-slider::before { - content: ""; - position: absolute; - left: 0; - width: var(--volume-before-width) !important; - height: 4px; - cursor: pointer; - background-color: currentColor; - border-radius: 2px; -} - -/* Resetting browser styles -/* --------------------------------------------------------------- */ - -.gh-whats-new .kg-audio-player-container input[type=range] { - position: relative; - -webkit-appearance: none; - background: transparent; -} - -.gh-whats-new .kg-audio-player-container input[type=range]:focus { - outline: none; -} - -.gh-whats-new .kg-audio-player-container input[type=range]::-webkit-slider-thumb { - -webkit-appearance: none; -} - -.gh-whats-new .kg-audio-player-container input[type=range]::-ms-track { - cursor: pointer; - border-color: transparent; - color: transparent; - background: transparent; -} - -.gh-whats-new .kg-audio-player-container button { - display: flex; - align-items: center; - border: 0; - cursor: pointer; -} - -.gh-whats-new .kg-audio-player-container input[type="range"] { - height: auto; - padding: 0; - border: 0; -} - -/* Chrome & Safari styles -/* --------------------------------------------------------------- */ - -.gh-whats-new .kg-audio-player-container input[type="range"]::-webkit-slider-runnable-track { - width: 100%; - height: 4px; - cursor: pointer; - background: rgba(124, 139, 154, 0.25); - border-radius: 2px; -} - -.gh-whats-new .kg-audio-player-container input[type="range"]::-webkit-slider-thumb { - position: relative; - box-sizing: content-box; - width: 13px; - height: 13px; - margin: -5px 0 0 0; - border: 0; - cursor: pointer; - background: #fff; - border-radius: 50%; - box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24); -} - -.gh-whats-new .kg-audio-player-container input[type="range"]:active::-webkit-slider-thumb { - transform: scale(1.2); -} - -/* Firefox styles -/* --------------------------------------------------------------- */ - -.gh-whats-new .kg-audio-player-container input[type="range"]::-moz-range-track { - width: 100%; - height: 4px; - cursor: pointer; - background: rgba(124, 139, 154, 0.25); - border-radius: 2px; -} - -.gh-whats-new .kg-audio-player-container input[type="range"]::-moz-range-progress { - background: currentColor; - border-radius: 2px; -} - -.gh-whats-new .kg-audio-player-container input[type="range"]::-moz-range-thumb { - box-sizing: content-box; - width: 13px; - height: 13px; - border: 0; - cursor: pointer; - background: #fff; - border-radius: 50%; - box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24); -} - -.gh-whats-new .kg-audio-player-container input[type="range"]:active::-moz-range-thumb { - transform: scale(1.2); -} - -/* Edge & IE styles -/* --------------------------------------------------------------- */ - -.gh-whats-new .kg-audio-player-container input[type="range"]::-ms-track { - width: 100%; - height: 3px; - border: solid transparent; - color: transparent; - cursor: pointer; - background: transparent; -} - -.gh-whats-new .kg-audio-player-container input[type="range"]::-ms-fill-lower { - background: #fff; -} - -.gh-whats-new .kg-audio-player-container input[type="range"]::-ms-fill-upper { - background: currentColor; -} - -.gh-whats-new .kg-audio-player-container input[type="range"]::-ms-thumb { - box-sizing: content-box; - width: 13px; - height: 13px; - border: 0; - cursor: pointer; - background: #fff; - border-radius: 50%; - box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24); -} - -.gh-whats-new .kg-audio-player-container input[type="range"]:active::-ms-thumb { - transform: scale(1.2); -} - -.gh-whats-new .kg-product-card { - display: flex; - align-items: center; - flex-direction: column; - width: 100%; - margin-bottom: 1.5em; -} - -.gh-whats-new .kg-product-card-container { - display: grid; - grid-template-columns: auto min-content; - align-items: center; - grid-row-gap: 16px; - background: transparent; - max-width: 550px; - width: 100%; -} - -.gh-whats-new .kg-product-card-image { - grid-column: 1 / 3; - justify-self: center; -} - -.gh-whats-new .kg-product-card-title-container { - grid-column: 1 / 2; -} - -.gh-whats-new .kg-product-card h4.kg-product-card-title { - font-family: var(--font-family); - text-decoration: none; - font-weight: 700; - font-size: 1.4em; - margin-top: 0; - margin-bottom: 0; - line-height: 1.15em; - text-transform: none; - color: inherit; -} - -.gh-whats-new .kg-product-card-description { - grid-column: 1 / 3; -} - -.gh-whats-new .kg-product-card .kg-product-card-description p, -.gh-whats-new .kg-product-card .kg-product-card-description ol, -.gh-whats-new .kg-product-card .kg-product-card-description ul { - font-family: var(--font-family); - font-size: 0.9em; - line-height: 1.5em; - opacity: .7; -} - -.gh-whats-new .kg-product-card .kg-product-card-description p:not(:first-of-type) { - margin-top: 0.8em; - margin-bottom: 0; -} - -.gh-whats-new .kg-product-card .kg-product-card-description p:first-of-type { - margin-top: -4px; -} - -.gh-whats-new .kg-product-card .kg-product-card-description ul, -.gh-whats-new .kg-product-card .kg-product-card-description ol { - margin-top: 0.95em; -} - -.gh-whats-new .kg-product-card .kg-product-card-description li+li { - margin-top: 0.2em; -} - -.gh-whats-new .kg-product-card-rating { - display: flex; - align-items: center; - grid-column: 2 / 3; - align-self: start; - justify-self: end; - padding-left: 16px; -} - -@media (max-width: 400px) { - .gh-whats-new .kg-product-card-title-container { - grid-column: 1 / 3; - } - - .gh-whats-new .kg-product-card-rating { - grid-column: 1 / 3; - justify-self: start; - margin-top: -15px; - padding-left: 0; - } -} - -.gh-whats-new .kg-product-card-rating-star { - height: 28px; - width: 20px; -} - -.gh-whats-new .kg-product-card-rating-star svg { - width: 16px; - height: 16px; - fill: currentColor; - opacity: 0.15; -} - -.gh-whats-new .kg-product-card-rating-star svg path { - fill: unset; -} - -.gh-whats-new .kg-product-card-rating-active.kg-product-card-rating-star svg { - opacity: 1; -} - -.gh-whats-new .kg-product-card a.kg-product-card-button { - justify-content: center; - grid-column: 1 / 3; - display: flex; - position: static; - align-items: center; - font-family: var(--font-family); - font-size: 0.95em; - font-weight: 600; - line-height: 1em; - text-decoration: none; - width: 100%; - height: 2.4em; - border-radius: 5px; - padding: 0 1.2em; - transition: opacity 0.2s ease-in-out; - margin: 0; -} - -.gh-whats-new .kg-product-card a.kg-product-card-btn-accent { - background-color: var(--accent-color); - color: #fff; -} - -.gh-whats-new .kg-blockquote-alt { - font-size: 1.5em; - font-style: italic; - line-height: 1.7em; - text-align: center; - padding: 0 2.5em; -} - -@media (max-width: 800px) { - .gh-whats-new .kg-blockquote-alt { - font-size: 1.4em; - padding-left: 2em; - padding-right: 2em; - } -} - -@media (max-width: 600px) { - .gh-whats-new .kg-blockquote-alt { - font-size: 1.2em; - padding-left: 1.75em; - padding-right: 1.75em; - } -} - -.gh-whats-new .kg-button-card { - display: flex; - position: static; - align-items: center; - width: 100%; - justify-content: flex-start; - padding: 30px 0; -} - -.gh-whats-new .kg-button-card.kg-align-left { - justify-content: flex-start; -} - -.gh-whats-new .kg-button-card a.kg-btn { - display: flex; - position: static; - align-items: center; - padding: 0 1.2em; - height: 2.4em; - line-height: 1em; - font-family: var(--font-family); - font-size: 0.95em; - font-weight: 600; - text-decoration: none; - border-radius: 5px; - transition: opacity 0.2s ease-in-out; -} - -.gh-whats-new .kg-button-card a.kg-btn:hover { - opacity: 0.85; -} - -.gh-whats-new .kg-button-card a.kg-btn-accent { - background-color: var(--accent-color); - color: #fff; -} - -.gh-whats-new .kg-callout-card { - display: flex; - padding: 1.2em 1.6em; - border-radius: 3px; -} - -.gh-whats-new .kg-callout-card-grey { - background: rgba(124, 139, 154, 0.13); -} - -.gh-whats-new .kg-callout-card-white { - background: transparent; - box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25); -} - -.gh-whats-new .kg-callout-card-blue { - background: rgba(33, 172, 232, 0.12); -} - -.gh-whats-new .kg-callout-card-green { - background: rgba(52, 183, 67, 0.12); -} - -.gh-whats-new .kg-callout-card-yellow { - background: rgba(240, 165, 15, 0.13); -} - -.gh-whats-new .kg-callout-card-red { - background: rgba(209, 46, 46, 0.11); -} - -.gh-whats-new .kg-callout-card-pink { - background: rgba(225, 71, 174, 0.11); -} - -.gh-whats-new .kg-callout-card-purple { - background: rgba(135, 85, 236, 0.12); -} - -.gh-whats-new .kg-callout-card-accent { - background: var(--ghost-accent-color); - color: #fff; -} - -.gh-whats-new .kg-callout-card-accent a { - color: #fff; -} - -.gh-whats-new .kg-callout-card div.kg-callout-emoji { - padding-right: .8em; - line-height: 1.25em; - font-size: 1.15em; -} - -.gh-whats-new .kg-callout-card div.kg-callout-text { - font-size: .95em; - line-height: 1.5em; -} - -.gh-whats-new .kg-callout-card + .kg-callout-card { - margin-top: 1em; -} - -.gh-whats-new .kg-file-card { - display: flex; -} - -.gh-whats-new .kg-file-card a.kg-file-card-container { - display: flex; - align-items: center; - justify-content: space-between; - color: inherit; - padding: 6px; - min-height: 92px; - border: 1px solid rgb(124 139 154 / 25%); - border-radius: 3px; - transition: all ease-in-out 0.35s; - text-decoration: none; - width: 100%; -} - -.gh-whats-new .kg-file-card a.kg-file-card-container:hover { - border: 1px solid rgb(124 139 154 / 35%); -} - -.gh-whats-new .kg-file-card-contents { - display: flex; - flex-direction: column; - justify-content: space-between; - margin: 4px 8px; -} - -.gh-whats-new .kg-file-card-title { - font-size: 1.15em; - font-weight: 700; - line-height: 1.3em; -} - -.gh-whats-new .kg-file-card-caption { - font-size: 0.95em; - line-height: 1.5em; - opacity: 0.6; -} - -.gh-whats-new .kg-file-card-metadata { - display: inline; - font-size: 0.825em; - line-height: 1.5em; - margin-top: 2px; -} - -.gh-whats-new .kg-file-card-filename { - display: inline; - font-weight: 500; -} - -.gh-whats-new .kg-file-card-filesize { - display: inline-block; - font-size: 0.925em; - opacity: 0.6; -} - -.gh-whats-new .kg-file-card-filesize:before { - display: inline-block; - content: "\2022"; - margin-right: 4px; -} - -.gh-whats-new .kg-file-card-icon { - position: relative; - display: flex; - align-items: center; - justify-content: center; - width: 80px; - min-width: 80px; - height: 100%; -} - -.gh-whats-new .kg-file-card-icon:before { - position: absolute; - display: block; - content: ""; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: currentColor; - opacity: 0.06; - transition: opacity ease-in-out 0.35s; - border-radius: 2px; -} - -.gh-whats-new .kg-file-card a.kg-file-card-container:hover .kg-file-card-icon:before { - opacity: 0.08; -} - -.gh-whats-new .kg-file-card-icon svg { - width: 24px; - height: 24px; - color: var(--ghost-accent-color); -} - -/* Size variations */ -.gh-whats-new .kg-file-card-medium a.kg-file-card-container { - min-height: 72px; -} - -.gh-whats-new .kg-file-card-medium .kg-file-card-caption { - opacity: 1.0; - font-weight: 500; -} - -.gh-whats-new .kg-file-card-small a.kg-file-card-container { - min-height: 52px; -} - -.gh-whats-new .kg-file-card-small .kg-file-card-metadata { - font-size: 1.0em; - margin-top: 0; -} - -.gh-whats-new .kg-file-card-small .kg-file-card-icon svg { - width: 20px; - height: 20px; -} - -.gh-whats-new .kg-file-card + .kg-file-card { - margin-top: 1em; -} - -.gh-whats-new .kg-nft-card { - display: flex; - flex-direction: column; - align-items: center; - width: 100%; - margin-left: auto; - margin-right: auto; -} - -.gh-whats-new .kg-nft-card a.kg-nft-card-container { - position: static; - display: flex; - flex: auto; - flex-direction: column; - text-decoration: none; - font-family: var(--font-family); - font-size: 14px; - font-weight: 400; - box-shadow: 0 2px 6px -2px rgb(0 0 0 / 10%), 0 0 1px rgb(0 0 0 / 40%); - width: 100%; - max-width: 512px; - color: #222; - background: #fff; - border-radius: 5px; - transition: none; -} - -.gh-whats-new .kg-nft-card * { - position: static; -} - -.gh-whats-new .kg-nft-metadata { - padding: 20px; - width: 100%; -} - -.gh-whats-new .kg-nft-image { - border-radius: 5px 5px 0 0; - width: 100%; -} - -.gh-whats-new .kg-nft-header { - display: flex; - justify-content: space-between; - align-items: flex-start; - gap: 20px; -} - -.gh-whats-new .kg-nft-header h4.kg-nft-title { - font-family: inherit; - font-size: 19px; - font-weight: 700; - line-height: 1.3em; - min-width: unset; - max-width: unset; - margin: 0; - color: #222; -} - -.gh-whats-new .kg-nft-opensea-logo { - margin-top: 2px; - width: 100px; - object-fit: scale-down; -} - -.gh-whats-new .kg-nft-creator { - font-family: inherit; - line-height: 1.4em; - margin: 4px 0 0; - color: #ababab; -} - -.gh-whats-new .kg-nft-creator span { - font-weight: 500; - color: #222; -} - -.gh-whats-new .kg-nft-card p.kg-nft-description { - font-family: inherit; - font-size: 14px; - line-height: 1.4em; - margin: 20px 0 0; - color: #222; -} - -.gh-whats-new .kg-toggle-card { - background: transparent; - box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25); - border-radius: 4px; - padding: 1.2em; -} - -.gh-whats-new .kg-toggle-card[data-kg-toggle-state="close"] .kg-toggle-content{ - height: 0; - overflow: hidden; - transition: opacity .5s ease, top .35s ease; - opacity: 0; - top: -0.5em; - position: relative; -} - -.gh-whats-new .kg-toggle-content { - height: auto; - opacity: 1; - transition: opacity 1s ease, top .35s ease; - top: 0; - position: relative; -} - -.gh-whats-new .kg-toggle-card[data-kg-toggle-state="close"] svg { - transform: unset; -} - -.gh-whats-new .kg-toggle-heading { - cursor: pointer; - display: flex; - justify-content: space-between; - align-items: flex-start; -} - -.gh-whats-new .kg-toggle-card h4.kg-toggle-heading-text { - font-size: 1.15em; - font-weight: 700; - line-height: 1.3em; - margin-top: 0; - margin-bottom: 0; - text-transform: none; - color: inherit; -} - -.gh-whats-new .kg-toggle-content p:first-of-type { - margin-top: 0.5em; -} - -.gh-whats-new .kg-toggle-card .kg-toggle-content p, -.gh-whats-new .kg-toggle-card .kg-toggle-content ol, -.gh-whats-new .kg-toggle-card .kg-toggle-content ul { - font-size: 0.95em; - line-height: 1.5em; - margin-top: 0.95em; -} - -.gh-whats-new .kg-toggle-card li + li { - margin-top: 0.5em; -} - -.gh-whats-new .kg-toggle-card-icon { - height: 24px; - width: 24px; - display: flex; - justify-content: center; - align-items: center; - margin-left: 1em; - background: none; - border: 0; -} - -.gh-whats-new .kg-toggle-heading svg { - width: 14px; - color: rgba(124, 139, 154, 0.5); - transition: all 0.3s; - transform: rotate(-180deg); -} - -.gh-whats-new .kg-toggle-heading path { - fill: none; - stroke: currentcolor; - stroke-linecap: round; - stroke-linejoin: round; - stroke-width: 1.5; - fill-rule: evenodd; -} - -.gh-whats-new .kg-toggle-card + .kg-toggle-card { - margin-top: 1em; -} - -.gh-whats-new .kg-video-card { - position: relative; - --seek-before-width: 0%; - --volume-before-width: 100%; - --buffered-width: 0%; -} - -.gh-whats-new .kg-video-card video { - display: block; - max-width: 100%; - height: auto; -} - -.gh-whats-new .kg-video-container { - position: relative; - display: flex; - flex-direction: column; - align-items: center; -} - -.gh-whats-new .kg-video-overlay { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - display: flex; - justify-content: center; - align-items: center; - background-image: linear-gradient(180deg,rgba(0,0,0,0.3) 0,transparent 70%,transparent 100%); - z-index: 99; - transition: opacity .2s ease-in-out; -} - -.gh-whats-new .kg-video-large-play-icon { - display: flex; - justify-content: center; - align-items: center; - width: 72px; - height: 72px; - padding: 0; - background: rgba(0, 0, 0, 0.5); - border-radius: 50%; - transition: opacity .2s ease-in-out; -} - -.gh-whats-new .kg-video-large-play-icon svg { - width: 20px; - height: auto; - margin-left: 2px; - fill: #fff; -} - -.gh-whats-new .kg-video-player-container { - position: absolute; - bottom: 0; - width: 100%; - height: 80px; - background: linear-gradient(rgba(0,0,0,0), rgba(0,0,0,.5)); - z-index: 99; - transition: opacity .2s ease-in-out; - -} - -.gh-whats-new .kg-video-player { - position: absolute; - bottom: 0; - display: flex; - align-items: center; - width: 100%; - z-index: 99; - padding: 12px 16px; -} - -.gh-whats-new .kg-video-current-time { - min-width: 38px; - padding: 0 4px; - color: #fff; - font-family: inherit; - font-size: .85em; - font-weight: 500; - line-height: 1.4em; - white-space: nowrap; -} - -.gh-whats-new .kg-video-time { - color: rgba(255, 255, 255, 0.6); - font-family: inherit; - font-size: .85em; - font-weight: 500; - line-height: 1.4em; - white-space: nowrap; -} - -.gh-whats-new .kg-video-duration { - padding: 0 4px; -} - -.gh-whats-new .kg-video-play-icon, -.gh-whats-new .kg-video-pause-icon { - position: relative; - padding: 0px 4px 0 0; - font-size: 0; - background: transparent; -} - -.gh-whats-new .kg-video-hide { - display: none !important; -} - -.gh-whats-new .kg-video-hide-animated { - opacity: 0 !important; - transition: opacity .2s ease-in-out; - cursor: initial; -} - -.gh-whats-new .kg-video-play-icon svg, -.gh-whats-new .kg-video-pause-icon svg { - width: 14px; - height: 14px; - fill: #fff; -} - -.gh-whats-new .kg-video-seek-slider { - flex-grow: 1; - margin: 0 4px; -} - -@media (max-width: 520px) { - .gh-whats-new .kg-video-seek-slider { - display: none; - } -} - -.gh-whats-new .kg-video-playback-rate { - min-width: 37px; - padding: 0 4px; - color: #fff; - font-family: inherit; - font-size: .85em; - font-weight: 600; - line-height: 1.4em; - text-align: left; - background: transparent; - white-space: nowrap; -} - -@media (max-width: 520px) { - .gh-whats-new .kg-video-playback-rate { - padding-left: 8px; - } -} - -.gh-whats-new .kg-video-mute-icon, -.gh-whats-new .kg-video-unmute-icon { - position: relative; - bottom: -1px; - padding: 0 4px; - font-size: 0; - background: transparent; -} - -@media (max-width: 520px) { - .gh-whats-new .kg-video-mute-icon, - .gh-whats-new .kg-video-unmute-icon { - margin-left: auto; - } -} - -.gh-whats-new .kg-video-mute-icon svg, -.gh-whats-new .kg-video-unmute-icon svg { - width: 16px; - height: 16px; - fill: #fff; -} - -.gh-whats-new .kg-video-volume-slider { - width: 80px; -} - -@media (max-width: 300px) { - .gh-whats-new .kg-video-volume-slider { - display: none; - } -} - -.gh-whats-new .kg-video-seek-slider::before { - content: ""; - position: absolute; - left: 0; - width: var(--seek-before-width) !important; - height: 4px; - cursor: pointer; - background-color: #EBEEF0; - border-radius: 2px; -} - -.gh-whats-new .kg-video-volume-slider::before { - content: ""; - position: absolute; - left: 0; - width: var(--volume-before-width) !important; - height: 4px; - cursor: pointer; - background-color: #EBEEF0; - border-radius: 2px; -} - -/* Resetting browser styles -/* --------------------------------------------------------------- */ - -.gh-whats-new .kg-video-card input[type=range] { - position: relative; - -webkit-appearance: none; - background: transparent; -} - -.gh-whats-new .kg-video-card input[type=range]:focus { - outline: none; -} - -.gh-whats-new .kg-video-card input[type=range]::-webkit-slider-thumb { - -webkit-appearance: none; -} - -.gh-whats-new .kg-video-card input[type=range]::-ms-track { - cursor: pointer; - border-color: transparent; - color: transparent; - background: transparent; -} - -.gh-whats-new .kg-video-card button { - display: flex; - align-items: center; - border: 0; - cursor: pointer; -} - -.gh-whats-new .kg-video-card input[type="range"] { - height: auto; - padding: 0; - border: 0; -} - -/* Chrome & Safari styles -/* --------------------------------------------------------------- */ - -.gh-whats-new .kg-video-card input[type="range"]::-webkit-slider-runnable-track { - width: 100%; - height: 4px; - cursor: pointer; - background: rgba(255, 255, 255, 0.2); - border-radius: 2px; -} - -.gh-whats-new .kg-video-card input[type="range"]::-webkit-slider-thumb { - position: relative; - box-sizing: content-box; - width: 13px; - height: 13px; - margin: -5px 0 0 0; - border: 0; - cursor: pointer; - background: #fff; - border-radius: 50%; - box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24); -} - -.gh-whats-new .kg-video-card input[type="range"]:active::-webkit-slider-thumb { - transform: scale(1.2); -} - -/* Firefox styles -/* --------------------------------------------------------------- */ - -.gh-whats-new .kg-video-card input[type="range"]::-moz-range-track { - width: 100%; - height: 4px; - cursor: pointer; - background: rgba(255, 255, 255, 0.2); - border-radius: 2px; -} - -.gh-whats-new .kg-video-card input[type="range"]::-moz-range-progress { - background: #EBEEF0; - border-radius: 2px; -} - -.gh-whats-new .kg-video-card input[type="range"]::-moz-range-thumb { - box-sizing: content-box; - width: 13px; - height: 13px; - border: 0; - cursor: pointer; - background: #fff; - border-radius: 50%; - box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24); -} - -.gh-whats-new .kg-video-card input[type="range"]:active::-moz-range-thumb { - transform: scale(1.2); -} - -/* Edge & IE styles -/* --------------------------------------------------------------- */ - -.gh-whats-new .kg-video-card input[type="range"]::-ms-track { - width: 100%; - height: 3px; - border: solid transparent; - color: transparent; - cursor: pointer; - background: transparent; -} - -.gh-whats-new .kg-video-card input[type="range"]::-ms-fill-lower { - background: #fff; -} - -.gh-whats-new .kg-video-card input[type="range"]::-ms-fill-upper { - background: #EBEEF0; -} - -.gh-whats-new .kg-video-card input[type="range"]::-ms-thumb { - box-sizing: content-box; - width: 13px; - height: 13px; - border: 0; - cursor: pointer; - background: #fff; - border-radius: 50%; - box-shadow: 0 0 0 1px rgba(0,0,0,.08), 0 1px 4px rgba(0,0,0,0.24); -} - -.gh-whats-new .kg-video-card input[type="range"]:active::-ms-thumb { - transform: scale(1.2); -} - -/* File card styles */ -.gh-whats-new .kg-file-card { - display: flex; -} - -.gh-whats-new .kg-file-card a.kg-file-card-container { - display: flex; - align-items: stretch; - justify-content: space-between; - color: inherit; - padding: 6px; - min-height: 92px; - border: 1px solid rgb(124 139 154 / 25%); - border-radius: 3px; - transition: all ease-in-out 0.35s; - text-decoration: none; - width: 100%; -} - -.gh-whats-new .kg-file-card a.kg-file-card-container:hover { - border: 1px solid rgb(124 139 154 / 35%); -} - -.gh-whats-new .kg-file-card-contents { - display: flex; - flex-direction: column; - justify-content: space-between; - margin: 4px 8px; - width: 100% -} - -.gh-whats-new .kg-file-card-title { - font-size: 1.15em; - font-weight: 700; - line-height: 1.3em; -} - -.gh-whats-new .kg-file-card-caption { - font-size: 0.95em; - line-height: 1.3em; - opacity: 0.6; -} - -.gh-whats-new .kg-file-card-title + .kg-file-card-caption { - margin-top: -6px; -} - -.gh-whats-new .kg-file-card-metadata { - display: inline; - font-size: 0.825em; - line-height: 1.3em; - margin-top: 2px; -} - -.gh-whats-new .kg-file-card-filename { - display: inline; - font-weight: 500; -} - -.gh-whats-new .kg-file-card-filesize { - display: inline-block; - font-size: 0.925em; - opacity: 0.6; -} - -.gh-whats-new .kg-file-card-filesize:before { - display: inline-block; - content: "\2022"; - margin-right: 4px; -} - -.gh-whats-new .kg-file-card-icon { - position: relative; - display: flex; - align-items: center; - justify-content: center; - width: 80px; - min-width: 80px; - height: 100%; -} - -.gh-whats-new .kg-file-card-icon:before { - position: absolute; - display: block; - content: ""; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: currentColor; - opacity: 0.06; - transition: opacity ease-in-out 0.35s; - border-radius: 2px; -} - -.gh-whats-new .kg-file-card a.kg-file-card-container:hover .kg-file-card-icon:before { - opacity: 0.08; -} - -.gh-whats-new .kg-file-card-icon svg { - width: 24px; - height: 24px; - color: var(--ghost-accent-color); -} - -.gh-whats-new .kg-file-card-medium a.kg-file-card-container { - min-height: 72px; -} - -.gh-whats-new .kg-file-card-medium .kg-file-card-caption { - opacity: 1.0; - font-weight: 500; -} - -.gh-whats-new .kg-file-card-small a.kg-file-card-container { - align-items: center; - min-height: 52px; -} - -.gh-whats-new .kg-file-card-small .kg-file-card-metadata { - font-size: 1.0em; - margin-top: 0; -} - -.gh-whats-new .kg-file-card-small .kg-file-card-icon svg { - width: 20px; - height: 20px; -} - -.gh-whats-new .kg-file-card + .kg-file-card { - margin-top: 1em; -} - -/* Header card */ - -.gh-whats-new .kg-header-card { - padding: 12vmin 4em; - min-height: 20vh; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - text-align: center; - margin-bottom: 1.5em; -} - -.gh-whats-new .kg-header-card.kg-size-small { - padding-top: 8vmin; - padding-bottom: 8vmin; - min-height: 12vh; -} - -.gh-whats-new .kg-header-card.kg-size-large { - padding-top: 12vmin; - padding-bottom: 12vmin; - min-height: 40vh; -} - -.gh-whats-new .kg-header-card.kg-align-left { - text-align: left; - align-items: flex-start; -} - -.gh-whats-new .kg-header-card.kg-style-dark { - background: #151515; - color: #ffffff; -} - -.gh-whats-new .kg-header-card.kg-style-light { - background-color: #fafafa; -} - -.gh-whats-new .kg-header-card.kg-style-accent { - background-color: var(--accent-color); -} - -.gh-whats-new .kg-header-card.kg-style-image { - position: relative; - background-color: #e7e7e7; - background-size: cover; - background-position: center; -} - -.gh-whats-new .kg-header-card.kg-style-image::before { - position: absolute; - display: block; - content: ""; - top: 0; - right: 0; - bottom: 0; - left: 0; - background: linear-gradient(0deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2)); -} - -.gh-whats-new .kg-header-card h2.kg-header-card-header { - font-size: 5em; - font-weight: 700; - line-height: 1.1em; - letter-spacing: -0.01em; - margin: 0; -} - -.gh-whats-new .kg-header-card h2.kg-header-card-header strong { - font-weight: 800; -} - -.gh-whats-new .kg-header-card.kg-size-small h2.kg-header-card-header { - font-size: 4em; -} - -.gh-whats-new .kg-header-card.kg-size-large h2.kg-header-card-header { - font-size: 6em; -} - -.gh-whats-new .kg-header-card h3.kg-header-card-subheader { - font-size: 1.5em; - font-weight: 500; - line-height: 1.4em; - margin: 0; - max-width: 40em; -} - -.gh-whats-new .kg-header-card h2 + h3.kg-header-card-subheader { - margin: 0.35em 0 0; -} - -.gh-whats-new .kg-header-card h3.kg-header-card-subheader strong { - font-weight: 600; -} - -.gh-whats-new .kg-header-card.kg-size-small h3.kg-header-card-subheader { - font-size: 1.25em; -} - -.gh-whats-new .kg-header-card.kg-size-large h3.kg-header-card-subheader { - font-size: 1.75em; -} - -.gh-whats-new .kg-header-card:not(.kg-style-light) h2.kg-header-card-header, -.gh-whats-new .kg-header-card:not(.kg-style-light) h3.kg-header-card-subheader { - color: #ffffff; -} - -.gh-whats-new .kg-header-card.kg-style-accent h3.kg-header-card-subheader, -.gh-whats-new .kg-header-card.kg-style-image h3.kg-header-card-subheader { - opacity: 1.0; -} - -.gh-whats-new .kg-header-card.kg-style-image h2.kg-header-card-header, -.gh-whats-new .kg-header-card.kg-style-image h3.kg-header-card-subheader, -.gh-whats-new .kg-header-card.kg-style-image a.kg-header-card-button { - z-index: 99; -} - -.gh-whats-new .kg-header-card h2.kg-header-card-header a, -.gh-whats-new .kg-header-card h3.kg-header-card-subheader a { - color: var(--ghost-accent-color); -} - -.gh-whats-new .kg-header-card.kg-style-accent h2.kg-header-card-header a, -.gh-whats-new .kg-header-card.kg-style-accent h3.kg-header-card-subheader a, -.gh-whats-new .kg-header-card.kg-style-image h2.kg-header-card-header a, -.gh-whats-new .kg-header-card.kg-style-image h3.kg-header-card-subheader a { - color: #fff; -} - -.gh-whats-new .kg-header-card a.kg-header-card-button { - display: flex; - position: static; - align-items: center; - fill: #fff; - background: #fff; - border-radius: 3px; - outline: none; - font-family: var(--font-family); - font-size: 1.05em; - font-weight: 600; - line-height: 1em; - text-align: center; - text-decoration: none; - letter-spacing: .2px; - white-space: nowrap; - text-overflow: ellipsis; - color: #151515; - height: 2.7em; - padding: 0 1.2em; - transition: opacity .2s ease; -} - -.gh-whats-new .kg-header-card h2 + a.kg-header-card-button, -.gh-whats-new .kg-header-card h3 + a.kg-header-card-button { - margin: 1.75em 0 0; -} - -.gh-whats-new .kg-header-card a.kg-header-card-button:hover { - opacity: 0.85; -} - -.gh-whats-new .kg-header-card.kg-size-large a.kg-header-card-button { - font-size: 1.1em; - height: 2.9em; -} - -.gh-whats-new .kg-header-card.kg-size-large h2 + a.kg-header-card-button, -.gh-whats-new .kg-header-card.kg-size-large h3 + a.kg-header-card-button { - margin-top: 2em; -} - -.gh-whats-new .kg-header-card.kg-size-small a.kg-header-card-button { - height: 2.4em; - font-size: 1em; -} - -.gh-whats-new .kg-header-card.kg-size-small h2 + a.kg-header-card-button, -.gh-whats-new .kg-header-card.kg-size-small h3 + a.kg-header-card-button { - margin-top: 1.5em; -} - -.gh-whats-new .kg-header-card.kg-style-image a.kg-header-card-button, -.gh-whats-new .kg-header-card.kg-style-dark a.kg-header-card-button { - background: #fff; - color: #151515; -} - -.gh-whats-new .kg-header-card.kg-style-light a.kg-header-card-button { - background: var(--ghost-accent-color); - color: #fff; -} - -.gh-whats-new .kg-header-card.kg-style-accent a.kg-header-card-button { - background: #fff; - color: #151515; -} - diff --git a/apps/admin-x-activitypub/src/App.tsx b/apps/admin-x-activitypub/src/App.tsx index 983751ea4581..efb1b2fdd221 100644 --- a/apps/admin-x-activitypub/src/App.tsx +++ b/apps/admin-x-activitypub/src/App.tsx @@ -1,4 +1,4 @@ -import MainContent from './MainContent'; +import ListIndex from './components/ListIndex'; import {DesignSystemApp, DesignSystemAppProps} from '@tryghost/admin-x-design-system'; import {FrameworkProvider, TopLevelFrameworkProps} from '@tryghost/admin-x-framework'; import {RoutingProvider} from '@tryghost/admin-x-framework/routing'; @@ -8,25 +8,16 @@ interface AppProps { designSystem: DesignSystemAppProps; } -const modals = { - paths: { - 'follow-site': 'FollowSite', - 'view-following': 'ViewFollowing', - 'view-followers': 'ViewFollowers' - }, - load: async () => import('./components/modals') -}; - const App: React.FC = ({framework, designSystem}) => { return ( - + - + ); }; -export default App; \ No newline at end of file +export default App; diff --git a/apps/admin-x-activitypub/src/MainContent.tsx b/apps/admin-x-activitypub/src/MainContent.tsx deleted file mode 100644 index 31ddedf3f885..000000000000 --- a/apps/admin-x-activitypub/src/MainContent.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import ActivityPubComponent from './components/ListIndex'; - -const MainContent = () => { - return ; -}; - -export default MainContent; diff --git a/apps/admin-x-activitypub/src/assets/images/ap-welcome.png b/apps/admin-x-activitypub/src/assets/images/ap-welcome.png deleted file mode 100644 index 189768bcc5de..000000000000 Binary files a/apps/admin-x-activitypub/src/assets/images/ap-welcome.png and /dev/null differ diff --git a/apps/admin-x-activitypub/src/components/FollowSite.tsx b/apps/admin-x-activitypub/src/components/FollowSite.tsx deleted file mode 100644 index c137e9f87028..000000000000 --- a/apps/admin-x-activitypub/src/components/FollowSite.tsx +++ /dev/null @@ -1,85 +0,0 @@ -import NiceModal from '@ebay/nice-modal-react'; -import {Modal, TextField, showToast} from '@tryghost/admin-x-design-system'; -import {useFollow} from '@tryghost/admin-x-framework/api/activitypub'; -import {useQueryClient} from '@tryghost/admin-x-framework'; -import {useRouting} from '@tryghost/admin-x-framework/routing'; -import {useState} from 'react'; - -// const sleep = (ms: number) => ( -// new Promise((resolve) => { -// setTimeout(resolve, ms); -// }) -// ); - -const FollowSite = NiceModal.create(() => { - const {updateRoute} = useRouting(); - const modal = NiceModal.useModal(); - const mutation = useFollow(); - const client = useQueryClient(); - - // mutation.isPending - // mutation.isError - // mutation.isSuccess - // mutation.mutate({username: '@index@site.com'}) - // mutation.reset(); - - // State to manage the text field value - const [profileName, setProfileName] = useState(''); - // const [success, setSuccess] = useState(false); - const [errorMessage, setError] = useState(null); - - const handleFollow = async () => { - try { - // Perform the mutation - await mutation.mutateAsync({username: profileName}); - // If successful, set the success state to true - // setSuccess(true); - showToast({ - message: 'Site followed', - type: 'success' - }); - - // // Because we don't return the new follower data from the API, we need to wait a bit to let it process and then update the query. - // // This is a dirty hack and should be replaced with a better solution. - // await sleep(2000); - - modal.remove(); - // Refetch the following data. - // At this point it might not be updated yet, but it will be eventually. - await client.refetchQueries({queryKey: ['FollowingResponseData'], type: 'active'}); - updateRoute(''); - } catch (error) { - // If there's an error, set the error state - setError(errorMessage); - } - }; - - return ( - { - mutation.reset(); - updateRoute(''); - }} - cancelLabel='Cancel' - okLabel='Follow' - size='sm' - title='Follow a Ghost site' - onOk={handleFollow} - > -
- setProfileName(e.target.value)} - /> -
- - ); -}); - -export default FollowSite; diff --git a/apps/admin-x-activitypub/src/components/ListIndex.tsx b/apps/admin-x-activitypub/src/components/ListIndex.tsx index 7c109c8ba81f..7156dba14575 100644 --- a/apps/admin-x-activitypub/src/components/ListIndex.tsx +++ b/apps/admin-x-activitypub/src/components/ListIndex.tsx @@ -1,282 +1,26 @@ -// import NiceModal from '@ebay/nice-modal-react'; -// import ActivityPubWelcomeImage from '../assets/images/ap-welcome.png'; -import React, {useState} from 'react'; -import articleBodyStyles from './articleBodyStyles'; -import getUsername from '../utils/get-username'; -import {ActorProperties, ObjectProperties, useBrowseFollowersForUser, useBrowseFollowingForUser, useBrowseInboxForUser} from '@tryghost/admin-x-framework/api/activitypub'; -import {Avatar, Button, Heading, List, ListItem, Page, SettingValue, ViewContainer, ViewTab} from '@tryghost/admin-x-design-system'; -import {useBrowseSite} from '@tryghost/admin-x-framework/api/site'; -import {useRouting} from '@tryghost/admin-x-framework/routing'; - -interface ViewArticleProps { - object: ObjectProperties, - onBackToList: () => void; -} - -const ActivityPubComponent: React.FC = () => { - const {updateRoute} = useRouting(); - - // TODO: Replace with actual user ID - const {data: {items: activities = []} = {}} = useBrowseInboxForUser('index'); - const {data: {totalItems: followingCount = 0} = {}} = useBrowseFollowingForUser('index'); - const {data: {totalItems: followersCount = 0} = {}} = useBrowseFollowersForUser('index'); - - const [articleContent, setArticleContent] = useState(null); - const [, setArticleActor] = useState(null); - - const handleViewContent = (object: ObjectProperties, actor: ActorProperties) => { - setArticleContent(object); - setArticleActor(actor); - }; - - const handleBackToList = () => { - setArticleContent(null); - }; - - const [selectedTab, setSelectedTab] = useState('inbox'); - - const tabs: ViewTab[] = [ - { - id: 'inbox', - title: 'Inbox', - contents:
-
    - {activities && activities.some(activity => activity.type === 'Create' && activity.object.type === 'Article') ? (activities.slice().reverse().map(activity => ( - activity.type === 'Create' && activity.object.type === 'Article' && -
  • handleViewContent(activity.object, activity.actor)}> - -
    • - ))) :
    -
    - {/* Ghost site logos */} - Welcome to ActivityPub -

    We’re so glad to have you on board! At the moment, you can follow other Ghost sites and enjoy their content right here inside Ghost.

    -

    You can see all of the users on the right—find your favorite ones and give them a follow.

    -
    -
    } -
- -
- }, - { - id: 'activity', - title: 'Activity', - contents:
- {activities && activities.slice().reverse().map(activity => ( - activity.type === 'Like' && } id='list-item' title={
{activity.actor.name} liked your post {activity.object.name}
}> - ))} - - -
- }, - { - id: 'likes', - title: 'Likes', - contents:
-
    - {activities && activities.slice().reverse().map(activity => ( - activity.type === 'Create' && activity.object.type === 'Article' && -
  • handleViewContent(activity.object, activity.actor)}> - -
    • - ))} -
- -
- } - ]; - +const ListIndex = () => { return ( - - {!articleContent ? ( - { - updateRoute('follow-site'); - }, - icon: 'add' - }} - selectedTab={selectedTab} - stickyHeader={true} - tabs={tabs} - toolbarBorder={false} - type='page' - onTabChange={setSelectedTab} - > - - - ) : ( - - )} - - - ); -}; - -const Sidebar: React.FC<{followingCount: number, followersCount: number, updateRoute: (route: string) => void}> = ({followingCount, followersCount, updateRoute}) => ( -
-
-
-
-
updateRoute('/view-following')}> - {followingCount} - Following→ +
+

ActivityPub Demo

+
+
+

This is a post title

+

This is some very short post content

+

Publish McPublisher

+
+
+

This is a post title

+

This is some very short post content

+

Publish McPublisher

-
updateRoute('/view-followers')}> - {followersCount} - Followers→ +
+

This is a post title

+

This is some very short post content

+

Publish McPublisher

-
-
- Explore -
- - {}} />} avatar={} detail='829 followers' hideActions={true} title='404 Media' /> - {}} />} avatar={} detail='791 followers' hideActions={true} title='The Browser' /> - {}} />} avatar={} detail='854 followers' hideActions={true} title='Welcome to Hell World' /> - -
-
-); - -const ArticleBody: React.FC<{heading: string, image: string|undefined, html: string}> = ({heading, image, html}) => { - // const dangerouslySetInnerHTML = {__html: html}; - // const cssFile = '../index.css'; - const site = useBrowseSite(); - const siteData = site.data?.site; - - const cssContent = articleBodyStyles(siteData?.url.replace(/\/$/, '')); - - const htmlContent = ` - - - ${cssContent} - - -
-

${heading}

-${image && - `
- ${heading} -
` -} -
-
- ${html} -
- - -`; - - return ( - - ); -}; - -const ObjectContentDisplay: React.FC<{actor: ActorProperties, object: ObjectProperties }> = ({actor, object}) => { - const parser = new DOMParser(); - const doc = parser.parseFromString(object.content || '', 'text/html'); - - const plainTextContent = doc.body.textContent; - const timestamp = - new Date(object?.published ?? new Date()).toLocaleDateString('default', {year: 'numeric', month: 'short', day: '2-digit'}) + ', ' + new Date(object?.published ?? new Date()).toLocaleTimeString('default', {hour: '2-digit', minute: '2-digit'}); - - const [isClicked, setIsClicked] = useState(false); - const [isLiked, setIsLiked] = useState(false); - - const handleLikeClick = (event: React.MouseEvent | undefined) => { - event?.stopPropagation(); - setIsClicked(true); - setIsLiked(!isLiked); - setTimeout(() => setIsClicked(false), 300); // Reset the animation class after 300ms - }; - - return ( - <> - {object && ( -
-
- - {actor.name} - {getUsername(actor)} - {timestamp} -
-
-
-
- {object.name} -
-

{plainTextContent}

-
-
-
- {object.image &&
- -
} -
-
- {/*
*/} -
- )} - - ); -}; - -const ViewArticle: React.FC = ({object, onBackToList}) => { - const {updateRoute} = useRouting(); - - const [isClicked, setIsClicked] = useState(false); - const [isLiked, setIsLiked] = useState(false); - - const handleLikeClick = (event: React.MouseEvent | undefined) => { - event?.stopPropagation(); - setIsClicked(true); - setIsLiked(!isLiked); - setTimeout(() => setIsClicked(false), 300); // Reset the animation class after 300ms - }; - - return ( - - -
-
-
-
-
-
-
-
-
-
-
- -
- - ); }; -export default ActivityPubComponent; +export default ListIndex; diff --git a/apps/admin-x-activitypub/src/components/ViewFollowers.tsx b/apps/admin-x-activitypub/src/components/ViewFollowers.tsx deleted file mode 100644 index bff12ef78c45..000000000000 --- a/apps/admin-x-activitypub/src/components/ViewFollowers.tsx +++ /dev/null @@ -1,45 +0,0 @@ -import {} from '@tryghost/admin-x-framework/api/activitypub'; -import NiceModal from '@ebay/nice-modal-react'; -import getUsername from '../utils/get-username'; -import {Avatar, Button, List, ListItem, Modal} from '@tryghost/admin-x-design-system'; -import {FollowingResponseData, useBrowseFollowersForUser, useFollow} from '@tryghost/admin-x-framework/api/activitypub'; -import {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing'; - -interface ViewFollowersModalProps { - following: FollowingResponseData[], - animate?: boolean -} - -const ViewFollowersModal: React.FC = ({}) => { - const {updateRoute} = useRouting(); - // const modal = NiceModal.useModal(); - const mutation = useFollow(); - - const {data: {items = []} = {}} = useBrowseFollowersForUser('inbox'); - - const followers = Array.isArray(items) ? items : [items]; - return ( - { - mutation.reset(); - updateRoute(''); - }} - cancelLabel='' - footer={false} - okLabel='' - size='md' - title='Followers' - topRightContent='close' - > -
- - {followers.map(item => ( - mutation.mutate({username: getUsername(item)})} />} avatar={} detail={getUsername(item)} id='list-item' title={item.name}> - ))} - -
- - ); -}; - -export default NiceModal.create(ViewFollowersModal); diff --git a/apps/admin-x-activitypub/src/components/ViewFollowing.tsx b/apps/admin-x-activitypub/src/components/ViewFollowing.tsx deleted file mode 100644 index 4a5bc82cd689..000000000000 --- a/apps/admin-x-activitypub/src/components/ViewFollowing.tsx +++ /dev/null @@ -1,60 +0,0 @@ -import {} from '@tryghost/admin-x-framework/api/activitypub'; -import NiceModal from '@ebay/nice-modal-react'; -import getUsername from '../utils/get-username'; -import {Avatar, Button, List, ListItem, Modal} from '@tryghost/admin-x-design-system'; -import {FollowingResponseData, useBrowseFollowingForUser, useUnfollow} from '@tryghost/admin-x-framework/api/activitypub'; -import {RoutingModalProps, useRouting} from '@tryghost/admin-x-framework/routing'; - -interface ViewFollowingModalProps { - following: FollowingResponseData[], - animate?: boolean -} - -const ViewFollowingModal: React.FC = ({}) => { - const {updateRoute} = useRouting(); - const mutation = useUnfollow(); - - const {data: {items = []} = {}} = useBrowseFollowingForUser('inbox'); - - const following = Array.isArray(items) ? items : [items]; - return ( - { - mutation.reset(); - updateRoute(''); - }} - cancelLabel='' - footer={false} - okLabel='' - size='md' - title='Following' - topRightContent='close' - > -
- - {following.map(item => ( - mutation.mutate({username: getUsername(item)})} />} avatar={} detail={getUsername(item)} id='list-item' title={item.name}> - ))} - - {/* - - -
-
-
- - Platformer Platformer Platformer Platformer Platformer - @index@platformerplatformerplatformerplatformer.news -
-
-
- -
Unfollow
 - -
*/} -
- - ); -}; - -export default NiceModal.create(ViewFollowingModal); diff --git a/apps/admin-x-activitypub/src/components/articleBodyStyles.ts b/apps/admin-x-activitypub/src/components/articleBodyStyles.ts deleted file mode 100644 index 4475737005cc..000000000000 --- a/apps/admin-x-activitypub/src/components/articleBodyStyles.ts +++ /dev/null @@ -1,5911 +0,0 @@ -const articleBodyStyles = (siteUrl: string|undefined) => { - return ``; -}; - -export default articleBodyStyles; diff --git a/apps/admin-x-activitypub/src/components/modals.tsx b/apps/admin-x-activitypub/src/components/modals.tsx deleted file mode 100644 index 5764840ba39c..000000000000 --- a/apps/admin-x-activitypub/src/components/modals.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import FollowSite from './FollowSite'; -import ViewFollowers from './ViewFollowers'; -import ViewFollowing from './ViewFollowing'; -import {ModalComponent} from '@tryghost/admin-x-framework/routing'; - -// eslint-disable-next-line @typescript-eslint/no-explicit-any -const modals = {FollowSite, ViewFollowing, ViewFollowers} satisfies {[key: string]: ModalComponent}; - -export default modals; - -export type ModalName = keyof typeof modals; diff --git a/apps/admin-x-activitypub/src/styles/index.css b/apps/admin-x-activitypub/src/styles/index.css index c3b58ac68289..d1f1f198edf8 100644 --- a/apps/admin-x-activitypub/src/styles/index.css +++ b/apps/admin-x-activitypub/src/styles/index.css @@ -1,25 +1 @@ @import '@tryghost/admin-x-design-system/styles.css'; - -.admin-x-base.admin-x-activitypub { - animation-name: none; -} - -@keyframes bump { - 0% { - transform: scale(1); - } - 50% { - transform: scale(1.1); - } - 100% { - transform: scale(1); - } - } - -.bump { -animation: bump 0.3s ease-in-out; -} - -.ap-red-heart path { - fill: #F50B23; -} \ No newline at end of file diff --git a/apps/admin-x-activitypub/src/utils/get-username.ts b/apps/admin-x-activitypub/src/utils/get-username.ts deleted file mode 100644 index 2fd6099e337d..000000000000 --- a/apps/admin-x-activitypub/src/utils/get-username.ts +++ /dev/null @@ -1,12 +0,0 @@ -function getUsername(actor: {preferredUsername: string; id: string|null;}) { - if (!actor.preferredUsername || !actor.id) { - return '@unknown@unknown'; - } - try { - return `@${actor.preferredUsername}@${(new URL(actor.id)).hostname}`; - } catch (err) { - return '@unknown@unknown'; - } -} - -export default getUsername; diff --git a/apps/admin-x-activitypub/test/acceptance/app.test.ts b/apps/admin-x-activitypub/test/acceptance/app.test.ts index 90fa60d84280..9e84a05428c7 100644 --- a/apps/admin-x-activitypub/test/acceptance/app.test.ts +++ b/apps/admin-x-activitypub/test/acceptance/app.test.ts @@ -5,6 +5,6 @@ test.describe('Demo', async () => { test('Renders the list page', async ({page}) => { await page.goto('/'); - await expect(page.locator('body')).toContainText('ActivityPub Inbox'); + await expect(page.locator('body')).toContainText('ActivityPub Demo'); }); }); diff --git a/apps/admin-x-activitypub/test/acceptance/listIndex.test.ts b/apps/admin-x-activitypub/test/acceptance/listIndex.test.ts deleted file mode 100644 index 8e855d1e2151..000000000000 --- a/apps/admin-x-activitypub/test/acceptance/listIndex.test.ts +++ /dev/null @@ -1,52 +0,0 @@ -import {expect, test} from '@playwright/test'; -import {mockApi, responseFixtures} from '@tryghost/admin-x-framework/test/acceptance'; - -test.describe('ListIndex', async () => { - test('Renders the list page', async ({page}) => { - const userId = 'index'; - await mockApi({ - page, - requests: { - useBrowseInboxForUser: {method: 'GET', path: `/inbox/${userId}`, response: responseFixtures.activitypubInbox}, - useBrowseFollowingForUser: {method: 'GET', path: `/following/${userId}`, response: responseFixtures.activitypubFollowing} - }, - options: {useActivityPub: true} - }); - - // Printing browser consol logs - page.on('console', (msg) => { - console.log(`Browser console log: ${msg.type()}: ${msg.text()}`); /* eslint-disable-line no-console */ - }); - - await page.goto('/'); - - await expect(page.locator('body')).toContainText('ActivityPub Inbox'); - - // following list - const followingUser = await page.locator('[data-test-following] > li').textContent(); - await expect(followingUser).toEqual('@index@main.ghost.org'); - const followingCount = await page.locator('[data-test-following-count]').textContent(); - await expect(followingCount).toEqual('1'); - - // following button - const followingList = await page.locator('[data-test-following-modal]'); - await expect(followingList).toBeVisible(); - - // activities - const activity = await page.locator('[data-test-activity-heading]').textContent(); - await expect(activity).toEqual('Testing ActivityPub'); - - // click on article - const articleBtn = await page.locator('[data-test-view-article]'); - await articleBtn.click(); - - // article is expanded - const frameLocator = page.frameLocator('#gh-ap-article-iframe'); - const textElement = await frameLocator.locator('[data-test-article-heading]').innerText(); - expect(textElement).toContain('Testing ActivityPub'); - - // go back to list - const backBtn = await page.locator('[data-test-back-button]'); - await backBtn.click(); - }); -}); diff --git a/apps/admin-x-activitypub/test/unit/ListIndex.test.tsx b/apps/admin-x-activitypub/test/unit/ListIndex.test.tsx new file mode 100644 index 000000000000..50459c8584ee --- /dev/null +++ b/apps/admin-x-activitypub/test/unit/ListIndex.test.tsx @@ -0,0 +1,10 @@ +import ListIndex from '../../src/components/ListIndex'; +import {render, screen} from '@testing-library/react'; + +describe('Demo', function () { + it('renders a component', async function () { + render(); + + expect(screen.getAllByRole('heading')[0].textContent).toEqual('ActivityPub Demo'); + }); +}); diff --git a/apps/admin-x-activitypub/test/unit/utils/get-username.test.tsx b/apps/admin-x-activitypub/test/unit/utils/get-username.test.tsx deleted file mode 100644 index 8ca868b1c9ba..000000000000 --- a/apps/admin-x-activitypub/test/unit/utils/get-username.test.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import getUsername from '../../../src/utils/get-username'; - -describe('getUsername', function () { - it('returns the formatted username', async function () { - const user = { - preferredUsername: 'index', - id: 'https://www.platformer.news/' - }; - - const result = getUsername(user); - - expect(result).toBe('@index@www.platformer.news'); - }); - - it('returns a default username if the user object is missing data', async function () { - const user = { - preferredUsername: '', - id: '' - }; - - const result = getUsername(user); - - expect(result).toBe('@unknown@unknown'); - }); - - it('returns a default username if url parsing fails', async function () { - const user = { - preferredUsername: 'index', - id: 'not-a-url' - }; - - const result = getUsername(user); - - expect(result).toBe('@unknown@unknown'); - }); -}); diff --git a/apps/admin-x-demo/package.json b/apps/admin-x-demo/package.json index 426e969f5c4f..0c8088c869ab 100644 --- a/apps/admin-x-demo/package.json +++ b/apps/admin-x-demo/package.json @@ -35,7 +35,7 @@ "@testing-library/react": "14.1.0", "@tryghost/admin-x-design-system": "0.0.0", "@tryghost/admin-x-framework": "0.0.0", - "@types/react": "18.3.3", + "@types/react": "18.3.2", "@types/react-dom": "18.3.0", "react": "18.3.1", "react-dom": "18.3.1" diff --git a/apps/admin-x-design-system/package.json b/apps/admin-x-design-system/package.json index 1b075723a93d..e4e3cad1a0dd 100644 --- a/apps/admin-x-design-system/package.json +++ b/apps/admin-x-design-system/package.json @@ -26,13 +26,13 @@ "tailwind.config.cjs" ], "devDependencies": { - "@codemirror/lang-html": "6.4.9", - "@storybook/addon-essentials": "7.6.20", - "@storybook/addon-interactions": "7.6.20", - "@storybook/addon-links": "7.6.20", + "@codemirror/lang-html": "^6.4.5", + "@storybook/addon-essentials": "7.6.19", + "@storybook/addon-interactions": "7.6.19", + "@storybook/addon-links": "7.6.19", "@storybook/addon-styling": "1.3.7", - "@storybook/blocks": "7.6.20", - "@storybook/react": "7.6.20", + "@storybook/blocks": "7.6.19", + "@storybook/react": "7.6.19", "@storybook/react-vite": "7.6.4", "@storybook/testing-library": "0.2.2", "@testing-library/react": "14.1.0", @@ -41,13 +41,12 @@ "eslint-plugin-react-hooks": "4.6.0", "eslint-plugin-react-refresh": "0.4.3", "eslint-plugin-tailwindcss": "3.13.0", - "jsdom": "24.1.0", "mocha": "10.2.0", - "react": "18.3.1", - "react-dom": "18.3.1", + "react": "^18.2.0", + "react-dom": "^18.2.0", "rollup-plugin-node-builtins": "2.1.2", "sinon": "17.0.0", - "storybook": "7.6.20", + "storybook": "7.6.19", "ts-node": "10.9.2", "typescript": "5.4.5", "vite": "4.5.3", @@ -57,18 +56,18 @@ "@dnd-kit/core": "6.1.0", "@dnd-kit/sortable": "7.0.2", "@ebay/nice-modal-react": "1.2.13", - "@sentry/react": "7.118.0", + "@sentry/react": "7.114.0", "@tailwindcss/forms": "0.5.7", "@tailwindcss/line-clamp": "0.4.4", - "@uiw/react-codemirror": "4.22.2", + "@uiw/react-codemirror": "^4.21.9", "autoprefixer": "10.4.19", "clsx": "2.1.1", - "postcss": "8.4.39", + "postcss": "8.4.38", "postcss-import": "16.1.0", - "react-colorful": "5.6.1", + "react-colorful": "^5.1.2", "react-hot-toast": "2.4.1", "react-select": "5.8.0", - "tailwindcss": "3.4.4" + "tailwindcss": "3.4.3" }, "peerDependencies": { "react": "^18.2.0", diff --git a/apps/admin-x-design-system/src/global/Button.tsx b/apps/admin-x-design-system/src/global/Button.tsx index 2464e98f15a2..5c91bfeb26b3 100644 --- a/apps/admin-x-design-system/src/global/Button.tsx +++ b/apps/admin-x-design-system/src/global/Button.tsx @@ -3,7 +3,7 @@ import React, {HTMLProps} from 'react'; import clsx from 'clsx'; import {LoadingIndicator, LoadingIndicatorColor, LoadingIndicatorSize} from './LoadingIndicator'; -export type ButtonColor = 'clear' | 'light-grey' | 'grey' | 'black' | 'green' | 'red' | 'white' | 'outline'; +export type ButtonColor = 'clear' | 'grey' | 'black' | 'green' | 'red' | 'white' | 'outline'; export type ButtonSize = 'sm' | 'md'; export interface ButtonProps extends Omit, 'label' | 'size' | 'children'> { @@ -75,13 +75,6 @@ const Button: React.FC = ({ loadingIndicatorColor = 'light'; iconColorClass = iconColorClass || 'text-white'; break; - case 'light-grey': - className = clsx( - link ? 'text-grey-800 hover:text-green-400 dark:text-white' : `bg-grey-200 text-black dark:bg-grey-900 dark:text-white ${!disabled && 'hover:!bg-grey-300 dark:hover:!bg-grey-800'}`, - className - ); - loadingIndicatorColor = 'dark'; - break; case 'grey': className = clsx( link ? 'text-black hover:text-grey-800 dark:text-white' : `bg-grey-100 text-black dark:bg-grey-900 dark:text-white ${!disabled && 'hover:!bg-grey-300 dark:hover:!bg-grey-800'}`, @@ -121,7 +114,7 @@ const Button: React.FC = ({ break; default: className = clsx( - link ? ' text-black hover:text-grey-800 dark:text-white' : `text-grey-900 dark:text-white dark:hover:bg-grey-900 ${!disabled && 'hover:bg-grey-200 hover:text-black'}`, + link ? ' text-black hover:text-grey-800 dark:text-white' : `text-black dark:text-white dark:hover:bg-grey-900 ${!disabled && 'hover:bg-grey-200'}`, (outlineOnMobile && !link) && 'border border-grey-300 hover:border-transparent md:border-transparent', className ); diff --git a/apps/admin-x-design-system/src/global/ButtonGroup.stories.tsx b/apps/admin-x-design-system/src/global/ButtonGroup.stories.tsx index 850c8d7baba6..eb007ad9ca14 100644 --- a/apps/admin-x-design-system/src/global/ButtonGroup.stories.tsx +++ b/apps/admin-x-design-system/src/global/ButtonGroup.stories.tsx @@ -33,14 +33,6 @@ export const Default: Story = { } }; -export const Small: Story = { - args: { - buttons: defaultButtons, - link: false, - size: 'sm' - } -}; - const linkButtons: ButtonProps[] = [ { label: 'Cancel', @@ -58,4 +50,21 @@ export const LinkButtons: Story = { buttons: linkButtons, link: true } +}; + +export const WithBackground: Story = { + args: { + buttons: linkButtons, + link: true, + clearBg: false + } +}; + +export const SmallWithBackground: Story = { + args: { + buttons: linkButtons, + link: true, + clearBg: false, + size: 'sm' + } }; \ No newline at end of file diff --git a/apps/admin-x-design-system/src/global/ButtonGroup.tsx b/apps/admin-x-design-system/src/global/ButtonGroup.tsx index 26697d497763..f41d9b0fa4f6 100644 --- a/apps/admin-x-design-system/src/global/ButtonGroup.tsx +++ b/apps/admin-x-design-system/src/global/ButtonGroup.tsx @@ -17,7 +17,7 @@ export interface ButtonGroupProps { const ButtonGroup: React.FC = ({size = 'md', buttons, link, linkWithPadding, clearBg = true, outlineOnMobile, className}) => { let groupColorClasses = clsx( 'flex items-center justify-start rounded', - link ? 'gap-4' : 'gap-2', + link ? 'gap-4' : 'gap-3', className ); @@ -33,7 +33,7 @@ const ButtonGroup: React.FC = ({size = 'md', buttons, link, li return (
{buttons.map(({key, ...props}) => ( -
); diff --git a/apps/admin-x-design-system/src/global/Toast.stories.tsx b/apps/admin-x-design-system/src/global/Toast.stories.tsx index bdb5deb86bab..90cef8de10f3 100644 --- a/apps/admin-x-design-system/src/global/Toast.stories.tsx +++ b/apps/admin-x-design-system/src/global/Toast.stories.tsx @@ -1,6 +1,7 @@ import type {Meta, StoryObj} from '@storybook/react'; import {ReactNode} from 'react'; +import {Toaster} from 'react-hot-toast'; import Button from './Button'; import {ShowToastProps, showToast} from './Toast'; @@ -24,6 +25,7 @@ const meta = { tags: ['autodocs'], decorators: [(_story: () => ReactNode) => ( <> + {_story()} )] diff --git a/apps/admin-x-design-system/src/global/form/TextArea.tsx b/apps/admin-x-design-system/src/global/form/TextArea.tsx index 5bda018ca5c4..6a3c1e3b66c7 100644 --- a/apps/admin-x-design-system/src/global/form/TextArea.tsx +++ b/apps/admin-x-design-system/src/global/form/TextArea.tsx @@ -18,6 +18,7 @@ export interface TextAreaProps extends HTMLProps { error?: boolean; placeholder?: string; hint?: React.ReactNode; + clearBg?: boolean; fontStyle?: FontStyles; className?: string; onChange?: (event: React.ChangeEvent) => void; diff --git a/apps/admin-x-design-system/src/global/form/Toggle.tsx b/apps/admin-x-design-system/src/global/form/Toggle.tsx index 4a3df9987f1c..5a056cd21a77 100644 --- a/apps/admin-x-design-system/src/global/form/Toggle.tsx +++ b/apps/admin-x-design-system/src/global/form/Toggle.tsx @@ -9,7 +9,6 @@ export type ToggleDirections = 'ltr' | 'rtl'; export interface ToggleProps { checked?: boolean; disabled?: boolean; - name?: string; error?: boolean; size?: ToggleSizes; label?: React.ReactNode; @@ -34,7 +33,6 @@ const Toggle: React.FC = ({ error, checked, disabled, - name, onChange }) => { const id = useId(); @@ -97,7 +95,6 @@ const Toggle: React.FC = ({ )} disabled={disabled} id={id} - name={name} role="switch" type="checkbox" onChange={onChange} /> diff --git a/apps/admin-x-design-system/src/global/layout/ViewContainer.tsx b/apps/admin-x-design-system/src/global/layout/ViewContainer.tsx index 38289b4bad54..f7878b71db5b 100644 --- a/apps/admin-x-design-system/src/global/layout/ViewContainer.tsx +++ b/apps/admin-x-design-system/src/global/layout/ViewContainer.tsx @@ -251,7 +251,7 @@ const ViewContainer: React.FC = ({ return (
- {(title || actions || headerContent || tabs) && toolbar} + {(title || actions || headerContent) && toolbar}
{mainContent}
diff --git a/apps/admin-x-design-system/src/global/modal/Modal.tsx b/apps/admin-x-design-system/src/global/modal/Modal.tsx index e959a3c89f12..2377c3de3fb2 100644 --- a/apps/admin-x-design-system/src/global/modal/Modal.tsx +++ b/apps/admin-x-design-system/src/global/modal/Modal.tsx @@ -27,7 +27,6 @@ export interface ModalProps { cancelLabel?: string; leftButtonProps?: ButtonProps; buttonsDisabled?: boolean; - okDisabled?: boolean; footer?: boolean | React.ReactNode; header?: boolean; padding?: boolean; @@ -63,7 +62,6 @@ const Modal: React.FC = ({ header, leftButtonProps, buttonsDisabled, - okDisabled, padding = true, onOk, okColor = 'black', @@ -181,7 +179,7 @@ const Modal: React.FC = ({ color: okColor, className: 'min-w-[80px]', onClick: onOk, - disabled: buttonsDisabled || okDisabled, + disabled: buttonsDisabled, loading: okLoading }); } diff --git a/apps/admin-x-design-system/src/settings/SettingGroup.tsx b/apps/admin-x-design-system/src/settings/SettingGroup.tsx index 2a620534fc2b..7c3ab39191c9 100644 --- a/apps/admin-x-design-system/src/settings/SettingGroup.tsx +++ b/apps/admin-x-design-system/src/settings/SettingGroup.tsx @@ -78,7 +78,6 @@ const SettingGroup = forwardRef(function Sett styles += ' border-grey-250 dark:border-grey-925'; - // The links visible before editing const viewButtons: ButtonProps[] = []; if (!hideEditButton) { @@ -90,7 +89,7 @@ const SettingGroup = forwardRef(function Sett { label, key: 'edit', - color: 'clear', + color: 'green', onClick: handleEdit } ); @@ -105,7 +104,6 @@ const SettingGroup = forwardRef(function Sett ); } - // The buttons that show when you are editing const editButtons: ButtonProps[] = [ { label: 'Cancel', @@ -121,10 +119,9 @@ const SettingGroup = forwardRef(function Sett } editButtons.push( { - label: label, + label, key: 'save', - color: saveState === 'unsaved' ? 'green' : 'light-grey', - disabled: saveState !== 'unsaved', + color: 'green', onClick: handleSave } ); @@ -154,35 +151,18 @@ const SettingGroup = forwardRef(function Sett styles ); - if (!isEditing) { - return ( -
-
- {customHeader ? customHeader : - - {customButtons ? customButtons : - (onEditingChange && ) - } - - } - {children} -
- ); - } else { - return ( -
-
- {customHeader ? customHeader : - - {customButtons ? customButtons : - (onEditingChange && ) - } - - } - {children} -
- ); - } + return ( +
+
+ {customHeader ? customHeader : + + {customButtons ? customButtons : + (onEditingChange && )} + + } + {children} +
+ ); }); export default SettingGroup; diff --git a/apps/admin-x-design-system/src/settings/SettingGroupHeader.tsx b/apps/admin-x-design-system/src/settings/SettingGroupHeader.tsx index 892782454383..181196bcf375 100644 --- a/apps/admin-x-design-system/src/settings/SettingGroupHeader.tsx +++ b/apps/admin-x-design-system/src/settings/SettingGroupHeader.tsx @@ -14,10 +14,10 @@ const SettingGroupHeader: React.FC = ({title, descripti {(title || description) &&
{title}{beta && Beta} - {description &&

{description}

} + {description &&

{description}

}
} -
+
{children}
diff --git a/apps/admin-x-design-system/tailwind.config.cjs b/apps/admin-x-design-system/tailwind.config.cjs index 7a614ce4f676..d554015aa496 100644 --- a/apps/admin-x-design-system/tailwind.config.cjs +++ b/apps/admin-x-design-system/tailwind.config.cjs @@ -270,7 +270,7 @@ module.exports = { base: '1.4rem', xs: '1.2rem', sm: '1.3rem', - md: '1.4rem', + md: '1.40rem', lg: '1.65rem', xl: '2rem', '2xl': '2.4rem', diff --git a/apps/admin-x-framework/package.json b/apps/admin-x-framework/package.json index 5381205abd23..ce52902a2caa 100644 --- a/apps/admin-x-framework/package.json +++ b/apps/admin-x-framework/package.json @@ -73,7 +73,6 @@ "c8": "8.0.1", "eslint-plugin-react-hooks": "4.6.0", "eslint-plugin-react-refresh": "0.4.3", - "jsdom": "24.1.0", "mocha": "10.2.0", "react": "18.3.1", "react-dom": "18.3.1", @@ -82,14 +81,14 @@ "typescript": "5.4.5" }, "dependencies": { - "@sentry/react": "7.118.0", + "@sentry/react": "7.114.0", "@tanstack/react-query": "4.36.1", "@tryghost/admin-x-design-system": "0.0.0", - "@types/react": "18.3.3", + "@types/react": "18.3.2", "@types/react-dom": "18.3.0", "@vitejs/plugin-react": "4.2.1", - "react": "18.3.1", - "react-dom": "18.3.1", + "react": "^18.2.0", + "react-dom": "^18.2.0", "vite": "4.5.3", "vite-plugin-css-injected-by-js": "^3.3.0", "vite-plugin-svgr": "3.3.0", diff --git a/apps/admin-x-framework/src/api/actions.ts b/apps/admin-x-framework/src/api/actions.ts index 43a00db4a595..e9f015bcde46 100644 --- a/apps/admin-x-framework/src/api/actions.ts +++ b/apps/admin-x-framework/src/api/actions.ts @@ -78,7 +78,7 @@ export const useBrowseActions = createInfiniteQuery({ } }); - const meta = pages[pages.length - 1].meta; + const meta = pages.at(-1)!.meta; return { actions: actions.reverse(), diff --git a/apps/admin-x-framework/src/api/activitypub.ts b/apps/admin-x-framework/src/api/activitypub.ts deleted file mode 100644 index 246292d55607..000000000000 --- a/apps/admin-x-framework/src/api/activitypub.ts +++ /dev/null @@ -1,122 +0,0 @@ -import {createMutation, createQueryWithId} from '../utils/api/hooks'; - -export type FollowItem = { - id: string; - preferredUsername: string, - // eslint-disable-next-line @typescript-eslint/no-explicit-any - [x: string]: any -}; - -export type ObjectProperties = { - '@context': string | (string | object)[]; - type: 'Article' | 'Link'; - name: string; - content: string; - url?: string | undefined; - attributedTo?: string | object[] | undefined; - image?: string; - published?: string; - preview?: {type: string, content: string}; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - [x: string]: any; -} - -export type ActorProperties = { - '@context': string | (string | object)[]; - attachment: object[]; - discoverable: boolean; - featured: string; - followers: string; - following: string; - id: string | null; - image: string; - inbox: string; - manuallyApprovesFollowers: boolean; - name: string; - outbox: string; - preferredUsername: string; - publicKey: { - id: string; - owner: string; - publicKeyPem: string; - }; - published: string; - summary: string; - type: 'Person'; - url: string; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - [x: string]: any; -} - -export type Activity = { - '@context': string; - id: string; - type: string; - actor: ActorProperties; - object: ObjectProperties; - to: string; -} - -export type InboxResponseData = { - '@context': string; - id: string; - summary: string; - type: 'OrderedCollection'; - totalItems: number; - items: Activity[]; -} - -export type FollowingResponseData = { - '@context': string; - id: string; - summary: string; - type: string; - totalItems: number; - items: FollowItem[]; -} - -type FollowRequestProps = { - username: string -} - -export const useFollow = createMutation({ - method: 'POST', - useActivityPub: true, - path: data => `/actions/follow/${data.username}` -}); - -export const useUnfollow = createMutation({ - method: 'POST', - useActivityPub: true, - path: data => `/actions/unfollow/${data.username}` -}); - -// This is a frontend root, not using the Ghost admin API -export const useBrowseInboxForUser = createQueryWithId({ - dataType: 'InboxResponseData', - useActivityPub: true, - headers: { - Accept: 'application/activity+json' - }, - path: id => `/inbox/${id}` -}); - -// This is a frontend root, not using the Ghost admin API -export const useBrowseFollowingForUser = createQueryWithId({ - dataType: 'FollowingResponseData', - useActivityPub: true, - headers: { - Accept: 'application/activity+json' - }, - path: id => `/following/${id}` -}); - -// This is a frontend root, not using the Ghost admin API -export const useBrowseFollowersForUser = createQueryWithId({ - dataType: 'FollowingResponseData', - useActivityPub: true, - headers: { - Accept: 'application/activity+json' - }, - path: id => `/followers/${id}` -}); diff --git a/apps/admin-x-framework/src/api/newsletters.ts b/apps/admin-x-framework/src/api/newsletters.ts index b74f8cbbbbac..481a07dfd429 100644 --- a/apps/admin-x-framework/src/api/newsletters.ts +++ b/apps/admin-x-framework/src/api/newsletters.ts @@ -21,7 +21,6 @@ export type Newsletter = { show_header_title: boolean; title_font_category: string; title_alignment: string; - show_excerpt: boolean; show_feature_image: boolean; body_font_category: string; footer_content: string | null; @@ -61,7 +60,7 @@ export const useBrowseNewsletters = createInfiniteQuery { const {pages} = originalData as InfiniteData; const newsletters = pages.flatMap(page => page.newsletters); - const meta = pages[pages.length - 1].meta; + const meta = pages.at(-1)!.meta; return { newsletters: newsletters, diff --git a/apps/admin-x-framework/src/api/tiers.ts b/apps/admin-x-framework/src/api/tiers.ts index 1813846cafcb..6ac9b67566c3 100644 --- a/apps/admin-x-framework/src/api/tiers.ts +++ b/apps/admin-x-framework/src/api/tiers.ts @@ -41,7 +41,7 @@ export const useBrowseTiers = createInfiniteQuery { const {pages} = originalData as InfiniteData; const tiers = pages.flatMap(page => page.tiers); - const meta = pages[pages.length - 1].meta; + const meta = pages.at(-1)!.meta; return { tiers, diff --git a/apps/admin-x-framework/src/api/users.ts b/apps/admin-x-framework/src/api/users.ts index b5c8b855a408..9df81ed45f6a 100644 --- a/apps/admin-x-framework/src/api/users.ts +++ b/apps/admin-x-framework/src/api/users.ts @@ -76,7 +76,7 @@ export const useBrowseUsers = createInfiniteQuery { const {pages} = originalData as InfiniteData; const users = pages.flatMap(page => page.users); - const meta = pages[pages.length - 1].meta; + const meta = pages.at(-1)!.meta; return { users: users, diff --git a/apps/admin-x-framework/src/hooks/useFilterableApi.ts b/apps/admin-x-framework/src/hooks/useFilterableApi.ts index 61b568916a79..6b738e8cd990 100644 --- a/apps/admin-x-framework/src/hooks/useFilterableApi.ts +++ b/apps/admin-x-framework/src/hooks/useFilterableApi.ts @@ -7,7 +7,7 @@ const escapeNqlString = (value: string) => { }; const useFilterableApi = < - Data extends {id: string} & {[k in FilterKey]: string} & {[k: string]: unknown}, + Data extends {id: string} & {[Key in FilterKey]: string}, ResponseKey extends string = string, FilterKey extends string = string >({path, filterKey, responseKey, limit = 20}: { @@ -41,27 +41,26 @@ const useFilterableApi = < return response[responseKey]; }; - const loadInitialValues = async (values: string[], key: string) => { - await loadData(''); + return { + loadData, - const data = [...(result.current.data || [])]; - const missingValues = values.filter(value => !result.current.data?.find(item => item[key] === value)); + loadInitialValues: async (ids: string[]) => { + await loadData(''); - if (missingValues.length) { - const additionalData = await fetchApi<{meta?: Meta} & {[k in ResponseKey]: Data[]}>(apiUrl(path, { - filter: `${key}:[${missingValues.join(',')}]`, - limit: 'all' - })); + const data = [...(result.current.data || [])]; + const missingIds = ids.filter(id => !result.current.data?.find(({id: dataId}) => dataId === id)); - data.push(...additionalData[responseKey]); - } + if (missingIds.length) { + const additionalData = await fetchApi<{meta?: Meta} & {[k in ResponseKey]: Data[]}>(apiUrl(path, { + filter: `id:[${missingIds.join(',')}]`, + limit: 'all' + })); - return values.map(value => data.find(item => item[key] === value)!); - }; + data.push(...additionalData[responseKey]); + } - return { - loadData, - loadInitialValues + return ids.map(id => data.find(({id: dataId}) => dataId === id)!); + } }; }; diff --git a/apps/admin-x-framework/src/test/acceptance.ts b/apps/admin-x-framework/src/test/acceptance.ts index b22e4ac92a6a..6bebb95f4e2a 100644 --- a/apps/admin-x-framework/src/test/acceptance.ts +++ b/apps/admin-x-framework/src/test/acceptance.ts @@ -16,8 +16,6 @@ import siteFixture from './responses/site.json'; import themesFixture from './responses/themes.json'; import tiersFixture from './responses/tiers.json'; import usersFixture from './responses/users.json'; -import activitypubInboxFixture from './responses/activitypub/inbox.json'; -import activitypubFollowingFixture from './responses/activitypub/following.json'; import {ActionsResponseType} from '../api/actions'; import {ConfigResponseType} from '../api/config'; @@ -65,9 +63,7 @@ export const responseFixtures = { themes: themesFixture as ThemesResponseType, newsletters: newslettersFixture as NewslettersResponseType, actions: actionsFixture as ActionsResponseType, - latestPost: {posts: [{id: '1', url: `${siteFixture.site.url}/test-post/`}]}, - activitypubInbox: activitypubInboxFixture, - activitypubFollowing: activitypubFollowingFixture + latestPost: {posts: [{id: '1', url: `${siteFixture.site.url}/test-post/`}]} }; const defaultLabFlags = { @@ -149,7 +145,7 @@ export const limitRequests = { browseNewslettersLimit: {method: 'GET', path: '/newsletters/?filter=status%3Aactive&limit=1', response: responseFixtures.newsletters} }; -export async function mockApi>({page, requests, options = {}}: {page: Page, requests: Requests, options?: {useActivityPub?: boolean}}) { +export async function mockApi>({page, requests}: {page: Page, requests: Requests}) { const lastApiRequests: {[key in keyof Requests]?: RequestRecord} = {}; const namedRequests = Object.entries(requests).reduce( @@ -157,11 +153,8 @@ export async function mockApi [] as Array ); - const routeRegex = options?.useActivityPub ? /\/activitypub\// : /\/ghost\/api\/admin\//; - const routeReplaceRegex = options.useActivityPub ? /^.*\/activitypub/ : /^.*\/ghost\/api\/admin/; - - await page.route(routeRegex, async (route) => { - const apiPath = route.request().url().replace(routeReplaceRegex, ''); + await page.route(/\/ghost\/api\/admin\//, async (route) => { + const apiPath = route.request().url().replace(/^.*\/ghost\/api\/admin/, ''); const matchingMock = namedRequests.find((request) => { if (request.method !== route.request().method()) { diff --git a/apps/admin-x-framework/src/test/responses/activitypub/following.json b/apps/admin-x-framework/src/test/responses/activitypub/following.json deleted file mode 100644 index f374bedb4e33..000000000000 --- a/apps/admin-x-framework/src/test/responses/activitypub/following.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "@context": "https://www.w3.org/ns/activitystreams", - "id": "https://0a2e-129-222-88-174.ngrok-free.app/activitypub/following/deadbeefdeadbeefdeadbeef", - "summary": "Following collection for index", - "type": "Collection", - "totalItems": 1, - "items": [ - { - "id": "https://main.ghost.org/activitypub/actor/deadbeefdeadbeefdeadbeef", - "username": "@index@main.ghost.org" - } - ] - } diff --git a/apps/admin-x-framework/src/test/responses/activitypub/inbox.json b/apps/admin-x-framework/src/test/responses/activitypub/inbox.json deleted file mode 100644 index 550fda9489f7..000000000000 --- a/apps/admin-x-framework/src/test/responses/activitypub/inbox.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "@context": "https://www.w3.org/ns/activitystreams", - "id": "https://example.com/activitypub/inbox/index", - "summary": "Inbox for index", - "type": "OrderedCollection", - "totalItems": 2, - "orderedItems": [ - { - "@context": "https://www.w3.org/ns/activitystreams", - "id": "https://main.ghost.org/activitypub/activity/664cf007fd27b20001a76d72", - "type": "Accept", - "actor": { - "@context": [ - "https://www.w3.org/ns/activitystreams", - "https://w3id.org/security/v1", - { - "featured": { - "@id": "http://joinmastodon.org/ns#featured", - "@type": "@id" - } - }, - { - "discoverable": { - "@id": "http://joinmastodon.org/ns#discoverable", - "@type": "@id" - } - }, - { - "manuallyApprovesFollowers": { - "@id": "http://joinmastodon.org/ns#manuallyApprovesFollowers", - "@type": "@id" - } - }, - { - "schema": "http://schema.org#", - "PropertyValue": "schema:PropertyValue", - "value": "schema:value" - } - ], - "type": "Person", - "id": "https://main.ghost.org/activitypub/actor/index", - "name": "The Main", - "preferredUsername": "index", - "summary": "The bio for the actor", - "url": "https://main.ghost.org/activitypub/actor/index", - "icon": "", - "image": "", - "published": "1970-01-01T00:00:00Z", - "manuallyApprovesFollowers": false, - "discoverable": true, - "attachment": [ - { - "type": "PropertyValue", - "name": "Website", - "value": "main.ghost.org" - } - ], - "following": "https://main.ghost.org/activitypub/following/index", - "followers": "https://main.ghost.org/activitypub/followers/index", - "inbox": "https://main.ghost.org/activitypub/inbox/index", - "outbox": "https://main.ghost.org/activitypub/outbox/index", - "featured": "https://main.ghost.org/activitypub/featured/index", - "publicKey": { - "id": "https://main.ghost.org/activitypub/actor/index#main-key", - "owner": "https://main.ghost.org/activitypub/actor/index", - "publicKeyPem": "-----BEGIN RSA PUBLIC KEY-----\nMIGJAoGBANRpUrwk7x7bJDddHmrYSWVw9enVPMFm5qAW7fTgoZ7x2PoJUIqy/bkqpXZ0SmZs\nsLO3UZm+yN/DqxioD8BnhhD0N8Ydv6+UniT7hE2tHvsMxQIq2jet1auSBZNFmUIWodsBxI/R\ntm+KwFBFk+P+MvVsGZ2K3Rkd4K0dv0/45dtXAgMBAAE=\n-----END RSA PUBLIC KEY-----\n" - } - }, - "object": { - "id": "https://0a2e-129-222-88-174.ngrok-free.app/activitypub/activity/664cf0074daa2f8183ba6ea6", - "type": "Follow" - }, - "to": "https://0a2e-129-222-88-174.ngrok-free.app/activitypub/actor/index" - }, - { - "type": "Create", - "actor": { - "@context": [ - "https://www.w3.org/ns/activitystreams", - "https://w3id.org/security/v1", - { - "featured": { - "@id": "http://joinmastodon.org/ns#featured", - "@type": "@id" - } - }, - { - "discoverable": { - "@id": "http://joinmastodon.org/ns#discoverable", - "@type": "@id" - } - }, - { - "manuallyApprovesFollowers": { - "@id": "http://joinmastodon.org/ns#manuallyApprovesFollowers", - "@type": "@id" - } - }, - { - "schema": "http://schema.org#", - "PropertyValue": "schema:PropertyValue", - "value": "schema:value" - } - ], - "type": "Person", - "id": "https://main.ghost.org/activitypub/actor/index", - "name": "The Main", - "preferredUsername": "index", - "summary": "The bio for the actor", - "url": "https://main.ghost.org/activitypub/actor/index", - "icon": "", - "image": "", - "published": "1970-01-01T00:00:00Z", - "manuallyApprovesFollowers": false, - "discoverable": true, - "attachment": [ - { - "type": "PropertyValue", - "name": "Website", - "value": "main.ghost.org" - } - ], - "following": "https://main.ghost.org/activitypub/following/index", - "followers": "https://main.ghost.org/activitypub/followers/index", - "inbox": "https://main.ghost.org/activitypub/inbox/index", - "outbox": "https://main.ghost.org/activitypub/outbox/index", - "featured": "https://main.ghost.org/activitypub/featured/index", - "publicKey": { - "id": "https://main.ghost.org/activitypub/actor/index#main-key", - "owner": "https://main.ghost.org/activitypub/actor/index", - "publicKeyPem": "-----BEGIN RSA PUBLIC KEY-----\nMIGJAoGBANRpUrwk7x7bJDddHmrYSWVw9enVPMFm5qAW7fTgoZ7x2PoJUIqy/bkqpXZ0SmZs\nsLO3UZm+yN/DqxioD8BnhhD0N8Ydv6+UniT7hE2tHvsMxQIq2jet1auSBZNFmUIWodsBxI/R\ntm+KwFBFk+P+MvVsGZ2K3Rkd4K0dv0/45dtXAgMBAAE=\n-----END RSA PUBLIC KEY-----\n" - } - }, - "object": { - "@context": "https://www.w3.org/ns/activitystreams", - "type": "Article", - "id": "https://main.ghost.org/activitypub/article/my-article/", - "name": "Testing ActivityPub", - "content": "

Super long test

", - "url": "https://main.ghost.org/my-article/", - "image": "https://main.ghost.org/content/images/2021/08/ghost-logo.png", - "published": "2024-05-09T00:00:00Z", - "attributedTo": { - "type": "Person", - "name": "The Main" - }, - "preview": { - "type": "Link", - "href": "https://main.ghost.org/my-article/", - "name": "Testing ActivityPub" - } - } - } - ] -} diff --git a/apps/admin-x-framework/src/test/responses/newsletters.json b/apps/admin-x-framework/src/test/responses/newsletters.json index 7c94e4ccea8e..96a971542e5c 100644 --- a/apps/admin-x-framework/src/test/responses/newsletters.json +++ b/apps/admin-x-framework/src/test/responses/newsletters.json @@ -19,7 +19,6 @@ "show_header_title": true, "title_font_category": "serif", "title_alignment": "center", - "show_excerpt": true, "show_feature_image": true, "body_font_category": "serif", "footer_content": "", diff --git a/apps/admin-x-framework/src/utils/api/fetchApi.ts b/apps/admin-x-framework/src/utils/api/fetchApi.ts index 352fd2f3db29..09671853402f 100644 --- a/apps/admin-x-framework/src/utils/api/fetchApi.ts +++ b/apps/admin-x-framework/src/utils/api/fetchApi.ts @@ -74,6 +74,10 @@ export const useFetchApi = () => { ...options }); + if (attempts !== 0 && sentryDSN) { + Sentry.captureMessage('Request took multiple attempts', {extra: getErrorData()}); + } + return handleResponse(response) as ResponseData; } catch (error) { retryingMs = Date.now() - startTime; @@ -111,11 +115,10 @@ export const useFetchApi = () => { }; }; -const {apiRoot, activityPubRoot} = getGhostPaths(); +const {apiRoot} = getGhostPaths(); -export const apiUrl = (path: string, searchParams: Record = {}, useActivityPub: boolean = false) => { - const root = useActivityPub ? activityPubRoot : apiRoot; - const url = new URL(`${root}${path}`, window.location.origin); +export const apiUrl = (path: string, searchParams: Record = {}) => { + const url = new URL(`${apiRoot}${path}`, window.location.origin); url.search = new URLSearchParams(searchParams).toString(); return url.toString(); }; diff --git a/apps/admin-x-framework/src/utils/api/hooks.ts b/apps/admin-x-framework/src/utils/api/hooks.ts index d2818cdb9cd7..23bb0a78a84b 100644 --- a/apps/admin-x-framework/src/utils/api/hooks.ts +++ b/apps/admin-x-framework/src/utils/api/hooks.ts @@ -20,11 +20,9 @@ export interface Meta { interface QueryOptions { dataType: string path: string - headers?: Record; defaultSearchParams?: Record; permissions?: string[]; returnData?: (originalData: unknown) => ResponseData; - useActivityPub?: boolean; } type QueryHookOptions = UseQueryOptions & { @@ -33,14 +31,14 @@ type QueryHookOptions = UseQueryOptions & { }; export const createQuery = (options: QueryOptions) => ({searchParams, ...query}: QueryHookOptions = {}): Omit, 'data'> & {data: ResponseData | undefined} => { - const url = apiUrl(options.path, searchParams || options.defaultSearchParams, options?.useActivityPub); + const url = apiUrl(options.path, searchParams || options.defaultSearchParams); const fetchApi = useFetchApi(); const handleError = useHandleError(); const result = useQuery({ enabled: options.permissions ? usePermission(options.permissions) : true, queryKey: [options.dataType, url], - queryFn: () => fetchApi(url, {...options}), + queryFn: () => fetchApi(url), ...query }); @@ -67,7 +65,7 @@ export const createPaginatedQuery = (options const paginatedSearchParams = searchParams || options.defaultSearchParams || {}; paginatedSearchParams.page = page.toString(); - const url = apiUrl(options.path, paginatedSearchParams, options?.useActivityPub); + const url = apiUrl(options.path, paginatedSearchParams); const fetchApi = useFetchApi(); const handleError = useHandleError(); @@ -120,8 +118,8 @@ export const createInfiniteQuery = (options: InfiniteQueryOptions< const nextPageParams = getNextPageParams || options.defaultNextPageParams || (() => ({})); const result = useInfiniteQuery({ - queryKey: [options.dataType, apiUrl(options.path, searchParams || options.defaultSearchParams, options?.useActivityPub)], - queryFn: ({pageParam}) => fetchApi(apiUrl(options.path, pageParam || searchParams || options.defaultSearchParams, options?.useActivityPub)), + queryKey: [options.dataType, apiUrl(options.path, searchParams || options.defaultSearchParams)], + queryFn: ({pageParam}) => fetchApi(apiUrl(options.path, pageParam || searchParams || options.defaultSearchParams)), getNextPageParam: data => nextPageParams(data, searchParams || options.defaultSearchParams || {}), ...query }); @@ -147,7 +145,6 @@ export const createQueryWithId = (options: Omit extends Omit, 'dataType' | 'path'>, Omit { path: (payload: Payload) => string; - headers?: Record; body?: (payload: Payload) => FormData | object; searchParams?: (payload: Payload) => { [key: string]: string; }; invalidateQueries?: { dataType: string; }; @@ -162,7 +159,7 @@ const mutate = ({fetchApi, path, payload, searchParams, o options: Omit, 'path'> }) => { const {defaultSearchParams, body, ...requestOptions} = options; - const url = apiUrl(path, searchParams || defaultSearchParams, options?.useActivityPub); + const url = apiUrl(path, searchParams || defaultSearchParams); const generatedBody = payload && body?.(payload); let requestBody: string | FormData | undefined = undefined; diff --git a/apps/admin-x-framework/src/utils/api/updateQueries.ts b/apps/admin-x-framework/src/utils/api/updateQueries.ts index a797d2fd83b5..bc2890c72352 100644 --- a/apps/admin-x-framework/src/utils/api/updateQueries.ts +++ b/apps/admin-x-framework/src/utils/api/updateQueries.ts @@ -10,7 +10,7 @@ export const insertToQueryCache = (field: string, recordsToInsert? if (typeof currentData === 'object' && 'pages' in currentData) { const {pages} = currentData as InfiniteData; - const lastPage = pages[pages.length - 1]; + const lastPage = pages.at(-1)!; return { ...currentData, pages: pages.slice(0, -1).concat({ diff --git a/apps/admin-x-framework/src/utils/errors.ts b/apps/admin-x-framework/src/utils/errors.ts index b8156d65d0aa..bfbafc71a266 100644 --- a/apps/admin-x-framework/src/utils/errors.ts +++ b/apps/admin-x-framework/src/utils/errors.ts @@ -22,10 +22,10 @@ export class APIError extends Error { errorOptions?: ErrorOptions ) { if (!message && response && response.url.includes('/ghost/api/admin/')) { - message = `Something went wrong while loading ${response.url.replace(/.+\/ghost\/api\/admin\//, '').replace(/\W.*/, '').replace('_', ' ')}, please try again.`; + message = `${response.statusText}, cannot fetch ${response.url.replace(/.+\/ghost\/api\/admin\//, '').replace(/\W.*/, '').replace('_', ' ')}`; } - super(message || 'Something went wrong, please try again.', errorOptions); + super(message || 'Unknown error', errorOptions); } } @@ -48,13 +48,13 @@ export class VersionMismatchError extends JSONError { export class ServerUnreachableError extends APIError { constructor(errorOptions?: ErrorOptions) { - super(undefined, undefined, 'Something went wrong, please try again.', errorOptions); + super(undefined, undefined, 'Server was unreachable', errorOptions); } } export class TimeoutError extends APIError { constructor(errorOptions?: ErrorOptions) { - super(undefined, undefined, 'Request timed out, please try again.', errorOptions); + super(undefined, undefined, 'Request timed out', errorOptions); } } diff --git a/apps/admin-x-framework/src/utils/helpers.ts b/apps/admin-x-framework/src/utils/helpers.ts index 1207ff12c613..d05d5a4ef472 100644 --- a/apps/admin-x-framework/src/utils/helpers.ts +++ b/apps/admin-x-framework/src/utils/helpers.ts @@ -3,7 +3,6 @@ export interface IGhostPaths { adminRoot: string; assetRoot: string; apiRoot: string; - activityPubRoot: string; } export function getGhostPaths(): IGhostPaths { @@ -12,8 +11,7 @@ export function getGhostPaths(): IGhostPaths { const adminRoot = `${subdir}/ghost/`; const assetRoot = `${subdir}/ghost/assets/`; const apiRoot = `${subdir}/ghost/api/admin`; - const activityPubRoot = `${subdir}/.ghost/activitypub`; - return {subdir, adminRoot, assetRoot, apiRoot, activityPubRoot}; + return {subdir, adminRoot, assetRoot, apiRoot}; } export function downloadFile(url: string) { diff --git a/apps/admin-x-framework/src/utils/queryClient.ts b/apps/admin-x-framework/src/utils/queryClient.ts index 26a9cfe719c1..7a3197e9166d 100644 --- a/apps/admin-x-framework/src/utils/queryClient.ts +++ b/apps/admin-x-framework/src/utils/queryClient.ts @@ -13,8 +13,7 @@ const queryClient = window.adminXQueryClient || new QueryClient({ staleTime: 5 * (60 * 1000), // 5 mins cacheTime: 10 * (60 * 1000), // 10 mins // We have custom retry logic for specific errors in fetchApi() - retry: false, - networkMode: 'always' + retry: false } } }); diff --git a/apps/admin-x-framework/test/unit/utils/api/hooks.test.tsx b/apps/admin-x-framework/test/unit/utils/api/hooks.test.tsx index 2099441d9634..1245c3c63f9d 100644 --- a/apps/admin-x-framework/test/unit/utils/api/hooks.test.tsx +++ b/apps/admin-x-framework/test/unit/utils/api/hooks.test.tsx @@ -60,47 +60,12 @@ describe('API hooks', function () { expect(mock.calls.length).toBe(1); expect(mock.calls[0]).toEqual(['http://localhost:3000/ghost/api/admin/test/', { credentials: 'include', - dataType: 'test', - headers: { - 'app-pragma': 'no-cache', - 'x-ghost-version': '5.x' - }, - method: 'GET', - mode: 'cors', - path: '/test/', - signal: expect.any(AbortSignal) - }]); - }); - }); - - it('can add custom headers', async function () { - await withMockFetch({ - json: {test: 1} - }, async (mock) => { - const useTestQuery = createQuery({ - dataType: 'test', - path: '/test/', - headers: {'Content-Type': 'ALOHA'} - }); - - const {result} = renderHook(() => useTestQuery(), {wrapper}); - - await waitFor(() => expect(result.current.isLoading).toBe(false)); - - expect(result.current.data).toEqual({test: 1}); - - expect(mock.calls.length).toBe(1); - expect(mock.calls[0]).toEqual(['http://localhost:3000/ghost/api/admin/test/', { - credentials: 'include', - dataType: 'test', headers: { - 'Content-Type': 'ALOHA', 'app-pragma': 'no-cache', 'x-ghost-version': '5.x' }, method: 'GET', mode: 'cors', - path: '/test/', signal: expect.any(AbortSignal) }]); }); diff --git a/apps/admin-x-settings/package.json b/apps/admin-x-settings/package.json index 63f09ab344c6..c6d267311cb1 100644 --- a/apps/admin-x-settings/package.json +++ b/apps/admin-x-settings/package.json @@ -37,10 +37,10 @@ "preview": "vite preview" }, "dependencies": { - "@codemirror/lang-html": "6.4.9", + "@codemirror/lang-html": "^6.4.5", "@tryghost/color-utils": "0.2.2", - "@tryghost/kg-unsplash-selector": "0.2.1", - "@tryghost/limit-service": "1.2.14", + "@tryghost/kg-unsplash-selector": "^0.1.15", + "@tryghost/limit-service": "^1.2.10", "@tryghost/nql": "0.12.3", "@tryghost/timezone-data": "0.4.3", "react": "18.3.1", @@ -52,9 +52,9 @@ "@testing-library/react": "14.1.0", "@tryghost/admin-x-design-system": "0.0.0", "@tryghost/admin-x-framework": "0.0.0", - "@types/react": "18.3.3", + "@types/react": "18.3.2", "@types/react-dom": "18.3.0", - "@types/validator": "13.12.0", + "@types/validator": "13.11.10", "@vitejs/plugin-react": "4.2.1", "eslint-plugin-react-hooks": "4.6.0", "eslint-plugin-react-refresh": "0.4.3", diff --git a/apps/admin-x-settings/src/MainContent.tsx b/apps/admin-x-settings/src/MainContent.tsx index 31898d9b565f..45bafb385a65 100644 --- a/apps/admin-x-settings/src/MainContent.tsx +++ b/apps/admin-x-settings/src/MainContent.tsx @@ -61,7 +61,7 @@ const MainContent: React.FC = () => { if (isEditorUser(currentUser)) { return ( -
+
Settings
diff --git a/apps/admin-x-settings/src/components/settings/advanced/CodeInjection.tsx b/apps/admin-x-settings/src/components/settings/advanced/CodeInjection.tsx index 484d52319dd0..aba04ba3c087 100644 --- a/apps/admin-x-settings/src/components/settings/advanced/CodeInjection.tsx +++ b/apps/admin-x-settings/src/components/settings/advanced/CodeInjection.tsx @@ -10,7 +10,7 @@ const CodeInjection: React.FC<{ keywords: string[] }> = ({keywords}) => { customHeader={
-
diff --git a/apps/admin-x-settings/src/components/settings/advanced/History.tsx b/apps/admin-x-settings/src/components/settings/advanced/History.tsx index 8b05a073cc24..7f33ae13546f 100644 --- a/apps/admin-x-settings/src/components/settings/advanced/History.tsx +++ b/apps/admin-x-settings/src/components/settings/advanced/History.tsx @@ -11,7 +11,7 @@ const History: React.FC<{ keywords: string[] }> = ({keywords}) => { return ( } + customButtons={
} ]; diff --git a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreview.tsx b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreview.tsx index f56790472430..7e94bbea2c77 100644 --- a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreview.tsx +++ b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreview.tsx @@ -106,7 +106,6 @@ const NewsletterPreview: React.FC<{newsletter: Newsletter}> = ({newsletter}) => senderReplyTo={renderReplyToEmail(newsletter, config, supportEmailAddress, defaultEmailAddress)} showBadge={newsletter.show_badge} showCommentCta={showCommentCta} - showExcerpt={newsletter.show_excerpt} showFeatureImage={newsletter.show_feature_image} showFeedback={showFeedback} showLatestPosts={newsletter.show_latest_posts} diff --git a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreviewContent.tsx b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreviewContent.tsx index e5f4642296c6..0bffd1434ac2 100644 --- a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreviewContent.tsx +++ b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreviewContent.tsx @@ -18,7 +18,6 @@ const NewsletterPreviewContent: React.FC<{ headerTitle?: string | null; headerSubtitle?: string | null; showPostTitleSection: boolean; - showExcerpt: boolean; titleAlignment?: string; titleFontCategory?: string; bodyFontCategory?: string; @@ -50,7 +49,6 @@ const NewsletterPreviewContent: React.FC<{ headerTitle, headerSubtitle, showPostTitleSection, - showExcerpt, titleAlignment, titleFontCategory, bodyFontCategory, @@ -77,7 +75,6 @@ const NewsletterPreviewContent: React.FC<{ const showHeader = headerIcon || headerTitle; const {config} = useGlobalData(); const hasNewEmailAddresses = useFeatureFlag('newEmailAddresses'); - const hasNewsletterExcerpt = useFeatureFlag('newsletterExcerpt'); const currentDate = new Date().toLocaleDateString('default', { year: 'numeric', @@ -101,25 +98,6 @@ const NewsletterPreviewContent: React.FC<{

To: Jamie Larson jamie@example.com

; } - let excerptClasses = 'mb-5 text-pretty leading-[1.7] text-black'; - - if (titleFontCategory === 'serif' && bodyFontCategory === 'serif') { - excerptClasses = clsx(excerptClasses, 'mb-8 font-serif text-[2.0rem] leading-tight'); - } else if (titleFontCategory !== 'serif' && bodyFontCategory === 'serif') { - excerptClasses = clsx(excerptClasses, 'mb-8 text-[1.7rem] leading-tight tracking-tight'); - } else if (titleFontCategory === 'serif' && bodyFontCategory !== 'serif') { - excerptClasses = clsx(excerptClasses, 'mb-8 font-serif text-[2.0rem] leading-tight'); - } else { - excerptClasses = clsx(excerptClasses, 'mb-8 text-[1.9rem] leading-tight tracking-tight'); - } - - if (titleAlignment === 'center') { - excerptClasses = clsx( - excerptClasses, - 'text-center' - ); - } - return (
@@ -134,38 +112,34 @@ const NewsletterPreviewContent: React.FC<{
{headerImage && (
- +
)} {showHeader && ( -
+
{headerIcon && } {headerTitle &&

{headerTitle}

} - {headerSubtitle &&
{headerSubtitle}
} + {headerSubtitle &&
{headerSubtitle}
}
)} {showPostTitleSection && ( -
+

Your email newsletter

- {(hasNewsletterExcerpt && showExcerpt) && ( -

A subtitle to highlight key points and engage your readers

- )}
-

+

By {authorPlaceholder} {currentDate}

-

View in browser

+

View in browser

)} @@ -173,21 +147,14 @@ const NewsletterPreviewContent: React.FC<{ {/* Feature image */} {showFeatureImage && ( <> -
+
Feature
-
Feature image caption
+
Feature image caption
)} -
+

This is what your content will look like when you send one of your posts as an email newsletter to your subscribers.

Over there on the right you'll see some settings that allow you to customize the look and feel of this template to make it perfectly suited to your brand. Email templates are exceptionally finnicky to make, but we've spent a long time optimising this one to make it work beautifully across devices, email clients and content types.

So, you can trust that every email you send with Ghost will look great and work well. Just like the rest of your site.

@@ -232,7 +199,7 @@ const NewsletterPreviewContent: React.FC<{

The three latest posts published on your site

-

Posts sent as an email only will never be shown here.

+

Posts sent as an email only will never be shown here.

Latest post @@ -241,7 +208,7 @@ const NewsletterPreviewContent: React.FC<{

Displayed at the bottom of each newsletter

-

Giving your readers one more place to discover your stories.

+

Giving your readers one more place to discover your stories.

Latest post @@ -250,7 +217,7 @@ const NewsletterPreviewContent: React.FC<{

To keep your work front and center

-

Making sure that your audience stays engaged.

+

Making sure that your audience stays engaged.

Latest post @@ -263,7 +230,7 @@ const NewsletterPreviewContent: React.FC<{ {showSubscriptionDetails && (

Subscription details

-

You are receiving this because you are a paid subscriber to {siteTitle}. Your subscription will renew on 17 Jul 2024.

+

You are receiving this because you are a paid subscriber to The Local Host. Your subscription will renew on 17 Jul 2024.

Name: Jamie Larson

@@ -279,9 +246,9 @@ const NewsletterPreviewContent: React.FC<{ {/* Footer */}
-
+
-
+
{siteTitle} © {currentYear} — Unsubscribe
diff --git a/apps/admin-x-settings/src/components/settings/email/useDefaultRecipientsOptions.tsx b/apps/admin-x-settings/src/components/settings/email/useDefaultRecipientsOptions.tsx index 8ee3e4af38a2..731b8dc6459b 100644 --- a/apps/admin-x-settings/src/components/settings/email/useDefaultRecipientsOptions.tsx +++ b/apps/admin-x-settings/src/components/settings/email/useDefaultRecipientsOptions.tsx @@ -62,11 +62,11 @@ const useDefaultRecipientsOptions = (selectedOption: string, defaultEmailRecipie const initSelectedSegments = async () => { const filters = defaultEmailRecipientsFilter?.split(',') || []; - const tierIds: string[] = [], labelSlugs: string[] = [], offerIds: string[] = []; + const tierIds: string[] = [], labelIds: string[] = [], offerIds: string[] = []; for (const filter of filters) { if (filter.startsWith('label:')) { - labelSlugs.push(filter.replace('label:', '')); + labelIds.push(filter.replace('label:', '')); } else if (filter.startsWith('offer_redemptions:')) { offerIds.push(filter.replace('offer_redemptions:', '')); } else if (isObjectId(filter)) { @@ -75,9 +75,9 @@ const useDefaultRecipientsOptions = (selectedOption: string, defaultEmailRecipie } const options = await Promise.all([ - tiers.loadInitialValues(tierIds, 'id').then(data => data.map(tierOption)), - labels.loadInitialValues(labelSlugs, 'slug').then(data => data.map(labelOption)), - offers.loadInitialValues(offerIds, 'id').then(data => data.map(offerOption)) + tiers.loadInitialValues(tierIds).then(data => data.map(tierOption)), + labels.loadInitialValues(labelIds).then(data => data.map(labelOption)), + offers.loadInitialValues(offerIds).then(data => data.map(offerOption)) ]).then(results => results.flat()); setSelectedSegments(filters.map(filter => options.find(option => option.value === filter)!)); diff --git a/apps/admin-x-settings/src/components/settings/general/SocialAccounts.tsx b/apps/admin-x-settings/src/components/settings/general/SocialAccounts.tsx index 2516b3c7bba1..37a0a0578047 100644 --- a/apps/admin-x-settings/src/components/settings/general/SocialAccounts.tsx +++ b/apps/admin-x-settings/src/components/settings/general/SocialAccounts.tsx @@ -76,7 +76,7 @@ const SocialAccounts: React.FC<{ keywords: string[] }> = ({keywords}) => { { diff --git a/apps/admin-x-settings/src/components/settings/general/UserDetailModal.tsx b/apps/admin-x-settings/src/components/settings/general/UserDetailModal.tsx index 27e492db49f8..f44833c327b7 100644 --- a/apps/admin-x-settings/src/components/settings/general/UserDetailModal.tsx +++ b/apps/admin-x-settings/src/components/settings/general/UserDetailModal.tsx @@ -113,6 +113,10 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => { onSave: async (values) => { await updateUser?.(values); }, + onSavedStateReset: () => { + mainModal.remove(); + navigateOnClose(); + }, onSaveError: handleError }); const setUserData = (newData: User) => updateForm(() => newData); @@ -349,10 +353,9 @@ const UserDetailModalContent: React.FC<{user: User}> = ({user}) => { animate={canAccessSettings(currentUser)} backDrop={canAccessSettings(currentUser)} buttonsDisabled={okProps.disabled} - cancelLabel='Close' dirty={saveState === 'unsaved'} okColor={okProps.color} - okLabel={okProps.label || 'Save'} + okLabel={okProps.label || 'Save & close'} size={canAccessSettings(currentUser) ? 'lg' : 'bleed'} stickyFooter={true} testId='user-detail-modal' diff --git a/apps/admin-x-settings/src/components/settings/general/Users.tsx b/apps/admin-x-settings/src/components/settings/general/Users.tsx index 703ef6547e11..aaede23f545d 100644 --- a/apps/admin-x-settings/src/components/settings/general/Users.tsx +++ b/apps/admin-x-settings/src/components/settings/general/Users.tsx @@ -221,7 +221,7 @@ const Users: React.FC<{ keywords: string[], highlight?: boolean }> = ({keywords, }; const buttons = ( -
diff --git a/apps/admin-x-settings/src/components/settings/growth/embedSignup/EmbedSignupForm.tsx b/apps/admin-x-settings/src/components/settings/growth/embedSignup/EmbedSignupForm.tsx index 703a52c622c4..8dffc09960fc 100644 --- a/apps/admin-x-settings/src/components/settings/growth/embedSignup/EmbedSignupForm.tsx +++ b/apps/admin-x-settings/src/components/settings/growth/embedSignup/EmbedSignupForm.tsx @@ -11,7 +11,7 @@ const EmbedSignupForm: React.FC<{ keywords: string[] }> = ({keywords}) => { return ( } + customButtons={
); diff --git a/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx b/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx index 01e9e5d6f7d4..2fcff193d850 100644 --- a/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx +++ b/apps/admin-x-settings/src/components/settings/membership/tiers/TierDetailModal.tsx @@ -1,4 +1,4 @@ -import NiceModal from '@ebay/nice-modal-react'; +import NiceModal, {useModal} from '@ebay/nice-modal-react'; import React, {useEffect, useRef} from 'react'; import TierDetailPreview from './TierDetailPreview'; import useFeatureFlag from '../../../../hooks/useFeatureFlag'; @@ -17,6 +17,7 @@ export type TierFormState = Partial> & { const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => { const isFreeTier = tier?.type === 'free'; + const modal = useModal(); const {updateRoute} = useRouting(); const {mutateAsync: updateTier} = useEditTier(); const {mutateAsync: createTier} = useAddTier(); @@ -96,6 +97,10 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => { } } }, + onSavedStateReset: () => { + modal.remove(); + updateRoute('tiers'); + }, onSaveError: handleError }); @@ -180,11 +185,10 @@ const TierDetailModalContent: React.FC<{tier?: Tier}> = ({tier}) => { updateRoute('tiers'); }} buttonsDisabled={okProps.disabled} - cancelLabel='Close' dirty={saveState === 'unsaved'} leftButtonProps={leftButtonProps} okColor={okProps.color} - okLabel={okProps.label || 'Save'} + okLabel={okProps.label || 'Save & close'} size='lg' testId='tier-detail-modal' title={(tier ? (tier.active ? 'Edit tier' : 'Edit archived tier') : 'New tier')} diff --git a/apps/admin-x-settings/src/components/settings/site/AnnouncementBar.tsx b/apps/admin-x-settings/src/components/settings/site/AnnouncementBar.tsx index d0ecb513c0d1..2bfaae75f91f 100644 --- a/apps/admin-x-settings/src/components/settings/site/AnnouncementBar.tsx +++ b/apps/admin-x-settings/src/components/settings/site/AnnouncementBar.tsx @@ -11,7 +11,7 @@ const AnnouncementBar: React.FC<{ keywords: string[] }> = ({keywords}) => { return ( } + customButtons={
-
+
{{#if (not (or this.loading this.error))}}
{{#each this.entries as |entry|}}
- + {{entry.title}}
{{moment-format entry.published_at "D MMM YYYY"}}
- +
{{else}}
@@ -26,7 +26,7 @@
- View more features → + View more features →
diff --git a/ghost/admin/app/components/editor/modals/publish-flow/complete.hbs b/ghost/admin/app/components/editor/modals/publish-flow/complete.hbs index 505cd3bd8e28..83c6e3116a3f 100644 --- a/ghost/admin/app/components/editor/modals/publish-flow/complete.hbs +++ b/ghost/admin/app/components/editor/modals/publish-flow/complete.hbs @@ -97,7 +97,18 @@

{{else}}

- Back to dashboard + {{#if (feature "onboardingChecklist")}} + Back to dashboard + {{else}} + + {{/if}}

{{/if}} {{/if}} diff --git a/ghost/admin/app/components/editor/publish-management.js b/ghost/admin/app/components/editor/publish-management.js index eb2906522b83..7d97a3190645 100644 --- a/ghost/admin/app/components/editor/publish-management.js +++ b/ghost/admin/app/components/editor/publish-management.js @@ -56,7 +56,7 @@ export default class PublishManagement extends Component { } } - if (isValid && (!this.publishFlowModal || this.publishFlowModal?.isClosing)) { + if (isValid && !this.publishFlowModal || this.publishFlowModal?.isClosing) { this.publishOptions.resetPastScheduledAt(); this.publishFlowModal = this.modals.open(PublishFlowModal, { @@ -83,7 +83,7 @@ export default class PublishManagement extends Component { const isValid = await this._validatePost(); - if (isValid && (!this.updateFlowModal || this.updateFlowModal.isClosing)) { + if (isValid && !this.updateFlowModal || this.updateFlowModal.isClosing) { this.updateFlowModal = this.modals.open(UpdateFlowModal, { publishOptions: this.publishOptions, saveTask: this.publishTask @@ -99,12 +99,10 @@ export default class PublishManagement extends Component { } @action - async openPreview(event, {skipAnimation} = {}) { + openPreview(event, {skipAnimation} = {}) { event?.preventDefault(); - const isValid = await this._validatePost(); - - if (isValid && (!this.previewModal || this.previewModal.isClosing)) { + if (!this.previewModal || this.previewModal.isClosing) { // open publish flow modal underneath to offer quick switching // without restarting the flow or causing flicker diff --git a/ghost/admin/app/components/gh-alert.js b/ghost/admin/app/components/gh-alert.js index 2114ae97a10f..ca22911459a3 100644 --- a/ghost/admin/app/components/gh-alert.js +++ b/ghost/admin/app/components/gh-alert.js @@ -9,8 +9,8 @@ export default class GhAlert extends Component { const typeMapping = { success: 'green', error: 'red', - warn: 'black', - info: 'black' + warn: 'blue', + info: 'blue' }; const type = this.args.message.type; diff --git a/ghost/admin/app/components/gh-editor-feature-image.hbs b/ghost/admin/app/components/gh-editor-feature-image.hbs index 0d934a7d8780..66775bb48d6c 100644 --- a/ghost/admin/app/components/gh-editor-feature-image.hbs +++ b/ghost/admin/app/components/gh-editor-feature-image.hbs @@ -46,11 +46,11 @@ @imageSrc={{@image}} @saveImage={{fn this.saveImage uploader.setFiles}} /> -
-
+
{{#if this.isEditingAlt}} - - {{#if (feature 'editorExcerpt')}} -
- - {{#if @excerptHasTk}} -
- TK -
- {{/if}} -
- {{#if @excerptErrorMessage}} -
- {{@excerptErrorMessage}} -
- {{/if}} -
- {{/if}}
diff --git a/ghost/admin/app/components/gh-koenig-editor-lexical.js b/ghost/admin/app/components/gh-koenig-editor-lexical.js index 2319ae9c8a6b..abc7eb7c4bcc 100644 --- a/ghost/admin/app/components/gh-koenig-editor-lexical.js +++ b/ghost/admin/app/components/gh-koenig-editor-lexical.js @@ -4,13 +4,11 @@ import {action} from '@ember/object'; import {inject as service} from '@ember/service'; import {tracked} from '@glimmer/tracking'; -export default class GhKoenigEditorLexical extends Component { +export default class GhKoenigEditorReactComponent extends Component { @service settings; - @service feature; containerElement = null; titleElement = null; - excerptElement = null; mousedownY = 0; uploadUrl = `${ghostPaths().apiRoot}/images/upload/`; @@ -32,10 +30,6 @@ export default class GhKoenigEditorLexical extends Component { return color; } - get excerpt() { - return this.args.excerpt || ''; - } - @action registerElement(element) { this.containerElement = element; @@ -112,106 +106,25 @@ export default class GhKoenigEditorLexical extends Component { this.titleElement.focus(); } + // move cursor to the editor on + // - Tab + // - Arrow Down/Right when input is empty or caret at end of input + // - Enter, creating an empty paragraph when editor is not empty @action onTitleKeydown(event) { - if (this.feature.editorExcerpt) { - // move cursor to the excerpt on - // - Tab (handled by browser) - // - Arrow Down/Right when input is empty or caret at end of input - // - Enter - const {key} = event; - const {value, selectionStart} = event.target; - - if (key === 'Enter') { - event.preventDefault(); - this.excerptElement?.focus(); - } - - if ((key === 'ArrowDown' || key === 'ArrowRight') && !event.shiftKey) { - const couldLeaveTitle = !value || selectionStart === value.length; - - if (couldLeaveTitle) { - event.preventDefault(); - this.excerptElement?.focus(); - } - } - } else { - // move cursor to the editor on - // - Tab - // - Arrow Down/Right when input is empty or caret at end of input - // - Enter, creating an empty paragraph when editor is not empty - const {editorAPI} = this; - - if (!editorAPI || event.originalEvent.isComposing) { - return; - } - - const {key} = event; - const {value, selectionStart} = event.target; - - const couldLeaveTitle = !value || selectionStart === value.length; - const arrowLeavingTitle = ['ArrowDown', 'ArrowRight'].includes(key) && couldLeaveTitle; - - if (key === 'Enter' || key === 'Tab' || arrowLeavingTitle) { - event.preventDefault(); + const {editorAPI} = this; - if (key === 'Enter' && !editorAPI.editorIsEmpty()) { - editorAPI.insertParagraphAtTop({focus: true}); - } else { - editorAPI.focusEditor({position: 'top'}); - } - } + if (!editorAPI || event.originalEvent.isComposing) { + return; } - } - - // Subtitle ("excerpt") Actions ------------------------------------------- - @action - registerExcerptElement(element) { - this.excerptElement = element; - } - - @action - focusExcerpt() { - this.excerptElement?.focus(); - - // timeout ensures this occurs after the keyboard events - setTimeout(() => { - this.excerptElement?.setSelectionRange(-1, -1); - }, 0); - } - - @action - onExcerptInput(event) { - this.args.setExcerpt?.(event.target.value); - } - - @action - onExcerptKeydown(event) { - // move cursor to the title on - // - Shift+Tab (handled by the browser) - // - Arrow Up/Left when input is empty or caret at start of input - // move cursor to the editor on - // - Tab - // - Arrow Down/Right when input is empty or caret at end of input - // - Enter, creating an empty paragraph when editor is not empty const {key} = event; const {value, selectionStart} = event.target; - if ((key === 'ArrowUp' || key === 'ArrowLeft') && !event.shiftKey) { - const couldLeaveTitle = !value || selectionStart === 0; - - if (couldLeaveTitle) { - event.preventDefault(); - this.focusTitle(); - } - } - - const {editorAPI} = this; const couldLeaveTitle = !value || selectionStart === value.length; - const arrowLeavingTitle = (key === 'ArrowRight' || key === 'ArrowDown') && couldLeaveTitle; + const arrowLeavingTitle = ['ArrowDown', 'ArrowRight'].includes(key) && couldLeaveTitle; - if (key === 'Enter' || (key === 'Tab' && !event.shiftKey) || arrowLeavingTitle) { + if (key === 'Enter' || key === 'Tab' || arrowLeavingTitle) { event.preventDefault(); if (key === 'Enter' && !editorAPI.editorIsEmpty()) { @@ -222,8 +135,6 @@ export default class GhKoenigEditorLexical extends Component { } } - // move cursor to the editor on - // Body actions ------------------------------------------------------------ @action @@ -236,7 +147,7 @@ export default class GhKoenigEditorLexical extends Component { // otherwise the browser will defocus the editor and the cursor will disappear @action focusEditor(event) { - if (!this.skipFocusEditor && event.target.classList.contains('gh-koenig-editor-pane') && this.editorAPI) { + if (!this.skipFocusEditor && event.target.classList.contains('gh-koenig-editor-pane')) { let editorCanvas = this.editorAPI.editorInstance.getRootElement(); let {bottom} = editorCanvas.getBoundingClientRect(); diff --git a/ghost/admin/app/components/gh-member-settings-form.hbs b/ghost/admin/app/components/gh-member-settings-form.hbs index d301aadf30db..f1a7630274eb 100644 --- a/ghost/admin/app/components/gh-member-settings-form.hbs +++ b/ghost/admin/app/components/gh-member-settings-form.hbs @@ -147,7 +147,21 @@ {{/if}} {{/if}} - {{sub.validityDetails}} + {{#if sub.isComplimentary}} + {{#if sub.compExpiry}} + Expires {{sub.compExpiry}} + {{/if}} + {{else}} + {{#if sub.hasEnded}} + Ended {{sub.validUntil}} + {{else if sub.willEndSoon}} + Has access until {{sub.validUntil}} + {{else if sub.trialUntil}} + Ends {{sub.trialUntil}} + {{else}} + Renews {{sub.validUntil}} + {{/if}} + {{/if}}
diff --git a/ghost/admin/app/components/gh-member-settings-form.js b/ghost/admin/app/components/gh-member-settings-form.js index bcd9193bf50b..8596af3b455e 100644 --- a/ghost/admin/app/components/gh-member-settings-form.js +++ b/ghost/admin/app/components/gh-member-settings-form.js @@ -1,8 +1,9 @@ import Component from '@glimmer/component'; +import moment from 'moment-timezone'; import {action} from '@ember/object'; -import {didCancel, task} from 'ember-concurrency'; -import {getSubscriptionData} from 'ghost-admin/utils/subscription-data'; +import {getNonDecimal, getSymbol} from 'ghost-admin/utils/currency'; import {inject as service} from '@ember/service'; +import {task} from 'ember-concurrency'; import {tracked} from '@glimmer/tracking'; export default class extends Component { @@ -59,9 +60,41 @@ export default class extends Component { return typeof value.id !== 'undefined' && self.findIndex(element => (element.tier_id || element.id) === (value.tier_id || value.id)) === index; }); - let subsWithPrice = subscriptions.filter(sub => !!sub.price); - let subscriptionData = subsWithPrice.map(sub => getSubscriptionData(sub)); + let subscriptionData = subscriptions.filter((sub) => { + return !!sub.price; + }).map((sub) => { + const periodEnded = sub.current_period_end && new Date(sub.current_period_end) < new Date(); + const data = { + ...sub, + attribution: { + ...sub.attribution, + referrerSource: sub.attribution?.referrer_source || 'Unknown', + referrerMedium: sub.attribution?.referrer_medium || '-' + }, + startDate: sub.start_date ? moment(sub.start_date).format('D MMM YYYY') : '-', + validUntil: sub.current_period_end ? moment(sub.current_period_end).format('D MMM YYYY') : '-', + hasEnded: sub.status === 'canceled' && periodEnded, + willEndSoon: sub.cancel_at_period_end || (sub.status === 'canceled' && !periodEnded), + cancellationReason: sub.cancellation_reason, + price: { + ...sub.price, + currencySymbol: getSymbol(sub.price.currency), + nonDecimalAmount: getNonDecimal(sub.price.amount) + }, + isComplimentary: !sub.id + }; + if (sub.trial_end_at) { + const inTrialMode = moment(sub.trial_end_at).isAfter(new Date(), 'day'); + if (inTrialMode) { + data.trialUntil = moment(sub.trial_end_at).format('D MMM YYYY'); + } + } + if (!sub.id && sub.tier?.expiry_at) { + data.compExpiry = moment(sub.tier.expiry_at).utc().format('D MMM YYYY'); + } + return data; + }); return tiers.map((tier) => { let tierSubscriptions = subscriptionData.filter((subscription) => { return subscription?.price?.tier?.tier_id === (tier.tier_id || tier.id); @@ -104,17 +137,8 @@ export default class extends Component { @action setup() { - try { - this.fetchTiers.perform(); - this.fetchNewsletters.perform(); - } catch (e) { - // Do not throw cancellation errors - if (didCancel(e)) { - return; - } - - throw e; - } + this.fetchTiers.perform(); + this.fetchNewsletters.perform(); } @action diff --git a/ghost/admin/app/components/gh-nav-menu/footer-banner.hbs b/ghost/admin/app/components/gh-nav-menu/footer-banner.hbs deleted file mode 100644 index 7ebaa07e970c..000000000000 --- a/ghost/admin/app/components/gh-nav-menu/footer-banner.hbs +++ /dev/null @@ -1,28 +0,0 @@ -{{#if this.showReferralInvite}} -
- - - You qualify for our invite-only referral program. -

Refer people to Ghost and earn a 30% share of the subscription revenue, every single month.

-
Find out more →
- -
-{{/if}} - -{{#if (and this.showWhatsNew this.whatsNew.hasNew)}} - {{#let (get this.whatsNew.entries "0") as |entry|}} -
- - -
- {{svg-jar "sparkle-fill" class="gh-sidebar-banner-icon gh-whatsnew-banner-icon"}} - What's new? -
-
{{entry.title}}
- {{#if entry.custom_excerpt}} -
{{entry.custom_excerpt}}
- {{/if}} - -
- {{/let}} -{{/if}} \ No newline at end of file diff --git a/ghost/admin/app/components/gh-nav-menu/footer-banner.js b/ghost/admin/app/components/gh-nav-menu/footer-banner.js deleted file mode 100644 index fab716af8217..000000000000 --- a/ghost/admin/app/components/gh-nav-menu/footer-banner.js +++ /dev/null @@ -1,89 +0,0 @@ -import Component from '@glimmer/component'; -import envConfig from 'ghost-admin/config/environment'; -import moment from 'moment-timezone'; -import {action} from '@ember/object'; -import {inject as service} from '@ember/service'; -import {task} from 'ember-concurrency'; - -export default class FooterBanner extends Component { - @service session; - @service dashboardStats; - @service feature; - @service membersUtils; - @service modals; - @service settings; - @service whatsNew; - - constructor() { - super(...arguments); - this.loadCurrentMRR.perform(); - } - - get isAdminOrOwner() { - return this.session.user.isAdmin; - } - - get isReferralNotificationNotDismissed() { - return !this.feature.accessibility.referralInviteDismissed; - } - - get stripeLiveModeEnabled() { - // allow testing mode when not in a production environment - const isDevModeStripeEnabled = envConfig.environment !== 'production' && this.membersUtils.isStripeEnabled; - const isLiveEnabled = this.settings.stripeConnectLivemode; - return isDevModeStripeEnabled || isLiveEnabled; - } - - get hasReachedMRR() { - return this.dashboardStats.currentMRR / 100 >= 100; - } - - get showReferralInvite() { - // Conditions to see the referral invite - // 1. Needs to be Owner or Admin - // 2. Stripe is setup and enabled in live mode - // 3. MRR is > $100 - // 4. Notification has not yet been dismissed by the user - return !this.args.hasThemeErrors && this.isAdminOrOwner && this.isReferralNotificationNotDismissed && this.stripeLiveModeEnabled && this.hasReachedMRR; - } - - get showWhatsNew() { - return !this.showReferralInvite && this.whatsNew.hasNewFeatured; - } - - @task - *loadCurrentMRR() { - if (this.isAdminOrOwnern) { - try { - yield this.dashboardStats.loadMrrStats(); - } catch (error) { - // noop - } - } - } - - @action - dismissReferralInvite(event) { - event.preventDefault(); - event.stopPropagation(); - - if (!this.feature.referralInviteDismissed) { - this.feature.referralInviteDismissed = moment().tz(this.settings.timezone); - } - } - - @action - dismissWhatsNewToast(event) { - event.preventDefault(); - event.stopPropagation(); - - // Dismiss - this.whatsNew.seen(); - } - - @action - openFeaturedWhatsNew(href) { - window.open(href, '_blank'); - this.whatsNew.seen(); - } -} diff --git a/ghost/admin/app/components/gh-nav-menu/footer.hbs b/ghost/admin/app/components/gh-nav-menu/footer.hbs index e40db0836310..da96e8510248 100644 --- a/ghost/admin/app/components/gh-nav-menu/footer.hbs +++ b/ghost/admin/app/components/gh-nav-menu/footer.hbs @@ -1,19 +1,12 @@
{{#if this.hasThemeErrors}} -
- -
+ {{/if}} - +
@@ -21,7 +14,7 @@
- {{#if (and this.whatsNew.hasNew (not this.whatsNew.hasNewFeatured))}}{{/if}} + {{#if this.whatsNew.hasNew}}{{/if}}
{{svg-jar "arrow-down" class="w3 mr1 fill-darkgrey"}}
@@ -52,12 +45,12 @@ {{else}}
  • - +
    • {{/if}} diff --git a/ghost/admin/app/components/gh-nav-menu/footer.js b/ghost/admin/app/components/gh-nav-menu/footer.js index b51777f23596..eb9e9eba1fcf 100644 --- a/ghost/admin/app/components/gh-nav-menu/footer.js +++ b/ghost/admin/app/components/gh-nav-menu/footer.js @@ -1,6 +1,5 @@ import Component from '@ember/component'; import ThemeErrorsModal from '../modals/design/theme-errors'; -import WhatsNew from '../modals/whats-new'; import calculatePosition from 'ember-basic-dropdown/utils/calculate-position'; import classic from 'ember-classic-decorator'; import {action} from '@ember/object'; @@ -44,7 +43,7 @@ export default class Footer extends Component { // filter errors that have other UI to display to users that the functionality is not working const filteredErrors = errors?.filter((error) => { if (error.code === 'GS110-NO-MISSING-PAGE-BUILDER-USAGE' && error?.failures?.[0].message.includes(`show_title_and_feature_image`)) { - return false; + return false; } return true; }); @@ -61,9 +60,4 @@ export default class Footer extends Component { return {horizontalPosition, verticalPosition, style}; } - - @action - openWhatsNew() { - return this.modals.open(WhatsNew); - } } diff --git a/ghost/admin/app/components/gh-nav-menu/main.hbs b/ghost/admin/app/components/gh-nav-menu/main.hbs index 47ea632ce7d8..58f9ecc8f74d 100644 --- a/ghost/admin/app/components/gh-nav-menu/main.hbs +++ b/ghost/admin/app/components/gh-nav-menu/main.hbs @@ -18,7 +18,7 @@
      {{#if (gh-user-can-admin this.session.user)}} -
    • +
    • {{svg-jar "house"}} Dashboard
      • {{/if}} diff --git a/ghost/admin/app/components/gh-nav-menu/main.js b/ghost/admin/app/components/gh-nav-menu/main.js index d47997f0a33c..51bce6256a8f 100644 --- a/ghost/admin/app/components/gh-nav-menu/main.js +++ b/ghost/admin/app/components/gh-nav-menu/main.js @@ -23,10 +23,10 @@ export default class Main extends Component.extend(ShortcutsMixin) { @service router; @service session; @service ui; + @service whatsNew; @service membersStats; @service settings; @service explore; - @service notifications; @inject config; diff --git a/ghost/admin/app/components/gh-post-settings-menu.hbs b/ghost/admin/app/components/gh-post-settings-menu.hbs index 1d01dcc5bcee..06963c9ebaf9 100644 --- a/ghost/admin/app/components/gh-post-settings-menu.hbs +++ b/ghost/admin/app/components/gh-post-settings-menu.hbs @@ -93,7 +93,7 @@ {{/if}} {{/if}} - {{#unless (feature 'editorExcerpt')}} + - {{/unless}} {{#unless this.session.user.isAuthorOrContributor}} diff --git a/ghost/admin/app/components/gh-token-input/label-token.js b/ghost/admin/app/components/gh-token-input/label-token.js index 0327c9c3924b..d82786d06814 100644 --- a/ghost/admin/app/components/gh-token-input/label-token.js +++ b/ghost/admin/app/components/gh-token-input/label-token.js @@ -1,17 +1,10 @@ import DraggableObject from 'ember-drag-drop/components/draggable-object'; import classic from 'ember-classic-decorator'; -import {alias} from '@ember/object/computed'; import {attributeBindings, classNames} from '@ember-decorators/component'; -import {computed} from '@ember/object'; @classic @attributeBindings('title') @classNames('label-token') export default class LabelToken extends DraggableObject { - @alias('content.name') name; - - @computed('name') - get title() { - return this.name ?? 'Label'; - } + title = this.name ?? 'Label'; } diff --git a/ghost/admin/app/components/koenig-image-editor.hbs b/ghost/admin/app/components/koenig-image-editor.hbs index f58b2a165e01..f5180629176b 100644 --- a/ghost/admin/app/components/koenig-image-editor.hbs +++ b/ghost/admin/app/components/koenig-image-editor.hbs @@ -6,10 +6,10 @@ {{/if}} diff --git a/ghost/admin/app/components/koenig-lexical-editor.js b/ghost/admin/app/components/koenig-lexical-editor.js index 18e6d2df19c9..da1770b383d2 100644 --- a/ghost/admin/app/components/koenig-lexical-editor.js +++ b/ghost/admin/app/components/koenig-lexical-editor.js @@ -83,28 +83,6 @@ export function decoratePostSearchResult(item, settings) { } } -/** - * Fetches the URLs of all active offers - * @returns {Promise<{label: string, value: string}[]>} - */ -export async function offerUrls() { - let offers = []; - - try { - offers = await this.fetchOffersTask.perform(); - } catch (e) { - // No-op: if offers are not available (e.g. missing permissions), return an empty array - return []; - } - - return offers.map((offer) => { - return { - label: `Offer — ${offer.name}`, - value: this.config.getSiteUrl(offer.code) - }; - }); -} - class ErrorHandler extends React.Component { state = { hasError: false @@ -295,6 +273,8 @@ export default class KoenigLexicalEditor extends Component { }; const fetchAutocompleteLinks = async () => { + const offers = await this.fetchOffersTask.perform(); + const defaults = [ {label: 'Homepage', value: window.location.origin + '/'}, {label: 'Free signup', value: '#/portal/signup/free'} @@ -339,23 +319,18 @@ export default class KoenigLexicalEditor extends Component { return []; }; - const offersLinks = await offerUrls.call(this); + const offersLinks = offers.toArray().map((offer) => { + return { + label: `Offer - ${offer.name}`, + value: this.config.getSiteUrl(offer.code) + }; + }); return [...defaults, ...memberLinks(), ...donationLink(), ...recommendationLink(), ...offersLinks]; }; const fetchLabels = async () => { - let labels = []; - try { - labels = await this.fetchLabelsTask.perform(); - } catch (e) { - // Do not throw cancellation errors - if (didCancel(e)) { - return; - } - - throw e; - } + const labels = await this.fetchLabelsTask.perform(); return labels.map(label => label.name); }; @@ -397,21 +372,12 @@ export default class KoenigLexicalEditor extends Component { if (!didCancel(error)) { throw error; } - return; } - // only published posts/pages and staff with posts have URLs + // only published posts/pages have URLs const filteredResults = []; results.forEach((group) => { - let items = group.options; - - if (group.groupName === 'Posts' || group.groupName === 'Pages') { - items = items.filter(i => i.status === 'published'); - } - - if (group.groupName === 'Staff') { - items = items.filter(i => !/\/404\//.test(i.url)); - } + const items = (group.groupName === 'Posts' || group.groupName === 'Pages') ? group.options.filter(i => i.status === 'published') : group.options; if (items.length === 0) { return; @@ -448,22 +414,18 @@ export default class KoenigLexicalEditor extends Component { fetchCollectionPosts, fetchEmbed, fetchLabels, - renderLabels: !this.session.user.isContributor, feature: { collectionsCard: this.feature.collectionsCard, collections: this.feature.collections, - internalLinking: this.feature.internalLinking, - internalLinkingAtLinks: this.feature.internalLinking, - contentVisibility: this.feature.contentVisibility + internalLinking: this.feature.internalLinking }, - deprecated: { // todo fix typo + deprecated: { headerV1: true // if false, shows header v1 in the menu }, membersEnabled: this.settings.membersSignupAccess === 'all', searchLinks, siteTitle: this.settings.title, - siteDescription: this.settings.description, - siteUrl: this.config.getSiteUrl('/') + siteDescription: this.settings.description }; const cardConfig = Object.assign({}, defaultCardConfig, props.cardConfig, {pinturaConfig: this.pinturaConfig}); diff --git a/ghost/admin/app/components/members-activity/event-type-filter.js b/ghost/admin/app/components/members-activity/event-type-filter.js index 50029841c671..957eafeec0c7 100644 --- a/ghost/admin/app/components/members-activity/event-type-filter.js +++ b/ghost/admin/app/components/members-activity/event-type-filter.js @@ -11,8 +11,7 @@ const ALL_EVENT_TYPES = [ {event: 'email_opened_event', icon: 'filter-dropdown-email-opened', name: 'Email opened', group: 'emails'}, {event: 'email_delivered_event', icon: 'filter-dropdown-email-received', name: 'Email received', group: 'emails'}, {event: 'email_complaint_event', icon: 'filter-dropdown-email-flagged-as-spam', name: 'Email flagged as spam', group: 'emails'}, - {event: 'email_failed_event', icon: 'filter-dropdown-email-bounced', name: 'Email bounced', group: 'emails'}, - {event: 'email_change_event', icon: 'filter-dropdown-email-address-changed', name: 'Email address changed', group: 'emails'} + {event: 'email_failed_event', icon: 'filter-dropdown-email-bounced', name: 'Email bounced', group: 'emails'} ]; export default class MembersActivityEventTypeFilter extends Component { diff --git a/ghost/admin/app/components/members/filter.js b/ghost/admin/app/components/members/filter.js index 6993d1c4e79f..475ddf53eb71 100644 --- a/ghost/admin/app/components/members/filter.js +++ b/ghost/admin/app/components/members/filter.js @@ -4,8 +4,8 @@ import nql from '@tryghost/nql-lang'; import {AUDIENCE_FEEDBACK_FILTER, CREATED_AT_FILTER, EMAIL_CLICKED_FILTER, EMAIL_COUNT_FILTER, EMAIL_FILTER, EMAIL_OPENED_COUNT_FILTER, EMAIL_OPENED_FILTER, EMAIL_OPEN_RATE_FILTER, EMAIL_SENT_FILTER, LABEL_FILTER, LAST_SEEN_FILTER, NAME_FILTER, NEWSLETTERS_FILTERS, NEXT_BILLING_DATE_FILTER, OFFERS_FILTER, PLAN_INTERVAL_FILTER, SIGNUP_ATTRIBUTION_FILTER, STATUS_FILTER, SUBSCRIBED_FILTER, SUBSCRIPTION_ATTRIBUTION_FILTER, SUBSCRIPTION_START_DATE_FILTER, SUBSCRIPTION_STATUS_FILTER, TIER_FILTER} from './filters'; import {TrackedArray} from 'tracked-built-ins'; import {action} from '@ember/object'; -import {didCancel, task} from 'ember-concurrency'; import {inject as service} from '@ember/service'; +import {task} from 'ember-concurrency'; import {tracked} from '@glimmer/tracking'; function escapeNqlString(value) { @@ -234,19 +234,9 @@ export default class MembersFilter extends Component { async parseDefaultFilters() { // we need to make sure all the filters are loaded before parsing the default filter // otherwise the filter will be parsed with the wrong properties - try { - await this.fetchTiers.perform(); - await this.fetchNewsletters.perform(); - await this.fetchOffers.perform(); - } catch (e) { - // Do not throw cancellation errors - if (didCancel(e)) { - return; - } - - throw e; - } - + await this.fetchTiers.perform(); + await this.fetchNewsletters.perform(); + await this.fetchOffers.perform(); if (this.args.defaultFilterParam) { // check if it is different before parsing const validFilters = this.validFilters; diff --git a/ghost/admin/app/components/modal-member-tier.js b/ghost/admin/app/components/modal-member-tier.js index 733d08e3e6b6..bc94dc2d1eeb 100644 --- a/ghost/admin/app/components/modal-member-tier.js +++ b/ghost/admin/app/components/modal-member-tier.js @@ -1,8 +1,8 @@ import ModalComponent from 'ghost-admin/components/modal-base'; import moment from 'moment-timezone'; import {action} from '@ember/object'; -import {didCancel, task} from 'ember-concurrency'; import {inject as service} from '@ember/service'; +import {task} from 'ember-concurrency'; import {tracked} from '@glimmer/tracking'; export default class ModalMemberTier extends ModalComponent { @@ -77,16 +77,7 @@ export default class ModalMemberTier extends ModalComponent { @action setup() { this.loadingTiers = true; - try { - this.fetchTiers.perform(); - } catch (e) { - // Do not throw cancellation errors - if (didCancel(e)) { - return; - } - - throw e; - } + this.fetchTiers.perform(); } @action diff --git a/ghost/admin/app/components/modal-post-history.hbs b/ghost/admin/app/components/modal-post-history.hbs index 3989c29db590..4795ea810327 100644 --- a/ghost/admin/app/components/modal-post-history.hbs +++ b/ghost/admin/app/components/modal-post-history.hbs @@ -1,6 +1,6 @@ {{!-- template-lint-disable no-invalid-interactive --}}
      -
      +
      {{#if this.selectedHTML}} {{{this.selectedHTML}}} @@ -9,31 +9,15 @@
      {{#if this.selectedRevision.feature_image}} - {{this.selectedRevision.feature_image_alt}} + {{/if}} {{#if this.selectedRevision.feature_image_caption}} -

      {{{this.selectedRevision.feature_image_caption}}}

      +

      {{{this.selectedRevision.feature_image_caption}}}

      {{/if}}
      -
      - {{this.currentTitle}} -
      - {{#if (feature "editorExcerpt")}} -
      - {{this.selectedRevision.custom_excerpt}} -
      -
      - {{/if}} - +
      {{this.currentTitle}}
      +
      @@ -44,8 +28,7 @@ aria-label="Close meta data panel" class="back settings-menu-header-action" data-test-button="close-psm-subview" - type="button" - {{on "click" this.closeModal}} + type="button" {{action "closeModal"}} {{on "mousedown" (optional this.noop)}} > {{svg-jar "arrow-left"}} @@ -56,19 +39,19 @@
        {{#each this.revisionList as |revision index|}} -
      • - diff --git a/ghost/admin/app/components/modal-post-history.js b/ghost/admin/app/components/modal-post-history.js index 05aba6646e67..54b546ed639e 100644 --- a/ghost/admin/app/components/modal-post-history.js +++ b/ghost/admin/app/components/modal-post-history.js @@ -3,7 +3,6 @@ import RestoreRevisionModal from '../components/modals/restore-revision'; import {action, set} from '@ember/object'; import {inject as service} from '@ember/service'; import {tracked} from '@glimmer/tracking'; -import {waitFor} from '@ember/test-waiters'; function checkFinishedRendering(element, done) { let last = element.innerHTML; @@ -51,10 +50,6 @@ export default class ModalPostHistory extends Component { latest: index === 0, createdAt: revision.get('createdAt'), title: revision.get('title'), - // custom_excerpt is a new field that was added to the post-revision model - // that may not have been populated for older revisions. To cover that case - // we revert to the current post's customExcerpt to avoid losing data when restoring. - custom_excerpt: revision.get('customExcerpt') ?? this.post.customExcerpt, feature_image: revision.get('featureImage'), feature_image_alt: revision.get('featureImageAlt'), feature_image_caption: revision.get('featureImageCaption'), @@ -89,11 +84,9 @@ export default class ModalPostHistory extends Component { } @action - @waitFor - async handleClick(index) { + handleClick(index) { this.selectedRevisionIndex = index; - // async with @waitFor so tests will wait for the action to complete - await this.updateSelectedHTML(); + this.updateSelectedHTML(); } @action @@ -145,31 +138,28 @@ export default class ModalPostHistory extends Component { } updateSelectedHTML() { - return new Promise((resolve) => { - if (this.selectedEditor) { - let selectedState = this.selectedEditor.editorInstance.parseEditorState(this.selectedRevision.lexical); + if (this.selectedEditor) { + let selectedState = this.selectedEditor.editorInstance.parseEditorState(this.selectedRevision.lexical); - this.selectedEditor.editorInstance.setEditorState(selectedState); - } + this.selectedEditor.editorInstance.setEditorState(selectedState); + } - let current = document.querySelector('.gh-post-history-hidden-lexical.current'); + let current = document.querySelector('.gh-post-history-hidden-lexical.current'); - let currentDone = false; + let currentDone = false; - let updateIfDone = () => { - if (currentDone) { - this.selectedHTML = this.stripInitialPlaceholder(current.innerHTML); - } - resolve(); - }; + let updateIfDone = () => { + if (currentDone) { + this.selectedHTML = this.stripInitialPlaceholder(current.innerHTML); + } + }; - checkFinishedRendering(current, () => { - current.querySelectorAll('[contenteditable]').forEach((el) => { - el.setAttribute('contenteditable', false); - }); - currentDone = true; - updateIfDone(); + checkFinishedRendering(current, () => { + current.querySelectorAll('[contenteditable]').forEach((el) => { + el.setAttribute('contenteditable', false); }); + currentDone = true; + updateIfDone(); }); } } diff --git a/ghost/admin/app/components/modals/editor/confirm-leave.hbs b/ghost/admin/app/components/modals/editor/confirm-leave.hbs index dc088fb052e0..b41d9098576a 100644 --- a/ghost/admin/app/components/modals/editor/confirm-leave.hbs +++ b/ghost/admin/app/components/modals/editor/confirm-leave.hbs @@ -1,4 +1,4 @@ -
        +

        Are you sure you want to leave this page?

        @@ -14,8 +14,8 @@
        - - + +
        \ No newline at end of file diff --git a/ghost/admin/app/components/modals/restore-revision.hbs b/ghost/admin/app/components/modals/restore-revision.hbs index 01e7336dfbc6..d9b319c219e1 100644 --- a/ghost/admin/app/components/modals/restore-revision.hbs +++ b/ghost/admin/app/components/modals/restore-revision.hbs @@ -1,4 +1,4 @@ -
        +

        {{this.title}}

        @@ -15,7 +15,6 @@ @successText="Restored" @task={{this.restoreRevisionTask}} @class="gh-btn gh-btn-black gh-btn-icon" - data-test-button="restore" />
        diff --git a/ghost/admin/app/components/modals/restore-revision.js b/ghost/admin/app/components/modals/restore-revision.js index 81981d2eb14e..4808d8a2e030 100644 --- a/ghost/admin/app/components/modals/restore-revision.js +++ b/ghost/admin/app/components/modals/restore-revision.js @@ -4,7 +4,6 @@ import {inject as service} from '@ember/service'; import {task} from 'ember-concurrency'; export default class RestoreRevisionModal extends Component { - @service feature; @service notifications; get title() { @@ -35,13 +34,6 @@ export default class RestoreRevisionModal extends Component { post.lexical = revision.lexical; post.title = revision.title; - post.featureImage = revision.feature_image; - post.featureImageAlt = revision.feature_image_alt; - post.featureImageCaption = revision.feature_image_caption; - - if (this.feature.editorExcerpt) { - post.customExcerpt = revision.custom_excerpt; - } yield post.save({adapterOptions: {saveRevision: true}}); diff --git a/ghost/admin/app/components/modals/whats-new.hbs b/ghost/admin/app/components/modals/whats-new.hbs deleted file mode 100644 index 7a027d0f65eb..000000000000 --- a/ghost/admin/app/components/modals/whats-new.hbs +++ /dev/null @@ -1,24 +0,0 @@ -
        -

        What's new?

        -
        - {{#each this.whatsNew.entries as |entry|}} - - {{#if entry.feature_image}} - {{entry.title}} - {{/if}} -
        -

        {{entry.title}}

        - {{#if entry.custom_excerpt}} -

        {{entry.custom_excerpt}}

        - {{/if}} - {{moment-format entry.published_at "DD MMMM YYYY"}} -
        -         - {{/each}} -
        - -
        - Turn on notifications - All updates → -
        -
        \ No newline at end of file diff --git a/ghost/admin/app/components/modals/whats-new.js b/ghost/admin/app/components/modals/whats-new.js deleted file mode 100644 index c82ae6d62aca..000000000000 --- a/ghost/admin/app/components/modals/whats-new.js +++ /dev/null @@ -1,15 +0,0 @@ -import Component from '@glimmer/component'; -import {inject as service} from '@ember/service'; - -export default class WhatsNewFeatured extends Component { - @service whatsNew; - - static modalOptions = { - className: 'fullscreen-modal-action fullscreen-modal-wide fullscreen-modal-whatsnew' - }; - - willDestroy() { - super.willDestroy(...arguments); - this.whatsNew.seen(); - } -} diff --git a/ghost/admin/app/components/posts-list/list-item.hbs b/ghost/admin/app/components/posts-list/list-item.hbs index 6b201b9b30b0..e588189a583b 100644 --- a/ghost/admin/app/components/posts-list/list-item.hbs +++ b/ghost/admin/app/components/posts-list/list-item.hbs @@ -95,14 +95,10 @@ {{#if @post.emailOnly}} to be sent - {{this.scheduledText}} to {{humanize-recipient-filter @post.emailSegment}} {{else}} to be published {{if @post.newsletter "and sent "}} - {{this.scheduledText}} - {{#if @post.newsletter}} - to {{humanize-recipient-filter @post.emailSegment}} - {{/if}} {{/if}} + {{this.scheduledText}} to {{humanize-recipient-filter @post.emailSegment}} {{/if}} diff --git a/ghost/admin/app/components/posts/analytics.js b/ghost/admin/app/components/posts/analytics.js index 0f81f7454dc8..3ec21fff26d3 100644 --- a/ghost/admin/app/components/posts/analytics.js +++ b/ghost/admin/app/components/posts/analytics.js @@ -201,30 +201,18 @@ export default class Analytics extends Component { } return this._fetchReferrersStats.perform(); } catch (e) { - // Do not throw cancellation errors - if (didCancel(e)) { - return; + if (!didCancel(e)) { + // re-throw the non-cancelation error + throw e; } - - throw e; } } async fetchLinks() { - try { - if (this._fetchLinks.isRunning) { - return this._fetchLinks.last; - } - - return this._fetchLinks.perform(); - } catch (e) { - // Do not throw cancellation errors - if (didCancel(e)) { - return; - } - - throw e; + if (this._fetchLinks.isRunning) { + return this._fetchLinks.last; } + return this._fetchLinks.perform(); } @task diff --git a/ghost/admin/app/components/posts/old-analytics.js b/ghost/admin/app/components/posts/old-analytics.js index a57bfb370626..dbc66cf5644e 100644 --- a/ghost/admin/app/components/posts/old-analytics.js +++ b/ghost/admin/app/components/posts/old-analytics.js @@ -171,30 +171,18 @@ export default class Analytics extends Component { } return this._fetchReferrersStats.perform(); } catch (e) { - // Do not throw cancellation errors - if (didCancel(e)) { - return; + if (!didCancel(e)) { + // re-throw the non-cancelation error + throw e; } - - throw e; } } async fetchLinks() { - try { - if (this._fetchLinks.isRunning) { - return this._fetchLinks.last; - } - - return this._fetchLinks.perform(); - } catch (e) { - // Do not throw cancellation errors - if (didCancel(e)) { - return; - } - - throw e; + if (this._fetchLinks.isRunning) { + return this._fetchLinks.last; } + return this._fetchLinks.perform(); } @task @@ -238,7 +226,7 @@ export default class Analytics extends Component { }, 2000); } - @task({drop: true}) + @task *_fetchReferrersStats() { let statsUrl = this.ghostPaths.url.api(`stats/referrers/posts/${this.post.id}`); let result = yield this.ajax.request(statsUrl); @@ -251,7 +239,7 @@ export default class Analytics extends Component { }); } - @task({drop: true}) + @task *_fetchLinks() { const filter = `post_id:'${this.post.id}'`; let statsUrl = this.ghostPaths.url.api(`links/`) + `?filter=${encodeURIComponent(filter)}`; diff --git a/ghost/admin/app/controllers/lexical-editor.js b/ghost/admin/app/controllers/lexical-editor.js index ee15feab8fb3..a01ec62cb619 100644 --- a/ghost/admin/app/controllers/lexical-editor.js +++ b/ghost/admin/app/controllers/lexical-editor.js @@ -15,7 +15,7 @@ import moment from 'moment-timezone'; import {GENERIC_ERROR_MESSAGE} from '../services/notifications'; import {action, computed} from '@ember/object'; import {alias, mapBy} from '@ember/object/computed'; -import {capitalizeFirstLetter} from '../helpers/capitalize-first-letter'; +import {captureMessage} from '@sentry/ember'; import {dropTask, enqueueTask, restartableTask, task, taskGroup, timeout} from 'ember-concurrency'; import {htmlSafe} from '@ember/template'; import {inject} from 'ghost-admin/decorators/inject'; @@ -25,13 +25,10 @@ import {isHostLimitError, isServerUnreachableError, isVersionMismatchError} from import {isInvalidError} from 'ember-ajax/errors'; import {mobiledocToLexical} from '@tryghost/kg-converters'; import {inject as service} from '@ember/service'; -import {slugify} from '@tryghost/string'; -import {tracked} from '@glimmer/tracking'; const DEFAULT_TITLE = '(Untitled)'; // suffix that is applied to the title of a post when it has been duplicated const DUPLICATED_POST_TITLE_SUFFIX = '(Copy)'; - // time in ms to save after last content edit const AUTOSAVE_TIMEOUT = 3000; // time in ms to force a save if the user is continuously typing @@ -104,45 +101,6 @@ const messageMap = { } }; -function textHasTk(text) { - let matchArr = TK_REGEX.exec(text); - - if (matchArr === null) { - return false; - } - - function isValidMatch(match) { - // negative lookbehind isn't supported before Safari 16.4 - // so we capture the preceding char and test it here - if (match[1] && match[1].trim() && WORD_CHAR_REGEX.test(match[1])) { - return false; - } - - // we also check any following char in code to avoid an overly - // complex regex when looking for word-chars following the optional - // trailing symbol char - if (match[4] && match[4].trim() && WORD_CHAR_REGEX.test(match[4])) { - return false; - } - - return true; - } - - // our regex will match invalid TKs because we can't use negative lookbehind - // so we need to loop through the matches discarding any that are invalid - // and moving on to any subsequent matches - while (matchArr !== null && !isValidMatch(matchArr)) { - text = text.slice(matchArr.index + matchArr[0].length - 1); - matchArr = TK_REGEX.exec(text); - } - - if (matchArr === null) { - return false; - } - - return true; -} - @classic export default class LexicalEditorController extends Controller { @controller application; @@ -160,8 +118,6 @@ export default class LexicalEditorController extends Controller { @inject config; - @tracked excerptErrorMessage = ''; - /* public properties -----------------------------------------------------*/ shouldFocusTitle = false; @@ -268,23 +224,48 @@ export default class LexicalEditorController extends Controller { @computed('post.titleScratch') get titleHasTk() { - return textHasTk(this.post.titleScratch); - } + let text = this.post.titleScratch; + let matchArr = TK_REGEX.exec(text); + + if (matchArr === null) { + return false; + } + + function isValidMatch(match) { + // negative lookbehind isn't supported before Safari 16.4 + // so we capture the preceding char and test it here + if (match[1] && match[1].trim() && WORD_CHAR_REGEX.test(match[1])) { + return false; + } + + // we also check any following char in code to avoid an overly + // complex regex when looking for word-chars following the optional + // trailing symbol char + if (match[4] && match[4].trim() && WORD_CHAR_REGEX.test(match[4])) { + return false; + } + + return true; + } + + // our regex will match invalid TKs because we can't use negative lookbehind + // so we need to loop through the matches discarding any that are invalid + // and moving on to any subsequent matches + while (matchArr !== null && !isValidMatch(matchArr)) { + text = text.slice(matchArr.index + matchArr[0].length - 1); + matchArr = TK_REGEX.exec(text); + } - @computed('post.customExcerpt') - get excerptHasTk() { - if (!this.feature.editorExcerpt) { + if (matchArr === null) { return false; } - return textHasTk(this.post.customExcerpt || ''); + return true; } - @computed('titleHasTk', 'excerptHasTk', 'postTkCount', 'featureImageTkCount') + @computed('titleHasTk', 'postTkCount', 'featureImageTkCount') get tkCount() { - const titleTk = this.titleHasTk ? 1 : 0; - const excerptTk = (this.feature.editorExcerpt && this.excerptHasTk) ? 1 : 0; - return titleTk + excerptTk + this.postTkCount + this.featureImageTkCount; + return (this.titleHasTk ? 1 : 0) + this.postTkCount + this.featureImageTkCount; } @action @@ -302,22 +283,6 @@ export default class LexicalEditorController extends Controller { this.set('post.titleScratch', title); } - @action - async updateExcerpt(excerpt) { - this.post.customExcerpt = excerpt; - try { - await this.post.validate({property: 'customExcerpt'}); - this.excerptErrorMessage = ''; - } catch (e) { - // validator throws undefined on validation error - if (e === undefined) { - this.excerptErrorMessage = this.post.errors.errorsFor('customExcerpt')?.[0]?.message; - return; - } - throw e; - } - } - // updates local willPublish/Schedule values, does not get applied to // the post's `status` value until a save is triggered @action @@ -644,7 +609,8 @@ export default class LexicalEditorController extends Controller { if (!options.silent) { let errorOrMessages = error || this.get('post.errors.messages'); this._showErrorAlert(prevStatus, this.get('post.status'), errorOrMessages); - return; + // simulate a validation error for upstream tasks + throw undefined; } return this.post; @@ -793,11 +759,22 @@ export default class LexicalEditorController extends Controller { try { yield post.save(options); + + // log if a save is slow + if (this.config.sentry_dsn && (Date.now() - startTime > 2000)) { + captureMessage('Successful Lexical save took > 2s', (scope) => { + scope.setTag('save_time', Math.ceil((Date.now() - startTime) / 1000)); + scope.setTag('post_type', post.isPage ? 'page' : 'post'); + scope.setTag('save_revision', options.adapterOptions?.saveRevision); + scope.setTag('email_segment', options.adapterOptions?.emailSegment); + scope.setTag('convert_to_lexical', options.adapterOptions?.convertToLexical); + }); + } } catch (error) { this.post.set('emailOnly', previousEmailOnlyValue); if (this.config.sentry_dsn && (Date.now() - startTime > 2000)) { - Sentry.captureException('Failed Lexical save took > 2s', (scope) => { + captureMessage('Failed Lexical save took > 2s', (scope) => { scope.setTag('save_time', Math.ceil((Date.now() - startTime) / 1000)); scope.setTag('post_type', post.isPage ? 'page' : 'post'); scope.setTag('save_revision', options.adapterOptions?.saveRevision); @@ -862,44 +839,39 @@ export default class LexicalEditorController extends Controller { // this is necessary to force a save when the title is blank this.set('hasDirtyAttributes', true); - // always save updates automatically for drafts - if (this.get('post.isDraft')) { + // generate slug if post + // - is new and doesn't have a title yet + // - still has the default title + // - previously had a title that ended with the duplicated post title suffix + if ( + (post.get('isNew') && !currentTitle) || + (currentTitle === DEFAULT_TITLE) || + currentTitle?.endsWith(DUPLICATED_POST_TITLE_SUFFIX) + ) { yield this.generateSlugTask.perform(); + } + + if (this.get('post.isDraft')) { yield this.autosaveTask.perform(); } this.ui.updateDocumentTitle(); } - /* - // sync the post slug with the post title, except when: - // - the user has already typed a custom slug, which should not be overwritten - // - the post has been published, so that published URLs are not broken - */ @enqueueTask *generateSlugTask() { - const currentTitle = this.get('post.title'); - const newTitle = this.get('post.titleScratch'); - const currentSlug = this.get('post.slug'); + let title = this.get('post.titleScratch'); // Only set an "untitled" slug once per post - if (newTitle === DEFAULT_TITLE && currentSlug) { - return; - } - - // Update the slug unless the slug looks to be a custom slug or the title is a default/has been cleared out - if ( - (currentSlug && slugify(currentTitle) !== currentSlug) - && !(currentTitle === DEFAULT_TITLE || currentTitle?.endsWith(DUPLICATED_POST_TITLE_SUFFIX)) - ) { + if (title === DEFAULT_TITLE && this.get('post.slug')) { return; } try { - const newSlug = yield this.slugGenerator.generateSlug('post', newTitle); + let slug = yield this.slugGenerator.generateSlug('post', title); - if (!isBlank(newSlug)) { - this.set('post.slug', newSlug); + if (!isBlank(slug)) { + this.set('post.slug', slug); } } catch (error) { // Nothing to do (would be nice to log this somewhere though), @@ -1091,8 +1063,7 @@ export default class LexicalEditorController extends Controller { && (state.isSaving || !state.hasDirtyAttributes); // If leaving the editor and the post has changed since we last saved a revision (and it's not deleted), always save a new revision - // but we should never autosave when leaving published or soon-to-be published content (scheduled); this should require the user to intervene - if (!this._saveOnLeavePerformed && hasChangedSinceLastRevision && hasDirtyAttributes && !state.isDeleted && post.get('status') === 'draft') { + if (!this._saveOnLeavePerformed && hasChangedSinceLastRevision && hasDirtyAttributes && !state.isDeleted) { transition.abort(); if (this._autosaveRunning) { this.cancelAutosave(); @@ -1131,7 +1102,6 @@ export default class LexicalEditorController extends Controller { if (this.post) { Object.assign(this._leaveModalReason, {status: this.post.status}); } - Sentry.captureMessage('showing leave editor modal', {extra: this._leaveModalReason}); console.log('showing leave editor modal', this._leaveModalReason); // eslint-disable-line const reallyLeave = await this.modals.open(ConfirmEditorLeaveModal); @@ -1257,19 +1227,6 @@ export default class LexicalEditorController extends Controller { // additional guard in case we are trying to compare null with undefined if (scratch || lexical) { if (scratch !== lexical) { - // lexical can dynamically set direction on loading editor state (e.g. "rtl"/"ltr") per the DOM context - // and we need to ignore this as a change from the user; see https://github.com/facebook/lexical/issues/4998 - const scratchChildNodes = scratch ? JSON.parse(scratch).root?.children : []; - const lexicalChildNodes = lexical ? JSON.parse(lexical).root?.children : []; - - // // nullling is typically faster than delete - scratchChildNodes.forEach(child => child.direction = null); - lexicalChildNodes.forEach(child => child.direction = null); - - if (JSON.stringify(scratchChildNodes) === JSON.stringify(lexicalChildNodes)) { - return false; - } - this._leaveModalReason = {reason: 'lexical is different', context: {current: lexical, scratch}}; return true; } @@ -1306,15 +1263,13 @@ export default class LexicalEditorController extends Controller { let notifications = this.notifications; let message = messageMap.success.post[prevStatus][status]; let actions, type, path; - type = this.get('post.displayName'); if (status === 'published' || status === 'scheduled') { + type = this.get('post.displayName'); path = this.get('post.url'); - actions = `View on site`; + actions = `View ${type}`; } - message = capitalizeFirstLetter(type) + ' ' + message.toLowerCase(); - notifications.showNotification(message, {type: 'success', actions: (actions && htmlSafe(actions)), delayed}); } @@ -1323,12 +1278,11 @@ export default class LexicalEditorController extends Controller { publishedAtUTC, previewUrl, emailOnly, - newsletter, - displayName + newsletter } = this.post; let publishedAtBlogTZ = moment.tz(publishedAtUTC, this.settings.timezone); - let title = capitalizeFirstLetter(displayName) + ' scheduled'; + let title = 'Scheduled'; let description = emailOnly ? ['Will be sent'] : ['Will be published']; if (newsletter) { @@ -1336,18 +1290,17 @@ export default class LexicalEditorController extends Controller { description.push(`${!emailOnly ? 'and delivered ' : ''}to ${recipientCount}`); } - description.push(`on ${publishedAtBlogTZ.format('D MMM YYYY')}`); - let timeZoneLabel = ''; + description.push(`on ${publishedAtBlogTZ.format('MMM Do')}`); + description.push(`at ${publishedAtBlogTZ.format('HH:mm')}`); if (publishedAtBlogTZ.utcOffset() === 0) { - timeZoneLabel = '(UTC)'; + description.push('(UTC)'); } else { - timeZoneLabel = `(UTC${publishedAtBlogTZ.format('Z').replace(/([+-])0/, '$1').replace(/:00/, '')})`; + description.push(`(UTC${publishedAtBlogTZ.format('Z').replace(/([+-])0/, '$1').replace(/:00/, '')})`); } - description.push(`at ${publishedAtBlogTZ.format('HH:mm')} ${timeZoneLabel}`); description = htmlSafe(description.join(' ')); - let actions = htmlSafe(`Show preview`); + let actions = htmlSafe(`View Preview`); return this.notifications.showNotification(title, {description, actions, type: 'success', delayed}); } diff --git a/ghost/admin/app/controllers/member.js b/ghost/admin/app/controllers/member.js index 0978126d0893..d93e04dbfc8e 100644 --- a/ghost/admin/app/controllers/member.js +++ b/ghost/admin/app/controllers/member.js @@ -212,7 +212,6 @@ export default class MemberController extends Controller { member.hasValidated.pushObject(payloadError.property); } } - return; } throw error; diff --git a/ghost/admin/app/controllers/members.js b/ghost/admin/app/controllers/members.js index 016987fda23e..45598c6d5cc6 100644 --- a/ghost/admin/app/controllers/members.js +++ b/ghost/admin/app/controllers/members.js @@ -7,11 +7,11 @@ import ghostPaths from 'ghost-admin/utils/ghost-paths'; import moment from 'moment-timezone'; import {A} from '@ember/array'; import {action} from '@ember/object'; -import {didCancel, task, timeout} from 'ember-concurrency'; import {ghPluralize} from 'ghost-admin/helpers/gh-pluralize'; import {inject} from 'ghost-admin/decorators/inject'; import {resetQueryParams} from 'ghost-admin/helpers/reset-query-params'; import {inject as service} from '@ember/service'; +import {task, timeout} from 'ember-concurrency'; import {tracked} from '@glimmer/tracking'; const PAID_PARAMS = [{ @@ -258,18 +258,8 @@ export default class MembersController extends Controller { @action refreshData() { - try { - this.fetchMembersTask.perform(); - this.fetchLabelsTask.perform(); - } catch (e) { - // Do not throw cancellation errors - if (didCancel(e)) { - return; - } - - throw e; - } - + this.fetchMembersTask.perform(); + this.fetchLabelsTask.perform(); this.membersStats.invalidate(); this.membersStats.fetchCounts(); this.membersStats.fetchMemberCount(); @@ -425,7 +415,7 @@ export default class MembersController extends Controller { this.searchParam = query; } - @task({restartable: true}) + @task *fetchLabelsTask() { yield this.store.query('label', {limit: 'all'}); } diff --git a/ghost/admin/app/controllers/offer.js b/ghost/admin/app/controllers/offer.js index 5949efe9f84e..3fe7e73c2268 100644 --- a/ghost/admin/app/controllers/offer.js +++ b/ghost/admin/app/controllers/offer.js @@ -4,11 +4,11 @@ import UnarchiveOfferModal from '../components/modals/offers/unarchive'; import config from 'ghost-admin/config/environment'; import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard'; import {action} from '@ember/object'; -import {didCancel, task} from 'ember-concurrency'; import {getSymbol} from 'ghost-admin/utils/currency'; import {inject} from 'ghost-admin/decorators/inject'; import {inject as service} from '@ember/service'; import {slugify} from '@tryghost/string'; +import {task} from 'ember-concurrency'; import {timeout} from 'ember-concurrency'; import {tracked} from '@glimmer/tracking'; @@ -258,16 +258,7 @@ export default class OffersController extends Controller { @action setup() { - try { - this.fetchTiers.perform(); - } catch (e) { - // Do not throw cancellation errors - if (didCancel(e)) { - return; - } - - throw e; - } + this.fetchTiers.perform(); } @action diff --git a/ghost/admin/app/controllers/reset.js b/ghost/admin/app/controllers/reset.js index 2ce6090ee82a..0c045c9762aa 100644 --- a/ghost/admin/app/controllers/reset.js +++ b/ghost/admin/app/controllers/reset.js @@ -62,10 +62,7 @@ export default class ResetController extends Controller.extend(ValidationEngine) password_reset: [{newPassword, ne2Password, token}] } }); - this.notifications.showNotification( - resp.password_reset[0].message, - {type: 'info', delayed: true, key: 'password.reset'} - ); + this.notifications.showAlert(resp.password_reset[0].message, {type: 'warn', delayed: true, key: 'password.reset'}); this.session.authenticate('authenticator:cookie', email, newPassword); return true; } catch (error) { diff --git a/ghost/admin/app/controllers/setup/done.js b/ghost/admin/app/controllers/setup/done.js new file mode 100644 index 000000000000..bd2480fc79b4 --- /dev/null +++ b/ghost/admin/app/controllers/setup/done.js @@ -0,0 +1,72 @@ +import Controller from '@ember/controller'; +import {isEmpty} from '@ember/utils'; +import {inject as service} from '@ember/service'; +import {task} from 'ember-concurrency'; +import {tracked} from '@glimmer/tracking'; + +const THEME_PROPERTIES = { + casper: ['description', 'color', 'coverImage'], + source: ['description', 'color', 'coverImage'], + edition: ['description', 'color', 'coverImage'], + dawn: ['description', 'color', 'icon'], + dope: ['description', 'color', 'logo'], + bulletin: ['description', 'color', 'logo'], + alto: ['description', 'color', 'logo'], + journal: ['description', 'color', 'logo'], + wave: ['description', 'color', 'logo', 'coverImage'], + edge: ['description', 'color', 'logo'], + ease: ['description', 'color', 'logo', 'coverImage'], + ruby: ['description', 'color', 'logo', 'coverImage'], + london: ['description', 'color', 'logo'], + digest: ['description', 'color', 'logo'] +}; + +export default class SetupFinishingTouchesController extends Controller { + @service modals; + @service router; + @service settings; + @service store; + @service themeManagement; + + @tracked descriptionVisible; + @tracked colorVisible; + @tracked logoVisible; + @tracked iconVisible; + @tracked coverImageVisible; + + themes = null; + + // Default properties to display + themeProperties = ['description', 'color', 'coverImage']; + + constructor() { + super(...arguments); + this.initThemeProperties.perform(); + } + + @task({drop: true}) + *initThemeProperties() { + this.themes = yield this.store.peekAll('theme'); + if (isEmpty(this.themes)) { + this.themes = yield this.store.findAll('theme'); + } + + const activeTheme = this.themes.findBy('active', true); + + if (activeTheme && THEME_PROPERTIES[activeTheme.name]) { + this.themeProperties = THEME_PROPERTIES[activeTheme.name]; + } + + this.descriptionVisible = this.themeProperties.includes('description'); + this.logoVisible = this.themeProperties.includes('logo'); + this.iconVisible = this.themeProperties.includes('icon'); + this.colorVisible = this.themeProperties.includes('color'); + this.coverImageVisible = this.themeProperties.includes('coverImage'); + } + + @task + *saveAndContinueTask() { + yield this.settings.save(); + this.router.transitionTo('home'); + } +} diff --git a/ghost/admin/app/controllers/signin.js b/ghost/admin/app/controllers/signin.js index 1c4531cf3a56..3ef67c25695f 100644 --- a/ghost/admin/app/controllers/signin.js +++ b/ghost/admin/app/controllers/signin.js @@ -25,7 +25,6 @@ export default class SigninController extends Controller.extend(ValidationEngine @tracked submitting = false; @tracked loggingIn = false; - @tracked flowNotification = ''; @tracked flowErrors = ''; @tracked passwordResetEmailSent = false; @@ -124,19 +123,21 @@ export default class SigninController extends Controller.extend(ValidationEngine let notifications = this.notifications; this.flowErrors = ''; - this.flowNotification = ''; // This is a bit dirty, but there's no other way to ensure the properties are set as well as 'forgotPassword' this.hasValidated.addObject('identification'); try { yield this.validate({property: 'forgotPassword'}); yield this.ajax.post(forgottenUrl, {data: {password_reset: [{email}]}}); - this.flowNotification = 'An email with password reset instructions has been sent.'; + notifications.showAlert( + 'Please check your email for instructions.', + {type: 'info', key: 'forgot-password.send.success'} + ); return true; } catch (error) { // ValidationEngine throws "undefined" for failed validation if (!error) { - return this.flowErrors = 'We need your email address to reset your password.'; + return this.flowErrors = 'We need your email address to reset your password!'; } if (isVersionMismatchError(error)) { diff --git a/ghost/admin/app/helpers/parse-member-event.js b/ghost/admin/app/helpers/parse-member-event.js index 8a3a04563335..f0581eb3b6c3 100644 --- a/ghost/admin/app/helpers/parse-member-event.js +++ b/ghost/admin/app/helpers/parse-member-event.js @@ -114,10 +114,6 @@ export default class ParseMemberEventHelper extends Helper { icon = 'subscriptions'; } - if (event.type === 'email_change_event') { - icon = 'email-changed'; - } - return 'event-' + icon; } @@ -212,15 +208,8 @@ export default class ParseMemberEventHelper extends Helper { return 'less like this'; } - if (event.type === 'email_change_event') { - if (event.data.from_email && event.data.to_email) { - return `Email address changed from ${event.data.from_email} to ${event.data.to_email}`; - } - return 'Email address changed'; - } - if (event.type === 'donation_event') { - return 'Made a one-time payment'; + return `Made a one-time payment`; } } @@ -341,7 +330,7 @@ export default class ParseMemberEventHelper extends Helper { * Get internal route props for a clickable object */ getRoute(event) { - if (['click_event', 'feedback_event'].includes(event.type)) { + if (['comment_event', 'click_event', 'feedback_event'].includes(event.type)) { if (event.data.post) { return { name: 'posts.analytics', diff --git a/ghost/admin/app/models/newsletter.js b/ghost/admin/app/models/newsletter.js index 041b10f500f6..4c725c039968 100644 --- a/ghost/admin/app/models/newsletter.js +++ b/ghost/admin/app/models/newsletter.js @@ -24,7 +24,6 @@ export default class Newsletter extends Model.extend(ValidationEngine) { @attr({defaultValue: true}) showHeaderTitle; @attr({defaultValue: true}) showHeaderName; @attr({defaultValue: true}) showPostTitleSection; - @attr({defaultValue: false}) showExcerpt; @attr({defaultValue: true}) showCommentCta; @attr({defaultValue: false}) showSubscriptionDetails; @attr({defaultValue: false}) showLatestPosts; diff --git a/ghost/admin/app/models/post-revision.js b/ghost/admin/app/models/post-revision.js index c0a42b2e971d..689811f8c890 100644 --- a/ghost/admin/app/models/post-revision.js +++ b/ghost/admin/app/models/post-revision.js @@ -3,7 +3,6 @@ import Model, {attr, belongsTo} from '@ember-data/model'; export default class PostRevisionModel extends Model { @attr('string') lexical; @attr('string') title; - @attr('string') customExcerpt; @attr('string') featureImage; @attr('string') featureImageAlt; @attr('string') featureImageCaption; diff --git a/ghost/admin/app/routes/application.js b/ghost/admin/app/routes/application.js index 5eb27060f1ec..e29eae32f7d8 100644 --- a/ghost/admin/app/routes/application.js +++ b/ghost/admin/app/routes/application.js @@ -8,7 +8,6 @@ import ShortcutsRoute from 'ghost-admin/mixins/shortcuts-route'; import ctrlOrCmd from 'ghost-admin/utils/ctrl-or-cmd'; import windowProxy from 'ghost-admin/utils/window-proxy'; import {Debug} from '@sentry/integrations'; -import {Replay} from '@sentry/replay'; import {beforeSend} from 'ghost-admin/utils/sentry'; import {importComponent} from '../components/admin-x/admin-x-component'; import {inject} from 'ghost-admin/decorators/inject'; @@ -185,54 +184,16 @@ export default Route.extend(ShortcutsRoute, { release: `ghost@${this.config.version}`, beforeSend, ignoreErrors: [ - // Browser autoplay policies (this regex covers a few) - /The play() request was interrupted/, - /The request is not allowed by the user agent or the platform in the current context/, - - // Network errors that we don't control - /Server was unreachable/, - /NetworkError when attempting to fetch resource./, - /Failed to fetch/, - /Load failed/, - /The operation was aborted./, - // TransitionAborted errors surface from normal application behaviour // - https://github.com/emberjs/ember.js/issues/12505 /^TransitionAborted$/, // ResizeObserver loop errors occur often from extensions and // embedded content, generally harmless and not useful to report - /^ResizeObserver loop completed with undelivered notifications/, - /^ResizeObserver loop limit exceeded/, - // When tasks in ember-concurrency are canceled, they sometimes lead to unhandled Promise rejections - // This doesn't affect the application and is not useful to report - // - http://ember-concurrency.com/docs/cancelation - 'TaskCancelation' - ], - integrations: [] + /^ResizeObserver loop completed with undelivered notifications/ + ] }; - - try { - // Session Replay on errors - // Docs: https://docs.sentry.io/platforms/javascript/session-replay - sentryConfig.replaysOnErrorSampleRate = 0.5; - sentryConfig.integrations.push( - // Replace with `Sentry.replayIntegration()` once we've migrated to @sentry/ember 8.x - // Docs: https://docs.sentry.io/platforms/javascript/migration/v7-to-v8/#removal-of-sentryreplay-package - new Replay({ - mask: ['.koenig-lexical', '.gh-dashboard'], - unmask: ['[role="menu"]', '[data-testid="settings-panel"]', '.gh-nav'], - maskAllText: false, - maskAllInputs: true, - blockAllMedia: true - }) - ); - } catch (e) { - // no-op, Session Replay is not critical - console.error('Error enabling Sentry Replay:', e); // eslint-disable-line no-console - } - if (this.config.sentry_env === 'development') { - sentryConfig.integrations.push(new Debug()); + sentryConfig.integrations = [new Debug()]; } Sentry.init(sentryConfig); } diff --git a/ghost/admin/app/routes/collection.js b/ghost/admin/app/routes/collection.js index f19f609f7668..7110da473f54 100644 --- a/ghost/admin/app/routes/collection.js +++ b/ghost/admin/app/routes/collection.js @@ -1,4 +1,3 @@ -import * as Sentry from '@sentry/ember'; import AuthenticatedRoute from 'ghost-admin/routes/authenticated'; import ConfirmUnsavedChangesModal from '../components/modals/confirm-unsaved-changes'; import {action} from '@ember/object'; @@ -78,7 +77,6 @@ export default class CollectionRoute extends AuthenticatedRoute { async confirmUnsavedChanges() { if (this.controller.model?.hasDirtyAttributes) { - Sentry.captureMessage('showing unsaved changes modal for collections route'); this.confirmModal = this.modals .open(ConfirmUnsavedChangesModal) .finally(() => { diff --git a/ghost/admin/app/routes/member.js b/ghost/admin/app/routes/member.js index ab9bdc8c7570..b0b245376b9f 100644 --- a/ghost/admin/app/routes/member.js +++ b/ghost/admin/app/routes/member.js @@ -1,4 +1,3 @@ -import * as Sentry from '@sentry/ember'; import AdminRoute from 'ghost-admin/routes/admin'; import ConfirmUnsavedChangesModal from '../components/modals/confirm-unsaved-changes'; import {action} from '@ember/object'; @@ -97,7 +96,6 @@ export default class MembersRoute extends AdminRoute { } async confirmUnsavedChanges() { - Sentry.captureMessage('showing unsaved changes modal for members route'); this.confirmModal = this.modals .open(ConfirmUnsavedChangesModal) .finally(() => { diff --git a/ghost/admin/app/routes/members.js b/ghost/admin/app/routes/members.js index 235ed2d67d83..67207e26206f 100644 --- a/ghost/admin/app/routes/members.js +++ b/ghost/admin/app/routes/members.js @@ -1,5 +1,4 @@ import AdminRoute from 'ghost-admin/routes/admin'; -import {didCancel} from 'ember-concurrency'; import {inject as service} from '@ember/service'; export default class MembersRoute extends AdminRoute { @@ -28,17 +27,7 @@ export default class MembersRoute extends AdminRoute { // trigger a background load of members plus labels for filter dropdown setupController(controller) { super.setupController(...arguments); - - try { - controller.fetchLabelsTask.perform(); - } catch (e) { - // Do not throw cancellation errors - if (didCancel(e)) { - return; - } - - throw e; - } + controller.fetchLabelsTask.perform(); } resetController(controller, _isExiting, transition) { diff --git a/ghost/admin/app/routes/setup/done.js b/ghost/admin/app/routes/setup/done.js index caca0c63e987..ced49eb2f68c 100644 --- a/ghost/admin/app/routes/setup/done.js +++ b/ghost/admin/app/routes/setup/done.js @@ -12,10 +12,23 @@ export default class SetupFinishingTouchesRoute extends AuthenticatedRoute { beforeModel() { super.beforeModel(...arguments); - if (this.session.user.isOwnerOnly) { + if (!this.session.user.isOwnerOnly) { + return; + } + + if (this.feature.onboardingChecklist) { this.onboarding.startChecklist(); + return this.router.transitionTo('dashboard'); } + } + + model() { + this.themeManagement.setPreviewType('homepage'); + this.themeManagement.updatePreviewHtmlTask.perform(); + } - return this.router.transitionTo('dashboard'); + deactivate() { + // rollback any unsaved setting changes when leaving + this.settings.rollbackAttributes(); } } diff --git a/ghost/admin/app/routes/setup/index.js b/ghost/admin/app/routes/setup/index.js index 9bc7190de915..827eb3d8afe6 100644 --- a/ghost/admin/app/routes/setup/index.js +++ b/ghost/admin/app/routes/setup/index.js @@ -1,11 +1,8 @@ import Route from '@ember/routing/route'; -import {inject as service} from '@ember/service'; export default class IndexRoute extends Route { - @service router; - beforeModel() { super.beforeModel(...arguments); - this.router.transitionTo('setup.one'); + this.transitionTo('setup.one'); } } diff --git a/ghost/admin/app/routes/tag.js b/ghost/admin/app/routes/tag.js index 17443be1dc25..ada63bba91fe 100644 --- a/ghost/admin/app/routes/tag.js +++ b/ghost/admin/app/routes/tag.js @@ -1,4 +1,3 @@ -import * as Sentry from '@sentry/ember'; import AuthenticatedRoute from 'ghost-admin/routes/authenticated'; import ConfirmUnsavedChangesModal from '../components/modals/confirm-unsaved-changes'; import {action} from '@ember/object'; @@ -78,7 +77,6 @@ export default class TagRoute extends AuthenticatedRoute { async confirmUnsavedChanges() { if (this.controller.model?.hasDirtyAttributes) { - Sentry.captureMessage('showing unsaved changes modal for tags route'); this.confirmModal = this.modals .open(ConfirmUnsavedChangesModal) .finally(() => { diff --git a/ghost/admin/app/serializers/post-revision.js b/ghost/admin/app/serializers/post-revision.js index 7b281fdd585f..ff94d1e54c62 100644 --- a/ghost/admin/app/serializers/post-revision.js +++ b/ghost/admin/app/serializers/post-revision.js @@ -5,6 +5,15 @@ import {EmbeddedRecordsMixin} from '@ember-data/serializer/rest'; export default class PostRevisionSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) { // settings for the EmbeddedRecordsMixin. attrs = { - author: {embedded: 'always'} + author: {embedded: 'always'}, + lexical: {key: 'lexical'}, + title: {key: 'title'}, + createdAt: {key: 'created_at'}, + postStatus: {key: 'post_status'}, + reason: {key: 'reason'}, + featureImage: {key: 'feature_image'}, + featureImageAlt: {key: 'feature_image_alt'}, + featureImageCaption: {key: 'feature_image_caption'}, + postIdLocal: {key: 'post_id'} }; } diff --git a/ghost/admin/app/services/dashboard-stats.js b/ghost/admin/app/services/dashboard-stats.js index c55d5f536342..e23b17b51a4a 100644 --- a/ghost/admin/app/services/dashboard-stats.js +++ b/ghost/admin/app/services/dashboard-stats.js @@ -3,8 +3,6 @@ import moment from 'moment-timezone'; import {task} from 'ember-concurrency'; import {tracked} from '@glimmer/tracking'; -import mergeStatsByDate from 'ghost-admin/utils/merge-stats-by-date'; - /** * @typedef MrrStat * @type {Object} @@ -243,16 +241,14 @@ export default class DashboardStatsService extends Service { return []; } - const firstChartDay = moment().add(-this.chartDays, 'days').format('YYYY-MM-DD'); - return this.memberAttributionStats.filter((stat) => { if (this.chartDays === 'all') { return true; } - return stat.date >= firstChartDay; + return stat.date >= moment().add(-this.chartDays, 'days').format('YYYY-MM-DD'); }).reduce((acc, stat) => { const statSource = stat.source ?? ''; - const existingSource = acc.find(s => s.source.toLowerCase() === statSource.toLowerCase()); + const existingSource = acc.find(s => s.source === statSource); if (existingSource) { existingSource.signups += stat.signups || 0; existingSource.paidConversions += stat.paidConversions || 0; @@ -465,7 +461,39 @@ export default class DashboardStatsService extends Service { } } - const subscriptionCountStats = mergeStatsByDate(result.stats); + function mergeDates(list, entry) { + const [current, ...rest] = list; + + if (!current) { + return entry ? [entry] : []; + } + + if (!entry) { + return mergeDates(rest, { + date: current.date, + count: current.count, + positiveDelta: current.positive_delta, + negativeDelta: current.negative_delta, + signups: current.signups, + cancellations: current.cancellations + }); + } + + if (current.date === entry.date) { + return mergeDates(rest, { + date: entry.date, + count: entry.count + current.count, + positiveDelta: entry.positiveDelta + current.positive_delta, + negativeDelta: entry.negativeDelta + current.negative_delta, + signups: entry.signups + current.signups, + cancellations: entry.cancellations + current.cancellations + }); + } + + return [entry].concat(mergeDates(list)); + } + + const subscriptionCountStats = mergeDates(result.stats); this.paidMembersByCadence = paidMembersByCadence; this.paidMembersByTier = paidMembersByTier; @@ -496,7 +524,7 @@ export default class DashboardStatsService extends Service { this.memberCountStats = this.dashboardMocks.memberCountStats; return; } - + const stats = yield this.membersStats.fetchMemberCount(); this.memberCountStats = stats.stats.map((d) => { return { diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js index cc71f9167264..318a3988073d 100644 --- a/ghost/admin/app/services/feature.js +++ b/ghost/admin/app/services/feature.js @@ -80,11 +80,9 @@ export default class FeatureService extends Service { @feature('filterEmailDisabled') filterEmailDisabled; @feature('adminXDemo') adminXDemo; @feature('portalImprovements') portalImprovements; + @feature('onboardingChecklist') onboardingChecklist; @feature('ActivityPub') ActivityPub; @feature('internalLinking') internalLinking; - @feature('editorExcerpt') editorExcerpt; - @feature('newsletterExcerpt') newsletterExcerpt; - @feature('contentVisibility') contentVisibility; _user = null; diff --git a/ghost/admin/app/services/onboarding.js b/ghost/admin/app/services/onboarding.js index d5a8d5ce3a5c..56f8d868f853 100644 --- a/ghost/admin/app/services/onboarding.js +++ b/ghost/admin/app/services/onboarding.js @@ -7,6 +7,7 @@ const EMPTY_SETTINGS = { }; export default class OnboardingService extends Service { + @service feature; @service session; ONBOARDING_STEPS = [ @@ -23,7 +24,8 @@ export default class OnboardingService extends Service { } get isChecklistShown() { - return this.session.user.isOwnerOnly + return this.feature.onboardingChecklist + && this.session.user.isOwnerOnly && this.checklistStarted && !this.checklistCompleted && !this.checklistDismissed; diff --git a/ghost/admin/app/services/search-provider-beta.js b/ghost/admin/app/services/search-provider-beta.js deleted file mode 100644 index ce40a1800ce9..000000000000 --- a/ghost/admin/app/services/search-provider-beta.js +++ /dev/null @@ -1,139 +0,0 @@ -import RSVP from 'rsvp'; -import Service from '@ember/service'; -import {default as Flexsearch} from 'flexsearch'; -import {isEmpty} from '@ember/utils'; -import {pluralize} from 'ember-inflector'; -import {inject as service} from '@ember/service'; -import {task} from 'ember-concurrency'; - -const {Document} = Flexsearch; - -export const SEARCHABLES = [ - { - name: 'Staff', - model: 'user', - fields: ['id', 'slug', 'url', 'name', 'profile_image'], - pathField: 'slug', - titleField: 'name', - index: ['name'] - }, - { - name: 'Tags', - model: 'tag', - fields: ['id', 'slug', 'url', 'name'], - pathField: 'slug', - titleField: 'name', - index: ['name'] - }, - { - name: 'Posts', - model: 'post', - fields: ['id', 'url', 'title', 'status', 'published_at', 'visibility'], - order: 'updated_at desc', // ensure we use a simple rather than default order for faster response - pathField: 'id', - titleField: 'title', - index: ['title'] - }, - { - name: 'Pages', - model: 'page', - fields: ['id', 'url', 'title', 'status', 'published_at', 'visibility'], - order: 'updated_at desc', // ensure we use a simple rather than default order for faster response - pathField: 'id', - titleField: 'title', - index: ['title'] - } -]; - -export default class SearchProviderService extends Service { - @service ajax; - @service notifications; - @service store; - - indexes = SEARCHABLES.reduce((indexes, searchable) => { - indexes[searchable.model] = new Document({ - tokenize: 'forward', - document: { - id: 'id', - index: searchable.index, - store: true - } - }); - - return indexes; - }, {}); - - /* eslint-disable require-yield */ - @task - *searchTask(term) { - const results = []; - - SEARCHABLES.forEach((searchable) => { - const searchResults = this.indexes[searchable.model].search(term, {enrich: true}); - const usedIds = new Set(); - const groupResults = []; - - searchResults.forEach((field) => { - field.result.forEach((searchResult) => { - const {id, doc} = searchResult; - - if (usedIds.has(id)) { - return; - } - - usedIds.add(id); - - groupResults.push({ - groupName: searchable.name, - id: `${searchable.model}.${doc[searchable.pathField]}`, - title: doc[searchable.titleField], - url: doc.url, - status: doc.status, - visibility: doc.visibility, - publishedAt: doc.published_at - }); - }); - }); - - if (!isEmpty(groupResults)) { - results.push({ - groupName: searchable.name, - options: groupResults - }); - } - }); - - return results; - } - /* eslint-enable require-yield */ - - @task - *refreshContentTask() { - try { - const promises = SEARCHABLES.map(searchable => this.#loadSearchable(searchable)); - yield RSVP.all(promises); - } catch (error) { - // eslint-disable-next-line - console.error(error); - } - } - - async #loadSearchable(searchable) { - const url = `${this.store.adapterFor(searchable.model).urlForQuery({}, searchable.model)}/`; - const query = {fields: searchable.fields, limit: 10000, order: searchable.order}; - - try { - const response = await this.ajax.request(url, {data: query}); - - response[pluralize(searchable.model)].forEach((item) => { - this.indexes[searchable.model].add(item); - }); - } catch (error) { - console.error(error); // eslint-disable-line - - this.notifications.showAPIError(error, { - key: `search.load${searchable.name}.error` - }); - } - } -} diff --git a/ghost/admin/app/services/search-provider.js b/ghost/admin/app/services/search-provider.js deleted file mode 100644 index 2bef46af0c2e..000000000000 --- a/ghost/admin/app/services/search-provider.js +++ /dev/null @@ -1,116 +0,0 @@ -import RSVP from 'rsvp'; -import Service from '@ember/service'; -import {isEmpty} from '@ember/utils'; -import {pluralize} from 'ember-inflector'; -import {inject as service} from '@ember/service'; -import {task} from 'ember-concurrency'; - -export const SEARCHABLES = [ - { - name: 'Staff', - model: 'user', - fields: ['id', 'slug', 'url', 'name'], // id not used but required for API to have correct url - idField: 'slug', - titleField: 'name' - }, - { - name: 'Tags', - model: 'tag', - fields: ['slug', 'url', 'name'], - idField: 'slug', - titleField: 'name' - }, - { - name: 'Posts', - model: 'post', - fields: ['id', 'url', 'title', 'status', 'published_at', 'visibility'], - idField: 'id', - titleField: 'title' - }, - { - name: 'Pages', - model: 'page', - fields: ['id', 'url', 'title', 'status', 'published_at', 'visibility'], - idField: 'id', - titleField: 'title' - } -]; - -export default class SearchProviderService extends Service { - @service ajax; - @service notifications; - @service store; - - content = []; - - /* eslint-disable require-yield */ - @task - *searchTask(term) { - const normalizedTerm = term.toString().toLowerCase(); - const results = []; - - SEARCHABLES.forEach((searchable) => { - const matchedContent = this.content.filter((item) => { - const normalizedTitle = item.title.toString().toLowerCase(); - return ( - item.groupName === searchable.name && - normalizedTitle.indexOf(normalizedTerm) >= 0 - ); - }); - - if (!isEmpty(matchedContent)) { - results.push({ - groupName: searchable.name, - options: matchedContent - }); - } - }); - - return results; - } - /* eslint-enable require-yield */ - - @task - *refreshContentTask() { - const content = []; - const promises = SEARCHABLES.map(searchable => this._loadSearchable(searchable, content)); - - try { - yield RSVP.all(promises); - this.content = content; - } catch (error) { - // eslint-disable-next-line - console.error(error); - } - } - - async _loadSearchable(searchable, content) { - const url = `${this.store.adapterFor(searchable.model).urlForQuery({}, searchable.model)}/`; - const maxSearchableLimit = '10000'; - const query = {fields: searchable.fields, limit: maxSearchableLimit}; - - try { - const response = await this.ajax.request(url, {data: query}); - - const items = response[pluralize(searchable.model)].map( - item => ({ - id: `${searchable.model}.${item[searchable.idField]}`, - url: item.url, - title: item[searchable.titleField], - groupName: searchable.name, - status: item.status, - visibility: item.visibility, - publishedAt: item.published_at - }) - ); - - content.push(...items); - } catch (error) { - console.error(error); // eslint-disable-line - - this.notifications.showAPIError(error, { - key: `search.load${searchable.name}.error` - }); - } - } -} diff --git a/ghost/admin/app/services/search.js b/ghost/admin/app/services/search.js index 2ba14e63675c..9b5ea0508bd8 100644 --- a/ghost/admin/app/services/search.js +++ b/ghost/admin/app/services/search.js @@ -1,24 +1,49 @@ +import RSVP from 'rsvp'; import Service from '@ember/service'; import {action} from '@ember/object'; -import {isBlank} from '@ember/utils'; +import {isBlank, isEmpty} from '@ember/utils'; +import {pluralize} from 'ember-inflector'; import {inject as service} from '@ember/service'; import {task, timeout} from 'ember-concurrency'; export default class SearchService extends Service { @service ajax; - @service feature; @service notifications; - @service searchProvider; - @service searchProviderBeta; @service store; + content = []; isContentStale = true; - get provider() { - return this.feature.internalLinking - ? this.searchProviderBeta - : this.searchProvider; - } + searchables = [ + { + name: 'Staff', + model: 'user', + fields: ['id', 'slug', 'url', 'name'], // id not used but required for API to have correct url + idField: 'slug', + titleField: 'name' + }, + { + name: 'Tags', + model: 'tag', + fields: ['slug', 'url', 'name'], + idField: 'slug', + titleField: 'name' + }, + { + name: 'Posts', + model: 'post', + fields: ['id', 'url', 'title', 'status', 'published_at', 'visibility'], + idField: 'id', + titleField: 'title' + }, + { + name: 'Pages', + model: 'page', + fields: ['id', 'url', 'title', 'status', 'published_at', 'visibility'], + idField: 'id', + titleField: 'title' + } + ]; @action expireContent() { @@ -42,7 +67,33 @@ export default class SearchService extends Service { yield this.refreshContentTask.lastRunning; } - return yield this.provider.searchTask.perform(term); + const searchResult = this._searchContent(term); + + return searchResult; + } + + _searchContent(term) { + const normalizedTerm = term.toString().toLowerCase(); + const results = []; + + this.searchables.forEach((searchable) => { + const matchedContent = this.content.filter((item) => { + const normalizedTitle = item.title.toString().toLowerCase(); + return ( + item.groupName === searchable.name && + normalizedTitle.indexOf(normalizedTerm) >= 0 + ); + }); + + if (!isEmpty(matchedContent)) { + results.push({ + groupName: searchable.name, + options: matchedContent + }); + } + }); + + return results; } @task({drop: true}) @@ -53,8 +104,47 @@ export default class SearchService extends Service { this.isContentStale = true; - yield this.provider.refreshContentTask.perform(); + const content = []; + const promises = this.searchables.map(searchable => this._loadSearchable(searchable, content)); + + try { + yield RSVP.all(promises); + this.content = content; + } catch (error) { + // eslint-disable-next-line + console.error(error); + } this.isContentStale = false; } + + async _loadSearchable(searchable, content) { + const url = `${this.store.adapterFor(searchable.model).urlForQuery({}, searchable.model)}/`; + const maxSearchableLimit = '10000'; + const query = {fields: searchable.fields, limit: maxSearchableLimit}; + + try { + const response = await this.ajax.request(url, {data: query}); + + const items = response[pluralize(searchable.model)].map( + item => ({ + id: `${searchable.model}.${item[searchable.idField]}`, + url: item.url, + title: item[searchable.titleField], + groupName: searchable.name, + status: item.status, + visibility: item.visibility, + publishedAt: item.published_at + }) + ); + + content.push(...items); + } catch (error) { + console.error(error); // eslint-disable-line + + this.notifications.showAPIError(error, { + key: `search.load${searchable.name}.error` + }); + } + } } diff --git a/ghost/admin/app/services/whats-new.js b/ghost/admin/app/services/whats-new.js index 6b2ffb6831b2..777c64258ecd 100644 --- a/ghost/admin/app/services/whats-new.js +++ b/ghost/admin/app/services/whats-new.js @@ -7,8 +7,6 @@ import {task} from 'ember-concurrency'; export default Service.extend({ session: service(), - store: service(), - response: null, entries: null, changelogUrl: 'https://ghost.org/blog/', @@ -41,47 +39,32 @@ export default Service.extend({ return latestMoment.isAfter(lastSeenMoment); }), - hasNewFeatured: computed('entries.[]', function () { - if (!this.hasNew) { - return false; - } - - let [latestEntry] = this.entries; - return latestEntry.featured; - }), - - seen: action(function () { - this.updateLastSeen.perform(); - }), - - openFeaturedModal: action(function () { + showModal: action(function () { this.set('isShowingModal', true); }), - closeFeaturedModal: action(function () { + closeModal: action(function () { this.set('isShowingModal', false); - this.seen(); + this.updateLastSeen.perform(); }), fetchLatest: task(function* () { try { - if (!this.response) { - // we should already be logged in at this point so lets grab the user - // record and store it locally so that we don't have to deal with - // session.user being a promise and causing issues with CPs - let user = yield this.session.user; - this.set('_user', user); - - this.response = yield fetch('https://ghost.org/changelog.json'); - if (!this.response.ok) { - // eslint-disable-next-line - return console.error('Failed to fetch changelog', {response}); - } - - let result = yield this.response.json(); - this.set('entries', result.posts || []); - this.set('changelogUrl', result.changelogUrl); + // we should already be logged in at this point so lets grab the user + // record and store it locally so that we don't have to deal with + // session.user being a promise and causing issues with CPs + let user = yield this.session.user; + this.set('_user', user); + + let response = yield fetch('https://ghost.org/changelog.json'); + if (!response.ok) { + // eslint-disable-next-line + return console.error('Failed to fetch changelog', {response}); } + + let result = yield response.json(); + this.set('entries', result.posts || []); + this.set('changelogUrl', result.changelogUrl); } catch (e) { console.error(e); // eslint-disable-line } diff --git a/ghost/admin/app/styles/app-dark.css b/ghost/admin/app/styles/app-dark.css index a6f40e77ff32..49d75f209475 100644 --- a/ghost/admin/app/styles/app-dark.css +++ b/ghost/admin/app/styles/app-dark.css @@ -54,7 +54,6 @@ @import "layouts/content.css"; @import "layouts/editor.css"; @import "layouts/whatsnew.css"; -@import "layouts/whatsnew-modal.css"; @import "layouts/tags.css"; @import "layouts/members.css"; @import "layouts/member-activity.css"; @@ -744,11 +743,6 @@ input:focus, /* Editor */ -.gh-editor-title, -.gh-editor-excerpt { - background: var(--white); -} - .gh-editor-title::placeholder { color: var(--midlightgrey-d2); } @@ -1432,7 +1426,3 @@ Onboarding checklist: Share publication modal */ .gh-share-links li a:hover { background: #394047; } - -.gh-sidebar-banner.gh-error-banner { - background: var(--lightgrey-d1); -} diff --git a/ghost/admin/app/styles/app.css b/ghost/admin/app/styles/app.css index 356fa42f08ec..e4baaa03aeec 100644 --- a/ghost/admin/app/styles/app.css +++ b/ghost/admin/app/styles/app.css @@ -56,7 +56,6 @@ @import "layouts/content.css"; @import "layouts/editor.css"; @import "layouts/whatsnew.css"; -@import "layouts/whatsnew-modal.css"; @import "layouts/tags.css"; @import "layouts/members.css"; @import "layouts/posts.css"; diff --git a/ghost/admin/app/styles/components/notifications.css b/ghost/admin/app/styles/components/notifications.css index 20fcb6e6daf8..8c008a47645c 100644 --- a/ghost/admin/app/styles/components/notifications.css +++ b/ghost/admin/app/styles/components/notifications.css @@ -312,8 +312,8 @@ /* ---------------------------------------------------------- */ .gh-alert-black { - border-bottom: 1px solid var(--black); - background: var(--black); + border-bottom: color-mod(var(--darkgrey) lightness(-10%)) 1px solid; + background: var(--darkgrey); color: #fff; } .gh-alert-black a { diff --git a/ghost/admin/app/styles/layouts/editor.css b/ghost/admin/app/styles/layouts/editor.css index 2a9ad8304f92..ee0c1b7427a5 100644 --- a/ghost/admin/app/styles/layouts/editor.css +++ b/ghost/admin/app/styles/layouts/editor.css @@ -160,8 +160,8 @@ .gh-og-preview { background: #fff; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1) inset, - 0 -1px 0 0 rgba(0, 0, 0, 0.06) inset, - 0 1px 4px rgba(0, 0, 0, 0.1); + 0 -1px 0 0 rgba(0, 0, 0, 0.06) inset, + 0 1px 4px rgba(0, 0, 0, 0.1); } .gh-og-preview-image { @@ -229,7 +229,7 @@ border-style: solid; border-color: #e1e8ed; color: #292f33; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; font-size: 1.4rem; line-height: 1.3em; background: #fff; @@ -283,7 +283,7 @@ /* NEW editor /* ---------------------------------------------------------- */ -.gh-main>section.gh-editor-fullscreen { +.gh-main > section.gh-editor-fullscreen { position: fixed; top: 0; left: 0; @@ -449,7 +449,7 @@ .gh-editor-feedback-dropdown { min-width: 400px; border-radius: 3px; - box-shadow: 0 0 0 1px rgba(0, 0, 0, .04), 0 8px 20px -3px rgba(0, 0, 0, .2); + box-shadow: 0 0 0 1px rgba(0,0,0,.04), 0 8px 20px -3px rgba(0,0,0,.2); padding: 20px; background-color: #fff; background-clip: padding-box; @@ -553,20 +553,13 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone { height: 4px; } -.gh-editor-feature-image { - position: relative; -} - -.gh-editor-feature-image img { - display: block; -} .gh-editor-feature-image-overlay { position: absolute; top: 0; left: 0; right: 0; - bottom: 0; - background-image: linear-gradient(180deg, rgba(0, 0, 0, .2), transparent 40%, transparent); + bottom: 100px; + background-image: linear-gradient(180deg,rgba(0,0,0,.2),transparent 40%,transparent); transition: all .1s ease-in; opacity: 0; } @@ -588,7 +581,7 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone { padding: 0; background: var(--white); color: var(--darkgrey); - border-radius: 6px; + border-radius: 4px; transition: all .1s ease-in; opacity: 0; } @@ -611,7 +604,7 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone { } .gh-editor-feature-image .image-action svg path { - stroke-width: 2; + fill: var(--darkgrey); } .gh-editor-feature-image-add { @@ -684,19 +677,12 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone { stroke: var(--midgrey-l2); } -.gh-editor-feature-image-caption-container { - position: relative; - display: flex; - justify-content: space-between; - align-items: center; - padding: .8rem 0; -} .gh-editor-feature-image-alttext, .gh-editor-feature-image-caption { width: 100%; min-height: 24px; - margin: 0; - padding: 0 3.6rem 0 0; + margin: 0 0 1.7em 0; + padding: 0; outline: none; border-width: 0; border-style: none; @@ -731,25 +717,12 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone { opacity: .5; } -.gh-editor-title-container { - position: relative; - max-width: 740px; - width: 100%; - margin-right: auto; - margin-left: auto; - border: none; - background: transparent; -} - .gh-editor-title { display: block; width: 100%; - max-width: unset; min-height: auto; - margin: 0 0 1.6rem; - padding: 0 0 4px; + margin-bottom: 1.2rem; border: none; - background: transparent; color: var(--black); font-size: 4.8rem; letter-spacing: -0.017em; @@ -759,18 +732,6 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone { box-shadow: none; } -@media (min-width: 500px) and (max-width: 768px) { - .gh-editor-title { - font-size: 3.6rem; - } -} - -@media (max-width: 500px) { - .gh-editor-title { - font-size: 2.8rem; - } -} - .gh-editor-title:focus { box-shadow: none !important; border: none !important; @@ -780,69 +741,6 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone { opacity: .5; } -.gh-editor-title::placeholder { - color: var(--lightgrey-d1); - font-weight: 700; - opacity: 1; -} - -.gh-editor-hidden-indicator { - position: absolute; - top: -1px; - height: 2.4rem; - margin-left: -6rem; - color: var(--midgrey-l2); -} - -.gh-editor-title-container .gh-editor-hidden-indicator { - top: 1.8rem; -} - -.gh-editor-hidden-indicator svg { - height: 2.4rem; -} - -.gh-editor-excerpt { - display: block; - width: 100%; - max-width: unset; - min-width: auto; - min-height: auto; /* Allows element to collapse for auto-expand calculation */ - margin: 0; - padding: 0; - border: none; - background: transparent; - color: var(--darkgrey); - font-size: 2.0rem; - font-weight: 440; - line-height: 1.5em; - letter-spacing: -.018em; - overflow: hidden; - box-shadow: none; -} - -.gh-editor-excerpt:focus { - box-shadow: none !important; - border: none !important; -} - -.gh-editor-excerpt-error { - margin-top: .8rem; - margin-bottom: 4.8rem; - color: var(--red-d1); - font-size: 1.4rem; - font-weight: 400; -} - -.gh-editor-title-divider { - margin: 1.6rem 0 4.8rem; -} - -.gh-editor-title-divider-error { - margin: 1.6rem 0 0; - border-top: 1px solid var(--red); -} - .gh-editor .tk-indicator { position: absolute; top: 15px; @@ -854,10 +752,6 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone { cursor: pointer; } -.gh-editor .tk-indicator-excerpt { - top: -1px; -} - .gh-editor-feature-image-container .tk-indicator { top: 0; padding: 0 .4rem; @@ -1033,6 +927,21 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone { } } +@media (max-width: 500px) { + .gh-editor-title { + font-size: 3.4rem; + } +} + +.gh-editor-title { + padding: 0 0 4px; +} + +.gh-editor-title::placeholder { + color: var(--lightgrey-d1); + font-weight: 700; + opacity: 1; +} .gh-editor .editor-preview { height: auto; margin-top: 4px; @@ -1051,7 +960,7 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone { .gh-editor .editor-preview h3, .gh-editor .editor-preview h4, .gh-editor .editor-preview h5, -.gh-editor .editor-preview h6 { +.gh-editor .editor-preview h6, { font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, "Open Sans", "Helvetica Neue", sans-serif; } @@ -1072,7 +981,7 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone { width: 100%; height: 100%; border: 2px solid var(--blue); - background-color: rgba(255, 255, 255, 0.6); + background-color: rgba(255,255,255,0.6); } .gh-editor-drop-target .drop-target-message { @@ -1123,7 +1032,6 @@ body[data-user-is-dragging] .gh-editor-feature-image-dropzone { position: relative; vertical-align: bottom; } - .editor-toolbar .fa-check:before { position: absolute; right: 3px; @@ -1212,8 +1120,8 @@ figure { left: -20px; width: 20px; height: 100%; - background: rgb(255, 255, 255); - background: linear-gradient(90deg, rgba(255, 255, 255, 1) 0%, rgba(255, 255, 255, 0) 100%); + background: rgb(255,255,255); + background: linear-gradient(90deg, rgba(255,255,255,1) 0%, rgba(255,255,255,0) 100%); z-index: 999; opacity: 0; transition: all 250ms ease-out; @@ -1226,22 +1134,22 @@ figure { right: 0; width: 20px; height: 100%; - background: rgb(255, 255, 255); - background: linear-gradient(90deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 100%); + background: rgb(255,255,255); + background: linear-gradient(90deg, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 100%); z-index: 999; } .ember-power-select-option[aria-current="true"] .kg-settings-link-url.scroller::before { opacity: 1; left: 0; - background: linear-gradient(90deg, rgba(244, 245, 245, 1) 0%, rgba(244, 245, 245, 0) 100%); + background: linear-gradient(90deg, rgba(244,245,245,1) 0%, rgba(244,245,245,0) 100%); } .ember-power-select-option[aria-current="true"] .kg-settings-link-url::after { - background: linear-gradient(90deg, rgba(244, 245, 245, 0) 0%, rgba(244, 245, 245, 1) 100%); + background: linear-gradient(90deg, rgba(244,245,245,0) 0%, rgba(244,245,245,1) 100%); } -.kg-settings-link-url>span { +.kg-settings-link-url > span { display: inline-block; font-weight: 400; font-size: 1.2rem; @@ -1260,10 +1168,65 @@ figure { /* Labs /* ---------------------------------------------------------- */ +.gh-editor-title-container { + position: relative; + max-width: 740px; + width: 100%; + margin-right: auto; + margin-left: auto; + border: none; + background: transparent; +} + +.gh-editor .gh-editor-title { + display: block; + width: 100%; + max-width: unset; + min-height: auto; + margin: 0 0 1.2rem; + border: none; + background: transparent; + color: var(--black); + font-size: 4.8rem; + letter-spacing: -0.017em; + line-height: 1.1em; + font-weight: 700; + overflow: hidden; + box-shadow: none; +} + +@media (min-width: 500px) and (max-width: 768px) { + .gh-editor .gh-editor-title { + font-size: 3.6rem; + } +} + +@media (max-width: 500px) { + .gh-editor .gh-editor-title { + font-size: 2.8rem; + } +} + +.gh-editor-hidden-indicator { + position: absolute; + top: -1px; + height: 2.4rem; + margin-left: -6rem; + color: var(--midgrey-l2); +} + +.gh-editor-title-container .gh-editor-hidden-indicator { + top: 1.8rem; +} + +.gh-editor-hidden-indicator svg { + height: 2.4rem; +} + .gh-setting-error { margin-top: 1em; line-height: 1.3em; color: var(--red); font-weight: 300; letter-spacing: 0.3px; -} \ No newline at end of file +} diff --git a/ghost/admin/app/styles/layouts/flow.css b/ghost/admin/app/styles/layouts/flow.css index c669f6ea04d8..bf22e34cc644 100644 --- a/ghost/admin/app/styles/layouts/flow.css +++ b/ghost/admin/app/styles/layouts/flow.css @@ -271,18 +271,7 @@ .gh-setup .gh-flow-content .main-error { margin-top: 16px; color: var(--red); - font-size: 1.4rem; - line-height: 1.5; - text-align: center; - text-wrap: balance; -} - -.gh-flow-content .main-notification, -.gh-setup .gh-flow-content .main-notification { - margin-top: 16px; - color: var(--black); - font-size: 1.4rem; - font-weight: 400; + font-size: 1.35rem; line-height: 1.5; text-align: center; text-wrap: balance; diff --git a/ghost/admin/app/styles/layouts/main.css b/ghost/admin/app/styles/layouts/main.css index c542e368ff6f..31659dcf5819 100644 --- a/ghost/admin/app/styles/layouts/main.css +++ b/ghost/admin/app/styles/layouts/main.css @@ -112,15 +112,7 @@ border-right: none; background: unset; width: 100%; - overflow: unset; -} - -.gh-nav-contributor .gh-nav-body { - overflow: unset; -} - -.gh-nav-contributor .gh-sidebar-banner { - max-width: 300px; + pointer-events: none; } .gh-nav-menu { @@ -453,10 +445,6 @@ z-index: 999; } -.gh-nav-list-home svg { - margin-top: -2px; -} - .gh-nav-list svg.force-fill path { fill: var(--midgrey); } @@ -2149,12 +2137,12 @@ section.gh-ds h2 { background: var(--red); } -/* Sidebar banners like ghost Referrals invite toast */ -.gh-sidebar-banner { +/* Ghost Referrals invite toast */ +.gh-referral-toast { position: relative; display: block; - padding: 12px 16px 16px; - margin: 0 -7px 32px; + padding: 25px; + margin-bottom: 50px; color: var(--black); text-decoration: none; background: var(--white); @@ -2164,38 +2152,38 @@ section.gh-ds h2 { cursor: pointer; } -.gh-sidebar-banner a { +.gh-referral-toast a { color: var(--black); } -.gh-sidebar-banner:hover { +.gh-referral-toast:hover { transform: translateY(-2px) scale(1.01); box-shadow: rgb(75 225 226 / 38%) -7px -4px 42px 10px, rgb(202 103 255 / 42%) 7px 8px 42px 10px; transition: all 0.3s ease; } -.gh-sidebar-banner-close { +.gh-referral-toast-close { position: absolute; - top: 4px; - right: 8px; + top: 7px; + right: 10px; padding: 5px; color: #ddd; font-size: 2.2rem; line-height: 1; } -.gh-sidebar-banner-close:hover { +.gh-referral-toast-close:hover { color: #15171A; } -.gh-sidebar-banner a > strong { +.gh-referral-toast a > strong { display: block; margin-bottom: 10px; font-size: 1.7rem; line-height: 1.2em; } -.gh-sidebar-banner a > p { +.gh-referral-toast a > p { margin: 0; font-size: 1.5rem; line-height: 1.35em; @@ -2204,115 +2192,22 @@ section.gh-ds h2 { color: #666; } -.gh-sidebar-banner a > p strong { +.gh-referral-toast a > p strong { color: #ff247d; } -.gh-sidebar-banner-button { +.gh-referral-toast-button { margin-top: 20px; border-radius: 5px; width: 100%; } -.gh-sidebar-banner-button span { +.gh-referral-toast-button span { padding: 0 12px; font-size: 1.4rem; text-align-last: center; - height: 38px; - line-height: 38px; -} - -.gh-sidebar-banner-container { - display: flex; - flex-direction: column; - text-align: left; -} - -.gh-sidebar-banner-icon { - width: 16px; - height: 16px; -} - -.gh-sidebar-banner-head { - display: flex; - align-items: center; - gap: 8px; - margin-bottom: 6px; - margin-top: 2px; -} - -.gh-sidebar-banner-subhead { - font-size: 13px; - color: var(--midgrey); - font-weight: 400; -} - -.gh-sidebar-banner a .gh-sidebar-banner-msg { - line-height: 1.4em; - font-weight: 600; - margin-top: -2px; - margin-bottom: 0; - font-size: 1.4rem; -} - -.gh-sidebar-banner-details { - line-height: 1.4em; - font-size: 1.35rem; - margin: 5px 0 0; - color: var(--darkgrey); - display: -webkit-box; - -webkit-line-clamp: 3; - -webkit-box-orient: vertical; - overflow: hidden; -} - -.gh-sidebar-banner-msg + .gh-sidebar-banner-button { - margin-top: 14px; -} - -.gh-referral-toast { - padding: 25px; - margin: 0 0 50px; -} - -.gh-referral-toast .gh-sidebar-banner-close { - top: 7px; - right: 10px; -} - -.gh-sidebar-banner.gh-error-banner { - box-shadow: 0px 0px 2px 0px rgba(0, 0, 0, 0.1), 0px 3px 8px 0px rgba(0, 0, 0, 0.06); - margin-bottom: 32px; - padding: 16px; -} - -.gh-sidebar-banner.gh-error-banner .gh-sidebar-banner-container { - flex-direction: row; - gap: 10px; -} - -.gh-sidebar-banner.gh-error-banner .gh-sidebar-banner-icon { - color: var(--red); -} - -.gh-sidebar-banner.gh-error-banner .gh-sidebar-banner-subhead { - color: var(--red); - font-size: 1.4rem; - font-weight: 600; - display: block; - margin-top: -2px; -} - -.gh-sidebar-banner.gh-error-banner .gh-sidebar-banner-msg { - font-weight: 400; - font-size: 1.3rem; - margin-top: 4px; - color: var(--darkgrey); -} - -.gh-sidebar-banner.gh-error-banner .gh-sidebar-banner-button { - color: var(--white); - background-color: var(--red); + height: 40px; + line-height: 40px; } .admin-x-container-error { diff --git a/ghost/admin/app/styles/layouts/post-history.css b/ghost/admin/app/styles/layouts/post-history.css index 590550a85f33..b9a3c1f219d1 100644 --- a/ghost/admin/app/styles/layouts/post-history.css +++ b/ghost/admin/app/styles/layouts/post-history.css @@ -199,7 +199,3 @@ .gh-post-history-hidden-lexical { display: none; } - -.gh-post-history .gh-editor-feature-image p { - margin: 0 0 1.2rem; -} diff --git a/ghost/admin/app/styles/layouts/whatsnew-modal.css b/ghost/admin/app/styles/layouts/whatsnew-modal.css deleted file mode 100644 index 31a32a673373..000000000000 --- a/ghost/admin/app/styles/layouts/whatsnew-modal.css +++ /dev/null @@ -1,150 +0,0 @@ -/* What's new modal */ -/* ---------------------------------------------------------- */ -.fullscreen-modal-whatsnew, -.fullscreen-modal-whatsnew-featured { - max-height: calc(100vh - 12vw); - overflow-y: auto; - border-radius: 8px !important; -} - -@media (max-height: 960px) { - .fullscreen-modal-whatsnew, - .fullscreen-modal-whatsnew-featured { - max-height: calc(100vh - 80px); - } -} - -.fullscreen-modal-whatsnew { - max-width: 640px !important; -} - -.fullscreen-modal-whatsnew a:focus { - outline: none; -} - -.gh-whatsnew-modal-entries { - display: flex; - flex-direction: column; - gap: 24px; - margin-bottom: 32px; -} - -.fullscreen-modal-whatsnew .modal-content, -.fullscreen-modal-whatsnew-featured .modal-content { - padding: 0; -} - -.gh-whatsnew-featured-container, -.gh-whatsnew-modal-entries { - padding: 0 32px; -} - -.gh-whatsnew-featured-subhead { - margin-bottom: 12px; - font-size: 1.3rem; - font-weight: 600; -} - -.gh-whatsnew-featured-date { - font-weight: 500; - color: var(--midgrey); -} - -.gh-whasnew-featured-title { - font-size: 2.8rem; -} - -.gh-whatsnew-featured-excerpt { - margin: 0 0 24px; - font-size: 1.6rem; - line-height: 1.35em; -} - -.gh-whatsnew-modal-footer { - z-index: 999; - display: flex; - justify-content: space-between; - align-items: center; - position: sticky; - bottom: 0px; - background: #fff; - padding: 32px; - margin-bottom: -32px; - box-shadow: 0px -7px 15px -10px rgba(0, 0, 0, 0.15); -} - -@media (max-width: 900px) { - .gh-whatsnew-modal-footer { - bottom: -10px; - } -} - -.gh-whatsnew-modal { - display: flex; - flex-direction: column; - gap: 24px; -} - -.gh-whasnew-modal-title { - font-size: 2.5rem; - padding: 32px 32px 28px; - margin: 0; -} - -.gh-whatsnew-modal-entry { - display: flex; - align-items: flex-start; - gap: 24px; - color: var(--black); - margin: -8px; - padding: 8px; -} - -.gh-whatsnew-modal-entry:hover { - background: var(--whitegrey-l2); - border-radius: 6px; -} - -.gh-whatsnew-modal-entry-featureimage { - max-width: 160px; - height: 110px; - object-fit: cover; - border-radius: 4px; -} - -.gh-whatsnew-modal-entrycontent { - display: flex; - flex-direction: column; - gap: 8px; - font-size: 1.4rem; -} - -.gh-whatsnew-modal-entrycontent h2 { - font-size: 1.7rem; - margin: 6px 0 0; -} - -.gh-whatsnew-modal-entrycontent p { - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - overflow: hidden; - line-height: 1.45em; - margin: 0; -} - -.gh-whatsnew-modal-entrycontent span { - color: var(--midgrey); -} - -.gh-whatsnew-modal-entrycontent img { - height: auto; -} - -.gh-whatsnew-banner-icon { - color: var(--yellow); -} - -.dropdown-item .gh-whatsnew-banner-icon { - margin-right: 0 !important; -} \ No newline at end of file diff --git a/ghost/admin/app/styles/layouts/whatsnew.css b/ghost/admin/app/styles/layouts/whatsnew.css index 015d6d6e581e..c584a95ac59f 100644 --- a/ghost/admin/app/styles/layouts/whatsnew.css +++ b/ghost/admin/app/styles/layouts/whatsnew.css @@ -1925,4 +1925,4 @@ .gh-whats-new .kg-header-card.kg-style-accent a.kg-header-card-button { background: #fff; color: #151515; -} \ No newline at end of file +} diff --git a/ghost/admin/app/styles/patterns/forms.css b/ghost/admin/app/styles/patterns/forms.css index 4eba90853a1e..82e216964bc0 100644 --- a/ghost/admin/app/styles/patterns/forms.css +++ b/ghost/admin/app/styles/patterns/forms.css @@ -231,14 +231,14 @@ select.error { .gh-input:focus, .gh-input.focus { outline: 0; - border-color: var(--green); + border-color: color-mod(var(--green)) !important; box-shadow: inset 0 0 0 1px var(--green); background: var(--white); } .error .gh-input:focus, .error .gh-input.focus { - border-color: var(--red); + border-color: color-mod(var(--red)) !important; box-shadow: inset 0 0 0 1px var(--red); } diff --git a/ghost/admin/app/styles/spirit/_custom-styles.css b/ghost/admin/app/styles/spirit/_custom-styles.css index 870b2278a534..de443ae1a4db 100644 --- a/ghost/admin/app/styles/spirit/_custom-styles.css +++ b/ghost/admin/app/styles/spirit/_custom-styles.css @@ -184,9 +184,9 @@ button, .btn-base { bottom: calc(100% + 4px); left: 50%; white-space: nowrap; - padding: 4px 10px; - border-radius: 6px; - background-color: var(--black); + padding: 3px 7px; + border-radius: 3px; + background-color: var(--darkgrey); color: var(--white); content: attr(data-tooltip); text-align: center; diff --git a/ghost/admin/app/templates/dashboard.hbs b/ghost/admin/app/templates/dashboard.hbs index ce1f815381da..b04c643a965b 100644 --- a/ghost/admin/app/templates/dashboard.hbs +++ b/ghost/admin/app/templates/dashboard.hbs @@ -85,34 +85,38 @@ {{#if this.isLoading }} {{else}} - {{#if this.onboarding.isChecklistShown}} - - {{/if}} - {{#if (and this.areMembersEnabled (not this.onboarding.isChecklistShown))}} - {{#if this.hasPaidTiers}} - + {{#if this.areMembersEnabled}} + + {{#if this.onboarding.isChecklistShown}} + {{/if}} -
        - + + {{#unless this.onboarding.isChecklistShown}} {{#if this.hasPaidTiers}} -
        -
        - - -
        -
        - {{/if}} - {{#unless this.membersUtils.isMembersInviteOnly}} - - {{/unless}} - {{#if this.areNewslettersEnabled}} - + {{/if}} +
        + + {{#if this.hasPaidTiers}} +
        +
        + + +
        +
        + {{/if}} + {{#unless this.membersUtils.isMembersInviteOnly}} + + {{/unless}} + {{#if this.areNewslettersEnabled}} + + {{/if}} - {{#if this.isTotalMembersZero}} - - {{/if}} -
        + {{#if this.isTotalMembersZero}} + + {{/if}} +
        + {{/unless}} {{/if}} {{#unless this.onboarding.isChecklistShown}} diff --git a/ghost/admin/app/templates/lexical-editor.hbs b/ghost/admin/app/templates/lexical-editor.hbs index bd9d5d51e7b3..015bbe996980 100644 --- a/ghost/admin/app/templates/lexical-editor.hbs +++ b/ghost/admin/app/templates/lexical-editor.hbs @@ -61,15 +61,11 @@ --}}
        diff --git a/ghost/admin/app/templates/setup/done.hbs b/ghost/admin/app/templates/setup/done.hbs new file mode 100644 index 000000000000..5dd1e9e805da --- /dev/null +++ b/ghost/admin/app/templates/setup/done.hbs @@ -0,0 +1,46 @@ +
        +
        +
        +
        +
        +
        +
        +
        +

        All done!

        +

        Your brand new publication is set up and ready to go.

        +
        +

        What do you want to do first?

        +
        + + {{svg-jar "posts"}} +
        Write your first post
        +

        Test out the editor and get a feel for creating content inside Ghost.

        +         + + {{svg-jar "paint-palette"}} +
        Customize your site
        +

        Review your settings and tweak the design to make your site just right.

        +         + + {{svg-jar "members"}} +
        Import members
        +

        Move your audience over to Ghost with our migration tools and guides.

        +         + + {{svg-jar "house"}} +
        Explore Ghost admin
        +

        View the dashboard, click around, and explore Ghost for yourself.

        +         +
        +
        +
        +
        +
        +
        +
        + + + +
        +
        +
        \ No newline at end of file diff --git a/ghost/admin/app/templates/signin.hbs b/ghost/admin/app/templates/signin.hbs index 01cc2e82c7ec..9c1991a9999a 100644 --- a/ghost/admin/app/templates/signin.hbs +++ b/ghost/admin/app/templates/signin.hbs @@ -73,7 +73,7 @@ data-test-button="sign-in" /> -

        {{if this.flowErrors this.flowErrors this.flowNotification}} 

        +

        {{if this.flowErrors this.flowErrors}} 

        {{/if}}
        diff --git a/ghost/admin/app/utils/merge-stats-by-date.js b/ghost/admin/app/utils/merge-stats-by-date.js deleted file mode 100644 index bdd881f8976b..000000000000 --- a/ghost/admin/app/utils/merge-stats-by-date.js +++ /dev/null @@ -1,26 +0,0 @@ -export default function mergeStatsByDate(list) { - const reducedStatsByDate = list.reduce((acc, current) => { - const currentDate = current.date; - - if (!acc[currentDate]) { - acc[currentDate] = { - date: currentDate, - count: 0, - positiveDelta: 0, - negativeDelta: 0, - signups: 0, - cancellations: 0 - }; - } - - acc[currentDate].count += current.count; - acc[currentDate].positiveDelta += current.positive_delta; - acc[currentDate].negativeDelta += current.negative_delta; - acc[currentDate].signups += current.signups; - acc[currentDate].cancellations += current.cancellations; - - return acc; - }, {}); - - return Object.values(reducedStatsByDate); -} diff --git a/ghost/admin/app/utils/sentry.js b/ghost/admin/app/utils/sentry.js index 1056046b2fcd..89b864cf868e 100644 --- a/ghost/admin/app/utils/sentry.js +++ b/ghost/admin/app/utils/sentry.js @@ -34,17 +34,10 @@ export function beforeSend(event, hint) { delete event.tags.ajax_url; } - // Do not report poshog-js errors to Sentry - if (hint && hint.originalException && hint.originalException.stack) { - if (hint.originalException.stack.includes('/posthog-js/')) { - return null; - } - } - return event; } catch (error) { // If any errors occur in beforeSend, send the original event to Sentry // Better to have some information than no information return event; } -} +} \ No newline at end of file diff --git a/ghost/admin/app/utils/subscription-data.js b/ghost/admin/app/utils/subscription-data.js deleted file mode 100644 index 347265ace40b..000000000000 --- a/ghost/admin/app/utils/subscription-data.js +++ /dev/null @@ -1,98 +0,0 @@ -import moment from 'moment-timezone'; -import {getNonDecimal, getSymbol} from 'ghost-admin/utils/currency'; - -export function getSubscriptionData(sub) { - const data = { - ...sub, - attribution: { - ...sub.attribution, - referrerSource: sub.attribution?.referrer_source || 'Unknown', - referrerMedium: sub.attribution?.referrer_medium || '-' - }, - startDate: sub.start_date ? moment(sub.start_date).format('D MMM YYYY') : '-', - validUntil: validUntil(sub), - hasEnded: isCanceled(sub), - willEndSoon: isSetToCancel(sub), - cancellationReason: sub.cancellation_reason, - price: { - ...sub.price, - currencySymbol: getSymbol(sub.price.currency), - nonDecimalAmount: getNonDecimal(sub.price.amount) - }, - isComplimentary: isComplimentary(sub), - compExpiry: compExpiry(sub), - trialUntil: trialUntil(sub) - }; - - data.validityDetails = validityDetails(data); - - return data; -} - -export function validUntil(sub) { - // If a subscription has been canceled immediately, don't render the end of validity date - // Reason: we don't store the exact cancelation date in the subscription object - if (sub.status === 'canceled' && !sub.cancel_at_period_end) { - return ''; - } - - // Otherwise, show the current period end date - if (sub.current_period_end) { - return moment(sub.current_period_end).format('D MMM YYYY'); - } - - return ''; -} - -export function isActive(sub) { - return ['active', 'trialing', 'past_due', 'unpaid'].includes(sub.status); -} - -export function isComplimentary(sub) { - return !sub.id; -} - -export function isCanceled(sub) { - return sub.status === 'canceled'; -} - -export function isSetToCancel(sub) { - return sub.cancel_at_period_end && isActive(sub); -} - -export function compExpiry(sub) { - if (!sub.id && sub.tier && sub.tier.expiry_at) { - return moment(sub.tier.expiry_at).utc().format('D MMM YYYY'); - } - - return undefined; -} - -export function trialUntil(sub) { - const inTrialMode = sub.trial_end_at && moment(sub.trial_end_at).isAfter(new Date(), 'day'); - if (inTrialMode) { - return moment(sub.trial_end_at).format('D MMM YYYY'); - } - - return undefined; -} - -export function validityDetails(data) { - if (data.isComplimentary && data.compExpiry) { - return `Expires ${data.compExpiry}`; - } - - if (data.hasEnded) { - return `Ended ${data.validUntil}`; - } - - if (data.willEndSoon) { - return `Has access until ${data.validUntil}`; - } - - if (data.trialUntil) { - return `Ends ${data.trialUntil}`; - } - - return `Renews ${data.validUntil}`; -} diff --git a/ghost/admin/app/validators/post.js b/ghost/admin/app/validators/post.js index f157e4d2f635..ec32addd340a 100644 --- a/ghost/admin/app/validators/post.js +++ b/ghost/admin/app/validators/post.js @@ -62,11 +62,7 @@ export default BaseValidator.create({ customExcerpt(model) { if (!validator.isLength(model.customExcerpt || '', 0, 300)) { - if (model.feature.editorExcerpt) { - model.errors.add('customExcerpt', 'Excerpt cannot be longer than 300 characters.'); - } else { - model.errors.add('customExcerpt', 'Excerpt cannot be longer than 300 characters.'); - } + model.errors.add('customExcerpt', 'Excerpt cannot be longer than 300 characters.'); this.invalidate(); } }, diff --git a/ghost/admin/mirage/config/members.js b/ghost/admin/mirage/config/members.js index dc062fbc2aeb..ba07a3a846ed 100644 --- a/ghost/admin/mirage/config/members.js +++ b/ghost/admin/mirage/config/members.js @@ -1,3 +1,4 @@ +import faker from 'faker'; import moment from 'moment-timezone'; import nql from '@tryghost/nql'; import {Response} from 'miragejs'; @@ -6,7 +7,6 @@ import { paginateModelCollection, withPermissionsCheck } from '../utils'; -import {faker} from '@faker-js/faker'; import {underscore} from '@ember/string'; const ALLOWED_ROLES = [ diff --git a/ghost/admin/mirage/factories/member-activity-event.js b/ghost/admin/mirage/factories/member-activity-event.js index 26436df768a9..23df12d38ef5 100644 --- a/ghost/admin/mirage/factories/member-activity-event.js +++ b/ghost/admin/mirage/factories/member-activity-event.js @@ -1,6 +1,6 @@ +import faker from 'faker'; import moment from 'moment-timezone'; import {Factory} from 'miragejs'; -import {faker} from '@faker-js/faker'; const EVENT_TYPES = [ 'newsletter_event', @@ -16,7 +16,7 @@ const EVENT_TYPES = [ /* eslint-disable camelcase */ export default Factory.extend({ - type() { return faker.helpers.arrayElement([EVENT_TYPES]); }, + type() { return faker.random.arrayElement([EVENT_TYPES]); }, createdAt() { return moment.utc().format(); }, afterCreate(event, server) { diff --git a/ghost/admin/mirage/factories/member.js b/ghost/admin/mirage/factories/member.js index b3828eff3b24..2e8a5a6caed7 100644 --- a/ghost/admin/mirage/factories/member.js +++ b/ghost/admin/mirage/factories/member.js @@ -1,6 +1,6 @@ +import faker from 'faker'; import moment from 'moment-timezone'; import {Factory, trait} from 'miragejs'; -import {faker} from '@faker-js/faker'; let randomDate = function randomDate(start = moment().subtract(30, 'days').toDate(), end = new Date()) { return new Date(start.getTime() + Math.random() * (end.getTime() - start.getTime())); diff --git a/ghost/admin/mirage/factories/offer.js b/ghost/admin/mirage/factories/offer.js index fd4f51a3b1d4..0da2539c2b67 100644 --- a/ghost/admin/mirage/factories/offer.js +++ b/ghost/admin/mirage/factories/offer.js @@ -1,6 +1,6 @@ +import faker from 'faker'; import moment from 'moment-timezone'; import {Factory} from 'miragejs'; -import {faker} from '@faker-js/faker'; let randomDate = function randomDate(start = moment().subtract(30, 'days').toDate(), end = new Date()) { return new Date(start.getTime() + Math.random() * (end.getTime() - start.getTime())); diff --git a/ghost/admin/mirage/factories/page.js b/ghost/admin/mirage/factories/page.js deleted file mode 100644 index 6f00f427e908..000000000000 --- a/ghost/admin/mirage/factories/page.js +++ /dev/null @@ -1,54 +0,0 @@ -import {Factory} from 'miragejs'; -import {isEmpty} from '@ember/utils'; - -export default Factory.extend({ - codeinjectionFoot: null, - codeinjectionHead: null, - createdAt: '2015-09-11T09:44:29.871Z', - createdBy: 1, - customExcerpt: null, - customTemplate: null, - description(i) { return `Title for page ${i}.`; }, - featured: false, - featureImage(i) { return `/content/images/2015/10/page-${i}.jpg`; }, - html(i) { return `

        HTML for page ${i}.

        `; }, - visibility: 'public', - metaDescription(i) { return `Meta description for page ${i}.`; }, - metaTitle(i) { return `Meta Title for page ${i}`; }, - ogDescription: null, - ogImage: null, - ogTitle: null, - excerpt(i) { return `Excerpt for page ${i}.`; }, - plaintext(i) { return `Plaintext for page ${i}.`; }, - publishedAt: '2015-12-19T16:25:07.000Z', - publishedBy: 1, - status(i) { - let statuses = ['draft', 'published', 'scheduled']; - return statuses[i % statuses.length]; - }, - title(i) { return `Page ${i}`; }, - twitterDescription: null, - twitterImage: null, - twitterTitle: null, - emailSubject: null, - updatedAt: '2015-10-19T16:25:07.756Z', - updatedBy: 1, - uuid(i) { return `page-${i}`; }, - - authors() { return []; }, - tags() { return []; }, - - afterCreate(page, server) { - if (isEmpty(page.authors)) { - let user = server.schema.users.find(1); - - if (!user) { - let role = server.schema.roles.find({name: 'Administrator'}) || server.create('role', {name: 'Administrator'}); - user = server.create('user', {roles: [role]}); - } - - page.authors = [user]; - page.save(); - } - } -}); diff --git a/ghost/admin/mirage/factories/post-revision.js b/ghost/admin/mirage/factories/post-revision.js deleted file mode 100644 index b7b90f47cd68..000000000000 --- a/ghost/admin/mirage/factories/post-revision.js +++ /dev/null @@ -1,5 +0,0 @@ -import {Factory} from 'miragejs'; - -export default Factory.extend({ - -}); diff --git a/ghost/admin/mirage/models/page.js b/ghost/admin/mirage/models/page.js index 6956b658b166..d597bc4ca47f 100644 --- a/ghost/admin/mirage/models/page.js +++ b/ghost/admin/mirage/models/page.js @@ -1,5 +1,5 @@ import PostModel from './post'; export default PostModel.extend({ - postRevisions: null + }); diff --git a/ghost/admin/mirage/models/post-revision.js b/ghost/admin/mirage/models/post-revision.js deleted file mode 100644 index 22973739d2d1..000000000000 --- a/ghost/admin/mirage/models/post-revision.js +++ /dev/null @@ -1,6 +0,0 @@ -import {Model, belongsTo} from 'miragejs'; - -export default Model.extend({ - post: belongsTo(), - author: belongsTo('user') -}); diff --git a/ghost/admin/mirage/models/post.js b/ghost/admin/mirage/models/post.js index 46ea92d1faaf..cc8b5150e46d 100644 --- a/ghost/admin/mirage/models/post.js +++ b/ghost/admin/mirage/models/post.js @@ -4,6 +4,5 @@ export default Model.extend({ tags: hasMany(), authors: hasMany('user'), email: belongsTo(), - newsletter: belongsTo(), - postRevisions: hasMany() + newsletter: belongsTo() }); diff --git a/ghost/admin/mirage/models/user.js b/ghost/admin/mirage/models/user.js index 0caf3fa25122..2eec70daf64c 100644 --- a/ghost/admin/mirage/models/user.js +++ b/ghost/admin/mirage/models/user.js @@ -6,6 +6,5 @@ export default Model.extend({ postCount: false, roles: hasMany(), - posts: hasMany(), - postRevision: hasMany() + posts: hasMany() }); diff --git a/ghost/admin/mirage/serializers/post-revision.js b/ghost/admin/mirage/serializers/post-revision.js deleted file mode 100644 index a71ed69b1142..000000000000 --- a/ghost/admin/mirage/serializers/post-revision.js +++ /dev/null @@ -1,9 +0,0 @@ -import BaseSerializer from './application'; - -export default BaseSerializer.extend({ - embed: true, - - include() { - return ['author']; - } -}); diff --git a/ghost/admin/mirage/serializers/post.js b/ghost/admin/mirage/serializers/post.js index 2985c0073f26..a8e4f2bda4ac 100644 --- a/ghost/admin/mirage/serializers/post.js +++ b/ghost/admin/mirage/serializers/post.js @@ -1,25 +1,15 @@ import BaseSerializer from './application'; -import {camelize} from '@ember/string'; export default BaseSerializer.extend({ embed: true, - include(request) { - const queryIncludes = (request.queryParams.include || '').split(',').compact().map(camelize); - const includes = new Set(queryIncludes); + include(/*request*/) { + let includes = []; - // embedded records that are included by default in the API - includes.add('tags'); - includes.add('authors'); + includes.push('tags'); + includes.push('authors'); - // clean up some things that mirage doesn't understand - includes.delete('authorsRoles'); - includes.delete('countClicks'); - includes.delete('postRevisionsAuthor'); - includes.delete('tiers'); - - const result = Array.from(includes); - return result; + return includes; }, serialize(postModelOrCollection, request) { @@ -27,7 +17,7 @@ export default BaseSerializer.extend({ if (post.status === 'published') { post.update('url', `http://localhost:4200/${post.slug}/`); } else { - post.update('url', `http://localhost:4200/p/${post.uuid}/`); + post.update('url', `http://localhost:4200/p/`); } }; diff --git a/ghost/admin/package.json b/ghost/admin/package.json index fe0fe9e57813..bc1add0385d0 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -1,6 +1,6 @@ { "name": "ghost-admin", - "version": "5.87.0", + "version": "5.82.10", "description": "Ember.js admin client for Ghost", "author": "Ghost Foundation", "homepage": "http://ghost.org", @@ -33,23 +33,20 @@ "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-decorators": "7.23.7", "@ember/jquery": "2.0.0", - "@ember/optional-features": "2.1.0", + "@ember/optional-features": "2.0.0", "@ember/render-modifiers": "2.1.0", "@ember/test-helpers": "2.9.4", - "@ember/test-waiters": "3.1.0", "@embroider/macros": "1.13.4", - "@faker-js/faker": "7.6.0", "@glimmer/component": "1.1.2", "@html-next/vertical-collection": "3.0.0", - "@sentry/ember": "7.118.0", + "@sentry/ember": "7.114.0", "@sentry/integrations": "7.114.0", - "@sentry/replay": "7.116.0", "@tryghost/color-utils": "0.2.2", "@tryghost/ember-promise-modals": "2.0.1", "@tryghost/helpers": "1.1.90", - "@tryghost/kg-clean-basic-html": "4.1.1", - "@tryghost/kg-converters": "1.0.5", - "@tryghost/koenig-lexical": "1.3.2", + "@tryghost/kg-clean-basic-html": "4.0.8", + "@tryghost/kg-converters": "1.0.3", + "@tryghost/koenig-lexical": "1.1.15", "@tryghost/limit-service": "1.2.14", "@tryghost/members-csv": "0.0.0", "@tryghost/nql": "0.12.3", @@ -72,7 +69,7 @@ "element-resize-detector": "1.2.4", "ember-ajax": "5.1.2", "ember-assign-helper": "0.4.0", - "ember-auto-import": "2.7.4", + "ember-auto-import": "2.7.2", "ember-classic-decorator": "3.0.1", "ember-cli": "3.24.0", "ember-cli-app-version": "5.0.0", @@ -123,7 +120,7 @@ "ember-truth-helpers": "3.1.1", "ember-websockets": "10.2.1", "eslint-plugin-babel": "5.3.1", - "flexsearch": "0.7.43", + "faker": "5.5.3", "fs-extra": "11.2.0", "glob": "8.1.0", "google-caja-bower": "https://github.com/acburdine/google-caja-bower#ghost", @@ -145,7 +142,7 @@ "react-dom": "18.3.1", "reframe.js": "4.0.2", "semver": "7.6.2", - "testem": "3.15.0", + "testem": "3.13.0", "tracked-built-ins": "3.3.0", "util": "0.12.5", "validator": "7.2.0", @@ -172,9 +169,9 @@ "*.js": "eslint" }, "dependencies": { - "jose": "4.15.9", + "jose": "4.15.5", "path-browserify": "1.0.1", - "webpack": "5.92.1" + "webpack": "5.91.0" }, "nx": { "targets": { diff --git a/ghost/admin/public/assets/icons/event-email-changed.svg b/ghost/admin/public/assets/icons/event-email-changed.svg deleted file mode 100644 index 2ed1e12e8f51..000000000000 --- a/ghost/admin/public/assets/icons/event-email-changed.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/ghost/admin/public/assets/icons/filter-dropdown-email-address-changed.svg b/ghost/admin/public/assets/icons/filter-dropdown-email-address-changed.svg deleted file mode 100644 index 8b2fd02f2e8c..000000000000 --- a/ghost/admin/public/assets/icons/filter-dropdown-email-address-changed.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/ghost/admin/public/assets/icons/koenig/kg-edit.svg b/ghost/admin/public/assets/icons/koenig/kg-edit.svg new file mode 100644 index 000000000000..8b4bd26cf48d --- /dev/null +++ b/ghost/admin/public/assets/icons/koenig/kg-edit.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/koenig/kg-trash.svg b/ghost/admin/public/assets/icons/koenig/kg-trash.svg index 9e232fc94a8a..2c16a4fb275a 100644 --- a/ghost/admin/public/assets/icons/koenig/kg-trash.svg +++ b/ghost/admin/public/assets/icons/koenig/kg-trash.svg @@ -1,4 +1 @@ - - - - \ No newline at end of file + diff --git a/ghost/admin/public/assets/icons/koenig/kg-wand.svg b/ghost/admin/public/assets/icons/koenig/kg-wand.svg deleted file mode 100644 index d604063224f9..000000000000 --- a/ghost/admin/public/assets/icons/koenig/kg-wand.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/sparkle-fill.svg b/ghost/admin/public/assets/icons/sparkle-fill.svg deleted file mode 100644 index fea5bb260b00..000000000000 --- a/ghost/admin/public/assets/icons/sparkle-fill.svg +++ /dev/null @@ -1 +0,0 @@ -Reward Stars 3 Streamline Icon: https://streamlinehq.com \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/warning-fill.svg b/ghost/admin/public/assets/icons/warning-fill.svg deleted file mode 100644 index 2561d9987c73..000000000000 --- a/ghost/admin/public/assets/icons/warning-fill.svg +++ /dev/null @@ -1 +0,0 @@ -Road Sign Warning Streamline Icon: https://streamlinehq.com \ No newline at end of file diff --git a/ghost/admin/tests/acceptance/editor-test.js b/ghost/admin/tests/acceptance/editor-test.js index 8e1ce1176f0b..612f2e7ddcdb 100644 --- a/ghost/admin/tests/acceptance/editor-test.js +++ b/ghost/admin/tests/acceptance/editor-test.js @@ -5,7 +5,6 @@ import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-sup import {beforeEach, describe, it} from 'mocha'; import {blur, click, currentRouteName, currentURL, fillIn, find, findAll, triggerEvent, typeIn} from '@ember/test-helpers'; import {datepickerSelect} from 'ember-power-datepicker/test-support'; -import {enableLabsFlag} from '../helpers/labs-flag'; import {expect} from 'chai'; import {selectChoose} from 'ember-power-select/test-support'; import {setupApplicationTest} from 'ember-mocha'; @@ -491,38 +490,6 @@ describe('Acceptance: Editor', function () { ).to.equal(0); }); - it('handles in-editor excerpt update and validation', async function () { - enableLabsFlag(this.server, 'editorExcerpt'); - - let post = this.server.create('post', {authors: [author], customExcerpt: 'Existing excerpt'}); - - await visit(`/editor/post/${post.id}`); - - expect(find('[data-test-textarea="excerpt"]'), 'initial textarea').to.be.visible; - expect(find('[data-test-textarea="excerpt"]'), 'initial textarea').to.have.value('Existing excerpt'); - - await fillIn('[data-test-textarea="excerpt"]', 'New excerpt'); - expect(find('[data-test-textarea="excerpt"]'), 'updated textarea').to.have.value('New excerpt'); - - await triggerEvent('[data-test-textarea="excerpt"]', 'keydown', { - key: 's', - keyCode: 83, // s - metaKey: ctrlOrCmd === 'command', - ctrlKey: ctrlOrCmd === 'ctrl' - }); - - expect(post.customExcerpt, 'saved excerpt').to.equal('New excerpt'); - - await fillIn('[data-test-textarea="excerpt"]', Array(302).join('a')); - - expect(find('[data-test-error="excerpt"]'), 'excerpt error').to.exist; - expect(find('[data-test-error="excerpt"]')).to.have.trimmed.text('Excerpt cannot be longer than 300 characters.'); - - await fillIn('[data-test-textarea="excerpt"]', Array(300).join('a')); - - expect(find('[data-test-error="excerpt"]'), 'excerpt error').to.not.exist; - }); - // https://github.com/TryGhost/Ghost/issues/11786 // NOTE: Flaky test with moving to Lexical editor, skipping for now it.skip('save shortcut works when tags/authors field is focused', async function () { @@ -635,39 +602,5 @@ describe('Acceptance: Editor', function () { 'TK reminder modal' ).to.exist; }); - - it('handles TKs in excerpt', async function () { - enableLabsFlag(this.server, 'editorExcerpt'); - - const post = this.server.create('post', {authors: [author]}); - - await visit(`/editor/post/${post.id}`); - - expect( - find('[data-test-textarea="excerpt"]').value, - 'initial excerpt' - ).to.equal(''); - - await fillIn('[data-test-textarea="excerpt"]', 'Test TK excerpt'); - - expect( - find('[data-test-textarea="excerpt"]').value, - 'excerpt after typing' - ).to.equal('Test TK excerpt'); - - // check for TK indicator - expect( - find('[data-testid="tk-indicator-excerpt"]'), - 'TK indicator text' - ).to.exist; - - // click publish to see if confirmation comes up - await click('[data-test-button="publish-flow"]'); - - expect( - find('[data-test-modal="tk-reminder"]'), - 'TK reminder modal' - ).to.exist; - }); }); }); diff --git a/ghost/admin/tests/acceptance/editor/post-revisions-test.js b/ghost/admin/tests/acceptance/editor/post-revisions-test.js deleted file mode 100644 index b8606480d44f..000000000000 --- a/ghost/admin/tests/acceptance/editor/post-revisions-test.js +++ /dev/null @@ -1,193 +0,0 @@ -import loginAsRole from '../../helpers/login-as-role'; -import moment from 'moment-timezone'; -import {click, find, findAll} from '@ember/test-helpers'; -import {enableLabsFlag} from '../../helpers/labs-flag'; -import {expect} from 'chai'; -import {setupApplicationTest} from 'ember-mocha'; -import {setupMirage} from 'ember-cli-mirage/test-support'; -import {visit} from '../../helpers/visit'; - -describe('Acceptance: Post revisions', function () { - let hooks = setupApplicationTest(); - setupMirage(hooks); - - beforeEach(async function () { - this.server.loadFixtures(); - - await loginAsRole('Administrator', this.server); - }); - - it('can restore a draft post revision', async function () { - const post = this.server.create('post', { - title: 'Current Title', - customExcerpt: 'Current excerpt', - status: 'draft' - }); - this.server.create('post-revision', { - post, - title: post.title, - customExcerpt: 'New excerpt', - featureImage: 'https://example.com/new-image.jpg', - featureImageAlt: 'New feature alt text', - featureImageCaption: 'New feature caption', - postStatus: 'draft', - author: post.authors.models[0], - createdAt: moment(post.updatedAt).subtract(1, 'hour'), - reason: 'explicit_save' - }); - this.server.create('post-revision', { - post, - title: 'Old Title', - customExcerpt: 'Old excerpt', - featureImage: 'https://example.com/old-image.jpg', - featureImageAlt: 'Old feature alt text', - featureImageCaption: 'Old feature caption', - postStatus: 'draft', - author: post.authors.models[0], - createdAt: moment(post.updatedAt).subtract(1, 'day'), - reason: 'initial_revision' - }); - - // this.timeout(0); - - await visit(`/editor/post/${post.id}`); - - // open post history menu - await click('[data-test-psm-trigger]'); - await click('[data-test-toggle="post-history"]'); - - // latest and previous post listed - expect(findAll('[data-test-revision-item]').length).to.equal(2); - expect(find('[data-test-revision-item="0"]')).to.contain.trimmed.text('19 Oct 2015, 15:25'); - expect(find('[data-test-revision-item="0"] [data-test-revision-latest]')).to.exist; - - expect(find('[data-test-revision-item="1"]')).to.contain.trimmed.text('18 Oct 2015, 16:25'); - expect(find('[data-test-revision-item="1"] [data-test-revision-latest]')).to.not.exist; - - // latest post is previewed by default - expect(find('[data-test-post-history-preview-title]')).to.have.trimmed.text('Current Title'); - expect(find('[data-test-post-history-preview-feature-image]')).to.have.attribute('src', 'https://example.com/new-image.jpg'); - expect(find('[data-test-post-history-preview-feature-image]')).to.have.attribute('alt', 'New feature alt text'); - expect(find('[data-test-post-history-preview-feature-image-caption]')).to.have.trimmed.text('New feature caption'); - - // excerpt is not visible (needs feature flag) - expect(find('[data-test-post-history-preview-excerpt]')).to.not.exist; - - // previous post can be previewed - await click('[data-test-revision-item="1"] [data-test-button="preview-revision"]'); - expect(find('[data-test-post-history-preview-title]')).to.have.trimmed.text('Old Title'); - - // previous post can be restored - expect(find('[data-test-revision-item="1"] [data-test-button="restore-revision"]')).to.exist; - await click('[data-test-revision-item="1"] [data-test-button="restore-revision"]'); - expect(find('[data-test-modal="restore-revision"]')).to.exist; - await click('[data-test-modal="restore-revision"] [data-test-button="restore"]'); - expect(find('[data-test-modal="restore-revision"]')).to.not.exist; - expect(find('[data-test-editor-title-input]')).to.have.value('Old Title'); - // post has been saved with correct data - expect(post.attrs.title).to.equal('Old Title'); - expect(post.attrs.featureImage).to.equal('https://example.com/old-image.jpg'); - expect(post.attrs.featureImageAlt).to.equal('Old feature alt text'); - expect(post.attrs.featureImageCaption).to.equal('Old feature caption'); - - // excerpt (customExcerpt) is not restored (needs feature flag) - expect(post.attrs.customExcerpt).to.equal('Current excerpt'); - }); - - it('can preview and restore excerpt (with editorExcerpt feature flag)', async function () { - enableLabsFlag(this.server, 'editorExcerpt'); - - const post = this.server.create('post', { - title: 'Current Title', - customExcerpt: 'Current excerpt', - status: 'draft' - }); - this.server.create('post-revision', { - post, - title: post.title, - customExcerpt: 'New excerpt', - postStatus: 'draft', - author: post.authors.models[0], - createdAt: moment(post.updatedAt).subtract(1, 'hour'), - reason: 'explicit_save' - }); - this.server.create('post-revision', { - post, - title: 'Old Title', - customExcerpt: 'Old excerpt', - postStatus: 'draft', - author: post.authors.models[0], - createdAt: moment(post.updatedAt).subtract(1, 'day'), - reason: 'initial_revision' - }); - - await visit(`/editor/post/${post.id}`); - - // open post history menu - await click('[data-test-psm-trigger]'); - await click('[data-test-toggle="post-history"]'); - - // excerpt is visible - expect(find('[data-test-post-history-preview-excerpt]')).to.exist; - expect(find('[data-test-post-history-preview-excerpt]')).to.have.trimmed.text('New excerpt'); - - // previous post can be previewed - await click('[data-test-revision-item="1"] [data-test-button="preview-revision"]'); - expect(find('[data-test-post-history-preview-excerpt]')).to.have.trimmed.text('Old excerpt'); - - // previous post can be restored - await click('[data-test-revision-item="1"] [data-test-button="restore-revision"]'); - await click('[data-test-modal="restore-revision"] [data-test-button="restore"]'); - - // post has been saved with correct data - expect(post.attrs.customExcerpt).to.equal('Old excerpt'); - }); - - it('reverts to current post excerpt if revision excerpt is missing (with editorExcerpt feature flag)', async function () { - enableLabsFlag(this.server, 'editorExcerpt'); - - const post = this.server.create('post', { - title: 'Current Title', - customExcerpt: 'Current excerpt', - status: 'draft' - }); - this.server.create('post-revision', { - post, - title: post.title, - postStatus: 'draft', - author: post.authors.models[0], - createdAt: moment(post.updatedAt).subtract(1, 'hour'), - reason: 'explicit_save' - }); - this.server.create('post-revision', { - post, - title: 'Old Title', - customExcerpt: null, - postStatus: 'draft', - author: post.authors.models[0], - createdAt: moment(post.updatedAt).subtract(1, 'day'), - reason: 'initial_revision' - }); - - await visit(`/editor/post/${post.id}`); - - // open post history menu - await click('[data-test-psm-trigger]'); - await click('[data-test-toggle="post-history"]'); - - // latest excerpt is set to current - expect(find('[data-test-post-history-preview-excerpt]')).to.exist; - expect(find('[data-test-post-history-preview-excerpt]')).to.have.trimmed.text('Current excerpt'); - - // previous post can be previewed and excerpt is set to current - await click('[data-test-revision-item="1"] [data-test-button="preview-revision"]'); - expect(find('[data-test-post-history-preview-excerpt]')).to.have.trimmed.text('Current excerpt'); - - // restore saves current excerpt - await click('[data-test-revision-item="1"] [data-test-button="restore-revision"]'); - await click('[data-test-modal="restore-revision"] [data-test-button="restore"]'); - - // post has been saved with correct data - expect(post.attrs.customExcerpt).to.equal('Current excerpt'); - }); -}); diff --git a/ghost/admin/tests/acceptance/editor/publish-flow-test.js b/ghost/admin/tests/acceptance/editor/publish-flow-test.js index c892c4edaa5f..dc39f3ab3c03 100644 --- a/ghost/admin/tests/acceptance/editor/publish-flow-test.js +++ b/ghost/admin/tests/acceptance/editor/publish-flow-test.js @@ -1,6 +1,6 @@ import loginAsRole from '../../helpers/login-as-role'; import moment from 'moment-timezone'; -import {blur, click, fillIn, find, findAll, waitFor} from '@ember/test-helpers'; +import {blur, click, fillIn, find, findAll} from '@ember/test-helpers'; import {clickTrigger, removeMultipleOption, selectChoose} from 'ember-power-select/test-support/helpers'; import {disableMailgun, enableMailgun} from '../../helpers/mailgun'; import {disableMembers, enableMembers} from '../../helpers/members'; @@ -125,7 +125,7 @@ describe('Acceptance: Publish flow', function () { expect(find('[data-test-button="publish-flow-preview"]'), 'preview button on complete step').to.not.exist; expect(find('[data-test-button="publish-flow-publish"]'), 'publish button on complete step').to.not.exist; - await click('[data-test-button="close-publish-flow"]'); + await click('[data-test-button="back-to-editor"]'); expect(find('[data-test-button="publish-flow"]'), 'publish button after publishing').to.not.exist; expect(find('[data-test-button="update-flow"]'), 'update button after publishing').to.exist; @@ -332,24 +332,22 @@ describe('Acceptance: Publish flow', function () { .text('Right now'); const siteTz = this.server.db.settings.findBy({key: 'timezone'}).value; - const plus10 = moment().tz(siteTz).add(10, 'minutes').startOf('minute'); + const plus10 = moment().tz(siteTz).add(10, 'minutes').set({}); await click('[data-test-setting="publish-at"] [data-test-setting-title]'); await click('[data-test-radio="schedule"]'); // date + time inputs are shown, defaults to now+5 mins - await waitFor('[data-test-setting="publish-at"] [data-test-date-time-picker-datepicker]'); expect(find('[data-test-setting="publish-at"] [data-test-date-time-picker-datepicker]'), 'datepicker').to.exist; expect(find('[data-test-setting="publish-at"] [data-test-date-time-picker-date-input]'), 'initial datepicker value') .to.have.value(plus10.format('YYYY-MM-DD')); - await waitFor('[data-test-setting="publish-at"] [data-test-date-time-picker-time-input]'); expect(find('[data-test-setting="publish-at"] [data-test-date-time-picker-time-input]'), 'time input').to.exist; expect(find('[data-test-setting="publish-at"] [data-test-date-time-picker-time-input]'), 'initial time input value') .to.have.value(plus10.format('HH:mm')); // can set a new date and time - const newDate = moment().tz(siteTz).add(4, 'days').add(5, 'hours').startOf('minute'); + const newDate = moment().tz(siteTz).add(4, 'days').add(5, 'hours').set('second', 0); await fillIn('[data-test-setting="publish-at"] [data-test-date-time-picker-date-input]', newDate.format('YYYY-MM-DD')); await blur('[data-test-setting="publish-at"] [data-test-date-time-picker-date-input]'); await fillIn('[data-test-setting="publish-at"] [data-test-date-time-picker-time-input]', newDate.format('HH:mm')); @@ -626,77 +624,4 @@ describe('Acceptance: Publish flow', function () { it('handles server error when confirming'); it('handles email sending error'); }); - - describe('Are you sure you want to leave? modal', function () { - // draft content should autosave and leave without warning - it(`Doesn't display for draft content`, async function () { - await loginAsRole('Administrator', this.server); - const post = this.server.create('post', { - title: 'Test Post', - status: 'draft' - }); - await visit('/editor/post/' + post.id); - await fillIn('[data-test-editor-title-input]', 'New Title'); - await click('[data-test-link="posts"]'); - expect(find('[data-test-modal="unsaved-post-changes"]'), 'unsaved changes modal').to.not.exist; - }); - // published content should never autosave and should warn on leaving when there's changes - it('Displays when published content title has changed', async function () { - await loginAsRole('Administrator', this.server); - const post = this.server.create('post', { - title: 'Test Post', - status: 'published' - }); - await visit('/editor/post/' + post.id); - await fillIn('[data-test-editor-title-input]', 'New Title'); - await click('[data-test-link="posts"]'); - expect(find('[data-test-modal="unsaved-post-changes"]'), 'unsaved changes modal').to.exist; - }); - it('Displays when scheduled content has changed', async function () { - await loginAsRole('Administrator', this.server); - const post = this.server.create('post', { - title: 'Test Post', - status: 'scheduled' - }); - await visit('/editor/post/' + post.id); - await fillIn('[data-test-editor-title-input]', 'New Title'); - await click('[data-test-link="posts"]'); - expect(find('[data-test-modal="unsaved-post-changes"]'), 'unsaved changes modal').to.exist; - }); - // published and edited content should not warn when changes are reverted (either via undo or manually) - it(`Does not display when changed content is changed back`, async function () { - await loginAsRole('Administrator', this.server); - const post = this.server.create('post', { - title: 'Test Post', - status: 'published', - lexical: `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content","type": "extended-text","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}` - }); - await visit('/editor/post/' + post.id); - await fillIn('[data-test-editor-title-input]', 'New Title'); - await click('[data-test-link="posts"]'); - expect(find('[data-test-modal="unsaved-post-changes"]'), 'unsaved changes modal').to.exist; - await click('[data-test-stay-button]'); - expect(find('[data-test-modal="unsaved-post-changes"]'), 'unsaved changes modal').to.not.exist; - // revert title - await fillIn('[data-test-editor-title-input]', 'Test Post'); - await click('[data-test-link="posts"]'); - expect(find('[data-test-modal="unsaved-post-changes"]'), 'unsaved changes modal').to.not.exist; - }); - it(`Does not save changes when leaving`, async function () { - await loginAsRole('Administrator', this.server); - const post = this.server.create('post', { - title: 'Test Post', - status: 'published', - lexical: `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content","type": "extended-text","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}` - }); - await visit('/editor/post/' + post.id); - await fillIn('[data-test-editor-title-input]', 'New Title'); - await click('[data-test-link="posts"]'); - expect(find('[data-test-modal="unsaved-post-changes"]'), 'unsaved changes modal').to.exist; - await click('[data-test-leave-button]'); - expect(find('[data-test-modal="unsaved-post-changes"]'), 'unsaved changes modal').to.not.exist; - // check that the title wasn't saved - expect(this.server.db.posts.find(post.id).title === 'Test Post').to.be.true; - }); - }); }); diff --git a/ghost/admin/tests/acceptance/onboarding-test.js b/ghost/admin/tests/acceptance/onboarding-test.js index 16c76925edd0..bc9077e6cd0e 100644 --- a/ghost/admin/tests/acceptance/onboarding-test.js +++ b/ghost/admin/tests/acceptance/onboarding-test.js @@ -1,6 +1,7 @@ import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support'; import {currentURL, find, visit} from '@ember/test-helpers'; import {describe, it} from 'mocha'; +import {enableLabsFlag} from '../helpers/labs-flag'; import {enableMembers} from '../helpers/members'; import {expect} from 'chai'; import {setupApplicationTest} from 'ember-mocha'; @@ -15,6 +16,7 @@ describe('Acceptance: Onboarding', function () { this.server.loadFixtures('settings'); this.server.loadFixtures('themes'); + enableLabsFlag(this.server, 'onboardingChecklist'); enableMembers(this.server); }); @@ -48,19 +50,6 @@ describe('Acceptance: Onboarding', function () { expect(find('[data-test-dashboard="header"]'), 'header').to.not.exist; expect(find('[data-test-dashboard="attribution"]'), 'attribution section').to.not.exist; }); - - it('checklist is shown when members disabled', async function () { - this.server.db.settings.update({membersSignupAccess: 'none'}); - await visit('/setup/done'); - await visit('/dashboard'); - - // onboarding is't shown - expect(find('[data-test-dashboard="onboarding-checklist"]'), 'checklist').to.exist; - - // other default dashboard elements are not visible - expect(find('[data-test-dashboard="header"]'), 'header').to.not.exist; - expect(find('[data-test-dashboard="attribution"]'), 'attribution section').to.not.exist; - }); }); describe('checklist (non-owner)', function () { diff --git a/ghost/admin/tests/acceptance/password-reset-test.js b/ghost/admin/tests/acceptance/password-reset-test.js index 2c86c75611ff..6dc0a8bc350e 100644 --- a/ghost/admin/tests/acceptance/password-reset-test.js +++ b/ghost/admin/tests/acceptance/password-reset-test.js @@ -17,7 +17,7 @@ describe('Acceptance: Password Reset', function () { await click('.forgotten-link'); // an alert with instructions is displayed - expect(findAll('[data-test-flow-notification]').length, 'alert count') + expect(findAll('.gh-alert-blue').length, 'alert count') .to.equal(1); }); @@ -41,7 +41,7 @@ describe('Acceptance: Password Reset', function () { // error message shown expect(find('p.main-error').textContent.trim(), 'error message') - .to.equal('We need your email address to reset your password.'); + .to.equal('We need your email address to reset your password!'); // invalid email provided await fillIn('input[name="identification"]', 'test'); @@ -61,7 +61,7 @@ describe('Acceptance: Password Reset', function () { // error message expect(find('p.main-error').textContent.trim(), 'error message') - .to.equal('We need your email address to reset your password.'); + .to.equal('We need your email address to reset your password!'); // unknown email provided await fillIn('input[name="identification"]', 'unknown@example.com'); diff --git a/ghost/admin/tests/acceptance/search-test.js b/ghost/admin/tests/acceptance/search-test.js index 3e025285be90..47af1f8d2b23 100644 --- a/ghost/admin/tests/acceptance/search-test.js +++ b/ghost/admin/tests/acceptance/search-test.js @@ -2,184 +2,167 @@ import ctrlOrCmd from 'ghost-admin/utils/ctrl-or-cmd'; import {authenticateSession} from 'ember-simple-auth/test-support'; import {click, currentURL, find, findAll, triggerKeyEvent, visit} from '@ember/test-helpers'; import {describe, it} from 'mocha'; -import {enableLabsFlag} from '../helpers/labs-flag'; import {expect} from 'chai'; import {getPosts} from '../../mirage/config/posts'; import {setupApplicationTest} from 'ember-mocha'; import {setupMirage} from 'ember-cli-mirage/test-support'; import {typeInSearch} from 'ember-power-select/test-support/helpers'; -const suites = [{ - name: 'Acceptance: Search', - beforeEach() { - // noop - } -}, { - name: 'Acceptance: Search (beta)', - beforeEach() { - enableLabsFlag(this.server, 'internalLinking'); - } -}]; - -suites.forEach((suite) => { - describe(suite.name, function () { - const trigger = '[data-test-modal="search"] .ember-power-select-trigger'; - // eslint-disable-next-line no-unused-vars - let firstUser, firstPost, secondPost, firstPage, firstTag; - - const hooks = setupApplicationTest(); - setupMirage(hooks); - - this.beforeEach(async function () { - this.server.loadFixtures(); - - // create user to authenticate as - let role = this.server.create('role', {name: 'Owner'}); - firstUser = this.server.create('user', {roles: [role], slug: 'owner', name: 'First user'}); - - // populate store with data we'll be searching - firstPost = this.server.create('post', {title: 'First post', slug: 'first-post'}); - secondPost = this.server.create('post', {title: 'Second post', slug: 'second-post'}); - firstPage = this.server.create('page', {title: 'First page', slug: 'first-page'}); - firstTag = this.server.create('tag', {name: 'First tag', slug: 'first-tag'}); - - suite.beforeEach.bind(this)(); - - return await authenticateSession(); - }); +describe('Acceptance: Search', function () { + const trigger = '[data-test-modal="search"] .ember-power-select-trigger'; + // eslint-disable-next-line no-unused-vars + let firstUser, firstPost, secondPost, firstPage, firstTag; - it('opens search modal when clicking icon', async function () { - await visit('/dashboard'); - expect(currentURL(), 'currentURL').to.equal('/dashboard'); - expect(find('[data-test-modal="search"]'), 'search modal').to.not.exist; - await click('[data-test-button="search"]'); - expect(find('[data-test-modal="search"]'), 'search modal').to.exist; - }); + const hooks = setupApplicationTest(); + setupMirage(hooks); - it('opens search icon when pressing Ctrl/Cmd+K', async function () { - await visit('/dashboard'); - expect(find('[data-test-modal="search"]'), 'search modal').to.not.exist; - await triggerKeyEvent(document, 'keydown', 'K', { - metaKey: ctrlOrCmd === 'command', - ctrlKey: ctrlOrCmd === 'ctrl' - }); - expect(find('[data-test-modal="search"]'), 'search modal').to.exist; - }); + this.beforeEach(async function () { + this.server.loadFixtures(); - it('closes search modal on escape key', async function () { - await visit('/dashboard'); - await click('[data-test-button="search"]'); - expect(find('[data-test-modal="search"]'), 'search modal').to.exist; - await triggerKeyEvent(document, 'keydown', 'Escape'); - expect(find('[data-test-modal="search"]'), 'search modal').to.not.exist; - }); + // create user to authenticate as + let role = this.server.create('role', {name: 'Owner'}); + firstUser = this.server.create('user', {roles: [role], slug: 'owner', name: 'First user'}); + + // populate store with data we'll be searching + firstPost = this.server.create('post', {title: 'First post', slug: 'first-post'}); + secondPost = this.server.create('post', {title: 'Second post', slug: 'second-post'}); + firstPage = this.server.create('page', {title: 'First page', slug: 'first-page'}); + firstTag = this.server.create('tag', {name: 'First tag', slug: 'first-tag'}); + + return await authenticateSession(); + }); + + it('opens search modal when clicking icon', async function () { + await visit('/dashboard'); + expect(currentURL(), 'currentURL').to.equal('/dashboard'); + expect(find('[data-test-modal="search"]'), 'search modal').to.not.exist; + await click('[data-test-button="search"]'); + expect(find('[data-test-modal="search"]'), 'search modal').to.exist; + }); - it('closes search modal on click outside', async function () { - await visit('/dashboard'); - await click('[data-test-button="search"]'); - expect(find('[data-test-modal="search"]'), 'search modal').to.exist; - await click('.epm-backdrop'); - expect(find('[data-test-modal="search"]'), 'search modal').to.not.exist; + it('opens search icon when pressing Ctrl/Cmd+K', async function () { + await visit('/dashboard'); + expect(find('[data-test-modal="search"]'), 'search modal').to.not.exist; + await triggerKeyEvent(document, 'keydown', 'K', { + metaKey: ctrlOrCmd === 'command', + ctrlKey: ctrlOrCmd === 'ctrl' }); + expect(find('[data-test-modal="search"]'), 'search modal').to.exist; + }); - it('finds posts, pages, staff, and tags when typing', async function () { - await visit('/dashboard'); - await click('[data-test-button="search"]'); - await typeInSearch('first'); // search is not case sensitive + it('closes search modal on escape key', async function () { + await visit('/dashboard'); + await click('[data-test-button="search"]'); + expect(find('[data-test-modal="search"]'), 'search modal').to.exist; + await triggerKeyEvent(document, 'keydown', 'Escape'); + expect(find('[data-test-modal="search"]'), 'search modal').to.not.exist; + }); - // all groups are present - const groupNames = findAll('.ember-power-select-group-name'); - expect(groupNames, 'group names').to.have.length(4); - expect(groupNames.map(el => el.textContent.trim())).to.deep.equal(['Staff', 'Tags', 'Posts', 'Pages']); + it('closes search modal on click outside', async function () { + await visit('/dashboard'); + await click('[data-test-button="search"]'); + expect(find('[data-test-modal="search"]'), 'search modal').to.exist; + await click('.epm-backdrop'); + expect(find('[data-test-modal="search"]'), 'search modal').to.not.exist; + }); - // correct results are found - const options = findAll('.ember-power-select-option'); - expect(options, 'number of search results').to.have.length(4); - expect(options.map(el => el.textContent.trim())).to.deep.equal(['First user', 'First tag', 'First post', 'First page']); + it('finds posts, pages, staff, and tags when typing', async function () { + await visit('/dashboard'); + await click('[data-test-button="search"]'); + await typeInSearch('first'); // search is not case sensitive - // first item is selected - expect(options[0]).to.have.attribute('aria-current', 'true'); - }); + // all groups are present + const groupNames = findAll('.ember-power-select-group-name'); + expect(groupNames, 'group names').to.have.length(4); + expect(groupNames.map(el => el.textContent.trim())).to.deep.equal(['Staff', 'Tags', 'Posts', 'Pages']); - it('up/down arrows move selected item', async function () { - await visit('/dashboard'); - await click('[data-test-button="search"]'); - await typeInSearch('first post'); - expect(findAll('.ember-power-select-option')[0], 'first option (initial)').to.have.attribute('aria-current', 'true'); - await triggerKeyEvent(trigger, 'keyup', 'ArrowDown'); - expect(findAll('.ember-power-select-option')[0], 'second option (after down)').to.have.attribute('aria-current', 'true'); - await triggerKeyEvent(trigger, 'keyup', 'ArrowUp'); - expect(findAll('.ember-power-select-option')[0], 'first option (after up)').to.have.attribute('aria-current', 'true'); - }); + // correct results are found + const options = findAll('.ember-power-select-option'); + expect(options, 'number of search results').to.have.length(4); + expect(options.map(el => el.textContent.trim())).to.deep.equal(['First user', 'First tag', 'First post', 'First page']); - it('navigates to editor when post selected (Enter)', async function () { - await visit('/dashboard'); - await click('[data-test-button="search"]'); - await typeInSearch('first post'); - await triggerKeyEvent(trigger, 'keydown', 'Enter'); - expect(currentURL(), 'url after selecting post').to.equal(`/editor/post/${firstPost.id}`); - }); + // first item is selected + expect(options[0]).to.have.attribute('aria-current', 'true'); + }); - it('navigates to editor when post selected (Clicked)', async function () { - await visit('/dashboard'); - await click('[data-test-button="search"]'); - await typeInSearch('first post'); - await click('.ember-power-select-option[aria-current="true"]'); - expect(currentURL(), 'url after selecting post').to.equal(`/editor/post/${firstPost.id}`); - }); + it('up/down arrows move selected item', async function () { + await visit('/dashboard'); + await click('[data-test-button="search"]'); + await typeInSearch('first post'); + expect(findAll('.ember-power-select-option')[0], 'first option (initial)').to.have.attribute('aria-current', 'true'); + await triggerKeyEvent(trigger, 'keyup', 'ArrowDown'); + expect(findAll('.ember-power-select-option')[0], 'second option (after down)').to.have.attribute('aria-current', 'true'); + await triggerKeyEvent(trigger, 'keyup', 'ArrowUp'); + expect(findAll('.ember-power-select-option')[0], 'first option (after up)').to.have.attribute('aria-current', 'true'); + }); - it('navigates to editor when page selected', async function () { - await visit('/dashboard'); - await click('[data-test-button="search"]'); - await typeInSearch('page'); - await triggerKeyEvent(trigger, 'keydown', 'Enter'); - expect(currentURL(), 'url after selecting page').to.equal(`/editor/page/${firstPage.id}`); - }); + it('navigates to editor when post selected (Enter)', async function () { + await visit('/dashboard'); + await click('[data-test-button="search"]'); + await typeInSearch('first post'); + await triggerKeyEvent(trigger, 'keydown', 'Enter'); + expect(currentURL(), 'url after selecting post').to.equal(`/editor/post/${firstPost.id}`); + }); - it('navigates to tag edit screen when tag selected', async function () { - await visit('/dashboard'); - await click('[data-test-button="search"]'); - await typeInSearch('tag'); - await triggerKeyEvent(trigger, 'keydown', 'Enter'); - expect(currentURL(), 'url after selecting tag').to.equal(`/tags/${firstTag.slug}`); - }); + it('navigates to editor when post selected (Clicked)', async function () { + await visit('/dashboard'); + await click('[data-test-button="search"]'); + await typeInSearch('first post'); + await click('.ember-power-select-option[aria-current="true"]'); + expect(currentURL(), 'url after selecting post').to.equal(`/editor/post/${firstPost.id}`); + }); - // TODO: Staff settings are now part of AdminX so this isn't working, can we test AdminX from Ember tests? - it.skip('navigates to user edit screen when user selected', async function () { - await visit('/dashboard'); - await click('[data-test-button="search"]'); - await typeInSearch('user'); - await triggerKeyEvent(trigger, 'keydown', 'Enter'); - expect(currentURL(), 'url after selecting user').to.equal(`/settings/staff/${firstUser.slug}`); - }); + it('navigates to editor when page selected', async function () { + await visit('/dashboard'); + await click('[data-test-button="search"]'); + await typeInSearch('page'); + await triggerKeyEvent(trigger, 'keydown', 'Enter'); + expect(currentURL(), 'url after selecting page').to.equal(`/editor/page/${firstPage.id}`); + }); - it('shows no results message when no results', async function () { - await visit('/dashboard'); - await click('[data-test-button="search"]'); - await typeInSearch('x'); - expect(find('.ember-power-select-option--no-matches-message'), 'no results message').to.contain.text('No results found'); - }); + it('navigates to tag edit screen when tag selected', async function () { + await visit('/dashboard'); + await click('[data-test-button="search"]'); + await typeInSearch('tag'); + await triggerKeyEvent(trigger, 'keydown', 'Enter'); + expect(currentURL(), 'url after selecting tag').to.equal(`/tags/${firstTag.slug}`); + }); - // https://linear.app/tryghost/issue/MOM-103/search-stalls-on-query-when-refresh-occurs - it('handles refresh on first search being slow', async function () { - this.server.get('/posts/', getPosts, {timing: 200}); + // TODO: Staff settings are now part of AdminX so this isn't working, can we test AdminX from Ember tests? + it.skip('navigates to user edit screen when user selected', async function () { + await visit('/dashboard'); + await click('[data-test-button="search"]'); + await typeInSearch('user'); + await triggerKeyEvent(trigger, 'keydown', 'Enter'); + expect(currentURL(), 'url after selecting user').to.equal(`/settings/staff/${firstUser.slug}`); + }); - await visit('/dashboard'); - await click('[data-test-button="search"]'); - await typeInSearch('first'); // search is not case sensitive + it('shows no results message when no results', async function () { + await visit('/dashboard'); + await click('[data-test-button="search"]'); + await typeInSearch('x'); + expect(find('.ember-power-select-option--no-matches-message'), 'no results message').to.contain.text('No results found'); + }); - // all groups are present - const groupNames = findAll('.ember-power-select-group-name'); - expect(groupNames, 'group names').to.have.length(4); - expect(groupNames.map(el => el.textContent.trim())).to.deep.equal(['Staff', 'Tags', 'Posts', 'Pages']); + // https://linear.app/tryghost/issue/MOM-103/search-stalls-on-query-when-refresh-occurs + it('handles refresh on first search being slow', async function () { + this.server.get('/posts/', getPosts, {timing: 200}); - // correct results are found - const options = findAll('.ember-power-select-option'); - expect(options, 'number of search results').to.have.length(4); - expect(options.map(el => el.textContent.trim())).to.deep.equal(['First user', 'First tag', 'First post', 'First page']); + await visit('/dashboard'); + await click('[data-test-button="search"]'); + await typeInSearch('first'); // search is not case sensitive - // first item is selected - expect(options[0]).to.have.attribute('aria-current', 'true'); - }); + // all groups are present + const groupNames = findAll('.ember-power-select-group-name'); + expect(groupNames, 'group names').to.have.length(4); + expect(groupNames.map(el => el.textContent.trim())).to.deep.equal(['Staff', 'Tags', 'Posts', 'Pages']); + + // correct results are found + const options = findAll('.ember-power-select-option'); + expect(options, 'number of search results').to.have.length(4); + expect(options.map(el => el.textContent.trim())).to.deep.equal(['First user', 'First tag', 'First post', 'First page']); + + // first item is selected + expect(options[0]).to.have.attribute('aria-current', 'true'); }); }); diff --git a/ghost/admin/tests/acceptance/setup-test.js b/ghost/admin/tests/acceptance/setup-test.js index 1b2dabef4452..4857598448ed 100644 --- a/ghost/admin/tests/acceptance/setup-test.js +++ b/ghost/admin/tests/acceptance/setup-test.js @@ -84,7 +84,7 @@ describe('Acceptance: Setup', function () { // it redirects to the dashboard expect(currentURL(), 'url after submitting account details') - .to.equal('/dashboard'); + .to.equal('/setup/done'); }); it('handles validation errors in setup', async function () { @@ -182,9 +182,9 @@ describe('Acceptance: Setup', function () { await authenticateSession(); }); - it('transitions to dashboard', async function () { + it('transitions to done screen', async function () { await visit('/?firstStart=true'); - expect(currentURL()).to.equal('/dashboard'); + expect(currentURL()).to.equal('/setup/done'); }); }); }); diff --git a/ghost/admin/tests/integration/components/gh-alert-test.js b/ghost/admin/tests/integration/components/gh-alert-test.js index 64863ea3e13f..92c961207806 100644 --- a/ghost/admin/tests/integration/components/gh-alert-test.js +++ b/ghost/admin/tests/integration/components/gh-alert-test.js @@ -45,11 +45,11 @@ describe('Integration: Component: gh-alert', function () { this.message.type = 'warn'; await settled(); - expect(alert, 'warn class is black').to.have.class('gh-alert-black'); + expect(alert, 'warn class is yellow').to.have.class('gh-alert-blue'); this.message.type = 'info'; await settled(); - expect(alert, 'info class is black').to.have.class('gh-alert-black'); + expect(alert, 'info class is blue').to.have.class('gh-alert-blue'); }); it('closes notification through notifications service', async function () { diff --git a/ghost/admin/tests/integration/services/search-test.js b/ghost/admin/tests/integration/services/search-test.js index ce453fdedaff..3b4060062c53 100644 --- a/ghost/admin/tests/integration/services/search-test.js +++ b/ghost/admin/tests/integration/services/search-test.js @@ -1,55 +1,30 @@ import {describe, it} from 'mocha'; -import {enableLabsFlag} from '../../helpers/labs-flag'; import {expect} from 'chai'; import {setupMirage} from 'ember-cli-mirage/test-support'; import {setupTest} from 'ember-mocha'; -const suites = [{ - name: 'Integration: Service: Search', - beforeEach() { - // noop - } -}, { - name: 'Integration: Service: Search (beta)', - beforeEach() { - enableLabsFlag(this.server, 'internalLinking'); - } -}]; +describe('Integration: Service: search', function () { + const hooks = setupTest(); + setupMirage(hooks); -suites.forEach((suite) => { - describe(suite.name, function () { - const hooks = setupTest(); - setupMirage(hooks); + let search; + // eslint-disable-next-line no-unused-vars + let firstUser, firstPost, secondPost, firstPage, firstTag; - let search; - // eslint-disable-next-line no-unused-vars - let firstUser, firstPost, secondPost, firstPage, firstTag; + beforeEach(function () { + search = this.owner.lookup('service:search'); - beforeEach(function () { - suite.beforeEach.bind(this)(); - - search = this.owner.lookup('service:search'); - - // populate store with data we'll be searching - firstPost = this.server.create('post', {title: 'First post', slug: 'first-post', visibility: 'members', publishedAt: '2024-05-08T16:21:07.000Z'}); - secondPost = this.server.create('post', {title: 'Second post', slug: 'second-post'}); - firstPage = this.server.create('page', {title: 'First page', slug: 'first-page'}); - firstTag = this.server.create('tag', {name: 'First tag', slug: 'first-tag'}); - }); - - it('returns urls for search results', async function () { - const results = await search.searchTask.perform('first'); - - expect(results[0].options[0].url).to.equal('http://localhost:4200/tag/first-tag/'); - expect(results[1].options[0].url).to.equal('http://localhost:4200/p/post-0/'); - expect(results[2].options[0].url).to.equal('http://localhost:4200/p/page-0/'); - }); + // populate store with data we'll be searching + firstPost = this.server.create('post', {title: 'First post', slug: 'first-post', visibility: 'members', publishedAt: '2024-05-08T16:21:07.000Z'}); + secondPost = this.server.create('post', {title: 'Second post', slug: 'second-post'}); + firstPage = this.server.create('page', {title: 'First page', slug: 'first-page'}); + firstTag = this.server.create('tag', {name: 'First tag', slug: 'first-tag'}); + }); - it('returns additional post-related fields', async function () { - const results = await search.searchTask.perform('post'); + it('returns additional post-related fields', async function () { + const results = await search.searchTask.perform('post'); - expect(results[0].options[0].visibility).to.equal('members'); - expect(results[0].options[0].publishedAt).to.equal('2024-05-08T16:21:07.000Z'); - }); + expect(results[0].options[0].visibility).to.equal('members'); + expect(results[0].options[0].publishedAt).to.equal('2024-05-08T16:21:07.000Z'); }); }); diff --git a/ghost/admin/tests/unit/components/koenig-lexical-editor-test.js b/ghost/admin/tests/unit/components/koenig-lexical-editor-test.js index 74e9525fff68..034ea84425d5 100644 --- a/ghost/admin/tests/unit/components/koenig-lexical-editor-test.js +++ b/ghost/admin/tests/unit/components/koenig-lexical-editor-test.js @@ -1,5 +1,4 @@ -import sinon from 'sinon'; -import {decoratePostSearchResult, offerUrls} from 'ghost-admin/components/koenig-lexical-editor'; +import {decoratePostSearchResult} from 'ghost-admin/components/koenig-lexical-editor'; import {describe, it} from 'mocha'; import {expect} from 'chai'; @@ -68,59 +67,4 @@ describe('Unit: Component: koenig-lexical-editor', function () { expect(result.metaIconTitle).to.be.undefined; }); }); - - describe('offersUrls', function () { - let context; - let performStub; - - beforeEach(function () { - context = { - fetchOffersTask: { - perform: () => {} - }, - config: { - getSiteUrl: code => `https://example.com?offer=${code}` - } - }; - - performStub = sinon.stub(context.fetchOffersTask, 'perform'); - }); - - afterEach(function () { - sinon.restore(); - }); - - it('returns an empty array if fetching offers gives no result', async function () { - performStub.resolves([]); - - const results = await offerUrls.call(context); - - expect(performStub.callCount).to.equal(1); - expect(results).to.deep.equal([]); - }); - - it('returns an empty array if fetching offers fails', async function () { - performStub.rejects(new Error('Failed to fetch offers')); - - const results = await offerUrls.call(context); - - expect(performStub.callCount).to.equal(1); - expect(results).to.deep.equal([]); - }); - - it(('returns an array of offers urls if fetching offers is successful'), async function () { - performStub.resolves([ - {name: 'Yellow Thursday', code: 'yellow-thursday'}, - {name: 'Green Friday', code: 'green-friday'} - ]); - - const results = await offerUrls.call(context); - - expect(performStub.callCount).to.equal(1); - expect(results).to.deep.equal([ - {label: 'Offer — Yellow Thursday', value: 'https://example.com?offer=yellow-thursday'}, - {label: 'Offer — Green Friday', value: 'https://example.com?offer=green-friday'} - ]); - }); - }); }); diff --git a/ghost/admin/tests/unit/controllers/editor-test.js b/ghost/admin/tests/unit/controllers/editor-test.js index 088f22391dd6..ce086550f4c8 100644 --- a/ghost/admin/tests/unit/controllers/editor-test.js +++ b/ghost/admin/tests/unit/controllers/editor-test.js @@ -13,6 +13,7 @@ describe('Unit: Controller: lexical-editor', function () { describe('generateSlug', function () { it('should generate a slug and set it on the post', async function () { let controller = this.owner.lookup('controller:lexical-editor'); + controller.set('slugGenerator', EmberObject.create({ generateSlug(slugType, str) { return RSVP.resolve(`${str}-slug`); @@ -32,6 +33,7 @@ describe('Unit: Controller: lexical-editor', function () { it('should not set the destination if the title is "(Untitled)" and the post already has a slug', async function () { let controller = this.owner.lookup('controller:lexical-editor'); + controller.set('slugGenerator', EmberObject.create({ generateSlug(slugType, str) { return RSVP.resolve(`${str}-slug`); @@ -46,95 +48,56 @@ describe('Unit: Controller: lexical-editor', function () { expect(controller.get('post.slug')).to.equal('whatever'); }); + }); - it('should generate a new slug if the previous title was (Untitled)', async function () { - let controller = this.owner.lookup('controller:lexical-editor'); - controller.set('slugGenerator', EmberObject.create({ - generateSlug(slugType, str) { - return RSVP.resolve(`${str}-slug`); - } - })); - controller.set('post', EmberObject.create({ - slug: '', - title: '(Untitled)', - titleScratch: 'title' - })); - - await controller.generateSlugTask.perform(); - - expect(controller.get('post.slug')).to.equal('title-slug'); + describe('saveTitleTask', function () { + beforeEach(function () { + this.controller = this.owner.lookup('controller:lexical-editor'); + this.controller.set('target', {send() {}}); }); - it('should generate a new slug if the previous title ended with (Copy)', async function () { - let controller = this.owner.lookup('controller:lexical-editor'); - controller.set('slugGenerator', EmberObject.create({ - generateSlug(slugType, str) { - return RSVP.resolve(`${str}-slug`); - } - })); + it('should invoke generateSlug if the post is new and a title has not been set', async function () { + let {controller} = this; - controller.set('post', EmberObject.create({ - slug: '', - title: 'title (Copy)', - titleScratch: 'newTitle' + controller.set('target', {send() {}}); + defineProperty(controller, 'generateSlugTask', task(function * () { + this.set('post.slug', 'test-slug'); + yield RSVP.resolve(); })); + controller.set('post', EmberObject.create({isNew: true})); - await controller.generateSlugTask.perform(); + expect(controller.get('post.isNew')).to.be.true; + expect(controller.get('post.titleScratch')).to.not.be.ok; + + controller.set('post.titleScratch', 'test'); + await controller.saveTitleTask.perform(); - expect(controller.get('post.slug')).to.equal('newTitle-slug'); + expect(controller.get('post.titleScratch')).to.equal('test'); + expect(controller.get('post.slug')).to.equal('test-slug'); }); - it('should not generate a new slug if it appears a custom slug was set', async function () { - let controller = this.owner.lookup('controller:lexical-editor'); - controller.set('slugGenerator', EmberObject.create({ - generateSlug(slugType, str) { - return RSVP.resolve(`${str}-slug`); - } - })); + it('should invoke generateSlug if the post is not new and it\'s title is "(Untitled)"', async function () { + let {controller} = this; - controller.set('post', EmberObject.create({ - slug: 'custom-slug', - title: 'original title', - titleScratch: 'newTitle' + controller.set('target', {send() {}}); + defineProperty(controller, 'generateSlugTask', task(function * () { + this.set('post.slug', 'test-slug'); + yield RSVP.resolve(); })); + controller.set('post', EmberObject.create({isNew: false, title: '(Untitled)'})); - expect(controller.get('post.slug')).to.equal('custom-slug'); - expect(controller.get('post.titleScratch')).to.equal('newTitle'); - - await controller.generateSlugTask.perform(); - - expect(controller.get('post.slug')).to.equal('custom-slug'); - }); - - it('should generate new slugs if the title changes', async function () { - let controller = this.owner.lookup('controller:lexical-editor'); - controller.set('slugGenerator', EmberObject.create({ - generateSlug(slugType, str) { - return RSVP.resolve(`${str}-slug`); - } - })); - controller.set('post', EmberObject.create({ - slug: 'somepost', - title: 'somepost', - titleScratch: 'newtitle' - })); + expect(controller.get('post.isNew')).to.be.false; + expect(controller.get('post.titleScratch')).to.not.be.ok; - await controller.generateSlugTask.perform(); + controller.set('post.titleScratch', 'New Title'); - expect(controller.get('post.slug')).to.equal('newtitle-slug'); - }); - }); + await controller.saveTitleTask.perform(); - describe('saveTitleTask', function () { - beforeEach(function () { - this.controller = this.owner.lookup('controller:lexical-editor'); - this.controller.set('target', {send() {}}); - defineProperty(this.controller, 'autosaveTask', task(function * () { - yield RSVP.resolve(); - })); + expect(controller.get('post.titleScratch')).to.equal('New Title'); + expect(controller.get('post.slug')).to.equal('test-slug'); }); - it('should invoke generateSlug if the post is not published', async function () { + it('should invoke generateSlug if the post is a duplicated post', async function () { let {controller} = this; controller.set('target', {send() {}}); @@ -142,29 +105,33 @@ describe('Unit: Controller: lexical-editor', function () { this.set('post.slug', 'test-slug'); yield RSVP.resolve(); })); + controller.set('post', EmberObject.create({isNew: false, title: 'Some Title (Copy)'})); - controller.set('post', EmberObject.create({isDraft: true})); - - expect(controller.get('post.isDraft')).to.be.true; + expect(controller.get('post.isNew')).to.be.false; expect(controller.get('post.titleScratch')).to.not.be.ok; - controller.set('post.titleScratch', 'test'); + controller.set('post.titleScratch', 'Some Title'); + await controller.saveTitleTask.perform(); - expect(controller.get('post.titleScratch')).to.equal('test'); + expect(controller.get('post.titleScratch')).to.equal('Some Title'); expect(controller.get('post.slug')).to.equal('test-slug'); }); - it('should not invoke generateSlug if the post is published', async function () { + it('should not invoke generateSlug if the post is new but has a title', async function () { let {controller} = this; controller.set('target', {send() {}}); + defineProperty(controller, 'generateSlugTask', task(function * () { + expect(false, 'generateSlug should not be called').to.equal(true); + yield RSVP.resolve(); + })); controller.set('post', EmberObject.create({ - title: 'a title', - isPublished: true + isNew: true, + title: 'a title' })); - expect(controller.get('post.isPublished')).to.be.true; + expect(controller.get('post.isNew')).to.be.true; expect(controller.get('post.title')).to.equal('a title'); expect(controller.get('post.titleScratch')).to.not.be.ok; @@ -174,6 +141,26 @@ describe('Unit: Controller: lexical-editor', function () { expect(controller.get('post.titleScratch')).to.equal('test'); expect(controller.get('post.slug')).to.not.be.ok; }); + + it('should not invoke generateSlug if the post is not new and the title is not "(Untitled)"', async function () { + let {controller} = this; + + controller.set('target', {send() {}}); + defineProperty(controller, 'generateSlugTask', task(function * () { + expect(false, 'generateSlug should not be called').to.equal(true); + yield RSVP.resolve(); + })); + controller.set('post', EmberObject.create({isNew: false})); + + expect(controller.get('post.isNew')).to.be.false; + expect(controller.get('post.title')).to.not.be.ok; + + controller.set('post.titleScratch', 'title'); + await controller.saveTitleTask.perform(); + + expect(controller.get('post.titleScratch')).to.equal('title'); + expect(controller.get('post.slug')).to.not.be.ok; + }); }); describe('TK count in title', function () { @@ -193,37 +180,4 @@ describe('Unit: Controller: lexical-editor', function () { expect(controller.get('tkCount')).to.equal(1); }); }); - - describe('hasDirtyAttributes', function () { - it('Changes in the direction field in the lexical string are not considered dirty', async function () { - let controller = this.owner.lookup('controller:lexical-editor'); - - const initialLexicalString = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content","type": "extended-text","version": 1}],"direction": null,"format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`; - const lexicalStringNoNullDirection = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Sample content","type": "extended-text","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`; - const lexicalStringUpdatedContent = `{"root":{"children":[{"children": [{"detail": 0,"format": 0,"mode": "normal","style": "","text": "Here's some new text","type": "extended-text","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "paragraph","version": 1}],"direction": "ltr","format": "","indent": 0,"type": "root","version": 1}}`; - - // we can't seem to call setPost directly, so we have to set the post manually - controller.set('post', EmberObject.create({ - title: 'this is a title', - titleScratch: 'this is a title', - status: 'published', - lexical: initialLexicalString, - lexicalScratch: initialLexicalString - })); - - // synthetically update the lexicalScratch as if the editor itself made the modifications on loading the initial editorState - controller.send('updateScratch',JSON.parse(lexicalStringNoNullDirection)); - - // this should NOT result in the post being dirty - while lexical !== lexicalScratch, we ignore the direction field - let isDirty = controller.get('hasDirtyAttributes'); - expect(isDirty).to.be.false; - - // now we try a synthetic change in the actual text content that should result in a dirty post - controller.send('updateScratch',JSON.parse(lexicalStringUpdatedContent)); - - // this should NOT result in the post being dirty - while lexical !== lexicalScratch, we ignore the direction field - isDirty = controller.get('hasDirtyAttributes'); - expect(isDirty).to.be.true; - }); - }); }); diff --git a/ghost/admin/tests/unit/utils/merge-stats-by-date-test.js b/ghost/admin/tests/unit/utils/merge-stats-by-date-test.js deleted file mode 100644 index 62480d478a7b..000000000000 --- a/ghost/admin/tests/unit/utils/merge-stats-by-date-test.js +++ /dev/null @@ -1,184 +0,0 @@ -import mergeStatsByDate from 'ghost-admin/utils/merge-stats-by-date'; -import {describe, it} from 'mocha'; -import {expect} from 'chai'; - -const STATS_DATA = [ - { - date: '2024-06-22', - tier: '111111111111111111111111', - cadence: 'month', - positive_delta: 0, - negative_delta: 0, - signups: 0, - cancellations: 0, - count: 456 - }, - { - date: '2024-06-22', - tier: '111111111111111111111111', - cadence: 'year', - positive_delta: 1, - negative_delta: 1, - signups: 0, - cancellations: 0, - count: 1354 - }, - { - date: '2024-06-23', - tier: '111111111111111111111111', - cadence: 'month', - positive_delta: 0, - negative_delta: 0, - signups: 0, - cancellations: 0, - count: 456 - }, - { - date: '2024-06-23', - tier: '111111111111111111111111', - cadence: 'year', - positive_delta: 1, - negative_delta: 1, - signups: 0, - cancellations: 0, - count: 1354 - }, - { - date: '2024-06-23', - tier: '111111111111111111111113', - cadence: 'year', - positive_delta: 0, - negative_delta: 0, - signups: 0, - cancellations: 0, - count: 400 - }, - { - date: '2024-06-24', - tier: '111111111111111111111111', - cadence: 'year', - positive_delta: 3, - negative_delta: 2, - signups: 1, - cancellations: 0, - count: 1355 - }, - { - date: '2024-06-24', - tier: '111111111111111111111113', - cadence: 'year', - positive_delta: 2, - negative_delta: 1, - signups: 2, - cancellations: 1, - count: 401 - }, - { - date: '2024-06-24', - tier: '111111111111111111111112', - cadence: 'year', - positive_delta: 1, - negative_delta: 0, - signups: 1, - cancellations: 0, - count: 55 - }, - { - date: '2024-06-25', - tier: '111111111111111111111111', - cadence: 'month', - positive_delta: 0, - negative_delta: 1, - signups: 0, - cancellations: 1, - count: 455 - }, - { - date: '2024-06-25', - tier: '111111111111111111111111', - cadence: 'year', - positive_delta: 2, - negative_delta: 5, - signups: 1, - cancellations: 4, - count: 1352 - }, - { - date: '2024-06-25', - tier: '111111111111111111111113', - cadence: 'year', - positive_delta: 1, - negative_delta: 2, - signups: 1, - cancellations: 2, - count: 400 - }, - { - date: '2024-06-26', - tier: '111111111111111111111111', - cadence: 'year', - positive_delta: 2, - negative_delta: 2, - signups: 0, - cancellations: 0, - count: 1352 - }, - { - date: '2024-06-26', - tier: '111111111111111111111113', - cadence: 'year', - positive_delta: 0, - negative_delta: 0, - signups: 0, - cancellations: 0, - count: 400 - } -]; - -describe('mergeStatsByDate', function () { - it('merges stats as expected', function () { - const result = mergeStatsByDate(STATS_DATA); - expect(result).to.deep.equal([ - { - date: '2024-06-22', - count: 1810, - positiveDelta: 1, - negativeDelta: 1, - signups: 0, - cancellations: 0 - }, - { - date: '2024-06-23', - count: 2210, - positiveDelta: 1, - negativeDelta: 1, - signups: 0, - cancellations: 0 - }, - { - date: '2024-06-24', - count: 1811, - positiveDelta: 6, - negativeDelta: 3, - signups: 4, - cancellations: 1 - }, - { - date: '2024-06-25', - count: 2207, - positiveDelta: 3, - negativeDelta: 8, - signups: 2, - cancellations: 7 - }, - { - date: '2024-06-26', - count: 1752, - positiveDelta: 2, - negativeDelta: 2, - signups: 0, - cancellations: 0 - } - ]); - }); -}); diff --git a/ghost/admin/tests/unit/utils/subscription-data-test.js b/ghost/admin/tests/unit/utils/subscription-data-test.js deleted file mode 100644 index 5b396b20d8cc..000000000000 --- a/ghost/admin/tests/unit/utils/subscription-data-test.js +++ /dev/null @@ -1,341 +0,0 @@ -import moment from 'moment-timezone'; -import {compExpiry, getSubscriptionData, isActive, isCanceled, isComplimentary, isSetToCancel, trialUntil, validUntil, validityDetails} from 'ghost-admin/utils/subscription-data'; -import {describe, it} from 'mocha'; -import {expect} from 'chai'; - -describe('Unit: Util: subscription-data', function () { - describe('validUntil', function () { - it('returns the end of the current billing period when the subscription is canceled at the end of the period', function () { - let sub = { - status: 'canceled', - cancel_at_period_end: true, - current_period_end: '2021-05-31' - }; - expect(validUntil(sub)).to.equal('31 May 2021'); - }); - - it('returns an empty string when the subscription is canceled immediately', function () { - let sub = { - status: 'canceled', - cancel_at_period_end: false, - current_period_end: '2021-05-31' - }; - expect(validUntil(sub)).to.equal(''); - }); - - it('returns the end of the current billing period when the subscription is active', function () { - let sub = { - status: 'active', - cancel_at_period_end: false, - current_period_end: '2021-05-31' - }; - expect(validUntil(sub)).to.equal('31 May 2021'); - }); - - it('returns the end of the current billing period when the subscription is in trial', function () { - let sub = { - status: 'trialing', - cancel_at_period_end: false, - current_period_end: '2021-05-31' - }; - expect(validUntil(sub)).to.equal('31 May 2021'); - }); - - it('returns the end of the current billing period when the subscription is past_due', function () { - let sub = { - status: 'past_due', - cancel_at_period_end: false, - current_period_end: '2021-05-31' - }; - expect(validUntil(sub)).to.equal('31 May 2021'); - }); - - it('returns the end of the current billing period when the subscription is unpaid', function () { - let sub = { - status: 'unpaid', - cancel_at_period_end: false, - current_period_end: '2021-05-31' - }; - expect(validUntil(sub)).to.equal('31 May 2021'); - }); - - // Extra data safety check, mainly for imported subscriptions - it('returns an empty string if the subcription is canceled immediately and has no current_period_start', function () { - let sub = { - status: 'canceled', - cancel_at_period_end: false - }; - expect(validUntil(sub)).to.equal(''); - }); - - // Extra data safety check, mainly for imported subscriptions - it('returns an empty string if the subscription has no current_period_end', function () { - let sub = { - status: 'active', - cancel_at_period_end: false - }; - expect(validUntil(sub)).to.equal(''); - }); - }); - - describe('isActive', function () { - it('returns true for active subscriptions', function () { - let sub = {status: 'active'}; - expect(isActive(sub)).to.be.true; - }); - - it('returns true for trialing subscriptions', function () { - let sub = {status: 'trialing'}; - expect(isActive(sub)).to.be.true; - }); - - it('returns true for past_due subscriptions', function () { - let sub = {status: 'past_due'}; - expect(isActive(sub)).to.be.true; - }); - - it('returns true for unpaid subscriptions', function () { - let sub = {status: 'unpaid'}; - expect(isActive(sub)).to.be.true; - }); - - it('returns false for canceled subscriptions', function () { - let sub = {status: 'canceled'}; - expect(isActive(sub)).to.be.false; - }); - }); - - describe('isComplimentary', function () { - it('returns true for complimentary subscriptions', function () { - let sub = {id: null}; - expect(isComplimentary(sub)).to.be.true; - }); - - it('returns false for paid subscriptions', function () { - let sub = {id: 'sub_123'}; - expect(isComplimentary(sub)).to.be.false; - }); - }); - - describe('isCanceled', function () { - it('returns true for canceled subscriptions', function () { - let sub = {status: 'canceled'}; - expect(isCanceled(sub)).to.be.true; - }); - - it('returns false for active subscriptions', function () { - let sub = {status: 'active'}; - expect(isCanceled(sub)).to.be.false; - }); - }); - - describe('isSetToCancel', function () { - it('returns true for subscriptions set to cancel at the end of the period', function () { - let sub = {status: 'active', cancel_at_period_end: true}; - expect(isSetToCancel(sub)).to.be.true; - }); - - it('returns false for canceled subscriptions', function () { - let sub = {status: 'canceled', cancel_at_period_end: true}; - expect(isSetToCancel(sub)).to.be.false; - }); - }); - - describe('trialUntil', function () { - it('returns the trial end date for subscriptions in trial', function () { - let sub = {status: 'trialing', trial_end_at: '2222-05-31'}; - expect(trialUntil(sub)).to.equal('31 May 2222'); - }); - - it('returns undefined for subscriptions not in trial', function () { - let sub = {status: 'active'}; - expect(trialUntil(sub)).to.be.undefined; - }); - }); - - describe('compExpiry', function () { - it('returns the complimentary expiry date for complimentary subscriptions', function () { - let sub = {id: null, tier: {expiry_at: moment.utc('2021-05-31').toISOString()}}; - expect(compExpiry(sub)).to.equal('31 May 2021'); - }); - - it('returns undefined for paid subscriptions', function () { - let sub = {id: 'sub_123'}; - expect(compExpiry(sub)).to.be.undefined; - }); - }); - - describe('validityDetails', function () { - it('returns "Expires {compExpiry}" for expired complimentary subscriptions', function () { - let data = { - isComplimentary: true, - compExpiry: '31 May 2021' - }; - expect(validityDetails(data)).to.equal('Expires 31 May 2021'); - }); - - it('returns "Ended {validUntil}" for canceled subscriptions', function () { - let data = { - hasEnded: true, - validUntil: '31 May 2021' - }; - expect(validityDetails(data)).to.equal('Ended 31 May 2021'); - }); - - it('returns "Has access until {validUntil}" for set to cancel subscriptions', function () { - let data = { - willEndSoon: true, - validUntil: '31 May 2021' - }; - expect(validityDetails(data)).to.equal('Has access until 31 May 2021'); - }); - - it('returns "Ends {validUntil}" for trial subscriptions', function () { - let data = { - trialUntil: '31 May 2021' - }; - expect(validityDetails(data)).to.equal('Ends 31 May 2021'); - }); - - it('returns "Renews {validUntil}" for active subscriptions', function () { - let data = { - validUntil: '31 May 2021' - }; - expect(validityDetails(data)).to.equal('Renews 31 May 2021'); - }); - }); - - describe('getSubscriptionData', function () { - it('returns the correct data for an active subscription', function () { - let sub = { - id: 'defined', - status: 'active', - cancel_at_period_end: false, - current_period_end: '2021-05-31', - trial_end_at: null, - tier: null, - price: { - currency: 'usd', - amount: 5000 - } - }; - let data = getSubscriptionData(sub); - - expect(data).to.include({ - isComplimentary: false, - compExpiry: undefined, - hasEnded: false, - validUntil: '31 May 2021', - willEndSoon: false, - trialUntil: undefined, - validityDetails: 'Renews 31 May 2021' - }); - }); - - it('returns the correct data for a trial subscription', function () { - let sub = { - id: 'defined', - status: 'trialing', - cancel_at_period_end: false, - current_period_end: '2222-05-31', - trial_end_at: '2222-05-31', - tier: null, - price: { - currency: 'usd', - amount: 5000 - } - }; - let data = getSubscriptionData(sub); - - expect(data).to.include({ - isComplimentary: false, - compExpiry: undefined, - hasEnded: false, - validUntil: '31 May 2222', - willEndSoon: false, - trialUntil: '31 May 2222', - validityDetails: 'Ends 31 May 2222' - }); - }); - - it('returns the correct data for an immediately canceled subscription', function () { - let sub = { - id: 'defined', - status: 'canceled', - cancel_at_period_end: false, - current_period_end: '2021-05-31', - trial_end_at: null, - tier: null, - price: { - currency: 'usd', - amount: 5000 - } - }; - let data = getSubscriptionData(sub); - - expect(data).to.include({ - isComplimentary: false, - compExpiry: undefined, - hasEnded: true, - validUntil: '', - willEndSoon: false, - trialUntil: undefined, - validityDetails: 'Ended ' - }); - }); - - it('returns the correct data for a subscription set to cancel at the end of the period', function () { - let sub = { - id: 'defined', - status: 'active', - cancel_at_period_end: true, - current_period_end: '2021-05-31', - trial_end_at: null, - tier: null, - price: { - currency: 'usd', - amount: 5000 - } - }; - let data = getSubscriptionData(sub); - - expect(data).to.include({ - isComplimentary: false, - compExpiry: undefined, - hasEnded: false, - validUntil: '31 May 2021', - willEndSoon: true, - trialUntil: undefined, - validityDetails: 'Has access until 31 May 2021' - }); - }); - - it('returns the correct data for a complimentary subscription', function () { - let sub = { - id: null, - status: 'active', - cancel_at_period_end: false, - current_period_end: '2021-05-31', - trial_end_at: null, - tier: { - expiry_at: moment.utc('2021-05-31').toISOString() - }, - price: { - currency: 'usd', - amount: 0 - } - }; - let data = getSubscriptionData(sub); - - expect(data).to.include({ - isComplimentary: true, - compExpiry: '31 May 2021', - hasEnded: false, - validUntil: '31 May 2021', - willEndSoon: false, - trialUntil: undefined, - validityDetails: 'Expires 31 May 2021' - }); - }); - }); -}); diff --git a/ghost/api-framework/lib/utils/options.js b/ghost/api-framework/lib/utils/options.js index 90b5d6eaa458..22dd57592585 100644 --- a/ghost/api-framework/lib/utils/options.js +++ b/ghost/api-framework/lib/utils/options.js @@ -1,5 +1,4 @@ const _ = require('lodash'); -const {IncorrectUsageError} = require('@tryghost/errors'); /** * @description Helper function to prepare params for internal usages. @@ -16,14 +15,6 @@ const trimAndLowerCase = (params) => { params = params.split(','); } - // If we don't have an array at this point, something is wrong, so we should throw an - // error to avoid trying to .map over something else - if (!_.isArray(params)) { - throw new IncorrectUsageError({ - message: 'Params must be a string or array' - }); - } - return params.map((item) => { return item.trim().toLowerCase(); }); diff --git a/ghost/api-framework/package.json b/ghost/api-framework/package.json index 82afad8e199e..71e02c6bcf86 100644 --- a/ghost/api-framework/package.json +++ b/ghost/api-framework/package.json @@ -24,11 +24,11 @@ "sinon": "15.2.0" }, "dependencies": { - "@tryghost/debug": "0.1.30", + "@tryghost/debug": "0.1.29", "@tryghost/errors": "1.3.2", - "@tryghost/promise": "0.3.10", - "@tryghost/tpl": "0.1.30", - "@tryghost/validator": "0.2.11", + "@tryghost/promise": "0.3.9", + "@tryghost/tpl": "0.1.29", + "@tryghost/validator": "0.2.10", "jsonpath": "1.1.1", "lodash": "4.17.21" } diff --git a/ghost/api-framework/test/util/options.test.js b/ghost/api-framework/test/util/options.test.js index ad926f8991c7..d9812a41cee2 100644 --- a/ghost/api-framework/test/util/options.test.js +++ b/ghost/api-framework/test/util/options.test.js @@ -20,12 +20,4 @@ describe('util/options', function () { it('accepts parameters in form of an array', function () { optionsUtil.trimAndLowerCase([' PeanUt', ' buTTer ']).should.eql(['peanut', 'butter']); }); - - it('throws error for invalid object input', function () { - try { - optionsUtil.trimAndLowerCase({name: 'peanut'}); - } catch (err) { - err.message.should.eql('Params must be a string or array'); - } - }); }); diff --git a/ghost/audience-feedback/package.json b/ghost/audience-feedback/package.json index 894ca81fec3c..dff538f0d6fe 100644 --- a/ghost/audience-feedback/package.json +++ b/ghost/audience-feedback/package.json @@ -25,7 +25,7 @@ }, "dependencies": { "@tryghost/errors": "1.3.2", - "@tryghost/tpl": "0.1.30", + "@tryghost/tpl": "0.1.29", "bson-objectid": "2.0.4" } } diff --git a/ghost/bookshelf-repository/package.json b/ghost/bookshelf-repository/package.json index be73c8ffb9a0..bb2e89d8519f 100644 --- a/ghost/bookshelf-repository/package.json +++ b/ghost/bookshelf-repository/package.json @@ -26,7 +26,7 @@ "@tryghost/nql": "0.12.3" }, "dependencies": { - "@tryghost/mongo-utils": "0.6.2", + "@tryghost/mongo-utils": "0.6.1", "knex": "2.4.2" } } diff --git a/ghost/bootstrap-socket/package.json b/ghost/bootstrap-socket/package.json index 102a925e8b4a..e8d95827c54f 100644 --- a/ghost/bootstrap-socket/package.json +++ b/ghost/bootstrap-socket/package.json @@ -24,6 +24,6 @@ "sinon": "15.2.0" }, "dependencies": { - "@tryghost/logging": "2.4.15" + "@tryghost/logging": "2.4.14" } } diff --git a/ghost/collections/package.json b/ghost/collections/package.json index 39f9e00454fa..9e064e268b62 100644 --- a/ghost/collections/package.json +++ b/ghost/collections/package.json @@ -26,14 +26,14 @@ "sinon": "15.2.0" }, "dependencies": { - "@tryghost/debug": "0.1.30", + "@tryghost/debug": "0.1.29", "@tryghost/errors": "1.3.2", "@tryghost/in-memory-repository": "0.0.0", - "@tryghost/logging": "2.4.15", + "@tryghost/logging": "2.4.14", "@tryghost/nql": "0.12.3", "@tryghost/nql-filter-expansions": "0.0.0", "@tryghost/post-events": "0.0.0", - "@tryghost/tpl": "0.1.30", + "@tryghost/tpl": "0.1.29", "bson-objectid": "2.0.4", "lodash": "4.17.21" }, diff --git a/ghost/core/core/boot.js b/ghost/core/core/boot.js index 6c9c83ed74f7..575b31cbc231 100644 --- a/ghost/core/core/boot.js +++ b/ghost/core/core/boot.js @@ -388,6 +388,8 @@ async function initNestDependencies() { debug('Begin: initNestDependencies'); const GhostNestApp = require('@tryghost/ghost'); const providers = []; + const urlUtils = require('./shared/url-utils'); + const activityPubBaseUrl = new URL('activitypub', urlUtils.urlFor('home', true)); providers.push({ provide: 'logger', useValue: require('@tryghost/logging') @@ -400,6 +402,9 @@ async function initNestDependencies() { }, { provide: 'DomainEvents', useValue: require('@tryghost/domain-events') + }, { + provide: 'ActivityPubBaseURL', + useValue: activityPubBaseUrl }, { provide: 'SettingsCache', useValue: require('./shared/settings-cache') @@ -509,11 +514,6 @@ async function bootGhost({backend = true, frontend = true, server = true} = {}) try { // Step 1 - require more fundamental components - // OpenTelemetry should be configured as early as possible - debug('Begin: Load OpenTelemetry'); - const opentelemetryInstrumentation = require('./shared/instrumentation'); - opentelemetryInstrumentation.initOpenTelemetry({config}); - debug('End: Load OpenTelemetry'); // Sentry must be initialized early, but requires config debug('Begin: Load sentry'); @@ -536,9 +536,8 @@ async function bootGhost({backend = true, frontend = true, server = true} = {}) debug('Begin: Get DB ready'); await initDatabase({config}); bootLogger.log('database ready'); - const connection = require('./server/data/db/connection'); sentry.initQueryTracing( - connection + require('./server/data/db/connection') ); debug('End: Get DB ready'); diff --git a/ghost/core/core/frontend/helpers/get.js b/ghost/core/core/frontend/helpers/get.js index 9373ee686cc3..85277b625524 100644 --- a/ghost/core/core/frontend/helpers/get.js +++ b/ghost/core/core/frontend/helpers/get.js @@ -299,7 +299,7 @@ module.exports = async function get(resource, options) { try { const spanName = `{{#get "${resource}"${apiOptionsString}}} ${data.member ? 'member' : 'public'}`; const result = await Sentry.startSpan({ - op: 'frontend.helpers.get', + op: 'frontend.helpers.get', name: spanName, tags: { resource, @@ -313,11 +313,11 @@ module.exports = async function get(resource, options) { if (response[resource] && response[resource].length) { response[resource].forEach(prepareContextResource); } - + // used for logging details of slow requests returnedRowsCount = response[resource] && response[resource].length; span?.setTag('returnedRows', returnedRowsCount); - + // block params allows the theme developer to name the data using something like // `{{#get "posts" as |result pageInfo|}}` const blockParams = [response[resource]]; @@ -325,7 +325,7 @@ module.exports = async function get(resource, options) { response.pagination = response.meta.pagination; blockParams.push(response.meta.pagination); } - + // Call the main template function const rendered = options.fn(response, { data: data, @@ -357,9 +357,7 @@ module.exports = async function get(resource, options) { apiOptions, returnedRows: returnedRowsCount } - }), { - time: totalMs - }); + })); } } } diff --git a/ghost/core/core/frontend/helpers/ghost_head.js b/ghost/core/core/frontend/helpers/ghost_head.js index 09904905ced3..ea3b19fac5f3 100644 --- a/ghost/core/core/frontend/helpers/ghost_head.js +++ b/ghost/core/core/frontend/helpers/ghost_head.js @@ -296,18 +296,6 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam head.push(``); } - if (options.data.site.accent_color) { - const accentColor = escapeExpression(options.data.site.accent_color); - const styleTag = ``; - const existingScriptIndex = _.findLastIndex(head, str => str.match(/<\/(style|script)>/)); - - if (existingScriptIndex !== -1) { - head[existingScriptIndex] = head[existingScriptIndex] + styleTag; - } else { - head.push(styleTag); - } - } - if (!_.isEmpty(globalCodeinjection)) { head.push(globalCodeinjection); } @@ -321,6 +309,19 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam } } + // AMP template has style injected directly because there can only be one `; + const existingScriptIndex = _.findLastIndex(head, str => str.match(/<\/(style|script)>/)); + + if (existingScriptIndex !== -1) { + head[existingScriptIndex] = head[existingScriptIndex] + styleTag; + } else { + head.push(styleTag); + } + } + debug('end'); return new SafeString(head.join('\n ').trim()); } catch (error) { diff --git a/ghost/core/core/frontend/src/cards/css/bookmark.css b/ghost/core/core/frontend/src/cards/css/bookmark.css index d04d74902c68..e14af83b01b7 100644 --- a/ghost/core/core/frontend/src/cards/css/bookmark.css +++ b/ghost/core/core/frontend/src/cards/css/bookmark.css @@ -12,7 +12,6 @@ .kg-bookmark-card a.kg-bookmark-container, .kg-bookmark-card a.kg-bookmark-container:hover { display: flex; - background: #fff; text-decoration: none; border-radius: 6px; border: 1px solid rgb(124 139 154 / 25%); @@ -29,7 +28,6 @@ justify-content: flex-start; padding: 20px; overflow: hidden; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; } .kg-bookmark-title { diff --git a/ghost/core/core/frontend/utils/images.js b/ghost/core/core/frontend/utils/images.js index d5e14acd9056..366d6b0d233b 100644 --- a/ghost/core/core/frontend/utils/images.js +++ b/ghost/core/core/frontend/utils/images.js @@ -92,10 +92,6 @@ module.exports.getImageWithSize = function getImageWithSize(imagePath, sizeOptio const sizeDirectoryName = prefixIfPresent('w', width) + prefixIfPresent('h', height); const formatPrefix = requestedFormat && imageTransform.canTransformToFormat(requestedFormat) ? `/format/${requestedFormat}` : ''; - if (!imageName) { - return imgBlogUrl; - } - return [imgBlogUrl, urlUtils.STATIC_IMAGE_URL_PREFIX, `/size/${sizeDirectoryName}`, formatPrefix, imageName].join(''); }; diff --git a/ghost/core/core/frontend/web/middleware/frontend-caching.js b/ghost/core/core/frontend/web/middleware/frontend-caching.js deleted file mode 100644 index 0f7e3ade1542..000000000000 --- a/ghost/core/core/frontend/web/middleware/frontend-caching.js +++ /dev/null @@ -1,77 +0,0 @@ -/** - * @file Middleware to set the appropriate cache headers on the frontend - */ -const config = require('../../../shared/config'); -const shared = require('../../../server/web/shared'); -const {api} = require('../../services/proxy'); - -/** - * Calculate the member's active tier. - * @param {object} member - The member object. - * @param {object} freeTier - The free tier object. - * @returns {string|null} - The member's active tier, or null if the member has more than one active subscription. - */ -function calculateMemberTier(member, freeTier) { - const activeSubscriptions = member.subscriptions.filter(sub => sub.status === 'active'); - if (activeSubscriptions.length === 0) { - return freeTier; - } - if (activeSubscriptions.length === 1) { - return activeSubscriptions[0].tier; - } - return null; // More than one active subscription -} - -/** - * @typedef {function(): Promise} GetFreeTier - */ - -/** - * Returns the frontend caching middleware. - * @param {GetFreeTier} [getFreeTier] - Async function that takes no arguments and resolves to the free tier object. - * @returns {function} Middleware function. - */ -const getMiddleware = async (getFreeTier = async () => { - const {tiers} = await api.tiers.browse(); - return tiers.find(tier => tier.type === 'free'); -}) => { - const freeTier = await getFreeTier(); - /** - * Middleware to set cache headers based on site configuration and request properties. - * @param {import('express').Request} req - * @param {import('express').Response} res - * @param {import('express').NextFunction} next - */ - function setFrontendCacheHeadersMiddleware(req, res, next) { - // Caching member's content is an experimental feature, enabled via config - const shouldCacheMembersContent = config.get('cacheMembersContent:enabled'); - // CASE: Never cache if the blog is set to private - // CASE: Never cache if the request is made by a member and the site is not configured to cache members content - if (res.isPrivateBlog || (req.member && !shouldCacheMembersContent)) { - return shared.middleware.cacheControl('private')(req, res, next); - } - - // CASE: Cache member's content if this feature is enabled - if (req.member && shouldCacheMembersContent) { - // Set the 'cache-control' header to 'public' - const memberTier = calculateMemberTier(req.member, freeTier); - if (!memberTier) { - // Member has more than one active subscription, don't cache the content - return shared.middleware.cacheControl('private')(req, res, next); - } - // The member is either on the free tier or has a single active subscription - // Cache the content based on the member's tier - res.set({'X-Member-Cache-Tier': memberTier.id}); - return shared.middleware.cacheControl('public', {maxAge: config.get('caching:frontend:maxAge')})(req, res, next); - } - // CASE: Site is not private and the request is not made by a member — cache the content - return shared.middleware.cacheControl('public', {maxAge: config.get('caching:frontend:maxAge')})(req, res, next); - } - - return setFrontendCacheHeadersMiddleware; -}; - -module.exports = { - getMiddleware, - calculateMemberTier // exported for testing -}; \ No newline at end of file diff --git a/ghost/core/core/frontend/web/middleware/index.js b/ghost/core/core/frontend/web/middleware/index.js index 472291a60775..59fad9092e95 100644 --- a/ghost/core/core/frontend/web/middleware/index.js +++ b/ghost/core/core/frontend/web/middleware/index.js @@ -1,7 +1,6 @@ module.exports = { cors: require('./cors'), errorHandler: require('./error-handler'), - frontendCaching: require('./frontend-caching'), handleImageSizes: require('./handle-image-sizes'), redirectGhostToAdmin: require('./redirect-ghost-to-admin'), serveFavicon: require('./serve-favicon'), diff --git a/ghost/core/core/frontend/web/site.js b/ghost/core/core/frontend/web/site.js index 8ffafeb3aa92..4b8188915a2e 100644 --- a/ghost/core/core/frontend/web/site.js +++ b/ghost/core/core/frontend/web/site.js @@ -3,6 +3,7 @@ const path = require('path'); const express = require('../../shared/express'); const DomainEvents = require('@tryghost/domain-events'); const {MemberPageViewEvent} = require('@tryghost/member-events'); +const GhostNestApp = require('@tryghost/ghost'); // App requires const config = require('../../shared/config'); @@ -20,6 +21,8 @@ const siteRoutes = require('./routes'); const shared = require('../../server/web/shared'); const errorHandler = require('@tryghost/mw-error-handler'); const mw = require('./middleware'); +const labs = require('../../shared/labs'); +const bodyParser = require('body-parser'); const STATIC_IMAGE_URL_PREFIX = `/${urlUtils.STATIC_IMAGE_URL_PREFIX}`; const STATIC_MEDIA_URL_PREFIX = `/${constants.STATIC_MEDIA_URL_PREFIX}`; @@ -48,6 +51,36 @@ module.exports = function setupSiteApp(routerConfig) { // enable CORS headers (allows admin client to hit front-end when configured on separate URLs) siteApp.use(mw.cors); + const jsonParser = bodyParser.json({ + type: ['application/activity+json', 'application/ld+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'], + // TODO: The @RawBody decorator in nest isn't working without this atm... + verify: function (req, res, buf) { + req.rawBody = buf; + } + }); + siteApp.use(async function nestBodyParser(req, res, next) { + if (labs.isSet('NestPlayground') || labs.isSet('ActivityPub')) { + jsonParser(req, res, next); + return; + } + return next(); + }); + + siteApp.use(async function nestApp(req, res, next) { + if (labs.isSet('NestPlayground') || labs.isSet('ActivityPub')) { + const originalExpressApp = req.app; + const app = await GhostNestApp.getApp(); + + const instance = app.getHttpAdapter().getInstance(); + instance(req, res, function (err) { + req.app = originalExpressApp; + next(err); + }); + return; + } + return next(); + }); + siteApp.use(offersService.middleware); siteApp.use(linkRedirects.service.handleRequest); @@ -88,6 +121,9 @@ module.exports = function setupSiteApp(routerConfig) { // Serve site files using the storage adapter siteApp.use(STATIC_FILES_URL_PREFIX, storage.getStorage('files').serve()); + // Global handling for member session, ensures a member is logged in to the frontend + siteApp.use(membersService.middleware.loadMemberSession); + // /member/.well-known/* serves files (e.g. jwks.json) so it needs to be mounted before the prettyUrl mw to avoid trailing slashes siteApp.use( '/members/.well-known', @@ -112,23 +148,18 @@ module.exports = function setupSiteApp(routerConfig) { // Theme static assets/files siteApp.use(mw.staticTheme()); - - // Serve robots.txt if not found in theme - siteApp.use(mw.servePublicFile('static', 'robots.txt', 'text/plain', config.get('caching:robotstxt:maxAge'))); - debug('Static content done'); - // site map - this should probably be refactored to be an internal app - sitemapHandler(siteApp); - - // Global handling for member session, ensures a member is logged in to the frontend - siteApp.use(membersService.middleware.loadMemberSession); - // Theme middleware // This should happen AFTER any shared assets are served, as it only changes things to do with templates siteApp.use(themeMiddleware); debug('Themes done'); + // Serve robots.txt if not found in theme + siteApp.use(mw.servePublicFile('static', 'robots.txt', 'text/plain', config.get('caching:robotstxt:maxAge'))); + + // site map - this should probably be refactored to be an internal app + sitemapHandler(siteApp); debug('Internal apps done'); // Add in all trailing slashes & remove uppercase @@ -136,12 +167,12 @@ module.exports = function setupSiteApp(routerConfig) { siteApp.use(shared.middleware.prettyUrls); // ### Caching - siteApp.use(async function frontendCaching(req, res, next) { - try { - const middleware = await mw.frontendCaching.getMiddleware(); - return middleware(req, res, next); - } catch { - return next(); + siteApp.use(function frontendCaching(req, res, next) { + // Site frontend is cacheable UNLESS request made by a member or site is in private mode + if (req.member || res.isPrivateBlog) { + return shared.middleware.cacheControl('private')(req, res, next); + } else { + return shared.middleware.cacheControl('public', {maxAge: config.get('caching:frontend:maxAge')})(req, res, next); } }); diff --git a/ghost/core/core/server/GhostServer.js b/ghost/core/core/server/GhostServer.js index cc16cc0df96a..dd6c1eeddcc6 100644 --- a/ghost/core/core/server/GhostServer.js +++ b/ghost/core/core/server/GhostServer.js @@ -127,8 +127,8 @@ class GhostServer { // ensure that Ghost exits correctly on Ctrl+C and SIGTERM process - .removeAllListeners('SIGINT').on('SIGINT', () => self.shutdown()) - .removeAllListeners('SIGTERM').on('SIGTERM', () => self.shutdown()); + .removeAllListeners('SIGINT').on('SIGINT', self.shutdown.bind(self)) + .removeAllListeners('SIGTERM').on('SIGTERM', self.shutdown.bind(self)); }); } diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/input/pages.js b/ghost/core/core/server/api/endpoints/utils/serializers/input/pages.js index afd6da5745b1..52ec3626b3cb 100644 --- a/ghost/core/core/server/api/endpoints/utils/serializers/input/pages.js +++ b/ghost/core/core/server/api/endpoints/utils/serializers/input/pages.js @@ -7,7 +7,6 @@ const slugFilterOrder = require('./utils/slug-filter-order'); const localUtils = require('../../index'); const mobiledoc = require('../../../../../lib/mobiledoc'); const postsMetaSchema = require('../../../../../data/schema').tables.posts_meta; -const postsSchema = require('../../../../../data/schema').tables.posts; const clean = require('./utils/clean'); const lexical = require('../../../../../lib/lexical'); const sentry = require('../../../../../../shared/sentry'); @@ -25,33 +24,6 @@ function removeSourceFormats(frame) { } } -/** - * Selects all allowed columns for the given frame. - * - * This removes the lexical and mobiledoc columns from the query. This is a performance improvement as we never intend - * to expose those columns in the content API and they are very large datasets to be passing around and de/serializing. - * - * NOTE: This is only intended for the Content API. We need these fields within Admin API responses. - * - * @param {Object} frame - The frame object. - */ -function selectAllAllowedColumns(frame) { - if (!frame.options.columns && !frame.options.selectRaw) { - // Because we're returning columns directly from the schema we need to remove info columns like @@UNIQUE_CONSTRAINTS@@ and @@INDEXES@@ - frame.options.selectRaw = _.keys(_.omit(postsSchema, ['lexical','mobiledoc','@@INDEXES@@','@@UNIQUE_CONSTRAINTS@@'])).join(','); - } else if (frame.options.columns) { - frame.options.columns = frame.options.columns.filter((column) => { - return !['mobiledoc', 'lexical'].includes(column); - }); - } else if (frame.options.selectRaw) { - frame.options.selectRaw = frame.options.selectRaw.split(',').map((column) => { - return column.trim(); - }).filter((column) => { - return !['mobiledoc', 'lexical'].includes(column); - }).join(','); - } -} - function defaultRelations(frame) { if (frame.options.withRelated) { return; @@ -65,11 +37,18 @@ function defaultRelations(frame) { } function setDefaultOrder(frame) { - if (!frame.options.order && frame.options.filter) { + let includesOrderedRelations = false; + + if (frame.options.withRelated) { + const orderedRelations = ['author', 'authors', 'tag', 'tags']; + includesOrderedRelations = _.intersection(orderedRelations, frame.options.withRelated).length > 0; + } + + if (!frame.options.order && !includesOrderedRelations && frame.options.filter) { frame.options.autoOrder = slugFilterOrder('posts', frame.options.filter); } - if (!frame.options.order && !frame.options.autoOrder) { + if (!frame.options.order && !frame.options.autoOrder && !includesOrderedRelations) { frame.options.order = 'title asc'; } } @@ -125,10 +104,7 @@ module.exports = { forcePageFilter(frame); if (localUtils.isContentAPI(frame)) { - // CASE: the content api endpoint for posts should not return mobiledoc or lexical - removeSourceFormats(frame); // remove from the format field - selectAllAllowedColumns(frame); // remove from any specified column or selectRaw options - + removeSourceFormats(frame); setDefaultOrder(frame); forceVisibilityColumn(frame); } diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/input/posts.js b/ghost/core/core/server/api/endpoints/utils/serializers/input/posts.js index 94d0ae86f099..66767b9514e5 100644 --- a/ghost/core/core/server/api/endpoints/utils/serializers/input/posts.js +++ b/ghost/core/core/server/api/endpoints/utils/serializers/input/posts.js @@ -7,7 +7,6 @@ const slugFilterOrder = require('./utils/slug-filter-order'); const localUtils = require('../../index'); const mobiledoc = require('../../../../../lib/mobiledoc'); const postsMetaSchema = require('../../../../../data/schema').tables.posts_meta; -const postsSchema = require('../../../../../data/schema').tables.posts; const clean = require('./utils/clean'); const lexical = require('../../../../../lib/lexical'); const sentry = require('../../../../../../shared/sentry'); @@ -17,16 +16,6 @@ const messages = { failedHtmlToLexical: 'Failed to convert HTML to Lexical' }; -/** - * Selects all allowed columns for the given frame. - * - * NOTE: This doesn't stop them from being FETCHED, just returned in the response. This causes - * the output serializer to remove them from the data object before returning. - * - * NOTE: This is only intended for the Content API. We need these fields within Admin API responses. - * - * @param {Object} frame - The frame object. - */ function removeSourceFormats(frame) { if (frame.options.formats?.includes('mobiledoc') || frame.options.formats?.includes('lexical')) { frame.options.formats = frame.options.formats.filter((format) => { @@ -35,33 +24,6 @@ function removeSourceFormats(frame) { } } -/** - * Selects all allowed columns for the given frame. - * - * This removes the lexical and mobiledoc columns from the query. This is a performance improvement as we never intend - * to expose those columns in the content API and they are very large datasets to be passing around and de/serializing. - * - * NOTE: This is only intended for the Content API. We need these fields within Admin API responses. - * - * @param {Object} frame - The frame object. - */ -function selectAllAllowedColumns(frame) { - if (!frame.options.columns && !frame.options.selectRaw) { - // Because we're returning columns directly from the schema we need to remove info columns like @@UNIQUE_CONSTRAINTS@@ and @@INDEXES@@ - frame.options.selectRaw = _.keys(_.omit(postsSchema, ['lexical','mobiledoc','@@INDEXES@@','@@UNIQUE_CONSTRAINTS@@'])).join(','); - } else if (frame.options.columns) { - frame.options.columns = frame.options.columns.filter((column) => { - return !['mobiledoc', 'lexical'].includes(column); - }); - } else if (frame.options.selectRaw) { - frame.options.selectRaw = frame.options.selectRaw.split(',').map((column) => { - return column.trim(); - }).filter((column) => { - return !['mobiledoc', 'lexical'].includes(column); - }).join(','); - } -} - /** * Map names of relations to the internal names */ @@ -92,11 +54,18 @@ function defaultRelations(frame) { } function setDefaultOrder(frame) { - if (!frame.options.order && frame.options.filter) { + let includesOrderedRelations = false; + + if (frame.options.withRelated) { + const orderedRelations = ['author', 'authors', 'tag', 'tags']; + includesOrderedRelations = _.intersection(orderedRelations, frame.options.withRelated).length > 0; + } + + if (!frame.options.order && !includesOrderedRelations && frame.options.filter) { frame.options.autoOrder = slugFilterOrder('posts', frame.options.filter); } - if (!frame.options.order && !frame.options.autoOrder) { + if (!frame.options.order && !frame.options.autoOrder && !includesOrderedRelations) { frame.options.order = 'published_at desc'; } } @@ -159,8 +128,7 @@ module.exports = { */ if (localUtils.isContentAPI(frame)) { // CASE: the content api endpoint for posts should not return mobiledoc or lexical - removeSourceFormats(frame); // remove from the format field - selectAllAllowedColumns(frame); // remove from any specified column or selectRaw options + removeSourceFormats(frame); setDefaultOrder(frame); forceVisibilityColumn(frame); diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/output/authentication.js b/ghost/core/core/server/api/endpoints/utils/serializers/output/authentication.js index a3410985a323..d041a915b51e 100644 --- a/ghost/core/core/server/api/endpoints/utils/serializers/output/authentication.js +++ b/ghost/core/core/server/api/endpoints/utils/serializers/output/authentication.js @@ -4,7 +4,7 @@ const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:output const messages = { checkEmailForInstructions: 'Check your email for further instructions.', - passwordChanged: 'Password updated', + passwordChanged: 'Password changed successfully.', invitationAccepted: 'Invitation accepted.' }; diff --git a/ghost/core/core/server/data/db/index.js b/ghost/core/core/server/data/db/index.js index 49883ca90efb..39a7da3a40cc 100644 --- a/ghost/core/core/server/data/db/index.js +++ b/ghost/core/core/server/data/db/index.js @@ -1,3 +1,8 @@ +const logging = require('@tryghost/logging'); +const metrics = require('@tryghost/metrics'); +const config = require('../../../shared/config'); +const ConnectionPoolInstrumentation = require('./ConnectionPoolInstrumentation'); + let connection; Object.defineProperty(exports, 'knex', { @@ -5,6 +10,10 @@ Object.defineProperty(exports, 'knex', { configurable: true, get: function get() { connection = connection || require('./connection'); + if (config.get('telemetry:connectionPool')) { + const instrumentation = new ConnectionPoolInstrumentation({knex: connection, logging, metrics, config}); + instrumentation.instrument(); + } return connection; } }); diff --git a/ghost/core/core/server/data/migrations/versions/5.83/2024-05-28-02-20-55-add-show-subhead-column-newsletters.js b/ghost/core/core/server/data/migrations/versions/5.83/2024-05-28-02-20-55-add-show-subhead-column-newsletters.js deleted file mode 100644 index 99a630febd36..000000000000 --- a/ghost/core/core/server/data/migrations/versions/5.83/2024-05-28-02-20-55-add-show-subhead-column-newsletters.js +++ /dev/null @@ -1,9 +0,0 @@ -// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253 - -const {createAddColumnMigration} = require('../../utils'); - -module.exports = createAddColumnMigration('newsletters', 'show_subhead', { - type: 'boolean', - nullable: false, - defaultTo: false -}); diff --git a/ghost/core/core/server/data/migrations/versions/5.84/2024-06-04-09-13-33-rename-newsletters-show-subhead.js b/ghost/core/core/server/data/migrations/versions/5.84/2024-06-04-09-13-33-rename-newsletters-show-subhead.js deleted file mode 100644 index 279b3ddf39b2..000000000000 --- a/ghost/core/core/server/data/migrations/versions/5.84/2024-06-04-09-13-33-rename-newsletters-show-subhead.js +++ /dev/null @@ -1,3 +0,0 @@ -const {createRenameColumnMigration} = require('../../utils'); - -module.exports = createRenameColumnMigration('newsletters', 'show_subhead', 'show_subtitle'); diff --git a/ghost/core/core/server/data/migrations/versions/5.84/2024-06-04-11-10-37-add-custom-excerpt-to-post-revisions.js b/ghost/core/core/server/data/migrations/versions/5.84/2024-06-04-11-10-37-add-custom-excerpt-to-post-revisions.js deleted file mode 100644 index 44ba3a24cda5..000000000000 --- a/ghost/core/core/server/data/migrations/versions/5.84/2024-06-04-11-10-37-add-custom-excerpt-to-post-revisions.js +++ /dev/null @@ -1,7 +0,0 @@ -const {createAddColumnMigration} = require('../../utils'); - -module.exports = createAddColumnMigration('post_revisions', 'custom_excerpt', { - type: 'string', - maxlength: 2000, - nullable: true -}); diff --git a/ghost/core/core/server/data/migrations/versions/5.84/2024-06-05-08-42-34-populate-post-revisions-custom-excerpt.js b/ghost/core/core/server/data/migrations/versions/5.84/2024-06-05-08-42-34-populate-post-revisions-custom-excerpt.js deleted file mode 100644 index e6fe2e681771..000000000000 --- a/ghost/core/core/server/data/migrations/versions/5.84/2024-06-05-08-42-34-populate-post-revisions-custom-excerpt.js +++ /dev/null @@ -1,11 +0,0 @@ -const logging = require('@tryghost/logging'); -const {createTransactionalMigration} = require('../../utils'); - -module.exports = createTransactionalMigration( - async function up() { - logging.warn('Skipping migration - noop'); - }, - async function down() { - // Not required - } -); diff --git a/ghost/core/core/server/data/migrations/versions/5.84/2024-06-05-13-48-35-rename-newsletters-show-subtitle.js b/ghost/core/core/server/data/migrations/versions/5.84/2024-06-05-13-48-35-rename-newsletters-show-subtitle.js deleted file mode 100644 index 8a91ffcad847..000000000000 --- a/ghost/core/core/server/data/migrations/versions/5.84/2024-06-05-13-48-35-rename-newsletters-show-subtitle.js +++ /dev/null @@ -1,3 +0,0 @@ -const {createRenameColumnMigration} = require('../../utils'); - -module.exports = createRenameColumnMigration('newsletters', 'show_subtitle', 'show_excerpt'); diff --git a/ghost/core/core/server/data/migrations/versions/5.85/2024-06-10-14-53-31-add-posts-updated-at-index.js b/ghost/core/core/server/data/migrations/versions/5.85/2024-06-10-14-53-31-add-posts-updated-at-index.js deleted file mode 100644 index 124e86e5005c..000000000000 --- a/ghost/core/core/server/data/migrations/versions/5.85/2024-06-10-14-53-31-add-posts-updated-at-index.js +++ /dev/null @@ -1,4 +0,0 @@ -// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253 -const {createAddIndexMigration} = require('../../utils'); - -module.exports = createAddIndexMigration('posts',['updated_at']); \ No newline at end of file diff --git a/ghost/core/core/server/data/migrations/versions/5.87/2024-06-25-12-08-20-add-posts-tags-post-tag-index.js b/ghost/core/core/server/data/migrations/versions/5.87/2024-06-25-12-08-20-add-posts-tags-post-tag-index.js deleted file mode 100644 index 4aa38673dbf7..000000000000 --- a/ghost/core/core/server/data/migrations/versions/5.87/2024-06-25-12-08-20-add-posts-tags-post-tag-index.js +++ /dev/null @@ -1,26 +0,0 @@ -const logging = require('@tryghost/logging'); -const {createNonTransactionalMigration} = require('../../utils'); -const {addIndex, dropIndex} = require('../../../schema/commands'); - -module.exports = createNonTransactionalMigration( - async function up(knex) { - await addIndex('posts_tags', ['post_id', 'tag_id'], knex); - }, - async function down(knex) { - try { - await dropIndex('posts_tags', ['post_id', 'tag_id'], knex); - } catch (err) { - if (err.code === 'ER_DROP_INDEX_FK') { - logging.error({ - message: 'Error dropping index over posts_tags(post_id, tag_id), re-adding index for post_id' - }); - - await addIndex('posts_tags', ['post_id'], knex); - await dropIndex('posts_tags', ['post_id', 'tag_id'], knex); - return; - } - - throw err; - } - } -); \ No newline at end of file diff --git a/ghost/core/core/server/data/migrations/versions/5.87/2024-06-25-12-08-45-add-posts-type-status-updated-at-index.js b/ghost/core/core/server/data/migrations/versions/5.87/2024-06-25-12-08-45-add-posts-type-status-updated-at-index.js deleted file mode 100644 index 2415fe1d447a..000000000000 --- a/ghost/core/core/server/data/migrations/versions/5.87/2024-06-25-12-08-45-add-posts-type-status-updated-at-index.js +++ /dev/null @@ -1,4 +0,0 @@ -// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253 -const {createAddIndexMigration} = require('../../utils'); - -module.exports = createAddIndexMigration('posts',['type','status','updated_at']); \ No newline at end of file diff --git a/ghost/core/core/server/data/schema/schema.js b/ghost/core/core/server/data/schema/schema.js index f2e7052f8cea..21e0ed51f644 100644 --- a/ghost/core/core/server/data/schema/schema.js +++ b/ghost/core/core/server/data/schema/schema.js @@ -30,7 +30,6 @@ module.exports = { header_image: {type: 'string', maxlength: 2000, nullable: true}, show_header_icon: {type: 'boolean', nullable: false, defaultTo: true}, show_header_title: {type: 'boolean', nullable: false, defaultTo: true}, - show_excerpt: {type: 'boolean', nullable: false, defaultTo: false}, title_font_category: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'sans_serif', validations: {isIn: [['serif', 'sans_serif']]}}, title_alignment: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'center', validations: {isIn: [['center', 'left']]}}, show_feature_image: {type: 'boolean', nullable: false, defaultTo: true}, @@ -82,7 +81,7 @@ module.exports = { * This is valid for all x_by fields. */ created_by: {type: 'string', maxlength: 24, nullable: false}, - updated_at: {type: 'dateTime', nullable: true, index: true}, + updated_at: {type: 'dateTime', nullable: true}, updated_by: {type: 'string', maxlength: 24, nullable: true}, published_at: {type: 'dateTime', nullable: true, index: true}, published_by: {type: 'string', maxlength: 24, nullable: true}, @@ -93,9 +92,6 @@ module.exports = { canonical_url: {type: 'text', maxlength: 2000, nullable: true}, newsletter_id: {type: 'string', maxlength: 24, nullable: true, references: 'newsletters.id'}, show_title_and_feature_image: {type: 'boolean', nullable: false, defaultTo: true}, - '@@INDEXES@@': [ - ['type','status','updated_at'] - ], '@@UNIQUE_CONSTRAINTS@@': [ ['slug', 'type'] ] @@ -298,10 +294,7 @@ module.exports = { id: {type: 'string', maxlength: 24, nullable: false, primary: true}, post_id: {type: 'string', maxlength: 24, nullable: false, references: 'posts.id'}, tag_id: {type: 'string', maxlength: 24, nullable: false, references: 'tags.id'}, - sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0}, - '@@INDEXES@@': [ - ['post_id','tag_id'] - ] + sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0} }, invites: { id: {type: 'string', maxlength: 24, nullable: false, primary: true}, @@ -419,8 +412,7 @@ module.exports = { reason: {type: 'string', maxlength: 50, nullable: true}, feature_image: {type: 'string', maxlength: 2000, nullable: true}, feature_image_alt: {type: 'string', maxlength: 191, nullable: true, validations: {isLength: {max: 125}}}, - feature_image_caption: {type: 'text', maxlength: 65535, nullable: true}, - custom_excerpt: {type: 'string', maxlength: 2000, nullable: true, validations: {isLength: {max: 300}}} + feature_image_caption: {type: 'text', maxlength: 65535, nullable: true} }, members: { id: {type: 'string', maxlength: 24, nullable: false, primary: true}, diff --git a/ghost/core/core/server/models/base/plugins/crud.js b/ghost/core/core/server/models/base/plugins/crud.js index 46ab3b1b34e7..614d5b8dfcb3 100644 --- a/ghost/core/core/server/models/base/plugins/crud.js +++ b/ghost/core/core/server/models/base/plugins/crud.js @@ -120,11 +120,6 @@ module.exports = function (Bookshelf) { }); } - //option param to skip distinct from count query, distinct adds a lot of latency and in this case the result set will always be unique. - if (unfilteredOptions.useBasicCount) { - options.useBasicCount = unfilteredOptions.useBasicCount; - } - const response = await itemCollection.fetchPage(options); // Attributes are being filtered here, so they are not leaked into calling layer // where models are serialized to json and do not do more filtering. diff --git a/ghost/core/core/server/models/newsletter.js b/ghost/core/core/server/models/newsletter.js index 2e41447c609e..ed6f1ddd8025 100644 --- a/ghost/core/core/server/models/newsletter.js +++ b/ghost/core/core/server/models/newsletter.js @@ -29,8 +29,7 @@ const Newsletter = ghostBookshelf.Model.extend({ background_color: 'light', border_color: null, title_color: null, - feedback_enabled: false, - show_excerpt: false + feedback_enabled: false }; }, diff --git a/ghost/core/core/server/models/post.js b/ghost/core/core/server/models/post.js index c1313faa76c4..1651bf5d13ee 100644 --- a/ghost/core/core/server/models/post.js +++ b/ghost/core/core/server/models/post.js @@ -973,7 +973,6 @@ Post = ghostBookshelf.Model.extend({ feature_image_alt: model.get('posts_meta')?.feature_image_alt, feature_image_caption: model.get('posts_meta')?.feature_image_caption, title: model.get('title'), - custom_excerpt: model.get('custom_excerpt'), post_status: model.get('status') }; @@ -1260,7 +1259,7 @@ Post = ghostBookshelf.Model.extend({ // these are the only options that can be passed to Bookshelf / Knex. const validOptions = { findOne: ['columns', 'importing', 'withRelated', 'require', 'filter'], - findPage: ['status','selectRaw'], + findPage: ['status'], findAll: ['columns', 'filter'], destroy: ['destroyAll', 'destroyBy'], diff --git a/ghost/core/core/server/services/custom-redirects/validation.js b/ghost/core/core/server/services/custom-redirects/validation.js index 1107a01c4201..aaba74b0f75d 100644 --- a/ghost/core/core/server/services/custom-redirects/validation.js +++ b/ghost/core/core/server/services/custom-redirects/validation.js @@ -1,7 +1,6 @@ const _ = require('lodash'); const tpl = require('@tryghost/tpl'); const errors = require('@tryghost/errors'); -const {isSafePattern} = require('redos-detector'); const messages = { redirectsWrongFormat: 'Incorrect redirects file format.', @@ -34,35 +33,18 @@ const validate = (redirects) => { if (!redirect.from || !redirect.to) { throw new errors.ValidationError({ message: tpl(messages.redirectsWrongFormat), + context: redirect, help: tpl(messages.redirectsHelp) }); } - // Ensure valid regex try { + // each 'from' property should be a valid RegExp string new RegExp(redirect.from); } catch (error) { throw new errors.ValidationError({ message: tpl(messages.invalidRedirectsFromRegex), - errorDetails: { - redirect, - invalid: true - }, - help: tpl(messages.redirectsHelp) - }); - } - - // Ensure safe regex - const analysis = isSafePattern(redirect.from); - - if (analysis.safe === false) { - throw new errors.ValidationError({ - message: tpl(messages.invalidRedirectsFromRegex), - errorDetails: { - redirect, - unsafe: true, - reason: analysis.error - }, + context: redirect, help: tpl(messages.redirectsHelp) }); } diff --git a/ghost/core/core/server/services/members-events/index.js b/ghost/core/core/server/services/members-events/index.js index 411e28d840a0..a99592d09320 100644 --- a/ghost/core/core/server/services/members-events/index.js +++ b/ghost/core/core/server/services/members-events/index.js @@ -1,6 +1,5 @@ const labsService = require('../../../shared/labs'); const DomainEvents = require('@tryghost/domain-events'); -const events = require('../../lib/common/events'); const settingsCache = require('../../../shared/settings-cache'); const members = require('../members'); @@ -33,8 +32,7 @@ class MembersEventsServiceWrapper { getMembersApi() { return members.api; }, - db, - events + db }); this.eventStorage.subscribe(DomainEvents); diff --git a/ghost/core/core/server/services/members/middleware.js b/ghost/core/core/server/services/members/middleware.js index e31d407a9008..a3ad49a4fb99 100644 --- a/ghost/core/core/server/services/members/middleware.js +++ b/ghost/core/core/server/services/members/middleware.js @@ -1,4 +1,3 @@ -const crypto = require('crypto'); const _ = require('lodash'); const logging = require('@tryghost/logging'); const membersService = require('./service'); @@ -12,76 +11,12 @@ const { } = require('./utils'); const errors = require('@tryghost/errors'); const tpl = require('@tryghost/tpl'); -const onHeaders = require('on-headers'); -const tiersService = require('../tiers/service'); -const config = require('../../../shared/config'); const messages = { missingUuid: 'Missing uuid.', invalidUuid: 'Invalid uuid.' }; -const getFreeTier = async function getFreeTier() { - const response = await tiersService.api.browse(); - const freeTier = response.data.find(tier => tier.type === 'free'); - return freeTier; -}; - -/** - * Sets the ghost-access and ghost-access-hmac cookies on the response object - * @param {Object} member - The member object - * @param {import('express').Request} req - The member object - * @param {import('express').Response} res - The express response object to set the cookies on - * @param {Object} freeTier - The free tier object - * @returns - */ -const setAccessCookies = function setAccessCookies(member, req, res, freeTier) { - if (!member) { - // If there is no cookie sent with the request, return early - if (!req.headers.cookie || !req.headers.cookie.includes('ghost-access')) { - return; - } - // If there are cookies sent with the request, set them to null and expire them immediately - const accessCookie = `ghost-access=null; Max-Age=0; Path=/; HttpOnly; SameSite=Strict;`; - const hmacCookie = `ghost-access-hmac=null; Max-Age=0; Path=/; HttpOnly; SameSite=Strict;`; - const existingCookies = res.getHeader('Set-Cookie') || []; - const cookiesToSet = [accessCookie, hmacCookie].concat(existingCookies); - - res.setHeader('Set-Cookie', cookiesToSet); - return; - } - const hmacSecret = config.get('cacheMembersContent:hmacSecret'); - if (!hmacSecret) { - return; - } - const hmacSecretBuffer = Buffer.from(hmacSecret, 'base64'); - if (hmacSecretBuffer.length === 0) { - return; - } - const activeSubscription = member.subscriptions?.find(sub => sub.status === 'active'); - - const cookieTimestamp = Math.floor(Date.now() / 1000); // to mitigate a cookie replay attack - const memberTier = activeSubscription && activeSubscription.tier.id || freeTier.id; - const memberTierAndTimestamp = `${memberTier}:${cookieTimestamp}`; - const memberTierHmac = crypto.createHmac('sha256', hmacSecretBuffer).update(memberTierAndTimestamp).digest('hex'); - - const maxAge = 3600; - const accessCookie = `ghost-access=${memberTierAndTimestamp}; Max-Age=${maxAge}; Path=/; HttpOnly; SameSite=Strict;`; - const hmacCookie = `ghost-access-hmac=${memberTierHmac}; Max-Age=${maxAge}; Path=/; HttpOnly; SameSite=Strict;`; - - const existingCookies = res.getHeader('Set-Cookie') || []; - const cookiesToSet = [accessCookie, hmacCookie].concat(existingCookies); - res.setHeader('Set-Cookie', cookiesToSet); -}; - -const accessInfoSession = async function accessInfoSession(req, res, next) { - const freeTier = await getFreeTier(); - onHeaders(res, function () { - setAccessCookies(req.member, req, res, freeTier); - }); - next(); -}; - // @TODO: This piece of middleware actually belongs to the frontend, not to the member app // Need to figure a way to separate these things (e.g. frontend actually talks to members API) const loadMemberSession = async function loadMemberSession(req, res, next) { @@ -307,16 +242,6 @@ const createSessionFromMagicLink = async function createSessionFromMagicLink(req // Note: don't reset 'member_login', or that would give an easy way around user enumeration by logging in to a manually created account const subscriptions = member && member.subscriptions || []; - if (config.get('cacheMembersContent:enabled')) { - // Set the ghost-access cookies to enable tier-based caching - try { - const freeTier = await getFreeTier(); - setAccessCookies(member, req, res, freeTier); - } catch { - // This is a non-critical operation, so we can safely ignore any errors - } - } - const action = req.query.action; if (action === 'signup' || action === 'signup-paid' || action === 'subscribe') { @@ -397,6 +322,5 @@ module.exports = { updateMemberData, updateMemberNewsletters, deleteSession, - accessInfoSession, deleteSuppression }; diff --git a/ghost/core/core/server/services/slack.js b/ghost/core/core/server/services/slack.js index be9916e4bcb8..b2027ea85fcb 100644 --- a/ghost/core/core/server/services/slack.js +++ b/ghost/core/core/server/services/slack.js @@ -63,24 +63,7 @@ function ping(post) { if (post.custom_excerpt) { description = post.custom_excerpt; } else if (post.html) { - const membersContentIdx = post.html.indexOf(''); - const substringEnd = membersContentIdx > -1 ? membersContentIdx : post.html.length; - - description = `${ - post.html - // Remove members-only content - .substring(0, substringEnd) - // Strip out HTML - .replace(/<[^>]+>/g, '') - // Split into sentences - .split('.') - // Remove empty strings - .filter(sentence => sentence.trim() !== '') - // Get the first three sentences - .slice(0, 3) - // Join 'em back together - .join('.') - }.`; + description = `${post.html.replace(/<[^>]+>/g, '').split('.').slice(0, 3).join('.')}.`; } else { description = null; } @@ -177,10 +160,7 @@ function slackListener(model, options) { return; } - ping({ - ...model.toJSON(), - authors: model.related('authors').toJSON() - }); + ping(model.toJSON()); } function slackTestPing() { diff --git a/ghost/core/core/server/services/webhooks/WebhookTrigger.js b/ghost/core/core/server/services/webhooks/WebhookTrigger.js index 68b92395233b..8e3f1c7f2a1f 100644 --- a/ghost/core/core/server/services/webhooks/WebhookTrigger.js +++ b/ghost/core/core/server/services/webhooks/WebhookTrigger.js @@ -87,7 +87,6 @@ class WebhookTrigger { const reqPayload = JSON.stringify(hookPayload); const url = webhook.get('target_url'); const secret = webhook.get('secret') || ''; - const ts = Date.now(); const headers = { 'Content-Length': Buffer.byteLength(reqPayload), @@ -96,7 +95,7 @@ class WebhookTrigger { }; if (secret !== '') { - headers['X-Ghost-Signature'] = `sha256=${crypto.createHmac('sha256', secret).update(`${reqPayload}${ts}`).digest('hex')}, t=${ts}`; + headers['X-Ghost-Signature'] = `sha256=${crypto.createHmac('sha256', secret).update(reqPayload).digest('hex')}, t=${Date.now()}`; } const opts = { diff --git a/ghost/core/core/server/web/api/endpoints/admin/app.js b/ghost/core/core/server/web/api/endpoints/admin/app.js index 5c31f6e44d0f..f8e340528a61 100644 --- a/ghost/core/core/server/web/api/endpoints/admin/app.js +++ b/ghost/core/core/server/web/api/endpoints/admin/app.js @@ -39,7 +39,7 @@ module.exports = function setupApiApp() { apiApp.use(routes()); apiApp.use(async function nestApp(req, res, next) { - if (labs.isSet('NestPlayground')) { + if (labs.isSet('NestPlayground') || labs.isSet('ActivityPub')) { const originalExpressApp = req.app; const app = await GhostNestApp.getApp(); diff --git a/ghost/core/core/server/web/api/middleware/upload.js b/ghost/core/core/server/web/api/middleware/upload.js index a1b5cf0868bc..513ebf0453f9 100644 --- a/ghost/core/core/server/web/api/middleware/upload.js +++ b/ghost/core/core/server/web/api/middleware/upload.js @@ -6,7 +6,6 @@ const errors = require('@tryghost/errors'); const config = require('../../../../shared/config'); const tpl = require('@tryghost/tpl'); const logging = require('@tryghost/logging'); -const {JSDOM} = require('jsdom'); const messages = { db: { @@ -145,35 +144,12 @@ const checkFileExists = (fileData) => { const checkFileIsValid = (fileData, types, extensions) => { const type = fileData.mimetype; + if (types.includes(type) && extensions.includes(fileData.ext)) { return true; } - return false; -}; -/** - * - * @param {String} filepath - * @returns {Boolean} - * - * Checks for the presence of - - - - ", -} -`; - exports[`{{ghost_head}} helper accent_color includes style tag on templates with no context 1 1`] = ` Object { "rendered": " diff --git a/ghost/core/test/unit/frontend/helpers/ghost_head.test.js b/ghost/core/test/unit/frontend/helpers/ghost_head.test.js index 2d07430fd7d7..a8305e56361e 100644 --- a/ghost/core/test/unit/frontend/helpers/ghost_head.test.js +++ b/ghost/core/test/unit/frontend/helpers/ghost_head.test.js @@ -1065,30 +1065,6 @@ describe('{{ghost_head}} helper', function () { } })); }); - - it('does not override code injection', async function () { - settingsCache.get.withArgs('codeinjection_head').returns(''); - - const renderObject = { - post: Object.assign({}, posts[1], {codeinjection_head: ''}) - }; - - const templateOptions = { - site: { - accent_color: '#site-setting' - } - }; - - await testGhostHead(testUtils.createHbsResponse({ - templateOptions, - renderObject: renderObject, - locals: { - relativeUrl: '/post/amp/', - context: null, - safeVersion: '0.3' - } - })); - }); }); describe('members scripts', function () { diff --git a/ghost/core/test/unit/frontend/meta/image-dimensions.test.js b/ghost/core/test/unit/frontend/meta/image-dimensions.test.js index c8cc38c338a7..83053f4543f6 100644 --- a/ghost/core/test/unit/frontend/meta/image-dimensions.test.js +++ b/ghost/core/test/unit/frontend/meta/image-dimensions.test.js @@ -282,49 +282,4 @@ describe('getImageDimensions', function () { done(); }).catch(done); }); - - it('does not append image size prefix to external images', function (done) { - const originalMetaData = { - coverImage: { - url: 'http://anothersite.com/some/storage/mypostcoverimage.jpg' - }, - authorImage: { - url: 'http://anothersite.com/some/storage/me.jpg' - }, - ogImage: { - url: 'http://anothersite.com/some/storage/super-facebook-image.jpg' - }, - twitterImage: 'http://anothersite.com/some/storage/super-twitter-image.jpg', - site: { - logo: { - url: 'http://anothersite.com/some/storage/logo.jpg' - } - } - }; - - const metaData = _.cloneDeep(originalMetaData); - - sizeOfStub.callsFake(() => ({ - width: 2000, - height: 1200, - type: 'jpg' - })); - - getImageDimensions.__set__('imageSizeCache', { - getCachedImageSizeFromUrl: sizeOfStub - }); - - getImageDimensions(metaData).then(function (result) { - should.exist(result); - result.coverImage.should.have.property('url'); - result.coverImage.url.should.eql('http://anothersite.com/some/storage/mypostcoverimage.jpg'); - result.authorImage.should.have.property('url'); - result.authorImage.url.should.eql('http://anothersite.com/some/storage/me.jpg'); - result.ogImage.should.have.property('url'); - result.ogImage.url.should.eql('http://anothersite.com/some/storage/super-facebook-image.jpg'); - result.site.logo.should.have.property('url'); - result.site.logo.url.should.eql('http://anothersite.com/some/storage/logo.jpg'); - done(); - }).catch(done); - }); }); diff --git a/ghost/core/test/unit/frontend/web/middleware/frontend-caching.test.js b/ghost/core/test/unit/frontend/web/middleware/frontend-caching.test.js deleted file mode 100644 index 4492265c11d9..000000000000 --- a/ghost/core/test/unit/frontend/web/middleware/frontend-caching.test.js +++ /dev/null @@ -1,94 +0,0 @@ -const assert = require('node:assert').strict; -const sinon = require('sinon'); -const testUtils = require('../../../../utils'); -const configUtils = require('../../../../utils/configUtils'); - -const frontendCaching = require('../../../../../core/frontend/web/middleware/frontend-caching'); - -const cacheMembersContentConfigKey = 'cacheMembersContent:enabled'; - -describe('frontendCaching', function () { - let res; - let req; - let next; - let middleware; - let freeTier; - let premiumTier; - - this.beforeEach(async function () { - res = { - set: sinon.spy(), - get: sinon.stub().returns(undefined) - }; - req = sinon.spy(); - next = sinon.spy(); - freeTier = {id: 'freeTierId'}; - premiumTier = {id: 'premiumTierId'}; - middleware = await frontendCaching.getMiddleware(async () => Promise.resolve(freeTier)); - }); - - this.afterEach(async function () { - sinon.restore(); - await configUtils.restore(); - }); - - it('should set cache control to private if the blog is private', function () { - res.isPrivateBlog = true; - middleware(req, res, next); - assert(res.set.calledOnce); - assert.ok(res.set.calledWith({'Cache-Control': testUtils.cacheRules.private})); - }); - - it('should set cache control to private if the request is made by a member', function () { - req.member = true; - middleware(req, res, next); - assert.ok(res.set.calledOnce); - assert.ok(res.set.calledWith({'Cache-Control': testUtils.cacheRules.private})); - }); - - it('should set cache control to public if the site is public and the request is not made by a member', function () { - req.member = undefined; - res.isPrivateBlog = undefined; - middleware(req, res, next); - assert.ok(res.set.calledOnce); - assert.ok(res.set.calledWith({'Cache-Control': testUtils.cacheRules.public})); - }); - - it('should set cache control to public if the request is made by a member and caching members content is enabled', function () { - configUtils.set(cacheMembersContentConfigKey, true); - req.member = { - subscriptions: [] - }; - res.isPrivateBlog = undefined; - middleware(req, res, next); - assert.equal(res.set.callCount, 2); - assert.ok(res.set.calledWith({'Cache-Control': testUtils.cacheRules.public})); - assert.ok(res.set.calledWith({'X-Member-Cache-Tier': 'freeTierId'})); - }); - - describe('calculateMemberTier', function () { - it('should return null if the member has more than one active subscription', function () { - const member = { - subscriptions: [{status: 'active'}, {status: 'active'}] - }; - const memberTier = frontendCaching.calculateMemberTier(member, freeTier); - assert.equal(memberTier, null); - }); - - it('should return the tier if the member has one active subscription', function () { - const member = { - subscriptions: [{status: 'active', tier: premiumTier}] - }; - const memberTier = frontendCaching.calculateMemberTier(member, freeTier); - assert.deepEqual(memberTier, premiumTier); - }); - - it('should return free if the member has no active subscriptions', function () { - const member = { - subscriptions: [] - }; - const memberTier = frontendCaching.calculateMemberTier(member, freeTier); - assert.equal(memberTier, freeTier); - }); - }); -}); \ No newline at end of file diff --git a/ghost/core/test/unit/server/data/schema/integrity.test.js b/ghost/core/test/unit/server/data/schema/integrity.test.js index 9e8ea291253d..ccb1443be2e5 100644 --- a/ghost/core/test/unit/server/data/schema/integrity.test.js +++ b/ghost/core/test/unit/server/data/schema/integrity.test.js @@ -35,7 +35,7 @@ const validateRouteSettings = require('../../../../../core/server/services/route */ describe('DB version integrity', function () { // Only these variables should need updating - const currentSchemaHash = 'ce97eff9bf1b3c215fed1271f9275f83'; + const currentSchemaHash = 'ccf3893bc3f8930f0d1188e646abda6d'; const currentFixturesHash = 'a489d615989eab1023d4b8af0ecee7fd'; const currentSettingsHash = '5c957ceb48c4878767d7d3db484c592d'; const currentRoutesHash = '3d180d52c663d173a6be791ef411ed01'; diff --git a/ghost/core/test/unit/server/services/custom-redirects/validation.test.js b/ghost/core/test/unit/server/services/custom-redirects/validation.test.js index a0e61861b973..a3a6f35b7a37 100644 --- a/ghost/core/test/unit/server/services/custom-redirects/validation.test.js +++ b/ghost/core/test/unit/server/services/custom-redirects/validation.test.js @@ -39,26 +39,6 @@ describe('UNIT: custom redirects validation', function () { should.fail('should have thrown'); } catch (err) { err.message.should.equal('Incorrect RegEx in redirects file.'); - err.errorDetails.redirect.should.equal(config[0]); - err.errorDetails.invalid.should.be.true(); - } - }); - - it('throws for an invalid redirects config having unsafe RegExp in from field', function () { - const config = [{ - permanent: true, - from: '^\/episodes\/([a-z0-9-]+)+\/$', // Unsafe due to the surplus + at the end causing infinite backtracking - to: '/' - }]; - - try { - validate(config); - should.fail('should have thrown'); - } catch (err) { - err.message.should.equal('Incorrect RegEx in redirects file.'); - err.errorDetails.redirect.should.equal(config[0]); - err.errorDetails.unsafe.should.be.true(); - err.errorDetails.reason.should.equal('hitMaxBacktracks'); } }); diff --git a/ghost/core/test/unit/server/services/slack.test.js b/ghost/core/test/unit/server/services/slack.test.js index 7b9b45f5ee0f..be3a0192543c 100644 --- a/ghost/core/test/unit/server/services/slack.test.js +++ b/ghost/core/test/unit/server/services/slack.test.js @@ -38,22 +38,10 @@ describe('Slack', function () { it('listener() calls ping() with toJSONified model', function () { const testPost = _.clone(testUtils.DataGenerator.Content.posts[2]); - const testAuthor = _.clone(testUtils.DataGenerator.Content.users[0]); const testModel = { toJSON: function () { return testPost; - }, - related: function (relation) { - return { - toJSON: function () { - if (relation === 'authors') { - return [testAuthor]; - } - - return []; - } - }; } }; @@ -64,10 +52,7 @@ describe('Slack', function () { listener(testModel); pingStub.calledOnce.should.be.true(); - pingStub.calledWith({ - ...testPost, - authors: [testAuthor] - }).should.be.true(); + pingStub.calledWith(testPost).should.be.true(); // Reset slack ping method resetSlack(); @@ -136,10 +121,7 @@ describe('Slack', function () { let requestUrl; let requestData; - const post = testUtils.DataGenerator.forKnex.createPost({ - slug: 'webhook-test', - html: `

        Hello World!

        This is a test post.

        This is members only content.

        ` - }); + const post = testUtils.DataGenerator.forKnex.createPost({slug: 'webhook-test'}); urlService.getUrlByResourceId.withArgs(post.id, {absolute: true}).returns('http://myblog.com/' + post.slug + '/'); settingsCacheStub.withArgs('slack_url').returns(slackURL); @@ -158,7 +140,7 @@ describe('Slack', function () { requestUrl.should.equal(slackURL); requestData.attachments[0].title.should.equal(post.title); requestData.attachments[0].title_link.should.equal('http://myblog.com/webhook-test/'); - requestData.attachments[0].fields[0].value.should.equal('Hello World!This is a test post.'); + requestData.attachments[0].fields[0].value.should.equal('## markdown.'); requestData.attachments[0].should.not.have.property('author_name'); requestData.icon_url.should.equal('http://myblog.com/favicon.ico'); diff --git a/ghost/core/test/unit/server/services/webhooks/trigger.test.js b/ghost/core/test/unit/server/services/webhooks/trigger.test.js index b4791ab7d02f..19919a52988e 100644 --- a/ghost/core/test/unit/server/services/webhooks/trigger.test.js +++ b/ghost/core/test/unit/server/services/webhooks/trigger.test.js @@ -1,155 +1,83 @@ const assert = require('assert/strict'); -const crypto = require('crypto'); const sinon = require('sinon'); const WebhookTrigger = require('../../../../../core/server/services/webhooks/WebhookTrigger'); -const SIGNATURE_HEADER = 'X-Ghost-Signature'; -const SIGNATURE_REGEX = /^sha256=[a-z0-9]+, t=\d+$/; - describe('Webhook Service', function () { - const WEBHOOK_EVENT = 'post.added'; - const WEBHOOK_TARGET_URL = 'http://example.com'; - const WEBHOOK_SECRET = 'abc123dontstealme'; - - let models, payload, request, webhookTrigger; - - beforeEach(function () { - models = { - Webhook: { - edit: sinon.stub(), - destroy: sinon.stub(), - findAllByEvent: sinon.stub(), - getByEventAndTarget: sinon.stub(), - add: sinon.stub() - } - }; - - models.Webhook.edit.resolves(null); - models.Webhook.destroy.resolves(null); - models.Webhook.findAllByEvent.resolves(null); - models.Webhook.getByEventAndTarget.resolves(null); - models.Webhook.add.resolves(null); - - payload = sinon.stub(); - request = sinon.stub().resolves({}); - - webhookTrigger = new WebhookTrigger({models, payload, request}); - - sinon.stub(webhookTrigger, 'onSuccess').callsFake(() => Promise.resolve()); - sinon.stub(webhookTrigger, 'onError').callsFake(() => Promise.resolve()); + const models = { + Webhook: { + edit: () => sinon.stub().resolves(null), + destroy: () => sinon.stub().resolves(null), + findAllByEvent: () => sinon.stub().resolves(null), + getByEventAndTarget: () => sinon.stub().resolves(null), + add: () => sinon.stub().resolves(null) + } + }; + + let payload = sinon.stub().resolves(null); + + afterEach(function () { + sinon.restore(); }); describe('trigger', function () { - it('does not trigger payload handler when there are no hooks registered for an event', async function () { - models.Webhook.findAllByEvent - .withArgs(WEBHOOK_EVENT, {context: {internal: true}}) + it('Does not trigger payload handler when event and model that has no hooks registered', async function () { + sinon.stub(models.Webhook, 'findAllByEvent') + .withArgs('post.added', {context: {internal: true}}) .resolves({models: []}); - await webhookTrigger.trigger(WEBHOOK_EVENT); - - assert.equal(models.Webhook.findAllByEvent.called, true); - assert.equal(payload.called, false); - assert.equal(request.called, false); - }); - - it('triggers payload handler when there are hooks registered for an event', async function () { - const webhookModel = { - get: sinon.stub() - }; - - webhookModel.get - .withArgs('event').returns(WEBHOOK_EVENT) - .withArgs('target_url').returns(WEBHOOK_TARGET_URL); - - models.Webhook.findAllByEvent - .withArgs(WEBHOOK_EVENT, {context: {internal: true}}) - .resolves({models: [webhookModel]}); - - const postModel = sinon.stub(); - - payload - .withArgs(WEBHOOK_EVENT, postModel) - .resolves({data: [1]}); - - await webhookTrigger.trigger(WEBHOOK_EVENT, postModel); - - assert.equal(models.Webhook.findAllByEvent.called, true); - assert.equal(payload.called, true); - assert.equal(request.called, true); - assert.equal(request.args[0][0], WEBHOOK_TARGET_URL); - assert.equal(request.args[0][1].body, '{"data":[1]}'); - assert.deepEqual(Object.keys(request.args[0][1].headers), ['Content-Length', 'Content-Type', 'Content-Version']); - assert.equal(request.args[0][1].headers['Content-Length'], 12); - assert.equal(request.args[0][1].headers['Content-Type'], 'application/json'); - assert.match(request.args[0][1].headers['Content-Version'], /v\d+\.\d+/); - }); - - it('includes a signature header when a webhook has a secret', async function () { - const webhookModel = { - get: sinon.stub() - }; - - webhookModel.get - .withArgs('event').returns(WEBHOOK_EVENT) - .withArgs('target_url').returns(WEBHOOK_TARGET_URL) - .withArgs('secret').returns(WEBHOOK_SECRET); - - models.Webhook.findAllByEvent - .withArgs(WEBHOOK_EVENT, {context: {internal: true}}) - .resolves({models: [webhookModel]}); + const webhookTrigger = new WebhookTrigger({ + models, + payload + }); - const postModel = sinon.stub(); - - payload - .withArgs(WEBHOOK_EVENT, postModel) - .resolves({data: [1]}); - - await webhookTrigger.trigger(WEBHOOK_EVENT, postModel); + await webhookTrigger.trigger('post.added'); assert.equal(models.Webhook.findAllByEvent.called, true); - assert.equal(payload.called, true); - assert.equal(request.called, true); - assert.equal(request.args[0][0], WEBHOOK_TARGET_URL); - - const header = request.args[0][1].headers[SIGNATURE_HEADER]; - assert.equal(SIGNATURE_REGEX.test(header), true); + assert.equal(payload.called, false); }); - it('uses the request payload and a timestamp to generate the hash in the signature header', async function () { - const clock = sinon.useFakeTimers(); - const ts = Date.now(); - const webhookModel = { - get: sinon.stub() + it('Does triggers payload handler and request when event when model has a registered hook', async function () { + const postModelStub = sinon.stub(); + const webhookModelStub = { + get: () => {} }; + sinon.stub(webhookModelStub, 'get') + .withArgs('event').returns('post.added') + .withArgs('target_url').returns('http://example.com'); - webhookModel.get - .withArgs('event').returns(WEBHOOK_EVENT) - .withArgs('target_url').returns(WEBHOOK_TARGET_URL) - .withArgs('secret').returns(WEBHOOK_SECRET); + const requestStub = sinon.stub().resolves({}); - models.Webhook.findAllByEvent - .withArgs(WEBHOOK_EVENT, {context: {internal: true}}) - .resolves({models: [webhookModel]}); + sinon.stub(models.Webhook, 'findAllByEvent') + .withArgs('post.added', {context: {internal: true}}) + .resolves({models: [webhookModelStub]}); - const postModel = sinon.stub(); + payload = sinon.stub().resolves({data: [1]}); - payload - .withArgs(WEBHOOK_EVENT, postModel) - .resolves({data: [1]}); + const webhookTrigger = new WebhookTrigger({ + models, + payload, + request: requestStub + }); - await webhookTrigger.trigger(WEBHOOK_EVENT, postModel); + sinon.stub(webhookTrigger, 'onSuccess').callsFake(function () { + return Promise.resolve(); + }); + sinon.stub(webhookTrigger, 'onError').callsFake(function () { + return Promise.resolve(); + }); + await webhookTrigger.trigger('post.added', postModelStub); assert.equal(models.Webhook.findAllByEvent.called, true); assert.equal(payload.called, true); - assert.equal(request.called, true); - assert.equal(request.args[0][0], WEBHOOK_TARGET_URL); - - const expectedHeader = `sha256=${crypto.createHmac('sha256', WEBHOOK_SECRET).update(`{"data":[1]}${ts}`).digest('hex')}, t=${ts}`; - const header = request.args[0][1].headers[SIGNATURE_HEADER]; - assert.equal(expectedHeader, header); - clock.restore(); + assert.equal(requestStub.called, true); + assert.equal(requestStub.args[0][0], 'http://example.com'); + assert.equal(requestStub.args[0][1].body, '{"data":[1]}'); + assert.deepEqual(Object.keys(requestStub.args[0][1].headers), ['Content-Length', 'Content-Type', 'Content-Version']); + assert.equal(requestStub.args[0][1].headers['Content-Length'], 12); + assert.equal(requestStub.args[0][1].headers['Content-Type'], 'application/json'); + assert.match(requestStub.args[0][1].headers['Content-Version'], /v\d+\.\d+/); }); }); }); diff --git a/ghost/core/test/unit/server/web/api/middleware/upload.test.js b/ghost/core/test/unit/server/web/api/middleware/upload.test.js index 8e52af67b6a8..0037345747f5 100644 --- a/ghost/core/test/unit/server/web/api/middleware/upload.test.js +++ b/ghost/core/test/unit/server/web/api/middleware/upload.test.js @@ -1,21 +1,18 @@ const should = require('should'); const validation = require('../../../../../../core/server/web/api/middleware/upload')._test; -const imageFixturePath = ('../../../../../utils/fixtures/images/'); -const fs = require('fs'); -const path = require('path'); describe('web utils', function () { describe('checkFileExists', function () { it('should return true if file exists in input', function () { - validation.checkFileExists({mimetype: 'file', path: 'path'}).should.be.true; + validation.checkFileExists({mimetype: 'file', path: 'path'}).should.be.true(); }); it('should return false if file does not exist in input', function () { - validation.checkFileExists({}).should.be.false; + validation.checkFileExists({}).should.be.false(); }); it('should return false if file is incorrectly structured', function () { - validation.checkFileExists({type: 'file'}).should.be.false; + validation.checkFileExists({type: 'file'}).should.be.false(); }); }); @@ -25,48 +22,22 @@ describe('web utils', function () { name: 'test.txt', mimetype: 'text', ext: '.txt' - }, ['text'], ['.txt']).should.be.true; + }, ['text'], ['.txt']).should.be.true(); validation.checkFileIsValid({ name: 'test.jpg', mimetype: 'jpeg', ext: '.jpg' - }, ['text', 'jpeg'], ['.txt', '.jpg']).should.be.true; + }, ['text', 'jpeg'], ['.txt', '.jpg']).should.be.true(); }); it('returns false if file has invalid extension', function () { - validation.checkFileIsValid({name: 'test.txt', mimetype: 'text'}, ['text'], ['.tar']).should.be.false; - validation.checkFileIsValid({name: 'test', mimetype: 'text'}, ['text'], ['.txt']).should.be.false; + validation.checkFileIsValid({name: 'test.txt', mimetype: 'text'}, ['text'], ['.tar']).should.be.false(); + validation.checkFileIsValid({name: 'test', mimetype: 'text'}, ['text'], ['.txt']).should.be.false(); }); it('returns false if file has invalid type', function () { - validation.checkFileIsValid({name: 'test.txt', mimetype: 'text'}, ['archive'], ['.txt']).should.be.false; - }); - }); - - describe('isSvgSafe', function () { - it('detects a - \ No newline at end of file diff --git a/ghost/core/test/utils/fixtures/images/svg-with-script2.svg b/ghost/core/test/utils/fixtures/images/svg-with-script2.svg deleted file mode 100644 index 11a4b938cf26..000000000000 --- a/ghost/core/test/utils/fixtures/images/svg-with-script2.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ghost/core/test/utils/stripe-mocker.js b/ghost/core/test/utils/stripe-mocker.js index a1562bf66418..0794af909c7d 100644 --- a/ghost/core/test/utils/stripe-mocker.js +++ b/ghost/core/test/utils/stripe-mocker.js @@ -6,16 +6,9 @@ let tiers = {}; let models = {}; const crypto = require('crypto'); -// @ts-check -/** - * @typedef {"customers" | "checkout" | "subscriptions" | "coupons" | "payment_methods" | "prices" | "setup_intents" | "products"} resource - */ - /** * The Stripe Mocker mimics an in memory version of the Stripe API. We can use it to quickly create new subscriptions and get a close to real world test environment with working webhooks etc. - * - * If you create a new subscription, it will by default send the checkout.session.completed webhook. - * If you update a subscription, it will by default send the customer.subscription.updated webhook. + * If you create a new subscription, it will automatically send the customer.subscription.created webhook. So you can test what happens. */ class StripeMocker { customers = []; @@ -56,19 +49,10 @@ class StripeMocker { models = require('../../core/server/models'); } - /** - * Generates a random ID. - * @returns {string} The generated random ID. - */ #generateRandomId() { return crypto.randomBytes(8).toString('hex'); } - /** - * Creates a mock Stripe customer. - * @param {object} overrides - Optional overrides for the customer object. - * @returns {object} - The created Stripe customer object. - */ createCustomer(overrides = {}) { const customerId = `cus_${this.#generateRandomId()}`; const stripeCustomer = { @@ -87,10 +71,10 @@ class StripeMocker { } /** - * Fetches a mock Stripe price for a given product/tier (by slug). - * @param {string} tierSlug + * + * @param {*} tierSlug * @param {'month' | 'year'} cadence - * @returns {Promise} - The fetched Stripe price object. + * @returns */ async getPriceForTier(tierSlug, cadence) { const product = await models.Product.findOne({slug: tierSlug}); @@ -105,13 +89,13 @@ class StripeMocker { } /** - * Creates a Ghost tier (product). + * * @param {object} data * @param {string} [data.name] * @param {string} data.currency * @param {number} data.monthly_price * @param {number} data.yearly_price - * @returns {Promise} - The created product object. + * @returns */ async createTier({name, currency, monthly_price, yearly_price}) { const result = await tiers.api.add({ @@ -126,15 +110,6 @@ class StripeMocker { }); } - /** - * Creates a trial subscription. - * - * @param {object} options - The options for creating the trial subscription. - * @param {string} options.customer - The customer ID. - * @param {string} options.price - The price ID. - * @param {object} [options.overrides] - Optional overrides for the trial subscription. - * @returns {Promise} - The created trial subscription object. - */ async createTrialSubscription({customer, price, ...overrides}) { return await this.createSubscription({ customer, @@ -168,17 +143,6 @@ class StripeMocker { await DomainEvents.allSettled(); } - /** - * Creates a subscription for a customer. - * - * @param {object} data - The data for creating the subscription. - * @param {object} data.customer - The customer object. - * @param {object} data.price - The price object. - * @param {object} [data.overrides] - Optional overrides for the subscription object. - * @param {object} options - The options for creating the subscription. - * @param {object} [options.sendWebhook=true] - Whether to send a webhook or not. - * @returns {Promise} The created subscription object. - */ async createSubscription({customer, price, ...overrides}, options = {sendWebhook: true}) { const subscriptionId = `sub_${this.#generateRandomId()}`; @@ -224,14 +188,6 @@ class StripeMocker { return subscription; } - /** - * Retrieves requested data from the in-memory storage similar to a HTTP request. - * - * @param {Array} arr - The array to search in. - * @param {string} id - The id to search for. - * @returns {Array} - An array containing the HTTP status code and the setup intent object. - * If the setup intent is not found, returns [404]. - */ #getData(arr, id) { const setupIntent = arr.find(c => c.id === id); if (!setupIntent) { @@ -240,15 +196,6 @@ class StripeMocker { return [200, setupIntent]; } - /** - * Handles creation and updating of in memory resources. - * - * @param {Array} arr - The array to store the processed data. - * @param {string} id - The ID of the resource. - * @param {string} body - The body of the POST request. - * @param {resource} resource - The type of resource. - * @returns {Array} - An array containing the HTTP status code and the processed data. - */ #postData(arr, id, body, resource) { const qs = require('qs'); let decoded = qs.parse(body, { @@ -362,9 +309,6 @@ class StripeMocker { return [200, subscription]; } - /** - * Removes all the registered nock interceptors. - */ remove() { for (const interceptor of this.nockInterceptors) { nock.removeInterceptor(interceptor); @@ -372,10 +316,6 @@ class StripeMocker { this.nockInterceptors = []; } - /** - * Stubs the Stripe API. - * This will intercept all requests to the Stripe API and return the mocked data. - */ stub() { this.remove(); @@ -485,13 +425,10 @@ class StripeMocker { }); } - /** - * Sends a webhook event to the Stripe webhook controller. - * - * @param {any} event - The webhook event to send. - * @returns {Promise} - A promise that resolves when the webhook event is handled. - */ async sendWebhook(event) { + /** + * @type {any} + */ const webhookController = stripeService.webhookController; await webhookController.handleEvent(event); } diff --git a/ghost/custom-theme-settings-service/package.json b/ghost/custom-theme-settings-service/package.json index 35db5859f3f8..c0a04ddcf2a8 100644 --- a/ghost/custom-theme-settings-service/package.json +++ b/ghost/custom-theme-settings-service/package.json @@ -25,10 +25,10 @@ "sinon": "15.2.0" }, "dependencies": { - "@tryghost/debug": "0.1.30", + "@tryghost/debug": "0.1.29", "@tryghost/errors": "1.3.2", "@tryghost/nql": "0.12.3", - "@tryghost/tpl": "0.1.30", + "@tryghost/tpl": "0.1.29", "lodash": "4.17.21" } } diff --git a/ghost/data-generator/lib/importers/CommentsImporter.js b/ghost/data-generator/lib/importers/CommentsImporter.js deleted file mode 100644 index b9588b2b3df5..000000000000 --- a/ghost/data-generator/lib/importers/CommentsImporter.js +++ /dev/null @@ -1,73 +0,0 @@ -const {faker} = require('@faker-js/faker'); -const TableImporter = require('./TableImporter'); -const {luck} = require('../utils/random'); -const generateEvents = require('../utils/event-generator'); -const dateToDatabaseString = require('../utils/database-date'); - -class CommentsImporter extends TableImporter { - static table = 'comments'; - static dependencies = ['posts']; - - constructor(knex, transaction) { - super(CommentsImporter.table, knex, transaction); - } - - async import(quantity) { - const posts = await this.transaction.select('id', 'published_at').from('posts') - .where('status', 'published'); - this.members = await this.transaction.select('id', 'created_at').from('members'); - - this.commentsPerPost = quantity ? quantity / posts.length : 10; - - await this.importForEach(posts, this.commentsPerPost); - } - - setReferencedModel(model) { - this.model = model; - - this.commentIds = []; - - this.timestamps = generateEvents({ - shape: 'ease-out', - trend: 'negative', - // Steady readers login more, readers who lose interest read less overall. - // ceil because members will all have logged in at least once - total: faker.datatype.number({min: 0, max: this.commentsPerPost}), - startTime: new Date(model.published_at), - endTime: new Date() - }); - - this.possibleMembers = this.members.filter(member => new Date(member.created_at) < new Date(model.published_at)); - } - - generate() { - const timestamp = this.timestamps.pop(); - if (!timestamp) { - // Out of events for this post - return null; - } - - if (this.possibleMembers.length === 0) { - return null; - } - - const isReply = luck(30) && this.commentIds.length > 0; // 30% of comments are replies - - const event = { - id: this.fastFakeObjectId(), - post_id: this.model.id, - member_id: this.possibleMembers[faker.datatype.number(this.possibleMembers.length - 1)].id, - parent_id: isReply ? this.commentIds[faker.datatype.number(this.commentIds.length - 1)] : undefined, - status: 'published', - created_at: dateToDatabaseString(timestamp), - updated_at: dateToDatabaseString(timestamp), - html: `

        ${faker.lorem.sentence().replace(/[&<>"']/g, c => `&#${c.charCodeAt(0)};`)}

        ` - }; - - this.commentIds.push(event.id); - - return event; - } -} - -module.exports = CommentsImporter; diff --git a/ghost/data-generator/lib/importers/PostsImporter.js b/ghost/data-generator/lib/importers/PostsImporter.js index 1f615a2fdc0e..67855b5f552a 100644 --- a/ghost/data-generator/lib/importers/PostsImporter.js +++ b/ghost/data-generator/lib/importers/PostsImporter.js @@ -55,44 +55,32 @@ class PostsImporter extends TableImporter { created_at: dateToDatabaseString(timestamp), created_by: '1', updated_at: dateToDatabaseString(timestamp), - published_at: status === 'published' ? dateToDatabaseString(timestamp) : status === 'scheduled' ? dateToDatabaseString(faker.date.soon(5, timestamp)) : null, + published_at: status === 'published' || status === 'scheduled' ? dateToDatabaseString(faker.date.soon(5, timestamp)) : null, uuid: faker.datatype.uuid(), title: title, type: this.type, slug: `${slugify(title)}-${faker.random.numeric(3)}`, status, visibility, - lexical: JSON.stringify({ - root: { - children: content.map(paragraph => ( - { - children: [ - { - detail: 0, - format: 0, - mode: 'normal', - style: '', - text: paragraph, - type: 'extended-text', - version: 1 - } - ], - direction: 'ltr', - format: '', - indent: 0, - type: 'paragraph', - version: 1 - } - )), - direction: 'ltr', - format: '', - indent: 0, - type: 'root', - version: 1 - } + mobiledoc: JSON.stringify({ + version: '0.3.1', + atoms: [], + cards: [], + markups: [['em']], + sections: content.map(paragraph => [ + 1, + 'p', + [ + [ + 0, + [], + 0, + paragraph + ] + ] + ]) }), html: content.map(paragraph => `

        ${paragraph}

        `).join(''), - plaintext: content.join('\n\n'), email_recipient_filter: 'all', newsletter_id: this.type === 'post' && status === 'published' && luck(90) ? (visibility === 'paid' ? this.newsletters[0].id : this.newsletters[1].id) : null }; diff --git a/ghost/data-generator/lib/importers/RecommendationClickEventsImporter.js b/ghost/data-generator/lib/importers/RecommendationClickEventsImporter.js index 0df2df5273da..b9595f8ec8a7 100644 --- a/ghost/data-generator/lib/importers/RecommendationClickEventsImporter.js +++ b/ghost/data-generator/lib/importers/RecommendationClickEventsImporter.js @@ -14,7 +14,7 @@ class RecommendationClickEventsImporter extends TableImporter { const recommendations = await this.transaction.select('id', 'created_at').from('recommendations'); this.members = await this.transaction.select('id').from('members').limit(500); - await this.importForEach(recommendations, quantity ? quantity / recommendations.length : () => faker.datatype.number({min: 0, max: 30})); + await this.importForEach(recommendations, quantity ? quantity / recommendations.length : () => faker.datatype.number({min: 0, max: 50})); } generate() { diff --git a/ghost/data-generator/lib/importers/index.js b/ghost/data-generator/lib/importers/index.js index efe2d9d46671..54f7ff56f35f 100644 --- a/ghost/data-generator/lib/importers/index.js +++ b/ghost/data-generator/lib/importers/index.js @@ -36,6 +36,5 @@ module.exports = [ require('./MembersFeedbackImporter'), require('./RecommendationsImporter'), require('./RecommendationClickEventsImporter'), - require('./RecommendationSubscribeEventsImporter'), - require('./CommentsImporter') + require('./RecommendationSubscribeEventsImporter') ]; diff --git a/ghost/data-generator/package.json b/ghost/data-generator/package.json index 07686799ae2e..11b9965a144e 100644 --- a/ghost/data-generator/package.json +++ b/ghost/data-generator/package.json @@ -18,7 +18,7 @@ "lib" ], "devDependencies": { - "@tryghost/debug": "0.1.30", + "@tryghost/debug": "0.1.29", "c8": "8.0.1", "knex": "2.4.2", "mocha": "10.2.0", @@ -27,9 +27,9 @@ }, "dependencies": { "@faker-js/faker": "7.6.0", - "@tryghost/root-utils": "0.3.28", + "@tryghost/root-utils": "0.3.27", "@tryghost/string": "0.2.12", - "csv-writer": "1.6.0", + "csv-writer": "^1.6.0", "probability-distributions": "0.9.1" } } diff --git a/ghost/domain-events/package.json b/ghost/domain-events/package.json index 103251b27fb3..d6e0db48773a 100644 --- a/ghost/domain-events/package.json +++ b/ghost/domain-events/package.json @@ -19,7 +19,7 @@ "lib" ], "devDependencies": { - "@tryghost/logging": "2.4.15", + "@tryghost/logging": "2.4.14", "c8": "8.0.1", "mocha": "10.2.0", "should": "13.2.3" diff --git a/ghost/email-addresses/package.json b/ghost/email-addresses/package.json index bf44203ac928..db0610337e89 100644 --- a/ghost/email-addresses/package.json +++ b/ghost/email-addresses/package.json @@ -29,6 +29,6 @@ "typescript": "5.4.5" }, "dependencies": { - "nodemailer": "6.9.14" + "nodemailer": "^6.6.3" } } diff --git a/ghost/email-analytics-service/package.json b/ghost/email-analytics-service/package.json index 43be69c86ece..d9eb14ca981e 100644 --- a/ghost/email-analytics-service/package.json +++ b/ghost/email-analytics-service/package.json @@ -23,7 +23,7 @@ "sinon": "15.2.0" }, "dependencies": { - "@tryghost/debug": "0.1.30", + "@tryghost/debug": "0.1.29", "lodash": "4.17.21" } } diff --git a/ghost/email-service/lib/EmailRenderer.js b/ghost/email-service/lib/EmailRenderer.js index 10463dfa5e3e..1a66fd4249ae 100644 --- a/ghost/email-service/lib/EmailRenderer.js +++ b/ghost/email-service/lib/EmailRenderer.js @@ -10,7 +10,6 @@ const htmlToPlaintext = require('@tryghost/html-to-plaintext'); const tpl = require('@tryghost/tpl'); const cheerio = require('cheerio'); const {EmailAddressParser} = require('@tryghost/email-addresses'); -const {registerHelpers} = require('./helpers/register-helpers'); const messages = { subscriptionStatus: { @@ -419,10 +418,6 @@ class EmailRenderer { return {src, width, height}; }); - // Add a class to each figcaption so we can style them in the email - $('figcaption').each((i, elem) => !!($(elem).addClass('kg-card-figcaption'))); - html = $.html(); - // Juice HTML (inline CSS) const juice = require('juice'); html = juice(html, {inlinePseudoElements: true, removeStyleTags: true}); @@ -760,16 +755,53 @@ class EmailRenderer { return replacements; } - getLabs() { - return this.#labs; - } - async renderTemplate(data) { - const labs = this.getLabs(); this.#handlebars = require('handlebars').create(); - // Register helpers - registerHelpers(this.#handlebars, labs); + // Helpers + this.#handlebars.registerHelper('if', function (conditional, options) { + if (conditional) { + return options.fn(this); + } else { + return options.inverse(this); + } + }); + + this.#handlebars.registerHelper('and', function () { + const len = arguments.length - 1; + + for (let i = 0; i < len; i++) { + if (!arguments[i]) { + return false; + } + } + + return true; + }); + + this.#handlebars.registerHelper('not', function () { + const len = arguments.length - 1; + + for (let i = 0; i < len; i++) { + if (!arguments[i]) { + return true; + } + } + + return false; + }); + + this.#handlebars.registerHelper('or', function () { + const len = arguments.length - 1; + + for (let i = 0; i < len; i++) { + if (arguments[i]) { + return true; + } + } + + return false; + }); // Partials if (this.#labs.isSet('emailCustomization')) { @@ -840,23 +872,18 @@ class EmailRenderer { * * @param {*} text * @param {number} maxLength - * @param {number} maxLengthMobile should be smaller than maxLength + * @param {number} maxLengthMobile should be larger than maxLength * @returns */ truncateHtml(text, maxLength, maxLengthMobile) { - if (!maxLengthMobile || maxLength <= maxLengthMobile) { + if (!maxLengthMobile || maxLength >= maxLengthMobile) { return escapeHtml(this.truncateText(text, maxLength)); } - if (text && text.length > maxLengthMobile) { - let ellipsis = ''; - - if (text.length > maxLengthMobile && text.length <= maxLength) { - ellipsis = '…'; - } else if (text.length > maxLength) { - ellipsis = '…'; + if (text && text.length > maxLength) { + if (text.length <= maxLengthMobile) { + return escapeHtml(text.substring(0, maxLength - 1)) + '' + escapeHtml(text.substring(maxLength - 1, maxLengthMobile - 1)) + '' + '…'; } - - return escapeHtml(text.substring(0, maxLengthMobile - 1)) + '' + escapeHtml(text.substring(maxLengthMobile - 1, maxLength - 1)) + '' + ellipsis; + return escapeHtml(text.substring(0, maxLength - 1)) + '' + escapeHtml(text.substring(maxLength - 1, maxLengthMobile - 1)) + '' + '…'; } else { return escapeHtml(text ?? ''); } @@ -1005,7 +1032,7 @@ class EmailRenderer { const {href: featureImageMobile, width: featureImageMobileWidth, height: featureImageMobileHeight} = await this.limitImageWidth(latestPost.get('feature_image'), 600, 480); latestPosts.push({ - title: this.truncateHtml(latestPost.get('title'), featureImage ? 85 : 95, featureImageMobile ? 55 : 75), + title: this.truncateHtml(latestPost.get('title'), featureImage ? 85 : 105, 105), url: this.#getPostUrl(latestPost), featureImage: featureImage ? { src: featureImage, @@ -1017,7 +1044,7 @@ class EmailRenderer { width: featureImageMobileWidth, height: featureImageMobileHeight } : null, - excerpt: this.truncateHtml(latestPost.get('custom_excerpt') || latestPost.get('plaintext'), featureImage ? 120 : 130, featureImageMobile ? 90 : 100) + excerpt: this.truncateHtml(latestPost.get('custom_excerpt') || latestPost.get('plaintext'), featureImage ? 60 : 70, 105) }); if (featureImage) { @@ -1026,16 +1053,6 @@ class EmailRenderer { } } - let excerptFontClass = ''; - const bodyFont = newsletter.get('body_font_category'); - const titleFont = newsletter.get('title_font_category'); - - if (titleFont === 'serif' && bodyFont === 'serif') { - excerptFontClass = 'post-excerpt-serif-serif'; - } else if (titleFont === 'serif' && bodyFont !== 'serif') { - excerptFontClass = 'post-excerpt-serif-sans'; - } - const data = { site: { title: this.#settingsCache.get('title'), @@ -1054,7 +1071,6 @@ class EmailRenderer { commentUrl: commentUrl.href, authors, publishedAt, - customExcerpt: post.get('custom_excerpt'), feature_image: postFeatureImage, feature_image_width: postFeatureImageWidth, feature_image_height: postFeatureImageHeight, @@ -1065,7 +1081,6 @@ class EmailRenderer { newsletter: { name: newsletter.get('name'), showPostTitleSection: newsletter.get('show_post_title_section'), - showExcerpt: newsletter.get('show_excerpt'), showCommentCta: newsletter.get('show_comment_cta') && this.#settingsCache.get('comments_enabled') !== 'off' && !hasEmailOnlyFlag, showSubscriptionDetails: newsletter.get('show_subscription_details') }, @@ -1097,9 +1112,8 @@ class EmailRenderer { footerContent: newsletter.get('footer_content'), classes: { - title: 'post-title' + ` ` + (post.get('custom_excerpt') ? 'post-title-with-excerpt' : 'post-title-no-excerpt') + (newsletter.get('title_font_category') === 'serif' ? ` post-title-serif` : ``) + (newsletter.get('title_alignment') === 'left' ? ` post-title-left` : ``), + title: 'post-title' + (newsletter.get('title_font_category') === 'serif' ? ` post-title-serif` : ``) + (newsletter.get('title_alignment') === 'left' ? ` post-title-left` : ``), titleLink: 'post-title-link' + (newsletter.get('title_alignment') === 'left' ? ` post-title-link-left` : ``), - excerpt: 'post-excerpt' + ` ` + (newsletter.get('show_feature_image') && !!postFeatureImage ? 'post-excerpt-with-feature-image' : 'post-excerpt-no-feature-image') + ` ` + excerptFontClass + (newsletter.get('title_alignment') === 'left' ? ` post-excerpt-left` : ``), meta: 'post-meta' + (newsletter.get('title_alignment') === 'left' ? ` post-meta-left` : ` post-meta-center`), body: newsletter.get('body_font_category') === 'sans_serif' ? `post-content-sans-serif` : `post-content` }, diff --git a/ghost/email-service/lib/email-templates/partials/styles-old.hbs b/ghost/email-service/lib/email-templates/partials/styles-old.hbs index a8f19b857381..2bc6a2dbdb85 100644 --- a/ghost/email-service/lib/email-templates/partials/styles-old.hbs +++ b/ghost/email-service/lib/email-templates/partials/styles-old.hbs @@ -172,7 +172,7 @@ blockquote.kg-blockquote-alt { text-align: center; font-size: 1.2em; font-style: italic; - color: #738a94; + color: #999999; } blockquote p { @@ -272,7 +272,7 @@ figcaption { padding-top: 10px; padding-bottom: 10px; line-height: 1.5em; - color: #738a94; + color: {{secondaryTextColor}}; } figcaption a { @@ -308,24 +308,28 @@ figure blockquote p { .header-image { padding-top: 24px; - padding-bottom: 16px; } .site-icon { - padding-bottom: 8px; - padding-top: 8px; + padding-bottom: 10px; + padding-top: 20px; text-align: center; border-radius: 3px; } .site-icon img { - width: 44px; - height: 44px; + width: 48px; + height: 48px; border-radius: 3px; } .site-info { - padding-top: 32px; + padding-top: 50px; +} + +.site-info-bordered { + padding-top: 50px; + border-bottom: 1px solid #e5eff5; } .site-url { @@ -338,7 +342,7 @@ figure blockquote p { } .site-url-bottom-padding { - padding-bottom: 12px; + padding-bottom: 50px; } .site-title { @@ -346,27 +350,19 @@ figure blockquote p { } .site-subtitle { - color: #738a94; - font-size: 13px; + color: #8695a4; + font-size: 14px; font-weight: 400; text-transform: none; } .post-title { - font-size: 36px; + padding-bottom: 16px; + font-size: 42px; line-height: 1.1em; font-weight: 700; text-align: center; } - -.post-title-with-excerpt { - padding-bottom: 8px; -} - -.post-title-no-excerpt { - padding-bottom: 16px; -} - .post-title-serif { font-family: Georgia, serif; letter-spacing: -0.01em; @@ -379,52 +375,17 @@ figure blockquote p { color: #15212A; display: block; text-align: center; - margin-top: 32px; + margin-top: 50px; } .post-title-link-left { text-align: left; } -.post-excerpt-wrapper { - width: 100%; - max-width: 600px !important; -} - -.post-excerpt { - margin: 0; - color: #15212A; - font-size: 19px; - line-height: 1.4em; - text-align: center; -} - -.post-excerpt-with-feature-image { - padding-bottom: 28px; -} - -.post-excerpt-no-feature-image { - padding-bottom: 32px; -} - -.post-excerpt-serif-serif { - font-family: Georgia, serif; - font-size: 20px; -} - -.post-excerpt-serif-sans { - font-size: 20px; - font-family: Georgia, serif; -} - -.post-excerpt-left { - text-align: left; -} - .post-meta, .view-online { color: #738a94; font-size: 13px; - font-weight: 400; + letter-spacing: 0.1px; text-align: center; } @@ -457,19 +418,15 @@ figure blockquote p { word-wrap: none; white-space: nowrap; color: #738a94; - text-decoration: underline !important; +} + +.feature-image-row:first-child > td { + padding-top: 24px; } .feature-image { padding-bottom: 30px; width: 100%; - text-align: center; -} - -.feature-image-row:first-child > td, -.header-image-row + .feature-image-row > td, -.site-info-row + .feature-image-row > td { - padding-top: 24px; } .feature-image-with-caption { @@ -481,17 +438,13 @@ figure blockquote p { .feature-image-caption { width: 100%; padding-top: 5px; - padding-bottom: 32px; + padding-bottom: 30px; text-align: center; - font-size: 13px !important; - color: #738a94; + font-size: 13px!important; + color: {{secondaryTextColor}}; line-height: 1.5em; } -.kg-card-figcaption { - font-size: 13px; -} - /* ------------------------------------- FEEDBACK BUTTONS ------------------------------------- */ @@ -519,7 +472,7 @@ figure blockquote p { .latest-posts-header { margin: 0; - padding: 8px 0 8px; + padding: 8px 0 16px; color: #15212A; font-size: 13px; font-weight: 700; @@ -527,8 +480,7 @@ figure blockquote p { } .latest-post { - max-width: 600px !important; - padding: 16px 0; + padding: 8px 0; } .latest-post a { @@ -643,7 +595,7 @@ figure blockquote p { } .post-content-row:first-child > td, .header-image-row + .post-content-row > td { - padding-top: 32px; + padding-top: 52px; } .post-content a, @@ -844,6 +796,10 @@ a[data-flickr-embed] img { border-radius: 3px; } +.kg-callout-card p { + margin: 0 +} + .kg-callout-card-grey { background: #eef0f2; } @@ -1154,7 +1110,7 @@ a[data-flickr-embed] img { padding: 20px; margin-bottom: 1.5em; border-radius: 4px; - border: 1px solid #738a94; + border: 1px solid {{secondaryBorderColor}}; } @@ -1305,10 +1261,6 @@ a[data-flickr-embed] img { display: none; } -.hide-desktop { - display: none; -} - /* ------------------------------------- RESPONSIVE AND MOBILE FRIENDLY STYLES ------------------------------------- */ @@ -1327,14 +1279,6 @@ a[data-flickr-embed] img { display: initial !important; } - .hide-desktop { - display: initial !important; - } - - .desktop-only { - display: none !important; - } - table.body p, table.body ul, table.body ol, @@ -1342,19 +1286,6 @@ a[data-flickr-embed] img { font-size: 16px; } - table.body .post-excerpt { - font-size: 16px !important; - } - - table.body .kg-callout-card { - padding: 16px 24px !important; - } - - table.body .kg-callout-text { - font-size: 16px !important; - line-height: 1.5em !important; - } - table.body pre { white-space: pre-wrap !important; word-break: break-word !important; @@ -1394,33 +1325,38 @@ a[data-flickr-embed] img { padding-top: 0 !important; } - table.body .site-info { - padding-top: 24px !important; + table.body .site-info, + table.body .site-info-bordered { + padding-top: 30px !important; + } + + table.body .site-url-bottom-padding { + padding-bottom: 30px !important; } table.body .post-title-link { - margin-top: 24px !important; + margin-top: 30px !important; } table.body .post-meta-wrapper { - padding-bottom: 24px !important; + padding-bottom: 30px !important; } table.body .site-icon img { - width: 36px !important; - height: 36px !important; + width: 40px !important; + height: 40px !important; } table.body .site-url a { - font-size: 13px !important; - padding-bottom: 16px !important; + font-size: 14px !important; + padding-bottom: 15px !important; } table.body .post-meta, table.body .post-meta-date { white-space: normal !important; - font-size: 13px !important; - line-height: 1.2em; + font-size: 12px !important; + line-height: 1.5em; } table.body .post-meta, @@ -1463,8 +1399,8 @@ a[data-flickr-embed] img { } table.body .post-title a { - font-size: 26px !important; - line-height: 1.1em !important; + font-size: 32px !important; + line-height: 1.15em !important; } table.feedback-buttons { @@ -1486,6 +1422,8 @@ a[data-flickr-embed] img { } table.body .latest-post-title { + display: inline-block !important; + width: 100%; padding-right: 8px !important; } @@ -1501,6 +1439,10 @@ a[data-flickr-embed] img { line-height: 1.2 !important; } + table.body .latest-post-excerpt span { + display: none !important; + } + table.body .subscription-box h3 { font-size: 14px !important; } @@ -1570,7 +1512,7 @@ a[data-flickr-embed] img { } table.body blockquote { - font-size: 16px !important; + font-size: 17px; line-height: 1.6em; margin-bottom: 0; padding-left: 15px; @@ -1578,12 +1520,13 @@ a[data-flickr-embed] img { table.body blockquote.kg-blockquote-alt { border-left: 0 none !important; - margin: 0 !important; - padding-left: 20px !important; - padding-right: 20px !important; - padding-bottom: 1.5em !important; - font-size: 18px !important; - line-height: 1.4em !important; + margin: 0 0 2.5em 0 !important; + padding: 0 50px 0 50px !important; + font-size: 1.2em; + } + + table.body blockquote + * { + margin-top: 1.5em !important; } table.body hr { @@ -1617,14 +1560,6 @@ a[data-flickr-embed] img { font-size: 13px!important; } - .kg-card-figcaption { - font-size: 13px!important; - } - - .kg-card-figcaption p, .kg-card-figcaption p span { - font-size: 13px!important; - } - } /* ------------------------------------- diff --git a/ghost/email-service/lib/email-templates/partials/styles.hbs b/ghost/email-service/lib/email-templates/partials/styles.hbs index 8b27fd652297..0a8b36fdf60c 100644 --- a/ghost/email-service/lib/email-templates/partials/styles.hbs +++ b/ghost/email-service/lib/email-templates/partials/styles.hbs @@ -454,7 +454,6 @@ figure blockquote p { .feature-image { padding-bottom: 30px; width: 100%; - text-align: center; } .feature-image-with-caption { @@ -465,7 +464,7 @@ figure blockquote p { width: 100%; padding: 10px 0 30px 0; font-size: 13px !important; - text-align: center; + text-align: center; color: {{secondaryTextColor}}; } @@ -497,7 +496,7 @@ figure blockquote p { .latest-posts-header { margin: 0; - padding: 8px 0 8px; + padding: 8px 0 16px; color: {{titleColor}}; font-size: 13px; font-weight: 700; @@ -506,7 +505,7 @@ figure blockquote p { .latest-post { max-width: 600px !important; - padding: 16px 0; + padding: 8px 0; } .latest-post a { @@ -1016,9 +1015,9 @@ a[data-flickr-embed] img { .kg-product-card { width: 100%; - margin: 0 0 1.5em; + margin: 0 0 1.5em; padding: 20px; - border-radius: 3px; + border-radius: 3px; border: 1px solid #e5eff5; border: 1px solid {{secondaryBorderColor}}; } @@ -1035,105 +1034,105 @@ a[data-flickr-embed] img { } .kg-audio-card { - width: auto; + width: auto; width: 100%; margin: 0 auto 1.5em; - border-radius: 3px; + border-radius: 3px; border: 1px solid #e5eff5; border: 1px solid {{secondaryBorderColor}}; } .kg-audio-title { - display: block; - padding-right: 20px; - padding-bottom: 4px; - padding-top: 4px; - font-size: 16px; - font-weight: 600; - line-height: 18px; - text-decoration: none !important; + display: block; + padding-right: 20px; + padding-bottom: 4px; + padding-top: 4px; + font-size: 16px; + font-weight: 600; + line-height: 18px; + text-decoration: none !important; color: {{textColor}} !important; } .kg-audio-play-button { - display: block; - box-sizing: border-box; - width: 16px; - height: 16px; - color: {{textColor}} !important; - border-style: solid; - border-width: 8px 0px 8px 16px; + display: block; + box-sizing: border-box; + width: 16px; + height: 16px; + color: {{textColor}} !important; + border-style: solid; + border-width: 8px 0px 8px 16px; border-color: transparent transparent transparent currentColor; } .kg-audio-duration { - display: block; - text-decoration: none; - font-size: 13px; - text-decoration: none !important; + display: block; + text-decoration: none; + font-size: 13px; + text-decoration: none !important; color: {{textColor}} !important; } .kg-audio-link { - text-decoration: none !important; - color: {{textColor}}; + text-decoration: none !important; + color: {{textColor}}; color: {{secondaryTextColor}}; } .kg-file-card { width: 100%; margin: 0 0 1.5em 0; - border-radius: 3px; + border-radius: 3px; border: 1px solid #e5eff5; border: 1px solid {{secondaryBorderColor}}; } .kg-file-title { - display: block; - width: 100%; - padding-left: 12px; - padding-top: 8px; - font-size: 17px; - font-weight: bold; - line-height: 1.3em; + display: block; + width: 100%; + padding-left: 12px; + padding-top: 8px; + font-size: 17px; + font-weight: bold; + line-height: 1.3em; text-decoration: none !important; - color: {{textColor}} !important; + color: {{textColor}} !important; } .kg-file-description { - display: block; - width: 100%; - padding-left: 12px; - padding-top: 2px; - font-size: 15px; - line-height: 1.4em; + display: block; + width: 100%; + padding-left: 12px; + padding-top: 2px; + font-size: 15px; + line-height: 1.4em; text-decoration: none !important; - color: {{textColor}} !important; - color: {{secondaryTextColor}} !important; + color: {{textColor}} !important; + color: {{secondaryTextColor}} !important; } .kg-file-meta { display: block; - width: 100%; - padding-left: 12px; - padding-top: 4px; + width: 100%; + padding-left: 12px; + padding-top: 4px; padding-bottom: 8px; - font-size: 13px; - line-height: 1.4em; + font-size: 13px; + line-height: 1.4em; text-decoration: none !important; color: {{textColor}} !important; - color: {{secondaryTextColor}} !important; + color: {{secondaryTextColor}} !important; } .kg-file-name { - font-weight: 500; + font-weight: 500; color: {{textColor}}; } .kg-file-thumbnail { - position: relative; - vertical-align: middle; - text-align: center; + position: relative; + vertical-align: middle; + text-align: center; border-radius: 2px; {{#if backgroundIsDark}} background: {{backgroundColor}} !important; @@ -1144,20 +1143,20 @@ a[data-flickr-embed] img { } .kg-twitter-card { - width: auto; + width: auto; width: 100%; margin: 0 auto; background: #FFFFFF !important; - border-radius: 12px; + border-radius: 12px; border: 1px solid #e5eff5; } .kg-toggle-card { background: transparent; - padding: 20px; + padding: 20px; margin-bottom: 1.5em; - border-radius: 4px; - border: 1px solid {{secondaryBorderColor}}; + border-radius: 4px; + border: 1px solid {{secondaryBorderColor}}; } @@ -1319,10 +1318,6 @@ a[data-flickr-embed] img { display: none; } -.hide-desktop { - display: none; -} - /* ------------------------------------- RESPONSIVE AND MOBILE FRIENDLY STYLES ------------------------------------- */ @@ -1343,14 +1338,6 @@ a[data-flickr-embed] img { display: initial !important; } - .hide-desktop { - display: initial !important; - } - - .desktop-only { - display: none !important; - } - table.body p, table.body ul, table.body ol, @@ -1474,6 +1461,8 @@ a[data-flickr-embed] img { } table.body .latest-post-title { + display: inline-block !important; + width: 100%; padding-right: 8px !important; } @@ -1489,6 +1478,10 @@ a[data-flickr-embed] img { line-height: 1.2 !important; } + table.body .latest-post-excerpt span { + display: none !important; + } + table.body .subscription-box h3 { font-size: 14px !important; } diff --git a/ghost/email-service/lib/email-templates/template-old.hbs b/ghost/email-service/lib/email-templates/template-old.hbs index 15d0b5705ea3..03921065d8fd 100644 --- a/ghost/email-service/lib/email-templates/template-old.hbs +++ b/ghost/email-service/lib/email-templates/template-old.hbs @@ -44,8 +44,8 @@ {{/if}} {{#if (or showHeaderIcon showHeaderTitle showHeaderName) }} - - + + {{#if (and showHeaderIcon site.iconUrl) }} @@ -79,18 +79,9 @@ {{post.title}} - {{#hasFeature 'newsletterExcerpt'}} - {{#if (and newsletter.showExcerpt post.customExcerpt)}} - - - - {{/if}} - {{/hasFeature}}
        -

        {{post.customExcerpt}}

        -
        - +