Disable shops

imports/plugins/core/dashboard/client/containers/toolbarContainer.js

@@ -51,7 +51,12 @@ function composer(props, onData) {
 
   if (user && user.roles) {
     // Get all shops for which user has roles
-    shops = Shops.find({ _id: { $in: Object.keys(user.roles) } }).fetch();
+    shops = Shops.find({
+      $and: [
+        { _id: { $in: Object.keys(user.roles) } },
+        { $or: [{ "workflow.status": "active" }, { _id: Reaction.getPrimaryShopId() }] }
+      ]
+    }).fetch();
   }
 
   // Standard variables

imports/plugins/included/product-variant/containers/productsContainer.js

@@ -8,7 +8,7 @@ import { Reaction } from "/client/api";
 import { ITEMS_INCREMENT } from "/client/config/defaults";
 import { ReactionProduct } from "/lib/api";
 import { applyProductRevision } from "/lib/api/products";
-import { Products, Tags } from "/lib/collections";
+import { Products, Tags, Shops } from "/lib/collections";
 import ProductsComponent from "../components/products";
 
 /**
@@ -166,9 +166,17 @@ function composer(props, onData) {
     window.prerenderReady = true;
   }
 
+  const activeShopsIds = Shops.find({
+    $or: [
+      { "workflow.status": "active" },
+      { _id: Reaction.getPrimaryShopId() }
+    ]
+  }).fetch().map(activeShop => activeShop._id);
+
   const productCursor = Products.find({
     ancestors: [],
-    type: { $in: ["simple"] }
+    type: { $in: ["simple"] },
+    shopId: { $in: activeShopsIds }
   });
 
   const products = productCursor.map((product) => {

server/publications/collections/products.js

@@ -95,6 +95,14 @@ Meteor.publish("Products", function (productScrollLimit = 24, productFilters, so
     return this.ready();
   }
 
+  // Get active shop id's to use for filtering
+  const activeShopsIds = Shops.find({
+    $or: [
+      { "workflow.status": "active" },
+      { _id: Reaction.getPrimaryShopId() }
+    ]
+  }).fetch().map(activeShop => activeShop._id);
+
   // if there are filter/params that don't match the schema
   // validate, catch except but return no results
   try {
@@ -278,7 +286,7 @@ Meteor.publish("Products", function (productScrollLimit = 24, productFilters, so
       $in: [true, false, null, undefined]
     };
     selector.shopId = {
-      $in: userAdminShopIds
+      $in: activeShopsIds
     };
 
     // Get _ids of top-level products
@@ -517,20 +525,11 @@ Meteor.publish("Products", function (productScrollLimit = 24, productFilters, so
     });
   }
 
-  // Get disabled shop id's to use for filtering
-  const disabledShopIds = Shops.find({
-    "workflow.status": {
-      $in: ["disabled", "archived"]
-    }
-  }, {
-    fields: { _id: 1 }
-  }).map((shop) => shop._id);
-
-  // Adjust the selector to exclude all disabled shops
+  // Adjust the selector to include only active shops
   newSelector = {
     ...newSelector,
     shopId: {
-      $nin: disabledShopIds
+      $in: activeShopsIds
     }
   };