Commit Graph

7188 Commits

Author SHA1 Message Date
renovate[bot]
a13e36e6ff Update dependency broccoli-funnel to v3.0.8 (#2011)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-21 09:56:30 +01:00
renovate[bot]
0dca4580ab Update dependency @sentry/ember to v6.7.1 (#2009)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-21 09:56:16 +01:00
renovate[bot]
88b137fc28 Update dependency ember-cli-inject-live-reload to v2.1.0 (#2007)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-21 09:55:37 +01:00
Rishabh Garg
274044e253 Added UI for portal products (#2010)
refs https://github.com/TryGhost/Team/issues/768

- adds portal products selection UI behind flag on portal settings screen
2021-06-21 14:21:48 +05:30
Rishabh
cde942f5bc Updated product benefits handling
refs https://github.com/TryGhost/Team/issues/792

- adds list of product benefits, if available, to main memebrship screen
- updates benefits management on product detail screen
2021-06-21 14:06:17 +05:30
Rishabh
dc6b2884f1 Added model and validator for product's benefit item
refs https://github.com/TryGhost/Team/issues/792

- updates product model to read product's list of benefits
- adds transformer to return emberArray with list of product benefits
- adds new model for each product benefit
- adds validator for new product benefit
2021-06-21 14:05:01 +05:30
Rishabh
e5a24c8bb3 Wired removing complimentary product action to API
refs https://github.com/TryGhost/Team/issues/769

- wired removing comp product action button to API, allowing removing comped subscription for member
2021-06-21 12:32:20 +05:30
Renovate Bot
129377a59a Update dependency eslint to v7.29.0 2021-06-18 21:16:59 +00:00
Kevin Ansfield
fc21cd836a 🎨 Opened member email settings up to Administrator staff users
no issue

- previously only Owner staff users could access the email settings screens despite Administrators having server-side permissions to change the related settings
2021-06-18 18:43:38 +01:00
Sanne de Vries
4961b35692 Added feature image caption to newsletter template preview 2021-06-18 18:50:20 +02:00
Sanne de Vries
e2a136609a Updated email design settings layout 2021-06-18 17:22:23 +02:00
Peter Zimon
821c087871 Refined complimentary for multiple products (alpha) 2021-06-18 16:58:00 +02:00
Rishabh
9b228659da Added dummy benefits section to products
refs https://github.com/TryGhost/Team/issues/792

- adds new hardcoded benefits section as prototype in Products modal
2021-06-18 19:09:14 +05:30
Kevin Ansfield
d96046cf1b Handled SecurityError when accessing iframe in <GhSiteIframe>
no issue

- when a site has a separate front-end and admin URL the `site` screen could throw errors due to cross-origin access to the iframe content
- detect the error and fall back to a less efficient forced refresh on guid change
2021-06-18 13:08:19 +01:00
Rishabh
176ed4a260 Fixed member product modal not closing
no refs

- Added missing close handling for member product modal
2021-06-18 16:28:53 +05:30
Rishabh
bc25dbdefa Fixed modal errors in stripe connect and member product
refs 909bd60db3

- The modal actions for glimmer modal components need to define `actions.confirm` separately and add confirmAction to handle both enter and manual confirmation
2021-06-18 16:24:18 +05:30
Kevin Ansfield
922e4e6b32 Fixed unhandled errors from billing app for non-owner users
no issue

- if the identities endpoint returned an expected 403 for non-owner/admin users we weren't handling it resulting in an error that could bubble up into error reporting services
2021-06-18 10:34:30 +01:00
Kevin Ansfield
909bd60db3 Fixed errors when enter key is pressed in modals
no issue

- enter key when a modal is displayed will always trigger the `confirm` action, if it's not provided then the base modal will throw a `You must override the "confirm" action ...` error
2021-06-18 10:12:46 +01:00
Peter Zimon
178733a521 Added benefits container to add/edit product (alpha) 2021-06-18 10:51:10 +02:00
Kevin Ansfield
c1841fd58b Removed unused from address confirmation modal component
no issue

- email send confirmation and instructions are shown inline rather than a modal meaning this component wasn't being used
2021-06-18 09:46:38 +01:00
Kevin Ansfield
1447a57aa8 Fixed enter key in brand accent form triggering error
no issue

- pressing enter in the accent field would attempt to submit the form and trigger the confirm action
- no confirm action was present on the modal component meaning the base modal confirm action would trigger a invalid usage error
- we don't want enter in the accent field to save, instead we want to blur the element and trigger a preview update
2021-06-18 09:42:32 +01:00
Kevin Ansfield
a41cb42a87 First pass at fixed rather than popover post settings sidebar
refs https://github.com/TryGhost/Team/issues/786

Enabled through labs `psmRedesign` flag, rough implementation to help design direction.

- fixed rather than popover when opened by putting editor and sidebar inside a flex container
- settings toggle fixed in top right rather than separate close button
2021-06-17 19:00:59 +01:00
Kevin Ansfield
dc1caf0b29 Removed usage of SettingsMenuMixin in post settings menu
no issue

- the post settings menu is the only component that uses the mixin so it makes sense to inline it, especially as mixins are deprecated and the mixin's utility is minimal and already overridden in places
2021-06-17 16:45:13 +01:00
Kevin Ansfield
4482aa5395 Added alpha labs flag for PSM redesign
refs https://github.com/TryGhost/Team/issues/786

- adds flag checkbox to labs page
- duplicates psm component ready for changes
2021-06-17 14:10:32 +01:00
Kevin Ansfield
18c9da0bf0 Fixed capitalisation inconsistency for Post Title
no issue

- out title standard is to only capitalise the first word rather than every word
2021-06-17 12:12:31 +01:00
Peter Zimon
d5a4be4ea1 Small UI refinement for benefits alpha 2021-06-17 11:18:26 +02:00
Peter Zimon
b82ab6b2f6 Added static benefits list to products card 2021-06-17 11:11:17 +02:00
Rishabh Garg
aa35d99de4 Add UI for complimentary products with multiple products feature (#2008)
* Added v1 comped subscription handling

* Cleanup

* Added cancellation for existing subscriptions

* Added loader for fetching products

* Refined complimentary popup

* Added default product selection

* Updated add complimentary for multiple products

* Updated products add comped button

Co-authored-by: Peter Zimon <zimo@ghost.org>
2021-06-17 13:09:43 +05:30
Kevin Ansfield
182cd106e5 Added retry button to feature image uploader
refs https://github.com/TryGhost/Team/issues/771

- allows for getting out of the error state so an upload can be re-attempted
2021-06-16 18:08:22 +01:00
Kevin Ansfield
0d30077325 Switched to new component for labs feature image redesign
refs https://github.com/TryGhost/Team/issues/771

- added `<GhEditorFeatureImage>` for more flexibility than offered by `<GhImageUploaderWithPreview>`
  - updated to more closely match intended designs
- removed alt/caption support from `<GhImageUploaderWithPreview>` as it's no longer used
- fixed upload/delete/upload not working due to file input references getting out of sync
2021-06-16 17:56:25 +01:00
Peter Zimon
628a482c3a Added cancellation reason to Members details
refs. https://github.com/TryGhost/Team/issues/780
2021-06-15 13:30:56 +02:00
Kevin Ansfield
ba47b710cb 🎨 Moved default focus in editor from body to title for new posts
refs https://github.com/TryGhost/Team/issues/707

Placing focus in the title aligns better with typical editorial process.

- switched `autofocus` attribute from body to title for new posts
- added a default value to the `mobiledoc` attr on the Post model, without it the autosave when moving from title to editor creates a forced re-render and clears the focus whilst you're typing
2021-06-14 15:35:59 +01:00
Kevin Ansfield
811ef34f2a Lock file maintenance 2021-06-14 14:46:50 +01:00
renovate[bot]
c5764ab84a Update dependency @tryghost/members-csv to v1.0.1 (#1990)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:46:08 +01:00
renovate[bot]
acbcd436a9 Update dependency @tryghost/timezone-data to v0.2.44 (#2002)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:44:58 +01:00
renovate[bot]
3457468af9 Update dependency @tryghost/helpers to v1.1.46 (#2001)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:44:40 +01:00
renovate[bot]
7dff13392f Update dependency @tryghost/limit-service to v0.6.1 (#2000)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:43:06 +01:00
renovate[bot]
b59e959ee6 Update dependency @ember/jquery to v2 (#2004)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:42:00 +01:00
renovate[bot]
038463e6c6 Update dependency walk-sync to v3 (#2006)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:35:28 +01:00
renovate[bot]
c1da1fe862 Update dependency broccoli-funnel to v3.0.7 (#2005)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:35:13 +01:00
renovate[bot]
30927c6d68 Update dependency @sentry/ember to v6.7.0 (#2003)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-06-14 13:34:55 +01:00
Peter Zimon
71e347b72c Updated product price styles 2021-06-14 14:05:49 +02:00
Kevin Ansfield
1b85b9244b Updated email previews to show full from email address
no issue

- moved duplicated email domain generation from `members-email` controller and `<GhMembersEmailSetting>` to `config.emailDomain`
- added `{{from-email-address emailStr}}` helper that will output the passed in emailStr value if it contains an `@` or concat `emailStr@emailDomain` if it doesn't - lets us use `settings.membersFromAddress` to always get a full email address when it could be just a name (`noreply`) or a full address
- updated customise email and post email preview templates to use the new helper
2021-06-11 16:42:27 +01:00
Sanne de Vries
f837eb5630 Updated email template settings and preview 2021-06-11 16:40:56 +02:00
Kevin Ansfield
645fd18a80 Fixed syntax error 2021-06-11 12:22:12 +01:00
Kevin Ansfield
9adfad67d2 Added <GhMembersFilterCount @filter="..." />
no issue

- added generic members filter component
- updated `<GhRecipientFilterCount />` to use the new generic component with `subscribed:true` added to the filter
2021-06-11 12:19:44 +01:00
Kevin Ansfield
937eac51ad Fixed "and sent to..." text appearing in scheduled header when not sending
refs bd60c8089b

- added conditional for displaying the recipient text
- fixed tests not expecting newlines in html
2021-06-11 12:10:28 +01:00
Kevin Ansfield
bd60c8089b 🐛 Fixed confusing member count shown in save notification and editor header
closes https://github.com/TryGhost/Team/issues/776

Since switching to using a real NQL filter in the `posts.email_recipient_filter` field where we used to show `free members`, `paid members`, or `all members` we were showing `status:free`, `status:-free`, and `status:free,status:-free` respectively. If labels are used in a filter the text became even longer.

- added a `membersCountCache` service
  - `.count(filter)` fetches a numeric count from the members API, if the filter has been counted in the last minute it returns the count directly from a cache instead to avoid hammering the members API when we show counts in multiple places across the UI
  - `.countString(filter)` fetches a count but returns a humanized string with the logic extracted from what we displayed in the confirm email sending modal
- added a `<GhRecipientFilterCount @filter="" />` component that acts as a wrapper around the async count from `membersCountCache`
- updated confirm email send modal, plus save notification and editor status displays for scheduled posts to use the new service and component
2021-06-11 11:44:50 +01:00
Peter Zimon
505eee29ef Fixed settings description line-height 2021-06-11 11:20:49 +02:00
Daniel Lockyer
b284e2e4da 🐛 Fixed sticky "unsaved settings" modal
fixes https://github.com/TryGhost/Team/issues/777

- the unsaved settings modal would come back if you left a settings
  sub-page with unsaved changes and then came back to the page
- if you then clicked on "Leave", Admin would crash with a Sentry error
  of `Cannot read property 'finally' of undefined`
- we had a similar bug in
  39c850f4fe
  and the fix was to remove the `.finally` because it assumed the
  confirm action returned a promise
- this commit performs a similar fix and seems to resolve the problem
2021-06-11 09:15:27 +01:00