Commit Graph

36160 Commits

Author SHA1 Message Date
Fabien "egg" O'Carroll
27bfa30f97 Handled our forced null conversion in bookshelf
refs https://github.com/TryGhost/Arch/issues/47

We've configured bookshelf to force empty strings to null, but this is
undesired behaviour here, so unfortunately we have to leak some business
logic into the repository.

This needs to be done to correctly support our filter validation logic.
2023-08-23 15:49:06 +07:00
Ronald Langeveld
359617462a
Fixed portal not passing all params in preview - Admin X (#17783)
refs https://github.com/TryGhost/Product/issues/3349

- Previously it detected members as being disabled altogether, which
wasn't the case.
- This resolves that by passing in a few extra required params to have
Portal loading properly

---

<!-- Leave the line below if you'd like GitHub Copilot to generate a
summary from your commit -->
<!--
copilot:summary
-->
### <samp>🤖 Generated by Copilot at d3cccab</samp>

This pull request enhances the portal preview feature by adding new
parameters to the iframe URL for the portal settings and pricing tiers.
It also cleans up some code in `PortalFrame.tsx` for better readability
and type safety.
2023-08-23 10:48:20 +02:00
renovate[bot]
2159b4fb30 Update dependency luxon to v3.4.1 2023-08-22 22:47:51 +01:00
renovate[bot]
5cd8b15cfd Update storybook monorepo to v7.3.2 2023-08-22 17:40:57 +01:00
renovate[bot]
8f780ba763 Update dependency html-validate to v8.3.0 2023-08-22 17:40:25 +01:00
renovate[bot]
7e63c541c9 Update dependency lint-staged to v14.0.1 2023-08-22 17:40:09 +01:00
renovate[bot]
26bdba9d4c Update dependency concurrently to v8.2.1 2023-08-22 17:39:36 +01:00
Ghost CI
cebe8d7db6 Merged v5.59.4 into main 2023-08-22 11:46:13 +00:00
Ghost CI
5f2b5d9d11 v5.59.4 2023-08-22 11:46:11 +00:00
Simon Backx
a011151e24
🐛 Fixed handling multiple Stripe subscriptions for same member (#17773)
fixes https://github.com/TryGhost/Product/issues/3752

- Added some extra tests for edge cases
- Updated handling of multiple subscriptions so they are handled better
- Canceling a subscription when the member still has other subscriptions will now get handled correctly where the status and products of the member stay intact
2023-08-22 13:27:21 +02:00
Jono M
8e24ca51ad
Wired up Slack integration in AdminX (#17781)
refs https://github.com/TryGhost/Product/issues/3729

This pull request improves the Slack integration settings by allowing
users to test the webhook URL and save the settings from a modal. It
also refactors the `SlackModal` component and adds a new API function
`useTestSlack` to handle the test message.
2023-08-22 12:15:38 +01:00
Ronald Langeveld
e61b62e6be
Wired up Analytics export download trigger (#17782)
refs https://github.com/TryGhost/Product/issues/3349

- added a download handler for the analytics download button.
- wired up the download api endpoint

<!-- Leave the line below if you'd like GitHub Copilot to generate a
summary from your commit -->
<!--
copilot:summary
-->
### <samp>🤖 Generated by Copilot at 46054be</samp>

This pull request adds a feature to export post analytics as a csv file
from the membership analytics dashboard. It implements a new query hook,
a download function, and a response handler in the
`apps/admin-x-settings` app, and adds a test case for the feature.
2023-08-22 11:09:05 +00:00
Jono M
49493abf75
Added tests for custom integrations (#17770)
refs https://github.com/TryGhost/Product/issues/3729

---

This pull request enhances the custom integrations feature in the
admin-x-settings app by adding accessibility and UI improvements to the
`Select` and `WebhookModal` components, refactoring the webhook and
integration types in the API module, and adding a new end-to-end test
file to verify the functionality using mocked API responses.
2023-08-22 11:25:25 +01:00
Naz
df3aaed3c8 Added test coverage for collection updates
refs https://github.com/TryGhost/Arch/issues/77

- The test covers collection updates on post resource add/edit/delete operations
2023-08-22 17:16:35 +08:00
Naz
e638d72e70 Refactored collections e2e Admin API test suite
refs https://github.com/TryGhost/Arch/issues/71

- With describe/it block levels mixed on the top level of the test suite the order fo test execution was scattered around. Having "describe" groups for each of the BREAD methods makes things more organized and readable.
2023-08-22 17:16:35 +08:00
Ghost CI
a0efe7a864 Merged v5.59.3 into main 2023-08-21 21:27:36 +00:00
Ghost CI
808ea02e45 v5.59.3 2023-08-21 21:27:34 +00:00
Steve Larson
37508a1b77 🐛 Fixed markdown card toolbar styles in mobiledoc editor
no refs
-toolbar styles were broken by upgrading kg-simplemde
-reverted kg-simplemde to v1 as v2+ is intended for lexical editor
2023-08-21 10:17:33 -05:00
Steve Larson
66da501125
🐛 Fixed markdown card toolbar styles in mobiledoc editor
no refs
-toolbar styles were broken by upgrading kg-simplemde
-reverted kg-simplemde to v1 as v2+ is intended for lexical editor
2023-08-21 14:53:50 +00:00
Ronald Langeveld
ac16121899
Fixed mailgun integration not setting base URL on AdminX (#17774)
refs https://github.com/TryGhost/Product/issues/3349

- Adds an additional condition to set the 'default' mailgun base url in case it not need change, to prevent it from staying null in the database config, when setting the domain and api key.
- In other cases it will work as usual.
2023-08-21 16:44:15 +02:00
Fabien "egg" O'Carroll
a343f39559 Handled sort_order updates for Collections
refs https://github.com/TryGhost/Arch/issues/73

With the latest version of bookshelf-relations we're able to define a model
specific hook which allows us to ignore sort_order updates on automatic
collections, which don't require their order to be persisted.
2023-08-21 12:16:32 +01:00
Michael Barrett
0ea5f9228d
Added custom theme setting visibility (#17763)
refs https://github.com/TryGhost/Product/issues/3716
2023-08-21 11:26:51 +01:00
Ghost CI
d0c95a37e1 v5.59.2 2023-08-18 15:03:06 +00:00
Michael Barrett
3a95caf48f
Implement member import with tier (#17506)
refs https://github.com/TryGhost/Product/issues/3629
2023-08-18 15:24:31 +01:00
Simon Backx
f1b51729fc
Converted Comments-UI App to TypeScript and React hooks (#17760)
refs https://github.com/TryGhost/Product/issues/3504

- App component now uses React hooks intead of React class component
- App is now written in TypeScript
- All JavaScript is now removed from the Comments-UI project
- Removed `PopupNotification` because these were never displayed
- Removed `action` from AppContext (never used)
- Moved options parsing out of `index.ts` into a separate utility file,
similar to the signup-form
- Improved reliability of some editor tests by always waiting for the
editor to be focused (was not always the case) + added an utility method
for this
2023-08-18 13:30:59 +00:00
Ronald Langeveld
d9cee38a77
Wired up Pintura integration to AdminX (#17759)
refs https://github.com/TryGhost/Product/issues/3729

- Wired up the Pintura Integration to AdminX.

---

<!-- Leave the line below if you'd like GitHub Copilot to generate a
summary from your commit -->
<!--
copilot:summary
-->
### <samp>🤖 Generated by Copilot at 4d33355</samp>

This pull request adds the ability to customize the Pintura image editor
with custom JS and CSS files in the advanced settings modal. It
introduces a new `files.ts` file in the `api` folder, which provides a
hook and a helper function for uploading and retrieving files. It also
modifies the `PinturaModal.tsx` component to use these functions and
display the settings.
2023-08-18 14:54:13 +02:00
Peter Zimon
ab36892799
Small AdminX UI improments (#17758)
refs. https://github.com/TryGhost/Product/issues/3349

- added static Preview button to Tips and Donations
- updated modal buttons in Design settigns, so it doesn't close on save
and easier to play around with various settings
2023-08-18 11:42:29 +02:00
Peter Zimon
5b896eb0f7
Static Tips & Donations settings in AdminX (#17757)
refs. https://github.com/TryGhost/Product/issues/3746

- Added staitc UI for Tips & donations in AdminX settings
2023-08-18 06:20:46 +00:00
Peter Zimon
b70f58860e
AdminX Labs static UI (#17754)
refs. https://github.com/TryGhost/Product/issues/3745

- added static UI for Labs in AdminX
2023-08-18 04:55:50 +00:00
Chris Raible
629aa08262
🐛 Fixed portal free signup link not working if free plan is hidden (#17742)
refs TryGhost/Product#3743

- Users should be able to hide the free plan from Portal, which removes it as an option on the main portal /signup page
- However, they should still be able to use the /signup/free link to allow members to signup for the free plan. Currently if the free plan is hidden from portal, the /signup/free link renders the main /signup page, with only paid plans available.
- This PR fixes that by allowing the /signup/free link to work even if the free plan is hidden from portal, but only by directly accessing the /signup/free link
2023-08-17 14:58:37 -07:00
Jono M
efd6150db0
Wired up custom integrations in AdminX (#17752)
refs https://github.com/TryGhost/Product/issues/3729
2023-08-17 20:24:39 +01:00
Simon Backx
850cc7a9a1
Moved old comment tests to Playwright (#17750)
refs https://github.com/TryGhost/Product/issues/3504
2023-08-17 12:47:08 +02:00
renovate[bot]
b388e392ff Update dependency @storybook/blocks to v7.3.1 2023-08-17 11:47:12 +02:00
renovate[bot]
636ae389b7 Update dependency nx to v16.7.1 2023-08-17 11:47:03 +02:00
Simon Backx
c8daf2e514
🐛 Fixed comments admin menu not visible when not logged in as member (#17749)
refs https://github.com/TryGhost/Product/issues/3504

- When you are logged in as an admin, but not as a member, no buttons
showed (discovered in new e2e tests)
- Added E2E tests for admin actions
2023-08-17 09:20:40 +00:00
Fabien "egg" O'Carroll
ad62cd4822 Removed edit method from Collection
We want to keep Entities as basic as possible, particularly when setting
property, so that each property can handle its own validation.
2023-08-17 09:45:41 +01:00
Peter Zimon
efc9a53fd2
Admin x custom integrations UI (#17747)
refs. https://github.com/TryGhost/Product/issues/3729

- added static new custom integration modal
- added static custom integration edit modal
- refined built-in integration UI
2023-08-17 10:12:28 +02:00
renovate[bot]
9e25058934 Update storybook monorepo to v7.3.1 2023-08-17 09:10:52 +02:00
renovate[bot]
bddde8ff3d Update dependency ember-keyboard to v8.2.1 2023-08-17 09:10:44 +02:00
Jono M
b6b50a388e
Fixed AdminX HTML editor always making forms dirty (#17741)
refs https://github.com/TryGhost/Product/issues/3545
2023-08-16 19:20:07 +01:00
Jono M
f1266c6b9f
Wired up Zapier integration in AdminX (#17737)
refs https://github.com/TryGhost/Product/issues/3729
2023-08-16 18:59:31 +01:00
Ronald Langeveld
738ce491f4
Wired FirstPromoter integration to AdminX (#17740)
refs: https://github.com/TryGhost/Product/issues/3729

- Wired up the FirstPromoter api to adminx
---

<!-- Leave the line below if you'd like GitHub Copilot to generate a
summary from your commit -->
<!--
copilot:summary
-->
### <samp>🤖 Generated by Copilot at bacd8ec</samp>

This pull request refactors the `FirstPromoterModal` component to use
hooks and helper functions, and adds a new end-to-end test file to
verify its functionality. The purpose of these changes is to improve the
code quality and the user experience of the FirstPromoter integration
feature.
2023-08-16 17:47:38 +02:00
Simon Backx
b587429008
🐛 Fixed importing offers when importing members from Stripe (#17739)
fixes https://github.com/TryGhost/Product/issues/3728

- When importing members from Stripe with an existing offer, that didn't
exist in Ghost, the offer never got linked with the imported
subscription because of a missing return statement.
- Fixes importing offers with duplicate names
- Added E2E tests for creating members from a Stripe Customer ID
2023-08-16 13:25:57 +00:00
Ronald Langeveld
a6776301e3
Wired up Amp integration to AdminX (#17738)
refs https://github.com/TryGhost/Product/issues/3729

- wired up api to the AMP integration on AdminX

---

<!-- Leave the line below if you'd like GitHub Copilot to generate a
summary from your commit -->
<!--
copilot:summary
-->
### <samp>🤖 Generated by Copilot at 930d3b2</samp>

This file adds a modal component to the advanced settings page that
allows users to toggle and customize AMP integration for their site. It
uses the `settings` API and React hooks to handle the modal logic and
state.
2023-08-16 14:40:10 +02:00
Ronald Langeveld
0da4653f3a
Wired up Unsplash integration to Admin X (#17727)
closes https://github.com/TryGhost/Product/issues/3741
refs https://github.com/TryGhost/Product/issues/3729

- my first commit with some Admin X stuff! 🕺🏻
- Wired up the API to the Unsplash integration modal

---

<!-- Leave the line below if you'd like GitHub Copilot to generate a
summary from your commit -->
<!--
copilot:summary
-->
### <samp>🤖 Generated by Copilot at da09dd4</samp>

This pull request adds a toggle to the Unsplash modal in the advanced
settings to enable or disable the Unsplash integration. It also updates
the settings API hook to include the Unsplash setting in the query.
2023-08-16 13:22:30 +02:00
Shaun Roselt
3e683c2f06
Added Japanese to list of supported languages (#17724)
fixes https://github.com/TryGhost/Ghost/issues/17715

- `ja` was missing from the list of supported locales
- also fixes some small typos discovered now the language is supported

Co-authored-by: Daniel Lockyer <hi@daniellockyer.com>
2023-08-16 09:44:01 +00:00
Naz
49a4a60d82 Fixed posts Content API test run in isolation
closes https://github.com/TryGhost/Arch/issues/76

- The posts test suite was failing when run in isolation. This was due to "collections" labs flag not being turned on, the events were not going through to collections service correctly
2023-08-16 16:07:01 +08:00
renovate[bot]
15143d2961 Update storybook monorepo to v7.3.0 2023-08-16 09:50:20 +02:00
renovate[bot]
e1d92d642a Update dependency postcss to v8.4.28 2023-08-16 06:08:42 +02:00
renovate[bot]
c9d687db60 Update dependency i18next-parser to v8.6.0 2023-08-16 06:08:27 +02:00