Commit Graph

788 Commits

Author SHA1 Message Date
Ronald Langeveld
3c4b981674
🐛 Fixed outside click exiting Code Injection modal (#19424)
no issue

- fixed a bug causing the full screen code injection to close when
clicking out side of it, which could cause the loss of unsaved changes.
2024-01-05 10:53:57 +00:00
Sodbileg Gansukh
3e98dd9edf
Simplified offers table UI (#19439)
fixes PROD-283
2024-01-04 10:45:44 +00:00
Sodbileg Gansukh
3611e99422
Close offer modal after archiving/reactivating (#19437)
fixes PROD-284
2024-01-04 02:17:53 +00:00
Sodbileg Gansukh
af1551bf8f
Moved learn more link to a separate line in Offers setting group (#19428)
fixes PROD-281
2024-01-03 06:57:32 +00:00
Jono M
51ee276e97
Updated files with mixed named/default exports to use only named exports (#19385)
no issue

Fixes a warning in yarn dev
2023-12-14 16:01:28 +00:00
Princi Vershwal
62a5b7d61a
Removed onBlur error feedback in Recommendation edit modal (#19382)
Fixes
[PROD-266](https://linear.app/tryghost/issue/PROD-266/remove-onblur-error-feedback-in-recommendation-edit-modal)
2023-12-14 13:09:55 +00:00
Princi Vershwal
e0aca1c2fb
Removed onBlur error feedback in Custom Integration/Webhook modal (#19384)
Fixes
[PROD-269](https://linear.app/tryghost/issue/PROD-269/remove-onblur-error-feedback-in-custom-integration-webhook-modal)
2023-12-14 12:46:37 +00:00
Princi Vershwal
82d9e3a978
Removed onBlur error feedback in Custom Integration edit modal (#19383)
Fixes
[PROD-268](https://linear.app/tryghost/issue/PROD-268/remove-onblur-error-feedback-in-custom-integration-edit-modal)
2023-12-14 12:30:07 +00:00
Princi Vershwal
8d3f3d60f7
Removed onBlur error feedback on Tier detail modal (#19381)
Fixes
[PROD-265](https://linear.app/tryghost/issue/PROD-265/remove-onblur-error-feedback-on-tier-detail-modal)
2023-12-14 11:53:35 +00:00
Princi Vershwal
bb42faf694
Removed onBlur error feedback in Newsletter General settings (#19379)
Fixes PROD-267
2023-12-14 11:44:05 +00:00
Ronald Langeveld
0dc4ac380c
Portal Iframe Improvements in Admin X (#19377)
refs PROD-4

- removed unnecessary props passed into the PortalFrame component.
2023-12-14 09:42:30 +02:00
Princi Vershwal
3fef668394
Validation fix: Corrected fields should revert back from error-state (#19376)
Fixes PROD-278
2023-12-14 07:03:20 +00:00
Princi Vershwal
7b0ec35a1f
Fixed validation error: Corrected fields should revert back from erro… (#19374)
Fixes
[PROD-272](https://linear.app/tryghost/issue/PROD-272/corrected-fields-should-revert-back-from-error-state)
2023-12-14 05:32:50 +00:00
Ronald Langeveld
275cdd4db9
Added performance adjustments to Portal iFrames (#19373)
refs PROD-4
2023-12-14 06:54:39 +02:00
Djordje Vlaisavljevic
69a8f71bd1 Switched checkbox to a hint showing status
refs PROD-276
2023-12-13 16:58:50 +00:00
Djordje Vlaisavljevic
b0ac1e9afd Hid price preselect dropdown when only monthly or yearly are shown
refs PROD-275
2023-12-13 16:58:50 +00:00
Djordje Vlaisavljevic
b97f91f408 Changed portal settings to show free tier name instead of "Free"
refs PROD-255
2023-12-13 16:58:50 +00:00
Sodbileg Gansukh
f00b342e83
Fixed number formatting of offer redemptions count (#19365)
fixes PROD-274

- corrected plural form of the label
- added number formatting
2023-12-13 15:38:53 +00:00
Sodbileg Gansukh
6462f8f2ab
Fixed minor design issues in offers (#19363)
fixes PROD-271, PROD-273
2023-12-13 15:26:28 +00:00
Peter Zimon
58d9b8e382
Update migration in settings (#19278)
refs.
7b40393d77

We're improving the usability and possibilities for publishers to
migrate from other platforms such as Substack, Medium or Mailchimp. This
PR applies changes to Ghost Settings to support the new flows, more
specifically:

- moves import and export functions out of Labs to its own setting,
directly available from search and the menu
- adds direct access to various platform migrations
- moves "Delete all content" to a dedicated setting group at the bottom
of all setting

---------

Co-authored-by: Jono Mingard <reason.koan@gmail.com>
2023-12-13 16:25:29 +01:00
Ronald Langeveld
f23767fe12
Fixed offers asc/desc sorting not updating in component (#19361)
refs
https://linear.app/tryghost/issue/PROD-8/when-i-sort-by-name-→-click-into-an-offer-→-go-back-to-the-list-it
2023-12-13 13:46:11 +00:00
Princi Vershwal
f29d7975a8
Removed validation onBlur (#19358)
Fixes
[PROD-209](https://linear.app/tryghost/issue/PROD-209/when-an-input-is-focused-and-a-modal-is-closed-error-messages-are)
2023-12-13 11:07:15 +00:00
Daniel Lockyer
a9c9202b5c Added defaults to Nx build step
refs https://github.com/TryGhost/DevOps/issues/122

- this allows us to DRY up some of the other configuration we have
  dotted around and fixes a niche bug with overlapping builds that we
  were seeing before, because Nx should only allow one build at a time
2023-12-13 11:54:31 +01:00
Daniel Lockyer
efec8b5fba Enabled concurrent execution of tsc and Vite build
refs https://github.com/TryGhost/DevOps/issues/122

- this runs the Vite build and Typescript type checking concurrently,
  which will speed up the total time to build
2023-12-13 11:54:31 +01:00
Ronald Langeveld
286194d61a
Added global state to avoid losing sorting state in Offers (#19355)
refs
https://linear.app/tryghost/issue/PROD-8/when-i-sort-by-name-→-click-into-an-offer-→-go-back-to-the-list-it


- we now handle the state via a global state to ensure we aren't resetting the sorting options after each rerender.
2023-12-13 12:25:06 +02:00
Sodbileg Gansukh
be47817ca0
Dark mode improvements for offers success screen (#19356) 2023-12-13 10:20:47 +00:00
Daniel Lockyer
fc02ca8bbb Reverted "Update Vite packages"
refs https://ghost.slack.com/archives/C0568LN2CGJ/p1702454781859679

- this reverts commit cf60db85d8 as we've
  seen issues with the `vite-plugin-css-injected-by-js` dependency
2023-12-13 09:24:29 +01:00
renovate[bot]
9f9f6d0526 Update dependency @types/react to v18.2.45 2023-12-13 08:59:33 +01:00
Sodbileg Gansukh
3713273560
Dark mode improvements for offers (#19352)
fixes PROD-262, PROD-261
2023-12-13 07:40:40 +00:00
renovate[bot]
981b8fc814 Update dependency @types/react to v18.2.44 2023-12-13 08:23:09 +01:00
Princi Vershwal
830967d2ed
Edit cancle button fix (#19350)
Fixes:
[PROD-213](https://linear.app/tryghost/issue/PROD-213/cancelling-should-act-two-ways-when-the-modal-is-opened-from-the-list)
2023-12-13 07:16:26 +00:00
Sodbileg Gansukh
b7648e7bc2
Added design improvements to the Portal preview in offers (#19349)
fixes PROD-251, PROD-252, PROD-254
2023-12-13 06:17:12 +00:00
Princi Vershwal
7d530406f6
Add offer cancel button fix (#19348)
Ref
[PROD-213](https://linear.app/tryghost/issue/PROD-213/cancelling-should-act-two-ways-when-the-modal-is-opened-from-the-list)
2023-12-13 05:48:48 +00:00
renovate[bot]
cf60db85d8 Update Vite packages 2023-12-12 18:23:37 +01:00
Sodbileg Gansukh
03fd494e84
Hide copy link feature when there's no offer code (#19335)
fixes PROD-253
2023-12-12 15:57:55 +00:00
Sodbileg Gansukh
0a5c61acb2
Removed linking when there's no redemptions (#19332)
fixes PROD-250
2023-12-12 15:37:50 +00:00
Djordje Vlaisavljevic
5c19249473
Added yearly discount indicator to monthly/yearly toggle PROD-60 PROD-222 PROD 223 (#19276)
refs PROD-60, PROD-222, PROD-223, PROD-89, PROD-94

- Indicator shows up in the monthly/yearly toggle if there are any paid
tiers with yearly discount, and shows the highest discount in order to
nudge visitors towards checking out yearly plan
- A couple of smaller portal improvements: typos, spacing, alignment

---------

Co-authored-by: Simon Backx <simon@ghost.org>
2023-12-12 09:32:56 +00:00
Princi Vershwal
c1c3775748
Revert "Add offer cancle button fix" (#19324)
Reverts TryGhost/Ghost#19297
2023-12-12 07:27:17 +00:00
Sodbileg Gansukh
c932e9d60e
Updated copy of the add offer link in the settings group (#19323) 2023-12-12 12:28:53 +07:00
Sodbileg Gansukh
742a743a6b
Removed extra div when there's no offers to show in the settings group (#19322) 2023-12-12 05:03:43 +00:00
Daniël van der Winden
8c5c773398
Fixed white icon bg's in tier list in dark mode (#19310)
Closes issue https://github.com/TryGhost/Ghost/issues/18872

Solves the problem of the bg-white class showing a white background
behind the checkmark icons in the tier list.
2023-12-11 17:13:46 +01:00
Jono M
9ff482f985
Updated AdminX routing to work with and without a leading slash (#19312)
no issue
2023-12-11 14:43:06 +00:00
Ronald Langeveld
4c09a96a3c
Changed request type to fetching iframe content in previews (#19307)
refs PROD-227

- Swapped out the request type from `POST` to `GET`.
2023-12-11 14:28:35 +00:00
Jono M
8ab693d74d
Fixed wrong credentials usage in AdminX previews (#19281)
refs PROD-227
2023-12-11 14:01:53 +00:00
renovate[bot]
29f9322cf3 Update dependency @types/react to v18.2.43 2023-12-11 09:49:06 +01:00
Princi Vershwal
5cb3ec6e0b
Add offer cancle button fix (#19297)
Fixes PROD-213
2023-12-11 04:40:35 +00:00
Ronald Langeveld
181c5c0920
Changed code injection to full screen editor. (#19259)
fixes PROD-7
https://ghost.slack.com/archives/C0568LN2CGJ/p1701690959138659

- Changed the code injector editor to only use the full screen editor in
its own modal.

---------

Co-authored-by: Peter Zimon <peter.zimon@gmail.com>
2023-12-08 09:11:52 +02:00
Sag
a5dcae80e7
Updated copy during email verification in newsletter settings (#19265)
fixes PROD-202
2023-12-06 19:56:25 +00:00
Djordje Vlaisavljevic
813abb06e2
Moved hint content to placeholders for consistency PROD-204, PROD-203 (#19261)
refs PROD-204, PROD-203

- Moved fallback value information from hints to placeholders for
consistency and cleaner layout
- Changed setting section label
2023-12-06 17:06:21 +00:00
Simon Backx
3bc068123c
Wired up checkbox to toggle tier visibility (#19260)
fixes PROD-200
2023-12-06 17:36:18 +01:00
Simon Backx
3f6ea04c43
Added portal default plan setting (#19238)
fixes PROD-61

This adds a new default plan setting. It defaults to yearly, which is
the current default selected interval in Portal.

Behind the new portal improvements feature flag, the default plan can be
changed. It will also change automatically if the available intervals
are changed.

This PR also wires up passing the new setting to the Portal preview.
2023-12-06 11:39:58 +01:00
Princi Vershwal
a38aef7522
Validation fix (#19256)
Fixes PROD-208
2023-12-06 10:38:05 +00:00
Princi Vershwal
60d142202b
Remove validation error once user start typing (#19251)
Ref
[PROD-15](https://linear.app/tryghost/issue/PROD-15/validation-issues)
2023-12-06 13:32:21 +05:30
Princi Vershwal
5a4d98e90d
Show Add offer button on settings screen if no offer is present (#19215)
Ref
[PROD-3](https://linear.app/tryghost/issue/PROD-3/settings-group-navigation-handling)
2023-12-06 04:31:48 +00:00
Djordje Vlaisavljevic
9eed858e8e
Added static design for toggling showing new tier in portal PROD-66 (#19242)
refs PROD-66

---------

Co-authored-by: Sag <guptazy@gmail.com>
Co-authored-by: Jono M <reason.koan@gmail.com>
Co-authored-by: Steve Larson <9larsons@gmail.com>
Co-authored-by: Daniel Lockyer <hi@daniellockyer.com>
Co-authored-by: Aileen Booker <AileenCGN@gmail.com>
2023-12-05 18:53:05 +00:00
Sag
545cf8c258
Updated logic to allow a different name for the free tier (#19229)
fixes PROD-69
2023-12-05 18:05:16 +00:00
Jono M
960fde80db
Fixed missing link on upgrade modals (#19237)
refs PROD-5
2023-12-05 14:59:49 +00:00
renovate[bot]
5811dcaa41 Update Types packages 2023-12-04 22:05:57 +01:00
renovate[bot]
a1c292b683 Update dependency @vitejs/plugin-react to v4.2.1 2023-12-04 19:41:11 +01:00
Djordje Vlaisavljevic
f1511e6081 Added logic for disabled state for the dropdown
refs GRO-141
2023-12-04 18:16:23 +00:00
Djordje Vlaisavljevic
7026b28e17 Added static dropdown for selecting default price plan
refs GRO-141
2023-12-04 18:16:23 +00:00
Djordje Vlaisavljevic
36294c6482 Added feature flag for portal improvements
refs GRO-154
2023-12-04 18:16:23 +00:00
Jono M
ede2d9c1b7
Fixed loading and error handling bugs in portal settings (#19225)
fixes ADM-31
2023-12-04 15:25:58 +00:00
Peter Zimon
be925251b8
Added "support email address" keywords (#19224)
refs.
https://linear.app/tryghost/issue/ADM-59/add-support-and-email-address-to-portal-keywords

Searching for "support email address" (or any combination of this) in
Settings resulted in an empty screen. The setting is availble under
Portal which is pretty hidden so it should at least be searchable. This
PR sets up new search keywords for support email address in Settings.
2023-12-04 14:15:10 +00:00
Jono M
d77d31a2d0
Updated to refocus settings search field upon clearing it (#19220)
fixes ADM-48
2023-12-04 12:16:22 +00:00
renovate[bot]
3267eb9843 Update dependency vite to v4.5.1 2023-12-04 12:56:21 +01:00
renovate[bot]
72ed1cdec2 Update Types packages 2023-12-04 11:06:28 +01:00
Ronald Langeveld
24ab28a8fc
Hide Offers when Stripe is disabled in AdminX (#19217)
refs ADM-56

- Hides Offers from setting menus when Stripe is disabled on Admin X settings.
2023-12-04 10:10:36 +02:00
Djordje Vlaisavljevic
21a1dd6b8d Updated newsletter settings form
refs GRO-111, GRO-110
2023-11-30 18:46:14 +00:00
Djordje Vlaisavljevic
26d89d421c Updated reply-to address in newsletter preview
refs GRO-110
2023-11-30 18:46:14 +00:00
Jono M
cc4176f0bf
Updated AdminX error handling to display validation errors correctly (#19210)
fixes ADM-44
2023-11-30 16:47:59 +00:00
Simon Backx
2809703c76
Added hint to Reply-To field in newsletter detail modal (#19209)
ref GRO-110
2023-11-30 17:09:11 +01:00
Simon Backx
226900f040
Allow custom reply-to addresses for self-hosters and allow empty values (#19200)
fixes GRO-105

The newsletter value is mapped to an empty value when shown to the
users, this matches the backend behaviour.

When entering an empty value, this is stored internally as 'newsletter'.

The replyToInput component now uses its own state for the input value.
This avoids weird issues when the rendered value changes, e.g. when
entering the text 'support' or 'newsletter' in the field.
2023-11-30 16:14:36 +01:00
Jono M
642c7f39cd
Fixed bugs with newsletter creation in admin (#19201)
refs ADM-4
2023-11-30 15:07:02 +00:00
Sag
4cc615a5d3
Updated wording in the support email verification process (#19187)
fixes GRO-87

- also updated logic to use the calculated "support_email_address" in Portal settings
2023-11-30 11:58:12 -03:00
Jono M
1b75747ca0
Fixed hardcoded private RSS URL in settings (#19199)
refs ADM-16

---------

Co-authored-by: Peter Zimon <peter.zimon@gmail.com>
2023-11-30 14:45:37 +00:00
Djordje Vlaisavljevic
4284e4bcdc
Fixed default address in the hint (#19202)
fixes GRO-101
2023-11-30 15:22:41 +01:00
Sodbileg Gansukh
77e9ea987b
Design details for offers modal (#19208)
no issues

- consistent spacing between modal and preview modal
- no action button jumping between the modals
- cleaner stats section in the edit screen
2023-11-30 14:08:25 +00:00
Sodbileg Gansukh
9edffbffee
Renamed offer stat label (#19206)
fixes ADM-34
2023-11-30 12:45:33 +00:00
Jono M
4b2c4dd2b3
Updated offers summary to find the latest three with active tiers (#19177)
fixes ADM-19
2023-11-30 10:21:16 +00:00
Ronald Langeveld
6983699e1a
🐛 Fixed slash not working in Koenig link editor (#19198)
fixes ADM-43 https://github.com/TryGhost/Product/issues/4213

- The slash '/' search was firing when it wasn't suppose to, eg via the
URL editor inside the minimal koenig editors.
- this fix makes sure that if any input field has focus, that the slash
search function doesn't get fired.
2023-11-30 12:16:05 +02:00
Simon Backx
c07218dff4
Fixed reply-to dropdown when custom address was set (#19197)
fixes GRO-103

When a custom reply-to address was set using one of the new flags, and
those flags were disabled - the dropdown showed an empty value and
saving was broken because of this value.

This change automatically reverts back to 'newsletter' as a default
value when editing a newsletter with an invalid reply-to value.
2023-11-30 09:58:27 +00:00
Sodbileg Gansukh
d6e535d3b0
Moved the action buttons to top on offers list screen (#19195)
fixes ADM-42
2023-11-30 09:25:23 +00:00
Simon Backx
ab21b8ae1d
Allowed custom/empty replyTo for newsletters with managed sending domain (#19183)
fixes GRO-75
fixes GRO-100

And allow them to be empty
2023-11-30 09:16:03 +00:00
Sodbileg Gansukh
79081686b1
Disabled backdrop click for offers modals (#19194)
refs ADM-37

- backdrop click should be disabled for modals, especially when modals
contain user editable fields
- to make things consistent, all offers related modals are not closeable
by backdrop clicking
2023-11-30 08:56:29 +00:00
Sodbileg Gansukh
cdfe3843c3
Simplified offers modal navigation (#19193)
fixes ADM-36

- removed the breadcrumbs from the preview modals
- fixed spacing of button group
2023-11-30 07:49:58 +00:00
Sodbileg Gansukh
9914eb753b
Offers modal and preview improvements (#19192)
fixes ADM-20

- increased the width of the modals
- smaller width for the portal preview for better balance
2023-11-30 05:43:37 +00:00
Sodbileg Gansukh
63774463ce
Simplified offers list screen in AdminX (#19190)
fixes ADM-40

- removed layout switch feature, and made the list layout default
- removed the help link, because it will no longer be necessary on the
list screen
- fixed offers count in the table header
2023-11-30 04:23:48 +00:00
Sodbileg Gansukh
49eaee40f2
Settings overview improvements for offers in AdminX (#19189)
fixes ADM-38
2023-11-30 03:17:17 +00:00
Sodbileg Gansukh
d318093f55
Reorganized add and edit forms of offers in AdminX (#19188)
refs ADM-33, ADM-34, ADM-35
2023-11-30 10:35:55 +08:00
Sag
22c6527c49
Moved helpers for newsletter emails into a separate util (#19185)
no issue
2023-11-29 18:35:33 +00:00
Djordje Vlaisavljevic
57e767860d
Put newsletter preview header changes behind newEmailAddresses flag GRO-102 (#19184)
refs GRO-102
2023-11-29 16:57:51 +00:00
John O'Nolan
440c804213
Added notice of upcoming removal of AMP (#19178)
Google AMP is on the way out. In Ghost 5.0 we changed the integration's
default state to be `disabled`, and we have planned to remove it
completely in Ghost 6.0 for a while — but we haven't shared this
anywhere.

@gergelyorosz bumped into this today:
https://twitter.com/GergelyOrosz/status/1729778093777100973

This PR is to start communicating our intent to remove AMP in the next
major release of Ghost, by adding inline messaging to the integration
settings in Ghost Admin
2023-11-29 15:22:33 +00:00
Sodbileg Gansukh
e33fe08469
Fixed amount off dropdown selector position during validation error (#19176)
fixes ADM-29
2023-11-29 14:29:13 +00:00
Ronald Langeveld
9a6d71884b
Set negative pricing in Offers index to 0 (#19174)
fixes ADM-24

- sets a negative amount to 0
- this usually occurs if the tier amount was changed after the offer has
been created.
2023-11-29 16:10:10 +02:00
Sodbileg Gansukh
babbca1c19
Design improvements for offers success screen (#19172)
fixes ADM-25

- added an input field above the copy link button for more explicity
- consistent text for social media sharing
2023-11-29 12:43:57 +00:00
Ronald Langeveld
2f43f58010
Fixed flaky Offers tests (#19170)
refs https://ghost.slack.com/archives/C02G9E68C/p1701258027793649

- missing an `await` before the `expect` in the test causing it to be potentially flaky.
2023-11-29 13:55:54 +02:00
Simon Backx
3ef427a504
Fixed displaying empty from address in newsletter preview (#19169)
no issue

When the from address of a newsletter is empty, and a custom sending
domain is setup the preview would display 'From: Sitename ()' instead of
'From: Sitename (default@address)'.

When a custom sending domain was setup, but a different from address was
saved, we'll also no longer display it in the input fields - as it will
also be ignored IRL.
2023-11-29 10:59:53 +00:00
Ronald Langeveld
d3b0a26e4d
Updated Acceptance Tests for Offers in Admin X (#19167)
no issue

- Updated acceptance testing for offers in AdminX
2023-11-29 10:32:31 +00:00
Djordje Vlaisavljevic
494e0918fd
Updated newsletter settings GRO-76 GRO-90 (#19155)
refs GRO-76, GRO-90

- Reused `renderReplyToEmail` and `renderSenderEmail` from
`NewsletterDetailModal.tsx` like Simon suggested
- Changed Newsletter preview header in Newsletter settings to show
Reply-to address instead of the “To” mock placeholder
- When no custom sending domain is set, switched “Sender email address”
to disabled TextField for better visual rhythm
- Added a link to the help doc for (Pro) users without custom sending
domain set (the doc itself will still need to be updated though, but Sam
and the gang are already aware of this)
- When custom sending domain is set, added a hint about the default
value, which IMO is clearer than using a placeholder
2023-11-29 09:53:08 +00:00