Feat aldeed 5417 remove operator prefix

client/modules/core/main.js

@@ -349,20 +349,6 @@ export default {
     return "";
   },
 
-  /**
-   * @name getPrimaryShopSettings
-   * @method
-   * @memberof Core/Client
-   * @returns {Object} shop settings of the primary shop
-   */
-  getPrimaryShopSettings() {
-    const settings = Packages.findOne({
-      name: "core",
-      shopId: this.getPrimaryShopId()
-    }) || {};
-    return settings.settings || {};
-  },
-
   /**
    * @name getCurrentShop
    * @summary Get the proper current shop based on various checks. This mirrors the logic in
@@ -461,36 +447,6 @@ export default {
     return this.getShopId() === this.getPrimaryShopId();
   },
 
-  /**
-   * @name getShopName
-   * @method
-   * @memberof Core/Client
-   * @summary gets name of shop by provided shopId, or current active shop if shopId is not provided
-   * @param {String} providedShopId - shopId of shop to return name of
-   * @returns {String} - shop name
-   */
-  getShopName(providedShopId) {
-    const shopId = providedShopId || this.getShopId();
-    const shop = Shops.findOne({
-      _id: shopId
-    });
-    return shop && shop.name;
-  },
-
-  /**
-   * @name getShopSettings
-   * @method
-   * @memberof Core/Client
-   * @returns {Object} shop settings
-   */
-  getShopSettings() {
-    const settings = Packages.findOne({
-      name: "core",
-      shopId: this.shopId
-    }) || {};
-    return settings.settings || {};
-  },
-
   getShopLanguage() {
     const shopId = this.getShopId();
     const shop = Shops.findOne({ _id: shopId });
@@ -529,46 +485,17 @@ export default {
     return slug;
   },
 
-  /**
-   * @name getPackageSettings
-   * @method
-   * @memberof Core/Client
-   * @param {String} name package name
-   * @returns {Object} package settings
-   */
-  getPackageSettings(name) {
-    const shopId = this.getShopId();
-    const query = { name };
-
-    if (shopId) {
-      query.shopId = shopId;
-    }
-
-    return Packages.findOne(query);
-  },
-
-  /**
-   * @name getPackageSettingsWithOptions
-   * @method
-   * @memberof Core/Client
-   * @param {Object} options options to pass to query
-   * @returns {Object} package settings with options
-   */
-  getPackageSettingsWithOptions(options) {
-    const query = options;
-    return Packages.findOne(query);
-  },
-
   /**
    * @name allowGuestCheckout
    * @method
    * @memberof Core/Client
    * @returns {Boolean} is guest checkout allowed
    */
   allowGuestCheckout() {
-    const settings = this.getShopSettings();
+    const pkg = Packages.findOne({ name: "core", shopId: this.getShopId() }) || {};
+    const shopSettings = pkg.settings || {};
     // we can disable in admin, let's check.
-    return !!(settings.public && settings.public.allowGuestCheckout);
+    return !!(shopSettings.public && shopSettings.public.allowGuestCheckout);
   },
 
   /**
@@ -917,22 +844,5 @@ export default {
     }
     Logger.debug("getRegistryForCurrentRoute not found", template, provides);
     return {};
-  },
-
-  /**
-   * @name getMarketplaceSettings
-   * @method
-   * @memberof Core/Client
-   * @summary finds the enabled `reaction-marketplace` package for the primary shop and returns the settings
-   * @returns {Object} The marketplace settings from the primary shop or undefined
-   */
-  getMarketplaceSettings() {
-    const marketplaceSettings = Packages.findOne({
-      name: "reaction-marketplace",
-      shopId: this.getPrimaryShopId(), // the primary shop always owns the marketplace settings
-      enabled: true // only use the marketplace settings if marketplace is enabled
-    });
-
-    return marketplaceSettings && marketplaceSettings.settings;
   }
 };

client/modules/core/subscriptions.js

@@ -1,8 +1,4 @@
-import { Meteor } from "meteor/meteor";
-import { Tracker } from "meteor/tracker";
 import { SubsManager } from "meteor/meteorhacks:subs-manager";
-import Reaction from "./main";
-import { getUserId } from "./helpers/utils";
 
 export const Subscriptions = {};
 
@@ -14,28 +10,8 @@ Subscriptions.Manager = new SubsManager();
  * General Subscriptions
  */
 
-Tracker.autorun(() => {
-  const userId = getUserId();
-  Subscriptions.Account = Subscriptions.Manager.subscribe("Accounts");
-  Subscriptions.UserProfile = Meteor.subscribe("UserProfile", userId);
-});
-
-// Primary shop subscription
-Subscriptions.PrimaryShop = Subscriptions.Manager.subscribe("PrimaryShop");
-
-// This Packages subscription is used for the Active shop's packages
-Subscriptions.Packages = Subscriptions.Manager.subscribe("Packages");
-
-Subscriptions.Groups = Subscriptions.Manager.subscribe("Groups");
-
 Subscriptions.BrandAssets = Subscriptions.Manager.subscribe("BrandAssets");
-
-Tracker.autorun(() => {
-  // Reload Packages sub if shopId changes
-  // We have a persistent subscription to the primary shop's packages,
-  // so don't refresh sub if we're updating to primaryShopId sub
-  const shopId = Reaction.getShopId();
-  if (shopId && shopId !== Reaction.getPrimaryShopId()) {
-    Subscriptions.Packages = Subscriptions.Manager.subscribe("Packages", shopId);
-  }
-});
+Subscriptions.Groups = Subscriptions.Manager.subscribe("Groups");
+Subscriptions.MyAccount = Subscriptions.Manager.subscribe("MyAccount");
+Subscriptions.PrimaryShop = Subscriptions.Manager.subscribe("PrimaryShop");
+Subscriptions.UserProfile = Subscriptions.Manager.subscribe("UserProfile");

imports/client/ui/components/ProfileImageWithData/ProfileImageWithData.js

@@ -73,7 +73,7 @@ class ProfileImageWithData extends Component {
                 open={Boolean(menuAnchorEl)}
                 onClose={() => setMenuAnchorEl(null)}
               >
-                <Link to={"/operator/profile"}>
+                <Link to={"/profile"}>
                   <MenuItem>{i18next.t("admin.userAccountDropdown.profileLabel")}</MenuItem>
                 </Link>
                 <MenuItem onClick={() => Meteor.logout()}>{i18next.t("accountsUI.signOut")}</MenuItem>

imports/client/ui/components/ShopLogoWithData/ShopLogoWithData.js

@@ -125,7 +125,7 @@ ShopLogoWithData.propTypes = {
 };
 
 ShopLogoWithData.defaultProps = {
-  linkTo: "/operator",
+  linkTo: "/",
   shouldShowShopName: false,
   size: 60
 };

imports/client/ui/components/Sidebar/Sidebar.js

@@ -17,6 +17,7 @@ import withStyles from "@material-ui/core/styles/withStyles";
 import SettingsIcon from "mdi-material-ui/Settings";
 import CloseIcon from "mdi-material-ui/Close";
 import { Translation } from "/imports/plugins/core/ui/client/components";
+import useIsAppLoading from "/imports/client/ui/hooks/useIsAppLoading.js";
 import useCurrentShopId from "../../hooks/useCurrentShopId";
 import ShopLogoWithData from "../ShopLogoWithData";
 
@@ -107,6 +108,7 @@ function Sidebar(props) {
     routes
   } = props;
 
+  const [isAppLoading] = useIsAppLoading();
   const [currentShopId] = useCurrentShopId();
 
   const primaryRoutes = routes.filter(({ isNavigationLink, isSetting }) => isNavigationLink && !isSetting).sort(routeSort);
@@ -133,14 +135,14 @@ function Sidebar(props) {
   }
 
   let list;
-  if (currentShopId) {
+  if (!isAppLoading && currentShopId) {
     list = (
       <List disablePadding>
         {primaryRoutes.map((route) => (
           <NavLink
             activeClassName={!isSettingsOpen ? activeClassName : null}
             className={classes.link}
-            to={`/operator${route.path}`}
+            to={route.path}
             key={route.path}
             onClick={() => {
               setIsSettingsOpen(false);
@@ -170,7 +172,7 @@ function Sidebar(props) {
               const [firstRoute] = settingRoutes;
 
               if (firstRoute) {
-                history.push(`/operator${firstRoute.path}`);
+                history.push(firstRoute.path);
               }
             }
             setIsSettingsOpen(!isSettingsOpen);
@@ -192,7 +194,7 @@ function Sidebar(props) {
             <NavLink
               activeClassName={activeClassName}
               className={classes.link}
-              to={`/operator${route.path}`}
+              to={route.path}
               key={route.path}
               onClick={onDrawerClose}
             >

imports/client/ui/hooks/useAuth.js

@@ -31,7 +31,7 @@ export default function useAuth() {
       setLoggedIn(!!Reaction.getUserId());
 
       // Attempt to check if we are still loading this data
-      setLoading((hasDashboardAccessForAnyShop !== true && hasDashboardAccessForAnyShop !== false) || !shop);
+      setLoading((hasDashboardAccessForAnyShop !== true && hasDashboardAccessForAnyShop !== false));
 
       if (!hasStorefrontHomeUrl && !isLoading) {
         Logger.warn("Missing storefront home URL. Please set this from the shop settings panel so that customer users can be redirected to your storefront.");

imports/client/ui/hooks/useCurrentInternalShopId.js

@@ -0,0 +1,20 @@
+import { useState, useEffect } from "react";
+import { Tracker } from "meteor/tracker";
+import { Reaction } from "/client/api";
+
+/**
+ * React Hook that gets the globally current shop ID
+ * @return {Array} [currentShopId]
+ */
+export default function useCurrentInternalShopId() {
+  const [currentShopId, setCurrentShopId] = useState(null);
+
+  useEffect(() => {
+    Tracker.autorun(() => {
+      const shop = Reaction.getCurrentShop();
+      setCurrentShopId((shop && shop._id) || null);
+    });
+  });
+
+  return [currentShopId];
+}