Fixed tier archive not updating portal preview

The tier visibility is now handled by visibility property on object, this change ensures portal preview is updated on a tier archive to show the correct Portal UI.

ghost/admin/app/components/gh-membership-products-alpha.hbs

@@ -30,6 +30,7 @@
             @product={{product}}
             @openEditProduct={{this.openEditProduct}}
             @onUnarchive={{this.onUnarchive}}
+            @onArchive={{this.onArchive}}
         />
     {{/each}}
     {{#if (eq this.type "active" )}}

ghost/admin/app/components/gh-membership-products-alpha.js

@@ -60,6 +60,12 @@ export default class extends Component {
     @action
     async onUnarchive() {
         this.type = 'active';
+        this.args.updatePortalPreview();
+    }
+
+    @action
+    async onArchive() {
+        this.args.updatePortalPreview();
     }
 
     @action

ghost/admin/app/components/gh-product-card.hbs

@@ -84,6 +84,7 @@
                             <Settings::Members::ArchiveTier
                                 @product={{@product}}
                                 @onUnarchive={{@onUnarchive}}
+                                @onArchive={{@onArchive}}
                             />
                         </li>
                     {{/if}}

ghost/admin/app/components/modal-portal-settings.js

@@ -52,7 +52,9 @@ export default ModalComponent.extend({
     portalPreviewUrl: computed('page', 'model.products.[]', 'changedProducts.[]', 'membersUtils.{isFreeChecked,isMonthlyChecked,isYearlyChecked}', 'settings.{portalName,portalButton,portalButtonIcon,portalButtonSignupText,portalButtonStyle,accentColor,portalPlans.[]}', function () {
         const options = this.getProperties(['page']);
         options.portalProducts = this.model.products?.filter((product) => {
-            return product.get('visibility') === 'public' && product.get('type') === 'paid';
+            return product.get('visibility') === 'public'
+                && product.get('active') === true
+                && product.get('type') === 'paid';
         }).map((product) => {
             return product.id;
         });

ghost/admin/app/components/modals/tiers/archive.js

@@ -13,11 +13,13 @@ export default class ArchiveTierModalComponent extends Component {
 
     @task({drop: true})
     *archiveTierTask() {
-        const {product} = this.args.data;
+        const {product, onArchive} = this.args.data;
         product.active = false;
+        product.visibility = 'none';
 
         try {
             yield product.save();
+            onArchive?.();
             return product;
         } catch (error) {
             if (error) {

ghost/admin/app/components/settings/members/archive-tier.js

@@ -20,7 +20,8 @@ export default class ArchiveTierComponent extends Component {
     handleArchiveTier() {
         if (!this.product.isNew) {
             this.modals.open('modals/tiers/archive', {
-                product: this.product
+                product: this.product,
+                onArchive: this.args.onArchive
             }, {
                 className: 'fullscreen-modal fullscreen-modal-action fullscreen-modal-wide'
             });

ghost/admin/app/controllers/settings/membership.js

@@ -266,10 +266,20 @@ export default class MembersAccessController extends Controller {
         let isMonthlyChecked = portalPlans.includes('monthly');
         let isYearlyChecked = portalPlans.includes('yearly');
 
+        const products = this.store.peekAll('product');
+        const portalProducts = products?.filter((product) => {
+            return product.get('visibility') === 'public'
+                && product.get('active') === true
+                && product.get('type') === 'paid';
+        }).map((product) => {
+            return product.id;
+        });
+
         const newUrl = new URL(this.membersUtils.getPortalPreviewUrl({
             button: false,
             monthlyPrice,
             yearlyPrice,
+            portalProducts,
             currency: this.currency,
             isMonthlyChecked,
             isYearlyChecked,

ghost/admin/app/templates/settings/membership.hbs

@@ -169,6 +169,7 @@
                             {{else}}
                                 {{#if (feature "multipleProducts")}}
                                     <GhMembershipProductsAlpha
+                                        @updatePortalPreview={{this.updatePortalPreview}}
                                         @products={{this.paidProducts}}
                                         @confirmProductSave={{this.confirmProductSave}}
                                     />