From 3cf5d9acb1214dab41db377b9400fb761aabe2c2 Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 16:00:07 -0600
Subject: [PATCH 01/19] feat: new address validation rules table and form

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../AddressValidationSettingsForm.js          | 333 ++++++++++++++----
 .../ShopAddressValidationSettings.js          | 315 +++++++++--------
 .../ShopAddressValidationSettings.js          | 136 ++-----
 .../hoc/withAddressValidationServices.js      |  38 --
 .../client/hooks/useAddressValidationRules.js |  43 +++
 .../hooks/useAddressValidationServices.js     |  26 ++
 imports/plugins/core/address/client/index.js  |  12 +-
 7 files changed, 546 insertions(+), 357 deletions(-)
 delete mode 100644 imports/plugins/core/address/client/hoc/withAddressValidationServices.js
 create mode 100644 imports/plugins/core/address/client/hooks/useAddressValidationRules.js
 create mode 100644 imports/plugins/core/address/client/hooks/useAddressValidationServices.js

diff --git a/imports/plugins/core/address/client/components/AddressValidationSettingsForm.js b/imports/plugins/core/address/client/components/AddressValidationSettingsForm.js
index bd90ec83d1..58d2389e09 100644
--- a/imports/plugins/core/address/client/components/AddressValidationSettingsForm.js
+++ b/imports/plugins/core/address/client/components/AddressValidationSettingsForm.js
@@ -1,87 +1,276 @@
-import React, { Component } from "react";
+import React, { useState } from "react";
 import PropTypes from "prop-types";
-import { uniqueId } from "lodash";
-import { Form } from "reacto-form";
-import { i18next } from "/client/api";
-import ErrorsBlock from "@reactioncommerce/components/ErrorsBlock/v1";
-import Field from "@reactioncommerce/components/Field/v1";
-import MultiSelect from "@reactioncommerce/components/MultiSelect/v1";
-import Select from "@reactioncommerce/components/Select/v1";
+import i18next from "i18next";
+import { useMutation } from "@apollo/react-hooks";
+import gql from "graphql-tag";
+import { useSnackbar } from "notistack";
+import SimpleSchema from "simpl-schema";
+import Button from "@reactioncommerce/catalyst/Button";
+import Grid from "@material-ui/core/Grid";
+import MenuItem from "@material-ui/core/MenuItem";
+import TextField from "@material-ui/core/TextField";
+import { makeStyles } from "@material-ui/styles";
+import muiOptions from "reacto-form/cjs/muiOptions";
+import useReactoForm from "reacto-form/cjs/useReactoForm";
 
-/**
- * @summary The default form validator
- * @see http://composableforms.com/spec/validation/
- * @param {Object} doc The document to validate
- * @returns {Object[]} ReactoForm validation errors array
- */
-async function defaultValidator(doc) {
-  if (typeof doc.serviceName !== "string" || doc.serviceName.length === 0) {
-    return [{ name: "serviceName", message: "You must choose an address validation service" }];
+const createRuleMutation = gql`
+  mutation createRuleMutation($input: CreateAddressValidationRuleInput!) {
+    createAddressValidationRule(input: $input) {
+      addressValidationRule {
+        _id
+      }
+    }
   }
+`;
 
-  return [];
-}
+const deleteRuleMutation = gql`
+  mutation deleteRuleMutation($input: DeleteAddressValidationRuleInput!) {
+    deleteAddressValidationRule(input: $input) {
+      addressValidationRule {
+        _id
+      }
+    }
+  }
+`;
 
-export default class AddressValidationSettingsForm extends Component {
-  static propTypes = {
-    countryOptions: PropTypes.arrayOf(PropTypes.shape({
-      label: PropTypes.string.isRequired,
-      value: PropTypes.string.isRequired
-    })),
-    onChange: PropTypes.func,
-    onSubmit: PropTypes.func.isRequired,
-    serviceOptions: PropTypes.arrayOf(PropTypes.shape({
-      label: PropTypes.string.isRequired,
-      value: PropTypes.string.isRequired
-    })),
-    validator: PropTypes.func,
-    value: PropTypes.shape({
-      countryCodes: PropTypes.arrayOf(PropTypes.string),
-      serviceName: PropTypes.string.isRequired
-    })
-  };
+const updateRuleMutation = gql`
+  mutation updateRuleMutation($input: UpdateAddressValidationRuleInput!) {
+    updateAddressValidationRule(input: $input) {
+      addressValidationRule {
+        _id
+      }
+    }
+  }
+`;
 
-  static defaultProps = {
-    validator: defaultValidator
-  };
+const useStyles = makeStyles((theme) => ({
+  deleteButton: {
+    marginRight: theme.spacing(1)
+  },
+  rightAlignedGrid: {
+    textAlign: "right"
+  },
+  textField: {
+    marginBottom: theme.spacing(4),
+    minWidth: 350
+  }
+}));
 
-  uniqueInstanceIdentifier = uniqueId("AddressValidationSettingsForm");
+const formSchema = new SimpleSchema({
+  "countryCodes": {
+    type: Array,
+    optional: true
+  },
+  "countryCodes.$": String,
+  "serviceName": {
+    type: String,
+    min: 1
+  }
+});
+const validator = formSchema.getFormValidator();
 
-  submit() {
-    if (this.form) {
-      this.form.submit();
+/**
+ * @summary React component that renders the form for adding, updating, or deleting
+ *   a custom tax rate record.
+ * @param {Object} props React props
+ * @return {React.Node} React node
+ */
+export default function AddressValidationSettingsForm(props) {
+  const classes = useStyles();
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const { enqueueSnackbar } = useSnackbar();
+
+  const {
+    doc,
+    getSupportedCountryOptionsForService = () => [],
+    onSuccess = () => {},
+    serviceOptions,
+    shopId
+  } = props;
+
+  const [createRule] = useMutation(createRuleMutation, {
+    ignoreResults: true,
+    onCompleted() {
+      setIsSubmitting(false);
+      onSuccess();
+    },
+    onError() {
+      setIsSubmitting(false);
+      enqueueSnackbar(i18next.t("admin.taxSettings.shopCustomTaxRatesFailed"), { variant: "warning" });
     }
-  }
+  });
 
-  render() {
-    const { countryOptions, onChange, onSubmit, serviceOptions, validator, value } = this.props;
+  const [deleteRule] = useMutation(deleteRuleMutation, {
+    ignoreResults: true,
+    onCompleted() {
+      setIsSubmitting(false);
+      onSuccess();
+    },
+    onError() {
+      setIsSubmitting(false);
+      enqueueSnackbar(i18next.t("admin.taxSettings.shopCustomTaxRatesFailed"), { variant: "warning" });
+    }
+  });
+
+  const [updateRule] = useMutation(updateRuleMutation, {
+    ignoreResults: true,
+    onCompleted() {
+      setIsSubmitting(false);
+      onSuccess();
+    },
+    onError() {
+      setIsSubmitting(false);
+      enqueueSnackbar(i18next.t("admin.taxSettings.shopCustomTaxRatesFailed"), { variant: "warning" });
+    }
+  });
 
-    const serviceNameInputId = `serviceName_${this.uniqueInstanceIdentifier}`;
-    const countryCodesInputId = `countryCodes_${this.uniqueInstanceIdentifier}`;
+  const {
+    formData: currentFormData,
+    getFirstErrorMessage,
+    getInputProps,
+    hasErrors,
+    submitForm
+  } = useReactoForm({
+    async onSubmit(formData) {
+      setIsSubmitting(true);
 
-    return (
-      <Form
-        onChange={onChange}
-        onSubmit={onSubmit}
-        ref={(formRef) => { this.form = formRef; }}
-        validator={validator}
-        value={value}
+      if (doc) {
+        await updateRule({
+          variables: {
+            input: {
+              // In case doc has additional fields not allowed, we'll copy just what we want
+              countryCodes: formData.countryCodes || null,
+              serviceName: formData.serviceName,
+              ruleId: formData._id,
+              shopId
+            }
+          }
+        });
+      } else {
+        await createRule({
+          variables: {
+            input: {
+              // In case doc has additional fields not allowed, we'll copy just what we want
+              countryCodes: formData.countryCodes || null,
+              serviceName: formData.serviceName,
+              shopId
+            }
+          }
+        });
+      }
+    },
+    validator(formData) {
+      return validator({
+        // Don't include `_id` when we're updating
+        countryCodes: formData.countryCodes,
+        serviceName: formData.serviceName
+      });
+    },
+    value: doc
+  });
+
+  const countryCodesInputProps = getInputProps("countryCodes", muiOptions);
+
+  return (
+    <div>
+      <TextField
+        className={classes.textField}
+        error={hasErrors(["serviceName"])}
+        fullWidth
+        helperText={getFirstErrorMessage(["serviceName"])}
+        label={i18next.t("addressValidation.serviceNameLabel")}
+        onKeyPress={(event) => {
+          if (event.key === "Enter") submitForm();
+        }}
+        select
+        {...getInputProps("serviceName", muiOptions)}
+      >
+        {serviceOptions.map((option) => (
+          <MenuItem key={option.value} value={option.value}>
+            {option.label}
+          </MenuItem>
+        ))}
+      </TextField>
+      <TextField
+        className={classes.textField}
+        error={hasErrors(["countryCodes"])}
+        fullWidth
+        helperText={getFirstErrorMessage(["countryCodes"]) || i18next.t("addressValidation.countryCodesHelpText")}
+        label={i18next.t("addressValidation.countryCodesLabel")}
+        onKeyPress={(event) => {
+          if (event.key === "Enter") submitForm();
+        }}
+        select
+        SelectProps={{ multiple: true }}
+        {...countryCodesInputProps}
+        // Avoid "value must be an array" error
+        value={countryCodesInputProps.value || []}
       >
-        <Field name="serviceName" label={i18next.t("addressValidation.serviceNameLabel")} labelFor={serviceNameInputId}>
-          <Select id={serviceNameInputId} name="serviceName" options={serviceOptions} />
-          <ErrorsBlock names={["serviceName"]} />
-        </Field>
-        <Field
-          helpText={i18next.t("addressValidation.countryCodesHelpText")}
-          isOptional
-          label={i18next.t("addressValidation.countryCodesLabel")}
-          labelFor={countryCodesInputId}
-          name="countryCodes"
+        {getSupportedCountryOptionsForService(currentFormData.serviceName).map((option) => (
+          <MenuItem key={option.value} value={option.value}>
+            {option.label}
+          </MenuItem>
+        ))}
+      </TextField>
+      <Grid className={classes.rightAlignedGrid} item xs={12}>
+        {!!doc &&
+          <Button
+            className={classes.deleteButton}
+            color="primary"
+            isDisabled={isSubmitting}
+            onClick={() => {
+              deleteRule({
+                variables: {
+                  input: {
+                    shopId,
+                    ruleId: doc._id
+                  }
+                }
+              });
+            }}
+            variant="contained"
+          >
+            {i18next.t("app.delete")}
+          </Button>}
+        <Button
+          color="primary"
+          isDisabled={isSubmitting}
+          onClick={submitForm}
+          variant="contained"
         >
-          <MultiSelect id={countryCodesInputId} name="countryCodes" options={countryOptions} />
-          <ErrorsBlock names={["countryCodes"]} />
-        </Field>
-      </Form>
-    );
-  }
+          {i18next.t("app.save")}
+        </Button>
+      </Grid>
+    </div>
+  );
 }
+
+AddressValidationSettingsForm.propTypes = {
+  /**
+   * Document to edit. Provide this to put the form into update mode
+   */
+  doc: PropTypes.shape({
+    _id: PropTypes.string.isRequired,
+    countryCodes: PropTypes.arrayOf(PropTypes.string),
+    serviceName: PropTypes.string.isRequired
+  }),
+  /**
+   * Function that returns a filtered list of country options
+   */
+  getSupportedCountryOptionsForService: PropTypes.func,
+  /**
+   * Function to call after form is successfully submitted
+   */
+  onSuccess: PropTypes.func,
+  /**
+   * Options for the `serviceName` field
+   */
+  serviceOptions: PropTypes.arrayOf(PropTypes.shape({
+    label: PropTypes.string.isRequired,
+    value: PropTypes.string.isRequired
+  })),
+  /**
+   * Shop ID to create/edit/delete address validation rule for
+   */
+  shopId: PropTypes.string.isRequired
+};
diff --git a/imports/plugins/core/address/client/components/ShopAddressValidationSettings.js b/imports/plugins/core/address/client/components/ShopAddressValidationSettings.js
index d66be4abea..c3fdb813ba 100644
--- a/imports/plugins/core/address/client/components/ShopAddressValidationSettings.js
+++ b/imports/plugins/core/address/client/components/ShopAddressValidationSettings.js
@@ -1,159 +1,184 @@
-import React, { Component } from "react";
+import React, { useState } from "react";
 import PropTypes from "prop-types";
-import { i18next } from "/client/api";
+import ReactTable from "react-table";
 import Button from "@reactioncommerce/catalyst/Button";
-import { SortableTable } from "/imports/plugins/core/ui/client/components";
+import Card from "@material-ui/core/Card";
+import CardContent from "@material-ui/core/CardContent";
+import Dialog from "@material-ui/core/Dialog";
+import DialogContent from "@material-ui/core/DialogContent";
+import { makeStyles } from "@material-ui/styles";
+import CountryOptions from "@reactioncommerce/api-utils/CountryOptions.js";
+import { i18next } from "/client/api";
 import AddressValidationSettingsForm from "./AddressValidationSettingsForm";
 
-export default class ShopAddressValidationSettings extends Component {
-  static propTypes = {
-    addressValidationServices: PropTypes.arrayOf(PropTypes.shape({
-      displayName: PropTypes.string.isRequired,
-      name: PropTypes.string.isRequired,
-      supportedCountryCodes: PropTypes.arrayOf(PropTypes.string)
-    })),
-    countryOptions: PropTypes.arrayOf(PropTypes.shape({
-      label: PropTypes.string.isRequired,
-      value: PropTypes.string.isRequired
-    })),
-    enabledServices: PropTypes.arrayOf(PropTypes.shape({
-      countryCodes: PropTypes.arrayOf(PropTypes.string),
-      serviceDisplayName: PropTypes.string.isRequired,
-      serviceName: PropTypes.string.isRequired
-    })),
-    onItemAdded: PropTypes.func.isRequired,
-    onItemDeleted: PropTypes.func.isRequired,
-    onItemEdited: PropTypes.func.isRequired
-  };
-
-  static defaultProps = {
-    addressValidationServices: [],
-    countryOptions: [],
-    enabledServices: []
-  };
-
-  state = {
-    isAdding: false,
-    selectedServiceNameInAddForm: null
+const useStyles = makeStyles((theme) => ({
+  createButton: {
+    marginBottom: theme.spacing(3)
+  },
+  row: {
+    cursor: "pointer"
   }
-
-  showAddForm = () => {
-    this.setState({ isAdding: true });
-  };
-
-  hideAddForm = () => {
-    this.setState({ isAdding: false });
-  };
-
-  handleAddFormSubmit = (...args) => {
-    const { onItemAdded } = this.props;
-    return onItemAdded(...args)
-      .then((result) => {
-        this.hideAddForm();
-        return result;
-      });
-  };
-
-  handleAddFormSubmitButton = () => {
-    if (this.addForm) {
-      this.addForm.submit();
-    }
-  };
-
-  handleAddFormChange = (doc) => {
-    this.setState({ selectedServiceNameInAddForm: doc.serviceName });
-  };
-
-  get serviceOptions() {
-    const { addressValidationServices } = this.props;
-
-    return (addressValidationServices || []).map((addressValidationService) => ({
-      label: addressValidationService.displayName,
-      value: addressValidationService.name
-    }));
-  }
-
-  get supportedCountryOptions() {
-    const { addressValidationServices, countryOptions } = this.props;
-    const { selectedServiceNameInAddForm } = this.state;
-
+}));
+
+const DEFAULT_PAGE_SIZE = 20;
+
+/**
+ * @summary React component that renders the form for adding, updating, or deleting
+ *   a custom tax rate record.
+ * @param {Object} props React props
+ * @return {React.Node} React node
+ */
+export default function ShopAddressValidationSettings(props) {
+  const {
+    addressValidationRules,
+    addressValidationServices,
+    fetchAddressValidationRules,
+    isLoadingAddressValidationRules,
+    refetchAddressValidationRules,
+    shopId,
+    totalAddressValidationRulesCount
+  } = props;
+
+  const classes = useStyles();
+  const [isCreating, setIsCreating] = useState(false);
+  const [editDoc, setEditDoc] = useState(null);
+  const [selectedPageSize, setSelectedPageSize] = useState(DEFAULT_PAGE_SIZE);
+
+  /**
+   * @summary Returns a filtered list of CountryOptions
+   * @param {String} serviceName Service name to filter by support
+   * @return {Object[]} Country options
+   */
+  function getSupportedCountryOptionsForService(serviceName) {
     // Don't show any countries in the list until they've selected a service
-    if (!selectedServiceNameInAddForm) return [];
+    if (!serviceName) return [];
 
     const selectedService = (addressValidationServices || []).find((service) =>
-      service.name === selectedServiceNameInAddForm);
+      service.name === serviceName);
 
-    if (!selectedService || !Array.isArray(selectedService.supportedCountryCodes)) return countryOptions;
+    if (!selectedService || !Array.isArray(selectedService.supportedCountryCodes)) return CountryOptions;
 
-    return countryOptions.filter(({ value }) => selectedService.supportedCountryCodes.includes(value));
+    return CountryOptions.filter(({ value }) => selectedService.supportedCountryCodes.includes(value));
   }
 
-  renderAddForm() {
-    return (
-      <div>
-        <AddressValidationSettingsForm
-          countryOptions={this.supportedCountryOptions}
-          onChange={this.handleAddFormChange}
-          onSubmit={this.handleAddFormSubmit}
-          ref={(instance) => { this.addForm = instance; }}
-          serviceOptions={this.serviceOptions}
-        />
-        <div style={{ display: "flex", justifyContent: "flex-end" }}>
-          <Button variant="outlined" onClick={this.hideAddForm}>{i18next.t("addressValidation.cancelButtonText")}</Button>
-          <div style={{ marginLeft: 14 }}>
-            <Button variant="contained" color="secondary" onClick={this.handleAddFormSubmitButton}>
-              {i18next.t("addressValidation.entryFormSubmitButtonText")}
-            </Button>
-          </div>
-        </div>
-      </div>
-    );
-  }
+  const serviceOptions = (addressValidationServices || []).map((addressValidationService) => ({
+    label: addressValidationService.displayName,
+    value: addressValidationService.name
+  }));
+
+  const columns = [{
+    accessor: (item) => {
+      if (!item.serviceName) return null;
+      const selectedService = (addressValidationServices || []).find((service) => service.name === item.serviceName);
+      return selectedService ? selectedService.displayName : item.serviceName;
+    },
+    Header: "Name",
+    id: "serviceName"
+  }, {
+    accessor: (item) => {
+      const countries = item.countryCodes || [];
+      if (countries.length === 0) {
+        const selectedService = (addressValidationServices || []).find((service) => service.name === item.serviceName);
+        if (selectedService && selectedService.supportedCountryCodes) {
+          return `All supported (${selectedService.supportedCountryCodes.join(", ")})`;
+        }
+        return "All";
+      }
+      return countries.join(", ");
+    },
+    Header: "Countries",
+    id: "countries"
+  }];
+
+  const handleDialogClose = () => {
+    setIsCreating(false);
+    setEditDoc(null);
+  };
 
-  render() {
-    const { addressValidationServices, enabledServices, onItemDeleted } = this.props;
-    const { isAdding } = this.state;
-
-    return (
-      <div className="clearfix">
-        <p>{i18next.t("addressValidation.helpText")}</p>
-        <SortableTable
-          className="-striped -highlight"
-          data={enabledServices}
-          columnMetadata={[
-            {
-              accessor: "serviceDisplayName",
-              Header: "Name"
-            },
-            {
-              accessor: (item) => {
-                const countries = item.countryCodes || [];
-                if (countries.length === 0) {
-                  const selectedService = (addressValidationServices || []).find((service) => service.name === item.serviceName);
-                  if (selectedService && selectedService.supportedCountryCodes) return selectedService.supportedCountryCodes.join(", ");
-                  return "All";
-                }
-                return countries.join(", ");
-              },
-              Header: "Countries",
-              id: "countries"
-            },
-            {
-              accessor: "_id",
-              Cell: (row) => (
-                <Button color="error" variant="outlined" size="small" onClick={() => { onItemDeleted(row.value); }}>
-                  {i18next.t("addressValidation.deleteItemButtonText")}
-                </Button>
-              )
-            }
-          ]}
-          filterType="none"
-        />
-        {!isAdding && <Button color="secondary" variant="contained" fullWidth onClick={this.showAddForm}>
-          {i18next.t("addressValidation.addNewItemButtonText")}
-        </Button>}
-        {!!isAdding && this.renderAddForm()}
-      </div>
-    );
-  }
+  return (
+    <div>
+      <Card>
+        <CardContent>
+          <p>{i18next.t("addressValidation.helpText")}</p>
+          <Button className={classes.createButton} color="primary" variant="contained" onClick={() => { setIsCreating(true); }}>
+            {i18next.t("addressValidation.addNewItemButtonText")}
+          </Button>
+          <ReactTable
+            className="-striped -highlight"
+            columns={columns}
+            data={addressValidationRules}
+            defaultPageSize={DEFAULT_PAGE_SIZE}
+            getTdProps={(state, rowInfo) => {
+              const tdProps = {};
+
+              if (rowInfo && rowInfo.original) {
+                tdProps.onClick = () => {
+                  setIsCreating(false);
+                  setEditDoc(rowInfo.original);
+                };
+              }
+
+              return tdProps;
+            }}
+            getTrProps={() => ({ className: classes.row })}
+            loading={isLoadingAddressValidationRules}
+            manual // informs React Table that you'll be handling sorting and pagination server-side
+            onFetchData={(state) => {
+              setSelectedPageSize(state.pageSize);
+              fetchAddressValidationRules({
+                first: state.pageSize,
+                offset: state.page * state.pageSize
+              });
+            }}
+            pages={Math.ceil(totalAddressValidationRulesCount / selectedPageSize)}
+          />
+        </CardContent>
+      </Card>
+      <Dialog
+        fullWidth={true}
+        maxWidth="sm"
+        open={!!(isCreating || editDoc)}
+        onClose={handleDialogClose}
+      >
+        <DialogContent>
+          <AddressValidationSettingsForm
+            doc={editDoc}
+            getSupportedCountryOptionsForService={getSupportedCountryOptionsForService}
+            onSuccess={() => {
+              handleDialogClose();
+              refetchAddressValidationRules();
+            }}
+            serviceOptions={serviceOptions}
+            shopId={shopId}
+          />
+        </DialogContent>
+      </Dialog>
+    </div>
+  );
 }
+
+ShopAddressValidationSettings.propTypes = {
+  addressValidationRules: PropTypes.arrayOf(PropTypes.shape({
+    _id: PropTypes.string.isRequired,
+    countryCodes: PropTypes.arrayOf(PropTypes.string),
+    serviceName: PropTypes.string.isRequired
+  })),
+  addressValidationServices: PropTypes.arrayOf(PropTypes.shape({
+    displayName: PropTypes.string.isRequired,
+    name: PropTypes.string.isRequired,
+    supportedCountryCodes: PropTypes.arrayOf(PropTypes.string)
+  })),
+  fetchAddressValidationRules: PropTypes.func,
+  isLoadingAddressValidationRules: PropTypes.bool,
+  refetchAddressValidationRules: PropTypes.func,
+  shopId: PropTypes.string.isRequired,
+  totalAddressValidationRulesCount: PropTypes.number
+};
+
+ShopAddressValidationSettings.defaultProps = {
+  addressValidationRules: [],
+  addressValidationServices: [],
+  fetchAddressValidationRules: () => {},
+  refetchAddressValidationRules: () => {},
+  totalAddressValidationRulesCount: 0
+};
diff --git a/imports/plugins/core/address/client/containers/ShopAddressValidationSettings.js b/imports/plugins/core/address/client/containers/ShopAddressValidationSettings.js
index 53a8f88199..ceb3eccb71 100644
--- a/imports/plugins/core/address/client/containers/ShopAddressValidationSettings.js
+++ b/imports/plugins/core/address/client/containers/ShopAddressValidationSettings.js
@@ -1,109 +1,43 @@
-import { get, sortBy } from "lodash";
-import { compose, withProps } from "recompose";
-import CountryOptions from "@reactioncommerce/api-utils/CountryOptions.js";
-import { registerComponent, composeWithTracker } from "@reactioncommerce/reaction-components";
-import Random from "@reactioncommerce/random";
-import { Meteor } from "meteor/meteor";
-import { Reaction } from "/client/api";
-import Logger from "/client/modules/logger";
-import { Packages } from "/lib/collections";
-import ShopAddressValidationSettings from "../components/ShopAddressValidationSettings";
-import withAddressValidationServices from "../hoc/withAddressValidationServices";
-
-const PACKAGE_NAME = "reaction-address";
-
-/**
- * @returns {Object[]} The list of enabled address validation services
- *   for the current shop, from package settings, with each item having
- *   `_id`, `createdAt`, `countryCodes`, and `serviceName` props
- */
-function getEnabledAddressValidationServices() {
-  // Get plugin settings for the current shop
-  const plugin = Packages.findOne({ name: PACKAGE_NAME, shopId: Reaction.getShopId() });
-  if (!plugin) return [];
-
-  return sortBy(get(plugin, "settings.addressValidation.enabledServices", []), "createdAt");
-}
+import React from "react";
+import { Components } from "@reactioncommerce/reaction-components";
+import useCurrentShopId from "/imports/client/ui/hooks/useCurrentShopId.js";
+import ShopAddressValidationSettings from "../components/ShopAddressValidationSettings.js";
+import useAddressValidationRules from "../hooks/useAddressValidationRules.js";
+import useAddressValidationServices from "../hooks/useAddressValidationServices.js";
 
 /**
- * @param {Object[]} enabledServices Updated `enabledServices` array, to store in
- *   package settings
- * @returns {Promise<Object>} Method result
+ * @summary React component that wraps ShopAddressValidationSettings to bind data
+ * @return {React.Node} React node
  */
-function updateEnabledServices(enabledServices) {
-  return new Promise((resolve, reject) => {
-    Meteor.call("package/update", PACKAGE_NAME, "settings.addressValidation.enabledServices", enabledServices, (error, result) => {
-      if (error) {
-        Logger.error(error);
-        reject(error);
-      } else {
-        resolve(result);
-      }
-    });
-  });
-}
-
-const handlers = {
-  onItemAdded(doc) {
-    const enabledServices = getEnabledAddressValidationServices();
-    enabledServices.push({ ...doc, _id: Random.id(), createdAt: new Date() });
-    return updateEnabledServices(enabledServices);
-  },
-  onItemDeleted(id) {
-    let enabledServices = getEnabledAddressValidationServices();
-    enabledServices = enabledServices.filter((item) => item._id !== id);
-    return updateEnabledServices(enabledServices);
-  },
-  onItemEdited(id, doc) {
-    let enabledServices = getEnabledAddressValidationServices();
-    enabledServices = enabledServices.map((item) => {
-      if (item._id === id) return { ...item, ...doc };
-      return item;
-    });
-    return updateEnabledServices(enabledServices);
-  }
-};
-
-const composer = (props, onData) => {
-  const { addressValidationServices } = props;
-
-  let enabledServices = getEnabledAddressValidationServices();
+export default function ShopAddressValidationSettingsContainer() {
+  const {
+    addressValidationServices,
+    isLoadingAddressValidationServices
+  } = useAddressValidationServices();
 
-  // Add serviceDisplayName to each item
-  if (Array.isArray(enabledServices)) {
-    enabledServices = enabledServices.map((item) => {
-      const serviceDefinition = (addressValidationServices || []).find(({ name }) => name === item.serviceName);
+  const [shopId] = useCurrentShopId();
 
-      let serviceDisplayName;
-      if (serviceDefinition) {
-        serviceDisplayName = serviceDefinition.displayName;
-      } else {
-        // There could be services enabled that have since had their plugins removed
-        serviceDisplayName = item.serviceName;
-      }
+  const {
+    addressValidationRules,
+    fetchAddressValidationRules,
+    isLoadingAddressValidationRules,
+    refetchAddressValidationRules,
+    totalAddressValidationRulesCount
+  } = useAddressValidationRules(shopId);
 
-      return {
-        serviceDisplayName,
-        ...item
-      };
-    });
+  if (!shopId || isLoadingAddressValidationServices) {
+    return <Components.Loading />;
   }
 
-  onData(null, {
-    addressValidationServices,
-    enabledServices,
-    countryOptions: CountryOptions
-  });
-};
-
-registerComponent("ShopAddressValidationSettings", ShopAddressValidationSettings, [
-  withProps(handlers),
-  withAddressValidationServices,
-  composeWithTracker(composer)
-]);
-
-export default compose(
-  withProps(handlers),
-  withAddressValidationServices,
-  composeWithTracker(composer)
-)(ShopAddressValidationSettings);
+  return (
+    <ShopAddressValidationSettings
+      addressValidationRules={addressValidationRules}
+      addressValidationServices={addressValidationServices}
+      fetchAddressValidationRules={fetchAddressValidationRules}
+      isLoadingAddressValidationRules={isLoadingAddressValidationRules}
+      refetchAddressValidationRules={refetchAddressValidationRules}
+      shopId={shopId}
+      totalAddressValidationRulesCount={totalAddressValidationRulesCount}
+    />
+  );
+}
diff --git a/imports/plugins/core/address/client/hoc/withAddressValidationServices.js b/imports/plugins/core/address/client/hoc/withAddressValidationServices.js
deleted file mode 100644
index 536937c4f3..0000000000
--- a/imports/plugins/core/address/client/hoc/withAddressValidationServices.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from "react";
-import { Query } from "react-apollo";
-import gql from "graphql-tag";
-
-const getAddressValidationServices = gql`
-  query getAddressValidationServices {
-    addressValidationServices {
-      displayName
-      name
-      supportedCountryCodes
-    }
-  }
-`;
-
-export default (Component) => (
-  class AddressValidationServicesQuery extends React.Component {
-    render() {
-      return (
-        <Query query={getAddressValidationServices}>
-          {({ loading, data }) => {
-            const props = {
-              ...this.props,
-              isLoadingAddressValidationServices: loading
-            };
-
-            if (!loading && data) {
-              props.addressValidationServices = data.addressValidationServices;
-            }
-
-            return (
-              <Component {...props} />
-            );
-          }}
-        </Query>
-      );
-    }
-  }
-);
diff --git a/imports/plugins/core/address/client/hooks/useAddressValidationRules.js b/imports/plugins/core/address/client/hooks/useAddressValidationRules.js
new file mode 100644
index 0000000000..6a9dbd5f27
--- /dev/null
+++ b/imports/plugins/core/address/client/hooks/useAddressValidationRules.js
@@ -0,0 +1,43 @@
+import { useLazyQuery } from "@apollo/react-hooks";
+import gql from "graphql-tag";
+
+const getAddressValidationRulesQuery = gql`
+  query getAddressValidationRules($shopId: ID!, $first: ConnectionLimitInt, $offset: Int) {
+    addressValidationRules(shopId: $shopId, first: $first, offset: $offset) {
+      nodes {
+        _id
+        countryCodes
+        serviceName
+      }
+      totalCount
+    }
+  }
+`;
+
+/**
+ * @summary React hook that returns the address validation rules for a shop
+ * @param {String} shopId Shop ID
+ * @return {Object} An object with `addressValidationRules` property, which may be an empty array.
+ *  The `isLoadingAddressValidationRules` property will be `true` until the query is done running.
+ */
+export default function useAddressValidationRules(shopId) {
+  const [getAddressValidationRules, { called, data, loading, refetch }] = useLazyQuery(getAddressValidationRulesQuery, {
+    fetchPolicy: "network-only"
+  });
+
+  return {
+    addressValidationRules: (data && data.addressValidationRules && data.addressValidationRules.nodes) || [],
+    fetchAddressValidationRules({ first = 20, offset = 0 }) {
+      getAddressValidationRules({
+        variables: {
+          first,
+          offset,
+          shopId
+        }
+      });
+    },
+    isLoadingAddressValidationRules: loading || !called,
+    refetchAddressValidationRules: refetch,
+    totalAddressValidationRulesCount: (data && data.addressValidationRules && data.addressValidationRules.totalCount) || 0
+  };
+}
diff --git a/imports/plugins/core/address/client/hooks/useAddressValidationServices.js b/imports/plugins/core/address/client/hooks/useAddressValidationServices.js
new file mode 100644
index 0000000000..e9037f6e3e
--- /dev/null
+++ b/imports/plugins/core/address/client/hooks/useAddressValidationServices.js
@@ -0,0 +1,26 @@
+import { useQuery } from "@apollo/react-hooks";
+import gql from "graphql-tag";
+
+const getAddressValidationServicesQuery = gql`
+  query getAddressValidationServices {
+    addressValidationServices {
+      displayName
+      name
+      supportedCountryCodes
+    }
+  }
+`;
+
+/**
+ * @summary React hook that returns the registered address validation services
+ * @return {Object} An object with `addressValidationServices` property, which may be an empty array.
+ *  The `isLoadingAddressValidationServices` property will be `true` until the query is done running.
+ */
+export default function useAddressValidationServices() {
+  const { data, loading } = useQuery(getAddressValidationServicesQuery);
+
+  return {
+    addressValidationServices: (data && data.addressValidationServices) || [],
+    isLoadingAddressValidationServices: loading
+  };
+}
diff --git a/imports/plugins/core/address/client/index.js b/imports/plugins/core/address/client/index.js
index 86b9876db7..53240ec48d 100644
--- a/imports/plugins/core/address/client/index.js
+++ b/imports/plugins/core/address/client/index.js
@@ -1 +1,11 @@
-export { default as ShopAddressValidationSettings } from "./containers/ShopAddressValidationSettings";
+import { registerOperatorRoute } from "/imports/client/ui";
+import ShopAddressValidationSettings from "./containers/ShopAddressValidationSettings";
+
+registerOperatorRoute({
+  isNavigationLink: true,
+  isSetting: true,
+  mainComponent: ShopAddressValidationSettings,
+  path: "/address-validation-settings",
+  priority: 900,
+  sidebarI18nLabel: "addressValidation.title"
+});

From 04894e38e8bbc32b9f412ab5bc84f308df80ac47 Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 16:01:28 -0600
Subject: [PATCH 02/19] refactor: delete unused MainDropdown

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../client/components/mainDropdown.js         | 136 ------------------
 .../client/containers/mainDropdown.js         | 115 ---------------
 imports/plugins/core/accounts/client/index.js |   2 -
 3 files changed, 253 deletions(-)
 delete mode 100644 imports/plugins/core/accounts/client/components/mainDropdown.js
 delete mode 100644 imports/plugins/core/accounts/client/containers/mainDropdown.js

diff --git a/imports/plugins/core/accounts/client/components/mainDropdown.js b/imports/plugins/core/accounts/client/components/mainDropdown.js
deleted file mode 100644
index be87b936dc..0000000000
--- a/imports/plugins/core/accounts/client/components/mainDropdown.js
+++ /dev/null
@@ -1,136 +0,0 @@
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { Components } from "@reactioncommerce/reaction-components";
-import { Reaction } from "/client/api";
-import Login from "./login";
-
-const iconStyle = {
-  margin: "10px 10px 10px 6px",
-  width: "20px",
-  fontSize: "inherit",
-  textAlign: "center"
-};
-
-const menuStyle = {
-  padding: "0px 10px 10px 10px",
-  minWidth: 220,
-  minHeight: 50
-};
-
-class MainDropdown extends Component {
-  static propTypes = {
-    adminShortcuts: PropTypes.object,
-    currentAccount: PropTypes.oneOfType([PropTypes.bool, PropTypes.object]),
-    handleChange: PropTypes.func,
-    userImage: PropTypes.object,
-    userName: PropTypes.string,
-    userShortcuts: PropTypes.object
-  }
-
-  buttonElement() {
-    const { userImage, userName } = this.props;
-    return (
-      <Components.Button containerStyle={{ color: "#000", fontWeight: "normal", letterSpacing: 0.8 }}>
-        <span className="main-dropdown-userImage">{userImage}</span>
-        <span className="main-dropdown-userName">{userName}</span>&nbsp;
-        <Components.Icon
-          icon={"fa fa-caret-down"}
-        />
-      </Components.Button>
-    );
-  }
-
-  renderAdminIcons() {
-    return (
-      Reaction.Apps(this.props.adminShortcuts).map((shortcut) => (
-        <Components.MenuItem
-          key={shortcut.packageId}
-          className="accounts-a-tag"
-          label={shortcut.label}
-          i18nKeyLabel={shortcut.i18nKeyLabel}
-          icon={shortcut.icon}
-          iconStyle={iconStyle}
-          value={shortcut}
-        />
-      ))
-    );
-  }
-
-  renderUserIcons() {
-    return (
-      Reaction.Apps(this.props.userShortcuts).map((option) => (
-        <Components.MenuItem
-          key={option.packageId}
-          className="accounts-a-tag"
-          label={option.label}
-          i18nKeyLabel={option.i18nKeyLabel}
-          icon={option.icon && option.icon}
-          iconStyle={iconStyle}
-          value={option}
-        />
-      ))
-    );
-  }
-
-  renderSignOutButton() {
-    return (
-      <Components.MenuItem
-        className="btn btn-primary btn-block accounts-btn-tag"
-        label="Sign out"
-        value="logout"
-      />
-    );
-  }
-
-  renderSignInComponent() {
-    return (
-      <div className="accounts-dropdown">
-        <div className="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-delay="1000">
-          <span>
-            <Components.Icon icon="fa fa-user" />
-          </span>
-          <b className="caret" />
-        </div>
-        <div
-          className="accounts-dialog accounts-layout dropdown-menu pull-right"
-          style={{ padding: "10px 20px" }}
-        >
-          <Login />
-        </div>
-      </div>
-    );
-  }
-
-  render() {
-    return (
-      <div className="accounts">
-        {this.props.currentAccount ?
-          <div style={{ paddingRight: 5 }}>
-            <Components.DropDownMenu
-              buttonElement={this.buttonElement()}
-              attachment="bottom right"
-              targetAttachment="top right"
-              menuStyle={menuStyle}
-              className="accounts-li-tag"
-              onChange={this.props.handleChange}
-              constraints={[{
-                to: "window",
-                attachment: "together"
-              }]}
-            >
-              {this.renderUserIcons()}
-              {this.renderAdminIcons()}
-              {this.renderSignOutButton()}
-            </Components.DropDownMenu>
-          </div>
-          :
-          <div className="accounts dropdown" role="menu">
-            {this.renderSignInComponent()}
-          </div>
-        }
-      </div>
-    );
-  }
-}
-
-export default MainDropdown;
diff --git a/imports/plugins/core/accounts/client/containers/mainDropdown.js b/imports/plugins/core/accounts/client/containers/mainDropdown.js
deleted file mode 100644
index f2b76a6a5e..0000000000
--- a/imports/plugins/core/accounts/client/containers/mainDropdown.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import { compose, withProps } from "recompose";
-import { Meteor } from "meteor/meteor";
-import { Accounts } from "meteor/accounts-base";
-import { Roles } from "meteor/alanning:roles";
-import { registerComponent, composeWithTracker, withCurrentAccount } from "@reactioncommerce/reaction-components";
-import { i18nextDep, i18next, Reaction, Logger } from "/client/api";
-import { getUserAvatar } from "/imports/plugins/core/accounts/client/helpers/helpers";
-import MainDropdown from "../components/mainDropdown";
-
-/**
- * @summary Returns the display name for a user
- * @param {Object} [displayUser] The user object. Defaults to logged in user.
- * @returns {String} Display name for a user
- */
-function displayName(displayUser) {
-  i18nextDep.depend();
-
-  const user = displayUser || Accounts.user();
-
-  if (user) {
-    if (user.name) {
-      return user.name;
-    } else if (user.username) {
-      return user.username;
-    } else if (user.profile && user.profile.name) {
-      return user.profile.name;
-    }
-
-    // todo: previous check was user.services !== "anonymous", "resume". Is this
-    // new check covers previous check?
-    if (Roles.userIsInRole(
-      user._id || user.userId, "account/profile",
-      Reaction.getShopId()
-    )) {
-      return i18next.t("accountsUI.guest", { defaultValue: "Guest" });
-    }
-  }
-
-  return null;
-}
-
-/**
- * @summary get shortcuts with audience permissions based on user roles
- * @returns {Object} Object with `provides`, `enabled`, and `audience` fields
- */
-function getAdminShortcutIcons() {
-  const roles = Roles.getRolesForUser(Reaction.getUserId(), Reaction.getShopId());
-
-  return {
-    provides: "shortcut",
-    enabled: true,
-    audience: roles
-  };
-}
-
-/**
- * @summary Selection change handler
- * @param {Event} event Event
- * @param {String} value New selected value
- * @returns {undefined}
- */
-function handleChange(event, value) {
-  event.preventDefault();
-
-  if (value === "logout") {
-    Meteor.logout((error) => {
-      if (error) {
-        Logger.error(error, "Failed to logout.");
-      }
-
-      // Resets the app to show the primary shop as the active shop when a user logs out.
-      // When an admin user is switching back and forth between shops, the app will keep the
-      // activeShopId as the last shop visited. If an admin user logs out, the app will stay on that shop
-      // for any new user who uses the same browser, temporarily, until the app is refreshed. This fixes that issue.
-      Reaction.setShopId(Reaction.getPrimaryShopId());
-    });
-  } else if (value.name !== "account/profile") {
-    Reaction.showActionView(value);
-  } else if (value.route || value.name) {
-    const route = value.name || value.route;
-    Reaction.Router.go(route);
-  }
-}
-
-const composer = ({ currentAccount }, onData) => {
-  const userImage = getUserAvatar(currentAccount);
-  const userName = displayName(currentAccount);
-  const adminShortcuts = getAdminShortcutIcons();
-
-  onData(null, {
-    adminShortcuts,
-    userImage,
-    userName
-  });
-};
-
-const handlers = {
-  handleChange,
-  userShortcuts: {
-    provides: "userAccountDropdown",
-    enabled: true
-  }
-};
-
-registerComponent("MainDropdown", MainDropdown, [
-  withCurrentAccount,
-  withProps(handlers),
-  composeWithTracker(composer, false)
-]);
-
-export default compose(
-  withCurrentAccount,
-  withProps(handlers),
-  composeWithTracker(composer, false)
-)(MainDropdown);
diff --git a/imports/plugins/core/accounts/client/index.js b/imports/plugins/core/accounts/client/index.js
index f8f5e588b3..4707cbaebf 100644
--- a/imports/plugins/core/accounts/client/index.js
+++ b/imports/plugins/core/accounts/client/index.js
@@ -17,7 +17,6 @@ export { default as GroupsTableCell } from "./components/groupsTableCell";
 export { default as Login } from "./components/login";
 export { default as LoginButtons } from "./components/loginButtons";
 export { default as LoginFormMessages } from "./components/loginFormMessages";
-export { default as MainDropdown } from "./components/mainDropdown";
 export { default as ManageGroups } from "./components/manageGroups";
 export { default as PermissionsList } from "./components/permissionsList";
 export { default as SignIn } from "./components/signIn";
@@ -30,7 +29,6 @@ export { default as UserOrdersListContainer } from "./containers/userOrdersListC
 export { default as AuthContainer } from "./containers/auth";
 export { default as EditGroupContainer } from "./containers/editGroupContainer";
 export { default as ForgotPasswordContainer } from "./containers/forgotPassword";
-export { default as MainDropdownContainer } from "./containers/mainDropdown";
 export { default as MessagesContainer } from "./containers/messages";
 export { default as UpdatePasswordContainer } from "./containers/updatePassword";
 export { default as VerifyAccount } from "./containers/verifyAccount";

From 86f29960844289f996968d1384034b860c65bd2e Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 16:02:48 -0600
Subject: [PATCH 03/19] refactor: delete unused methods from Reaction obj

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../plugins/core/core/server/Reaction/core.js | 42 ----------
 .../core/core/server/Reaction/index.js        |  2 -
 .../core/core/server/Reaction/loadSettings.js | 83 -------------------
 3 files changed, 127 deletions(-)
 delete mode 100644 imports/plugins/core/core/server/Reaction/loadSettings.js

diff --git a/imports/plugins/core/core/server/Reaction/core.js b/imports/plugins/core/core/server/Reaction/core.js
index a4d01b5fdd..4e9c4e005d 100644
--- a/imports/plugins/core/core/server/Reaction/core.js
+++ b/imports/plugins/core/core/server/Reaction/core.js
@@ -20,39 +20,6 @@ const { Shops, Accounts: AccountsCollection } = Collections;
 export default {
   ...AbsoluteUrlMixin,
 
-  Packages: {},
-
-  /**
-   * @summary This is used only for the old `registerPackage` in this file. After that is removed,
-   *   this likely can be removed, too.
-   * @param {ReactionNodeApp} app App instance
-   * @returns {undefined}
-   */
-  async onAppInstanceCreated(app) {
-    this.reactionNodeApp = app;
-    if (this.whenAppInstanceReadyCallbacks) {
-      for (const callback of this.whenAppInstanceReadyCallbacks) {
-        await callback(this.reactionNodeApp); // eslint-disable-line no-await-in-loop
-      }
-      this.whenAppInstanceReadyCallbacks = [];
-    }
-  },
-
-  /**
-   * @summary This is used only for the old `registerPackage` in this file. After that is removed,
-   *   this likely can be removed, too.
-   * @param {Function} callback Function to call after `this.reactionNodeApp` is set, which might be immediately
-   * @returns {undefined}
-   */
-  whenAppInstanceReady(callback) {
-    if (this.reactionNodeApp) {
-      callback(this.reactionNodeApp);
-    } else {
-      if (!this.whenAppInstanceReadyCallbacks) this.whenAppInstanceReadyCallbacks = [];
-      this.whenAppInstanceReadyCallbacks.push(callback);
-    }
-  },
-
   /**
    * @summary Called to indicate that startup is done, causing all
    *   `onAppStartupComplete` callbacks to run in series.
@@ -84,15 +51,6 @@ export default {
     }
   },
 
-  /**
-   * @deprecated Use `app.registerPlugin` pattern instead. See the simple-pricing plugin.
-   * @param {Object} packageInfo Plugin options
-   * @returns {Object} Plugin options
-   */
-  registerPackage(packageInfo) {
-    this.whenAppInstanceReady((app) => app.registerPlugin(packageInfo));
-  },
-
   defaultCustomerRoles: ["guest", "account/profile", "product", "tag", "index", "cart/completed"],
   defaultVisitorRoles: ["anonymous", "guest", "product", "tag", "index", "cart/completed"],
 
diff --git a/imports/plugins/core/core/server/Reaction/index.js b/imports/plugins/core/core/server/Reaction/index.js
index 0b872ad340..5fb4ab3cac 100644
--- a/imports/plugins/core/core/server/Reaction/index.js
+++ b/imports/plugins/core/core/server/Reaction/index.js
@@ -2,7 +2,6 @@ import Log from "@reactioncommerce/logger";
 import Core from "./core";
 import { Fixture, Importer } from "./importer";
 import getSlug from "./getSlug";
-import loadSettings from "./loadSettings";
 import * as Collections from "/lib/collections";
 import * as Schemas from "/lib/collections/schemas";
 import * as accountUtils from "./accountUtils";
@@ -14,7 +13,6 @@ export default {
   Fixture,
   getSlug,
   Importer,
-  loadSettings,
   Log,
   Router: {},
   Schemas
diff --git a/imports/plugins/core/core/server/Reaction/loadSettings.js b/imports/plugins/core/core/server/Reaction/loadSettings.js
deleted file mode 100644
index e8a14b4589..0000000000
--- a/imports/plugins/core/core/server/Reaction/loadSettings.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import _ from "lodash";
-import Logger from "@reactioncommerce/logger";
-import { check } from "meteor/check";
-import { ServiceConfiguration } from "meteor/service-configuration";
-import { Packages } from "/lib/collections";
-import { EJSON } from "meteor/ejson";
-
-/**
- * @method loadSettings
- * @summary
- * This basically allows you to "hardcode" all the settings. You can change them
- * via admin etc for the session, but when the server restarts they'll
- * be restored back to the supplied json
- *
- * All settings are private unless added to `settings.public`
- *
- * Meteor account services can be added in `settings.services`
- * @memberof Core
- * @param {Object} json - json object to insert
- * @returns {Boolean} boolean -  returns true on insert
- * @example
- *  ReactionRegistry.loadSettings Assets.getText("settings/reaction.json")
- */
-export default function loadSettings(json) {
-  check(json, String);
-  let exists;
-  let service;
-  let services;
-  let settings;
-  const validatedJson = EJSON.parse(json);
-
-  // validate json and error out if not an array
-  if (!_.isArray(validatedJson[0])) {
-    Logger.warn("Load Settings is not an array. Failed to load settings.");
-    return false;
-  }
-
-  let result;
-  // loop settings and upsert packages.
-  for (const pkg of validatedJson) {
-    for (const item of pkg) {
-      exists = Packages.findOne({
-        name: item.name
-      });
-
-      // insert into the Packages collection
-      if (exists) {
-        result = Packages.upsert({
-          name: item.name
-        }, {
-          $set: {
-            settings: item.settings,
-            enabled: item.enabled
-          }
-        }, {
-          multi: true,
-          upsert: true,
-          validate: false
-        });
-      }
-      // sets the private settings of various
-      // accounts authentication services
-      if (item.settings.services) {
-        for (services of item.settings.services) {
-          for (service in services) {
-            // actual settings for the service
-            if ({}.hasOwnProperty.call(services, service)) {
-              settings = services[service];
-              ServiceConfiguration.configurations.upsert({
-                service
-              }, {
-                $set: settings
-              });
-              Logger.debug(`service configuration loaded: ${item.name} | ${service}`);
-            }
-          }
-        }
-      }
-      Logger.debug(`loaded local package data: ${item.name}`);
-    }
-  }
-  return result;
-}

From 6b32bdc118d33920f318c02898f09d3b8981e08d Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 16:05:52 -0600
Subject: [PATCH 04/19] feat: delete package and registry methods

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../plugins/core/core/server/methods/index.js | 20 +------
 .../core/core/server/methods/shop/index.js    |  2 -
 .../core/server/methods/shop/togglePackage.js | 32 ----------
 .../core/core/server/methods/updatePackage.js | 41 -------------
 .../core/server/methods/updateRegistry.js     | 59 -------------------
 5 files changed, 1 insertion(+), 153 deletions(-)
 delete mode 100644 imports/plugins/core/core/server/methods/shop/togglePackage.js
 delete mode 100644 imports/plugins/core/core/server/methods/updatePackage.js
 delete mode 100644 imports/plugins/core/core/server/methods/updateRegistry.js

diff --git a/imports/plugins/core/core/server/methods/index.js b/imports/plugins/core/core/server/methods/index.js
index 8d01f94171..56ccd6a045 100644
--- a/imports/plugins/core/core/server/methods/index.js
+++ b/imports/plugins/core/core/server/methods/index.js
@@ -1,25 +1,7 @@
 import getOpaqueIdFromInternalId from "./getOpaqueIdFromInternalId";
-import updatePackage from "./updatePackage";
-import updateRegistry from "./updateRegistry";
 import shopMethods from "./shop";
 
-/**
- * @file Methods for Registry
- *
- *
- * @namespace Registry/Methods
-*/
-
-/**
- * @file Methods for Packages.
- *
- *
- * @namespace Package/Methods
-*/
-
 export default {
   ...shopMethods,
-  getOpaqueIdFromInternalId,
-  "package/update": updatePackage,
-  "registry/update": updateRegistry
+  getOpaqueIdFromInternalId
 };
diff --git a/imports/plugins/core/core/server/methods/shop/index.js b/imports/plugins/core/core/server/methods/shop/index.js
index 14a1497daa..179a2c08f0 100644
--- a/imports/plugins/core/core/server/methods/shop/index.js
+++ b/imports/plugins/core/core/server/methods/shop/index.js
@@ -1,6 +1,5 @@
 import createTag from "./createTag";
 import locateAddress from "./locateAddress";
-import togglePackage from "./togglePackage";
 import updateBrandAssets from "./updateBrandAssets";
 import updateCurrencyConfiguration from "./updateCurrencyConfiguration";
 import updateDefaultParcelSize from "./updateDefaultParcelSize";
@@ -18,7 +17,6 @@ import updateShopExternalServices from "./updateShopExternalServices";
 export default {
   "shop/createTag": createTag,
   "shop/locateAddress": locateAddress,
-  "shop/togglePackage": togglePackage,
   "shop/updateBrandAssets": updateBrandAssets,
   "shop/updateCurrencyConfiguration": updateCurrencyConfiguration,
   "shop/updateDefaultParcelSize": updateDefaultParcelSize,
diff --git a/imports/plugins/core/core/server/methods/shop/togglePackage.js b/imports/plugins/core/core/server/methods/shop/togglePackage.js
deleted file mode 100644
index 81faadca53..0000000000
--- a/imports/plugins/core/core/server/methods/shop/togglePackage.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { check } from "meteor/check";
-import { Reaction } from "/lib/api";
-import ReactionError from "@reactioncommerce/reaction-error";
-import { Packages } from "/lib/collections";
-
-/**
- * @name shop/togglePackage
- * @method
- * @memberof Shop/Methods
- * @summary enable/disable Reaction package
- * @param {String} packageId - package _id
- * @param {Boolean} enabled - current package `enabled` state
- * @returns {Number} mongo update result
- */
-export default function togglePackage(packageId, enabled) {
-  check(packageId, String);
-  check(enabled, Boolean);
-
-  const shopId = Reaction.getShopId();
-  if (!Reaction.hasPermission(["owner", "admin"], Reaction.getUserId(), shopId)) {
-    throw new ReactionError("access-denied", "Access Denied");
-  }
-
-  return Packages.update({
-    _id: packageId,
-    shopId
-  }, {
-    $set: {
-      enabled: !enabled
-    }
-  });
-}
diff --git a/imports/plugins/core/core/server/methods/updatePackage.js b/imports/plugins/core/core/server/methods/updatePackage.js
deleted file mode 100644
index d1f642dd7b..0000000000
--- a/imports/plugins/core/core/server/methods/updatePackage.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { check, Match } from "meteor/check";
-import { Packages } from "/lib/collections";
-import Reaction from "/imports/plugins/core/core/server/Reaction";
-import ReactionError from "@reactioncommerce/reaction-error";
-
-/**
- * @method package/update
- * @memberof Package/Methods
- * @summary updates the data stored for a certain Package.
- * @param {String} packageName - the name of the Package to update.
- * @param {String} field - the part of the Package's data that is to
- * be updated.
- * @param {Object|Array} value - the new data that's to be stored for the said
- * Package.
- * @since 1.5.1
- * @returns {Object} - returns an object with info about the update operation.
- */
-export default function updatePackage(packageName, field, value) {
-  check(packageName, String);
-  check(field, String);
-  check(value, Match.OneOf(Object, Array));
-
-  const userId = Reaction.getUserId();
-  const shopId = Reaction.getShopId();
-  if (!Reaction.hasPermission([packageName], userId, shopId)) {
-    throw new ReactionError("access-denied", `Access Denied. You don't have permissions for the ${packageName} package.`);
-  }
-
-  const updateResult = Packages.update({
-    name: packageName,
-    shopId
-  }, {
-    $set: {
-      [field]: value
-    }
-  });
-  if (updateResult !== 1) {
-    throw new ReactionError("server-error", `An error occurred while updating the package ${packageName}.`);
-  }
-  return updateResult;
-}
diff --git a/imports/plugins/core/core/server/methods/updateRegistry.js b/imports/plugins/core/core/server/methods/updateRegistry.js
deleted file mode 100644
index f18a59a000..0000000000
--- a/imports/plugins/core/core/server/methods/updateRegistry.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import ReactionError from "@reactioncommerce/reaction-error";
-import { check } from "meteor/check";
-import { Packages } from "/lib/collections";
-import Reaction from "/imports/plugins/core/core/server/Reaction";
-import { mergeDeep } from "/lib/api";
-
-/**
- * @name registry/update
- * @method
- * @memberof Registry/Methods
- * @example Meteor.call("registry/update", packageId, settingsKey, fields)
- * @param  {String} packageId ID of package
- * @param  {String} name      Name of package
- * @param  {Array} fields     Fields to update
- * @todo Name could be optional. Just use package name as default.
- * @returns {Boolean}          true on success, false on error
- */
-export default function updateRegistry(packageId, name, fields) {
-  check(packageId, String);
-  check(name, String);
-  check(fields, Array);
-
-  const shopId = Reaction.getShopId();
-
-  // settings use just the last name from full name so that schemas don't need to define overly complex names based with
-  // x/x/x formatting.
-  // TODO Name could be optional. Just use package name as default
-  const setting = name.split("/").splice(-1);
-
-  let dataToSave = {};
-  dataToSave[setting] = {};
-
-  fields.forEach((field) => {
-    dataToSave[setting][field.property] = field.value;
-  });
-
-  const currentPackage = Packages.findOne({ _id: packageId, shopId });
-  if (currentPackage && currentPackage.settings) {
-    dataToSave = mergeDeep(currentPackage.settings, dataToSave);
-  }
-
-  // user must have permission to package to update settings
-  if (!Reaction.hasPermission([name], Reaction.getUserId(), shopId)) {
-    throw new ReactionError("access-denied", "Access denied");
-  }
-
-  return Packages.upsert({
-    _id: packageId,
-    shopId
-  }, {
-    $set: {
-      settings: dataToSave
-    },
-    $setOnInsert: {
-      enabled: true,
-      name: currentPackage ? currentPackage.name : null
-    }
-  }, { upsert: true });
-}

From 44c221ee92f6ea3c7b5575477b0442d80f028270 Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 16:07:19 -0600
Subject: [PATCH 05/19] feat: delete Packages publication

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../publications/collections/packages.js      | 143 ------------------
 .../core/core/server/publications/index.js    |   1 -
 2 files changed, 144 deletions(-)
 delete mode 100644 imports/plugins/core/core/server/publications/collections/packages.js

diff --git a/imports/plugins/core/core/server/publications/collections/packages.js b/imports/plugins/core/core/server/publications/collections/packages.js
deleted file mode 100644
index ef2aad908e..0000000000
--- a/imports/plugins/core/core/server/publications/collections/packages.js
+++ /dev/null
@@ -1,143 +0,0 @@
-import _ from "lodash";
-import { Meteor } from "meteor/meteor";
-import { check, Match } from "meteor/check";
-import { Roles } from "meteor/alanning:roles";
-import { Packages } from "/lib/collections";
-import Reaction from "/imports/plugins/core/core/server/Reaction";
-import { translateRegistry } from "/lib/api";
-
-/**
- * @method transform
- * @memberof Packages
- * @description For transforming packages before publication sets some defaults for the client and adds i18n while checking privileged settings for enabled status
- * @param {Object} doc Registry doc
- * @param {String} userId Id of user to check permissions for
- * @returns {Object} Registry doc with permissions
- */
-function transform(doc, userId) {
-  const registrySettings = {};
-  const packageSettings = {};
-  let permissions = ["admin", "owner", doc.name];
-
-  // Get all permissions, add them to an array
-  if (doc.registry && doc.registry.permissions) {
-    for (const item of doc.registry.permissions) {
-      permissions.push(item.permission);
-    }
-  }
-  permissions = _.uniq(permissions);
-
-  // check for admin,owner or package permissions to view settings
-  const hasAdmin = Roles.userIsInRole(userId, permissions, doc.shopId);
-
-  if (doc.registry) {
-    for (let registry of doc.registry) {
-      // add some normalized defaults
-      registry.packageId = doc._id;
-      registry.shopId = doc.shopId;
-      registry.packageName = registry.packageName || doc.name;
-      [registry.settingsKey] = (registry.name || doc.name).split("/").splice(-1);
-      // check and set package enabled state
-      registry.permissions = [...permissions];
-      if (registry.route) {
-        registry.permissions.push(registry.name || `${doc.name}/${registry.template}`);
-
-        // Delete the route if the user doesn't have the correct permissions
-        if (Roles.userIsInRole(userId, registry.permissions, doc.shopId) === false) {
-          delete registry.route;
-        }
-      }
-
-      // We no longer use a settingsKey for "enabled" for some registry types.
-      // Would prefer to eliminate for all eventually.
-      if (Array.isArray(registry.provides) && registry.provides.includes("paymentSettings")) {
-        registry.enabled = !!doc.enabled;
-      } else {
-        if (doc.settings && doc.settings[registry.settingsKey]) {
-          registry.enabled = !!doc.settings[registry.settingsKey].enabled;
-        } else {
-          registry.enabled = !!doc.enabled;
-        }
-        // define export settings
-        registrySettings[registry.settingsKey] = {
-          enabled: registry.enabled
-        };
-      }
-
-      // add i18n keys
-      registry = translateRegistry(registry, doc);
-    }
-  }
-  // admin users get all settings the intent of this it so block publication of settings without limiting the use settings
-  // in this transform. non admin users should get public setting
-  if (hasAdmin === false && doc.settings) {
-    registrySettings.public = doc.settings.public;
-    delete doc.settings;
-    Object.assign(packageSettings, registrySettings);
-    doc.settings = packageSettings;
-  }
-
-  return doc;
-}
-
-// eslint-disable-next-line consistent-return
-Meteor.publish("Packages", function (shopId) {
-  check(shopId, Match.Maybe(String));
-
-  const self = this;
-  let myShopId = shopId;
-
-  if (!self.userId) return self.ready();
-
-  if (!myShopId) {
-    myShopId = Reaction.getPrimaryShopId();
-    if (!myShopId) {
-      return self.ready();
-    }
-  }
-
-  // default options, we're limiting fields here that we don't want to publish unless admin user. in particular, settings
-  // should not be published but we need to use settings in the transform everything except settings.public and
-  // settings.*.enabled are removed in transform
-  let options = {
-    fields: {
-      shopId: 1,
-      name: 1,
-      enabled: 1,
-      registry: 1,
-      layout: 1,
-      icon: 1,
-      settings: 1,
-      audience: 1
-    }
-  };
-
-  // if admin user, return all shop properties
-  if (
-    Roles.userIsInRole(self.userId, ["dashboard", "owner", "admin"], myShopId) ||
-    Roles.userIsInRole(self.userId, ["owner", "admin"], Roles.GLOBAL_GROUP)
-  ) {
-    options = {};
-  }
-
-  const query = { shopId: myShopId };
-
-  // observe and transform Package registry adds i18n and other meta data
-  const observer = Packages.find(query, options).observe({
-    added(doc) {
-      self.added("Packages", doc._id, transform(doc, self.userId));
-    },
-    changed(newDoc, origDoc) {
-      self.changed("Packages", origDoc._id, transform(newDoc, self.userId));
-    },
-    removed(origDoc) {
-      self.removed("Packages", origDoc._id);
-    }
-  });
-
-  self.onStop(() => {
-    observer.stop();
-  });
-
-  return self.ready();
-});
diff --git a/imports/plugins/core/core/server/publications/index.js b/imports/plugins/core/core/server/publications/index.js
index c00f205a19..c411601e7a 100644
--- a/imports/plugins/core/core/server/publications/index.js
+++ b/imports/plugins/core/core/server/publications/index.js
@@ -5,7 +5,6 @@ import "./collections/groups";
 import "./collections/media";
 import "./collections/members";
 import "./collections/orders";
-import "./collections/packages";
 import "./collections/product";
 import "./collections/products";
 import "./collections/reactiveAggregate";

From c36170b9efbf1f47efa773512e2cb11c93af2bc8 Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 16:12:03 -0600
Subject: [PATCH 06/19] feat: delete Packages collection and schemas

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 imports/collections/schemas/index.js          |   1 -
 imports/collections/schemas/layouts.js        |   6 +-
 imports/collections/schemas/registry.js       | 335 ------------------
 imports/collections/schemas/shipping.js       |  23 --
 imports/collections/schemas/social.js         |  70 ----
 .../server/startup/collection-security.js     |   3 +-
 .../lib/collections/schemas/config.js         |  37 --
 .../lib/collections/schemas/index.js          |   1 -
 imports/plugins/core/router/lib/router.js     |  11 +-
 .../lib/collections/schemas/config.js         |  23 --
 .../lib/collections/schemas/index.js          |   1 -
 .../lib/collections/schemas/index.js          |   1 -
 .../lib/collections/schemas/stripe.js         |  69 ----
 imports/test-utils/helpers/mockContext.js     |   1 -
 imports/utils/tests/mockContext.js            |   1 -
 lib/collections/collections.js                |   9 -
 16 files changed, 5 insertions(+), 587 deletions(-)
 delete mode 100644 imports/collections/schemas/registry.js
 delete mode 100644 imports/plugins/core/discounts/lib/collections/schemas/config.js
 delete mode 100644 imports/plugins/included/discount-codes/lib/collections/schemas/config.js
 delete mode 100644 imports/plugins/included/payments-stripe/lib/collections/schemas/index.js
 delete mode 100644 imports/plugins/included/payments-stripe/lib/collections/schemas/stripe.js

diff --git a/imports/collections/schemas/index.js b/imports/collections/schemas/index.js
index 58d1b3e329..ab654fc975 100644
--- a/imports/collections/schemas/index.js
+++ b/imports/collections/schemas/index.js
@@ -29,7 +29,6 @@ export * from "./notifications";
 export * from "./orders";
 export * from "./payments";
 export * from "./products";
-export * from "./registry";
 export * from "./shipping";
 export * from "./shops";
 export * from "./groups";
diff --git a/imports/collections/schemas/layouts.js b/imports/collections/schemas/layouts.js
index 649b7beeb9..9d8cfe47ab 100644
--- a/imports/collections/schemas/layouts.js
+++ b/imports/collections/schemas/layouts.js
@@ -5,8 +5,7 @@ import { registerSchema } from "@reactioncommerce/schemas";
  * @name LayoutStructure
  * @memberof Schemas
  * @type {SimpleSchema}
- * @summary Layout are used by the Shops and Packages schemas.
- * Layouts are used to in two ways: 1) Define the template layout on the site
+ * @summary Layouts are used to in two ways: 1) Define the template layout on the site
  * 2) Define workflow components used in each layout block
  * @description Read more about Layouts in {@link https://docs.reactioncommerce.com/reaction-docs/master/layout documentation}
  * @property {String} template optional
@@ -59,8 +58,7 @@ registerSchema("LayoutStructure", LayoutStructure);
  * @name Layout
  * @memberof Schemas
  * @type {SimpleSchema}
- * @summary Layout are used by the Shops and Packages schemas.
- * Read more about Layouts in {@link https://docs.reactioncommerce.com/reaction-docs/master/layout documentation}
+ * @summary Read more about Layouts in {@link https://docs.reactioncommerce.com/reaction-docs/master/layout documentation}
  * @property {String} layout optional
  * @property {String} workflow optional
  * @property {String} template optional
diff --git a/imports/collections/schemas/registry.js b/imports/collections/schemas/registry.js
deleted file mode 100644
index f8f86c5605..0000000000
--- a/imports/collections/schemas/registry.js
+++ /dev/null
@@ -1,335 +0,0 @@
-import SimpleSchema from "simpl-schema";
-import { registerSchema } from "@reactioncommerce/schemas";
-import { Layout } from "./layouts";
-
-/**
- * @name Permissions
- * @memberof Schemas
- * @summary The Permissions schema is part of the Registry. The Registry Schema allows package settings to be defined.
- * For more, read the in-depth {@link https://blog.reactioncommerce.com/an-intro-to-architecture-the-registry/ Intro to Architecture: The Registry}.
- * @type {SimpleSchema}
- * @property {String} permission
- * @property {String} label
- */
-export const Permissions = new SimpleSchema({
-  permission: {
-    type: String
-  },
-  label: {
-    type: String
-  }
-});
-
-registerSchema("Permissions", Permissions);
-
-/**
- * @name Registry
- * @memberof Schemas
- * @type {SimpleSchema}
- * @summary The Registry Schema allows package settings to be defined. For more, read the in-depth {@link https://blog.reactioncommerce.com/an-intro-to-architecture-the-registry/ Intro to Architecture: The Registry}.
- * @property {String[]} provides Legacy `provides` apps use a String rather than an array. These are transformed in loadPackages.
- * @property {String} route optional
- * @property {String} name optional, Registry name must be unique. Namespace your plugin (e.g. `yourorg-plugin-name`) to avoid conflicts.
- * @property {String} template optional, Assign to a Blaze template
- * @property {String} workflow optional, A layout for a template in the package
- * @property {String} layout optional, Force the app to render a specific layout
- * @property {String[]} triggersEnter optional, Trigger on Enter
- * @property {String[]} triggersExit optional, Trigger on Exit
- * @property {Object} options optional, Routing Options
- * @property {String} description optional, deprecated
- * @property {String} icon optional, A set of CSS classes, often Font Awesome classes, used to define the package in the sidebar.
- * @property {String} label optional, Human-readable name for a Registry entry
- * @property {String} container optional, Used to group plugins
- * @property {Number} priority optional, Plugin load order. Lower values loaded first.
- * @property {Boolean} enabled optional, Enable or not
- * @property {Permissions[]} permissions optional, Define a new user permission
- * @property {String[]} audience optional, Define what permissions are required to view a step in a workflow
- * @property {Object} meta optional, Set `dashboardSize` for the `actionView`
- * @property {String[]} showForShopTypes optional, Shop Types this plugin should show for
- * @property {String[]} hideForShopTypes optional, Shop Types this plugin should not show for
- */
-export const Registry = new SimpleSchema({
-  // TODO: This should _not_ be optional in the future, but we need to organize our packages better
-  "provides": {
-    // Legacy `provides` apps use a String rather than an array. These are transformed in loadPackages
-    type: Array,
-    optional: true
-  },
-  "provides.$": {
-    type: String
-  },
-  "route": {
-    type: String,
-    optional: true
-  },
-  // TODO: This should _not_ be optional in the future, but we need to organize our packages better
-  "name": {
-    type: String,
-    label: "Registry Name",
-    optional: true
-  },
-  "template": {
-    type: String,
-    optional: true
-  },
-  "workflow": {
-    type: String,
-    optional: true
-  },
-  "layout": {
-    type: String,
-    optional: true
-  },
-  "triggersEnter": {
-    type: Array,
-    label: "Trigger on Entry",
-    optional: true
-  },
-  "triggersEnter.$": {
-    type: String
-  },
-  "triggersExit": {
-    type: Array,
-    label: "Trigger on Exit",
-    optional: true
-  },
-  "triggersExit.$": {
-    type: String
-  },
-  "options": {
-    label: "Routing Options",
-    type: Object,
-    optional: true,
-    defaultValue: {}
-  },
-  "description": {
-    type: String,
-    optional: true
-  },
-  "icon": {
-    type: String,
-    optional: true
-  },
-  "label": {
-    type: String,
-    optional: true
-  },
-  "container": {
-    type: String,
-    optional: true
-  },
-  "priority": {
-    type: SimpleSchema.Integer,
-    optional: true
-  },
-  "enabled": {
-    type: Boolean,
-    optional: true
-  },
-  "permissions": {
-    type: Array,
-    optional: true
-  },
-  "permissions.$": {
-    type: Permissions
-  },
-  "audience": {
-    type: Array,
-    label: "Audience",
-    optional: true
-  },
-  "audience.$": {
-    type: String
-  },
-  "meta": {
-    label: "Meta",
-    type: Object,
-    optional: true,
-    blackbox: true
-  },
-  "showForShopTypes": {
-    label: "Shop Types this plugin should show for",
-    type: Array,
-    optional: true
-  },
-  "showForShopTypes.$": {
-    type: String
-  },
-  "hideForShopTypes": {
-    type: Array,
-    label: "Shop Types this plugin should not show for",
-    optional: true
-  },
-  "hideForShopTypes.$": {
-    type: String
-  }
-});
-
-registerSchema("Registry", Registry);
-
-/**
- * @name PackageConfig
- * @memberof Schemas
- * @type {SimpleSchema}
- * @summary The PackageConfig is part of the configuration settings required for packages in the Registry.
- * The Registry Schema allows package settings to be defined. For more, read the in-depth {@link https://blog.reactioncommerce.com/an-intro-to-architecture-the-registry/ Intro to Architecture: The Registry}.
- * @property {String} shopId The shop that owns this package config
- * @property {String} name required
- * @property {Boolean} enabled default value: true
- * @property {String} icon optional
- * @property {Object} settings optional
- * @property {Registry[]} registry optional
- * @property {Layout[]} layout optional
- */
-export const PackageConfig = new SimpleSchema({
-  "shopId": {
-    type: String,
-    label: "PackageConfig ShopId",
-    optional: true
-  },
-  "name": String,
-  "enabled": {
-    type: Boolean,
-    defaultValue: true
-  },
-  "version": {
-    type: String,
-    label: "Package Version",
-    optional: true
-  },
-  "icon": {
-    type: String,
-    optional: true
-  },
-  "settings": {
-    type: Object,
-    optional: true,
-    blackbox: true,
-    defaultValue: {}
-  },
-  "registry": {
-    type: Array,
-    optional: true
-  },
-  "registry.$": {
-    type: Registry
-  },
-  "layout": {
-    type: Array,
-    optional: true
-  },
-  "layout.$": {
-    type: Layout
-  }
-});
-
-registerSchema("PackageConfig", PackageConfig);
-
-/**
- * @name CorePackageConfig
- * @memberof Schemas
- * @type {SimpleSchema}
- * @summary The Core Package Config is part of the Registry.
- * The Registry Schema allows package settings to be defined. For more, read the in-depth {@link https://blog.reactioncommerce.com/an-intro-to-architecture-the-registry/ Intro to Architecture: The Registry}.
- * @extends {PackageConfig}
- * @property {Object} settings.mail optional, Mail settings
- * @property {String} settings.mail.user Mail user
- * @property {String} settings.mail.password Mail password
- * @property {String} settings.mail.host Mail host
- * @property {String} settings.mail.port Mail port
- * @property {String} settings.openexchangerates.appId OpenExchangeRates Id
- * @property {String} settings.openexchangerates.refreshPeriod default value: `"every 1 hour"`
- * @property {String} settings.google.clientId default value: `null`
- * @property {String} settings.google.apiKey default value: `null`
- * @property {Object} settings.public optional Settings in `public` are published to the client.
- * @property {Boolean} settings.public.allowGuestCheckout allows guest checkout
- * @property {String} settings.cart.cleanupDurationDays default value: `"older than 3 days"`
- */
-export const CorePackageConfig = PackageConfig.clone().extend({
-  // Remove blackbox: true from settings obj
-  "settings": {
-    type: Object,
-    optional: true,
-    blackbox: false,
-    defaultValue: {}
-  },
-  "settings.mail": {
-    type: Object,
-    optional: true,
-    label: "Mail Settings"
-  },
-  "settings.mail.user": {
-    type: String,
-    label: "Username"
-  },
-  "settings.mail.password": {
-    type: String,
-    label: "Password"
-  },
-  "settings.mail.host": {
-    type: String,
-    label: "Host"
-  },
-  "settings.mail.port": {
-    type: String,
-    label: "Port"
-  },
-  "settings.openexchangerates": {
-    type: Object,
-    optional: true
-  },
-  "settings.openexchangerates.appId": {
-    type: String,
-    label: "Open Exchange Rates App Id",
-    optional: true
-  },
-  "settings.openexchangerates.refreshPeriod": {
-    type: String,
-    label: "Open Exchange Rates refresh period",
-    defaultValue: "every 1 hour"
-  },
-  "settings.google": {
-    type: Object,
-    optional: true
-  },
-  "settings.google.clientId": {
-    type: String,
-    label: "Google Client Id"
-  },
-  "settings.google.apiKey": {
-    type: String,
-    label: "Google Api Key"
-  },
-  "settings.public": {
-    type: Object,
-    optional: true,
-    defaultValue: {}
-  },
-  "settings.public.allowGuestCheckout": {
-    type: Boolean,
-    label: "Allow Guest Checkout",
-    defaultValue: true
-  },
-  "settings.cart": {
-    type: Object,
-    defaultValue: {},
-    optional: true
-  },
-  "settings.cart.cleanupDurationDays": {
-    type: String,
-    label: "Cleanup Schedule",
-    defaultValue: "older than 3 days"
-  },
-  "settings.sitemaps": {
-    type: Object,
-    defaultValue: {},
-    optional: true
-  },
-  "settings.sitemaps.refreshPeriod": {
-    type: String,
-    label: "Sitemap refresh period",
-    defaultValue: "every 24 hours"
-  }
-});
-
-registerSchema("CorePackageConfig", CorePackageConfig);
diff --git a/imports/collections/schemas/shipping.js b/imports/collections/schemas/shipping.js
index 154f82aa7c..a1c50d26e0 100644
--- a/imports/collections/schemas/shipping.js
+++ b/imports/collections/schemas/shipping.js
@@ -3,7 +3,6 @@ import { registerSchema } from "@reactioncommerce/schemas";
 import { schemaIdAutoValue } from "./helpers";
 import { Address } from "./address";
 import { Invoice } from "./payments";
-import { PackageConfig } from "./registry";
 import { Workflow } from "./workflow";
 
 /**
@@ -526,25 +525,3 @@ export const Shipping = new SimpleSchema({
 });
 
 registerSchema("Shipping", Shipping);
-
-/**
- * @name ShippingPackageConfig
- * @memberof Schemas
- * @type {SimpleSchema}
- * @property {String} settings.name default value: `Flat Rate Service`
- */
-export const ShippingPackageConfig = PackageConfig.clone().extend({
-  // Remove blackbox: true from settings obj
-  "settings": {
-    type: Object,
-    optional: true,
-    blackbox: false,
-    defaultValue: {}
-  },
-  "settings.name": {
-    type: String,
-    defaultValue: "Flat Rate Service"
-  }
-});
-
-registerSchema("ShippingPackageConfig", ShippingPackageConfig);
diff --git a/imports/collections/schemas/social.js b/imports/collections/schemas/social.js
index 39a8ffdad2..3f58a126d4 100644
--- a/imports/collections/schemas/social.js
+++ b/imports/collections/schemas/social.js
@@ -1,6 +1,5 @@
 import SimpleSchema from "simpl-schema";
 import { registerSchema } from "@reactioncommerce/schemas";
-import { PackageConfig } from "./registry";
 
 /**
  * @name SocialProvider
@@ -25,72 +24,3 @@ export const SocialProvider = new SimpleSchema({
 });
 
 registerSchema("SocialProvider", SocialProvider);
-
-/**
- * @name SocialPackageConfig
- * @memberof Schemas
- * @type {SimpleSchema}
- * @extends {PackageConfig}
- * @property {Object} settings.public optional
- * @property {Object} settings.public.apps optional
- * @property {SocialProvider} settings.public.apps.facebook  optional, Facebook
- * @property {String} settings.public.apps.facebook.appId optional, Facebook App ID
- * @property {SocialProvider} settings.public.apps.twitter optional, Twitter
- * @property {String} settings.public.apps.twitter.username optional, Twitter username
- * @property {SocialProvider} settings.public.apps.pinterest optional, Pinterest
- * @property {SocialProvider} settings.public.apps.googleplus optional, Google+
- */
-export const SocialPackageConfig = PackageConfig.clone().extend({
-  // Remove blackbox: true from settings obj
-  "settings": {
-    type: Object,
-    optional: true,
-    blackbox: false,
-    defaultValue: {}
-  },
-  "settings.public": {
-    type: Object,
-    optional: true,
-    defaultValue: {}
-  },
-  "settings.public.apps": {
-    type: Object,
-    label: "Social Settings",
-    optional: true,
-    defaultValue: {}
-  },
-  "settings.public.apps.facebook": {
-    type: SocialProvider,
-    optional: true,
-    defaultValue: {}
-  },
-  "settings.public.apps.facebook.appId": {
-    type: String,
-    regEx: /\d+/,
-    label: "App Id",
-    optional: true
-  },
-  "settings.public.apps.twitter": {
-    type: SocialProvider,
-    optional: true,
-    defaultValue: {}
-  },
-  "settings.public.apps.twitter.username": {
-    type: String,
-    label: "Username",
-    optional: true
-  },
-  "settings.public.apps.pinterest": {
-    type: SocialProvider,
-    optional: true,
-    defaultValue: {}
-  },
-  "settings.public.apps.googleplus": {
-    type: SocialProvider,
-    label: "Google+",
-    optional: true,
-    defaultValue: {}
-  }
-});
-
-registerSchema("SocialPackageConfig", SocialPackageConfig);
diff --git a/imports/plugins/core/core/server/startup/collection-security.js b/imports/plugins/core/core/server/startup/collection-security.js
index 991d264008..2dc8496cd0 100644
--- a/imports/plugins/core/core/server/startup/collection-security.js
+++ b/imports/plugins/core/core/server/startup/collection-security.js
@@ -5,7 +5,6 @@ import Reaction from "/imports/plugins/core/core/server/Reaction";
 
 const {
   Accounts,
-  Packages,
   Emails,
   MediaRecords,
   Orders,
@@ -116,7 +115,7 @@ export default function () {
    */
 
   Security.permit(["insert", "update", "remove"])
-    .collections([Accounts, Products, Tags, Shipping, Orders, Packages, Templates])
+    .collections([Accounts, Products, Tags, Shipping, Orders, Templates])
     .ifHasRoleForActiveShop({ role: "admin" })
     .ifShopIdMatches()
     .exceptProps(["shopId"])
diff --git a/imports/plugins/core/discounts/lib/collections/schemas/config.js b/imports/plugins/core/discounts/lib/collections/schemas/config.js
deleted file mode 100644
index d3b983c261..0000000000
--- a/imports/plugins/core/discounts/lib/collections/schemas/config.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { registerSchema } from "@reactioncommerce/schemas";
-import { PackageConfig } from "/lib/collections/schemas";
-import { Discounts } from "./discounts";
-
-/**
- * @name DiscountsPackageConfig
- * @memberof Schemas
- * @type {SimpleSchema}
- */
-export const DiscountsPackageConfig = PackageConfig.clone().extend({
-  // Remove blackbox: true from settings obj
-  "settings": {
-    type: Object,
-    optional: true,
-    blackbox: false,
-    defaultValue: {}
-  },
-  "settings.rates": {
-    type: Object,
-    optional: true,
-    defaultValue: {}
-  },
-  "settings.rates.enabled": {
-    type: Boolean,
-    optional: true,
-    defaultValue: false
-  },
-  "settings.rates.discounts": {
-    type: Array,
-    optional: true
-  },
-  "settings.rates.discounts.$": {
-    type: Discounts
-  }
-});
-
-registerSchema("DiscountsPackageConfig", DiscountsPackageConfig);
diff --git a/imports/plugins/core/discounts/lib/collections/schemas/index.js b/imports/plugins/core/discounts/lib/collections/schemas/index.js
index 9534ec432c..a61b2ebb3e 100644
--- a/imports/plugins/core/discounts/lib/collections/schemas/index.js
+++ b/imports/plugins/core/discounts/lib/collections/schemas/index.js
@@ -1,2 +1 @@
 export * from "./discounts";
-export * from "./config";
diff --git a/imports/plugins/core/router/lib/router.js b/imports/plugins/core/router/lib/router.js
index 79d2b4818d..ffccb27b0d 100644
--- a/imports/plugins/core/router/lib/router.js
+++ b/imports/plugins/core/router/lib/router.js
@@ -10,10 +10,9 @@ import Blaze from "meteor/gadicc:blaze-react-component";
 import { Template } from "meteor/templating";
 import { Session } from "meteor/session";
 import { Tracker } from "meteor/tracker";
-import { Packages, Shops } from "/lib/collections";
+import { Shops } from "/lib/collections";
 import { getComponent } from "@reactioncommerce/reaction-components/components";
 import Hooks from "./hooks";
-import { addRoutePrefixToPackageRoutes, getEnabledPackageRoutes } from "./utils";
 
 // Using a ternary operator here to avoid a mutable export - open to suggestions for a better way to do this
 export const history = Meteor.isClient ? createBrowserHistory() : createMemoryHistory();
@@ -565,13 +564,11 @@ Router.initPackageRoutes = (options) => {
   Router.Reaction = options.reactionContext;
   Router.routes = [];
 
-  const packages = Packages.find().fetch();
-
   // Default layouts
   const indexLayout = ReactionLayout(options.indexRoute);
   const defaultNotFoundLayout = ReactionLayout({ template: "notFound" });
 
-  const defaultRouteDefinitions = [{
+  const allRouteDefinitions = [{
     route: "/",
     name: "index",
     options: {
@@ -604,10 +601,6 @@ Router.initPackageRoutes = (options) => {
     }
   }];
 
-  const enabledPackageRoutes = getEnabledPackageRoutes(ReactionLayout, packages);
-  const updatedPackageRoutes = addRoutePrefixToPackageRoutes(enabledPackageRoutes);
-  const allRouteDefinitions = [...updatedPackageRoutes, ...defaultRouteDefinitions];
-
   // Uniq-ify routes
   // Take all route definitions in the order that were received, and reverse it.
   // Routes defined later, like in the case of custom routes will then have a
diff --git a/imports/plugins/included/discount-codes/lib/collections/schemas/config.js b/imports/plugins/included/discount-codes/lib/collections/schemas/config.js
deleted file mode 100644
index 8eab0135cd..0000000000
--- a/imports/plugins/included/discount-codes/lib/collections/schemas/config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { DiscountsPackageConfig } from "/imports/plugins/core/discounts/lib/collections/schemas";
-import { registerSchema } from "@reactioncommerce/schemas";
-
-/**
- * @name DiscountCodesPackageConfig
- * @memberof Schemas
- * @type {SimpleSchema}
- * @summary A schema that extends discount schema with properties for discount codes.
- */
-export const DiscountCodesPackageConfig = DiscountsPackageConfig.clone().extend({
-  "settings.codes": {
-    type: Object,
-    optional: true,
-    defaultValue: {}
-  },
-  "settings.codes.enabled": {
-    type: Boolean,
-    optional: true,
-    defaultValue: false
-  }
-});
-
-registerSchema("DiscountCodesPackageConfig", DiscountCodesPackageConfig);
diff --git a/imports/plugins/included/discount-codes/lib/collections/schemas/index.js b/imports/plugins/included/discount-codes/lib/collections/schemas/index.js
index ff51c8cedb..f84b9ec5a7 100644
--- a/imports/plugins/included/discount-codes/lib/collections/schemas/index.js
+++ b/imports/plugins/included/discount-codes/lib/collections/schemas/index.js
@@ -1,2 +1 @@
-export * from "./config";
 export * from "./codes";
diff --git a/imports/plugins/included/payments-stripe/lib/collections/schemas/index.js b/imports/plugins/included/payments-stripe/lib/collections/schemas/index.js
deleted file mode 100644
index c3c598ddcc..0000000000
--- a/imports/plugins/included/payments-stripe/lib/collections/schemas/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./stripe";
diff --git a/imports/plugins/included/payments-stripe/lib/collections/schemas/stripe.js b/imports/plugins/included/payments-stripe/lib/collections/schemas/stripe.js
deleted file mode 100644
index 09ddb8aec8..0000000000
--- a/imports/plugins/included/payments-stripe/lib/collections/schemas/stripe.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import SimpleSchema from "simpl-schema";
-import { check } from "meteor/check";
-import { Tracker } from "meteor/tracker";
-import { PackageConfig } from "/lib/collections/schemas";
-import { registerSchema } from "@reactioncommerce/schemas";
-
-/**
- * @name StripeConnectAuthorizationCredentials
- * @memberof Schemas
- * @type {SimpleSchema}
- * @see {@link https://stripe.com/docs/api}
- */
-export const StripeConnectAuthorizationCredentials = new SimpleSchema({
-  token_type: { // eslint-disable-line camelcase
-    type: String
-  },
-  stripe_publishable_key: { // eslint-disable-line camelcase
-    type: String
-  },
-  scope: {
-    type: String
-  },
-  livemode: {
-    type: Boolean
-  },
-  stripe_user_id: { // eslint-disable-line camelcase
-    type: String
-  },
-  refresh_token: { // eslint-disable-line camelcase
-    type: String
-  },
-  access_token: { // eslint-disable-line camelcase
-    type: String
-  }
-}, { check, tracker: Tracker });
-
-registerSchema("StripeConnectAuthorizationCredentials", StripeConnectAuthorizationCredentials);
-
-/**
- * @name StripePackageConfig
- * @memberof Schemas
- * @type {SimpleSchema}
- */
-export const StripePackageConfig = PackageConfig.clone().extend({
-  // Remove blackbox: true from settings obj
-  "settings": {
-    type: Object,
-    optional: true,
-    blackbox: false,
-    defaultValue: {}
-  },
-  "settings.mode": {
-    type: Boolean,
-    defaultValue: false
-  },
-  // This field only applies to marketplace style orders where a payment is taken on behalf of another store
-  "settings.applicationFee": {
-    type: Number,
-    label: "Percentage Application Fee",
-    optional: true,
-    defaultValue: 5
-  },
-  "settings.public": {
-    type: Object,
-    defaultValue: {}
-  }
-});
-
-registerSchema("StripePackageConfig", StripePackageConfig);
diff --git a/imports/test-utils/helpers/mockContext.js b/imports/test-utils/helpers/mockContext.js
index cc163b3553..6974e2277f 100644
--- a/imports/test-utils/helpers/mockContext.js
+++ b/imports/test-utils/helpers/mockContext.js
@@ -80,7 +80,6 @@ export function mockCollection(collectionName) {
   "NavigationTrees",
   "Notifications",
   "Orders",
-  "Packages",
   "Products",
   "Revisions",
   "roles",
diff --git a/imports/utils/tests/mockContext.js b/imports/utils/tests/mockContext.js
index a1eee87a6f..46e1e32db5 100644
--- a/imports/utils/tests/mockContext.js
+++ b/imports/utils/tests/mockContext.js
@@ -36,7 +36,6 @@ const mockContext = {
   "NavigationTrees",
   "Notifications",
   "Orders",
-  "Packages",
   "Products",
   "Revisions",
   "roles",
diff --git a/lib/collections/collections.js b/lib/collections/collections.js
index eb8c111431..5bff58cc62 100644
--- a/lib/collections/collections.js
+++ b/lib/collections/collections.js
@@ -90,15 +90,6 @@ export const Orders = new Mongo.Collection("Orders", {
 
 Orders.attachSchema(Schemas.Order);
 
-/**
- * @name Packages
- * @memberof Collections
- * @type {MongoCollection}
- */
-export const Packages = new Mongo.Collection("Packages");
-
-Packages.attachSchema(Schemas.PackageConfig);
-
 /**
  * @name Catalog
  * @memberof Collections

From e5383ff09e2c435bd11fe32c20de5b40fd1f39d7 Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 16:16:08 -0600
Subject: [PATCH 07/19] refactor: remove unused code related to Packages

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 client/modules/core/helpers/apps.js           | 172 ------------------
 client/modules/core/helpers/permissions.js    |   8 -
 client/modules/core/index.js                  |   3 -
 client/modules/core/main.js                   |  71 +-------
 imports/plugins/core/accounts/client/index.js |  10 -
 .../client/templates/dashboard/dashboard.html |  50 -----
 .../client/templates/dashboard/dashboard.js   | 112 +-----------
 .../core/core/server/Reaction/importer.js     |  19 --
 .../core/core/server/methods/shop/index.js    |   6 +-
 .../core/server/methods/shop/locateAddress.js |  35 ----
 .../shop/updateShopExternalServices.js        |  35 ----
 .../plugins/core/core/server/util/geocoder.js | 158 ----------------
 .../core/dashboard/client/components/index.js |   2 -
 .../client/components/packageList.js          | 122 -------------
 .../client/components/shortcutBar.js          |  88 ---------
 .../dashboard/client/components/toolbar.js    |  35 ----
 .../client/containers/actionViewContainer.js  |  20 --
 .../core/dashboard/client/containers/index.js |   1 -
 .../client/containers/packageListContainer.js |  97 ----------
 .../client/containers/toolbarContainer.js     |  26 +--
 .../plugins/core/dashboard/client/index.js    |  27 +--
 .../dashboard/client/templates/dashboard.html |  28 ---
 .../dashboard/client/templates/dashboard.js   |  28 ---
 .../client/templates/packages/README.md       |  28 ---
 .../client/templates/packages/grid/grid.html  |  24 ---
 .../client/templates/packages/grid/grid.js    | 153 ----------------
 .../templates/packages/grid/package.html      |  10 -
 .../client/templates/packages/grid/package.js |  76 --------
 .../client/templates/packages/packages.html   |   5 -
 .../client/templates/packages/packages.js     |  11 --
 .../client/templates/settings/settings.html   |  64 -------
 .../client/templates/settings/settings.js     |  85 ---------
 .../templates/shop/settings/settings.html     |  45 -----
 .../templates/shop/settings/settings.js       |  70 +------
 .../client/containers/adminContainer.js       |  54 ------
 .../core/layout/client/containers/index.js    |   1 -
 .../client/containers/quickMenuContainer.js   |  46 -----
 imports/plugins/core/router/lib/utils.js      | 112 ------------
 imports/plugins/core/router/lib/utils.test.js |  34 ----
 .../core/ui/client/components/app/app.js      |   6 +-
 40 files changed, 21 insertions(+), 1956 deletions(-)
 delete mode 100644 client/modules/core/helpers/apps.js
 delete mode 100644 imports/plugins/core/core/server/methods/shop/locateAddress.js
 delete mode 100644 imports/plugins/core/core/server/methods/shop/updateShopExternalServices.js
 delete mode 100644 imports/plugins/core/core/server/util/geocoder.js
 delete mode 100644 imports/plugins/core/dashboard/client/components/packageList.js
 delete mode 100644 imports/plugins/core/dashboard/client/components/shortcutBar.js
 delete mode 100644 imports/plugins/core/dashboard/client/containers/packageListContainer.js
 delete mode 100644 imports/plugins/core/dashboard/client/templates/dashboard.html
 delete mode 100644 imports/plugins/core/dashboard/client/templates/dashboard.js
 delete mode 100644 imports/plugins/core/dashboard/client/templates/packages/README.md
 delete mode 100644 imports/plugins/core/dashboard/client/templates/packages/grid/grid.html
 delete mode 100644 imports/plugins/core/dashboard/client/templates/packages/grid/grid.js
 delete mode 100644 imports/plugins/core/dashboard/client/templates/packages/grid/package.html
 delete mode 100644 imports/plugins/core/dashboard/client/templates/packages/grid/package.js
 delete mode 100644 imports/plugins/core/dashboard/client/templates/packages/packages.html
 delete mode 100644 imports/plugins/core/dashboard/client/templates/packages/packages.js
 delete mode 100644 imports/plugins/core/dashboard/client/templates/settings/settings.html
 delete mode 100644 imports/plugins/core/dashboard/client/templates/settings/settings.js
 delete mode 100644 imports/plugins/core/layout/client/containers/adminContainer.js
 delete mode 100644 imports/plugins/core/layout/client/containers/index.js
 delete mode 100644 imports/plugins/core/layout/client/containers/quickMenuContainer.js
 delete mode 100644 imports/plugins/core/router/lib/utils.js
 delete mode 100644 imports/plugins/core/router/lib/utils.test.js

diff --git a/client/modules/core/helpers/apps.js b/client/modules/core/helpers/apps.js
deleted file mode 100644
index c99ca28575..0000000000
--- a/client/modules/core/helpers/apps.js
+++ /dev/null
@@ -1,172 +0,0 @@
-import _ from "lodash";
-import { Template } from "meteor/templating";
-import { Roles } from "meteor/alanning:roles";
-import { Reaction } from "/client/api";
-import { Packages, Shops } from "/lib/collections";
-
-/**
- * @typedef optionHash
- * @type {Object}
- * @property {String} name - name of a package.
- * @property {String} provides -purpose of this package as identified to the registry
- * @property {String} container - filter registry entries for matching container.
- * @property {String} shopId - filter to only display results matching shopId, not returned
- * @property {String} template - filter registry entries for matching template
- */
-
-/**
- * @method Apps
- * @param {optionHash} optionHash Option hash
- * @returns {Object[]} returns an array of filtered, structure reactionApps
- */
-export function Apps(optionHash) {
-  const { getUserId } = Reaction;
-  const filter = {};
-  const registryFilter = {};
-  let key;
-  const reactionApps = [];
-  let options = {};
-
-  // allow for object or option.hash
-  if (optionHash) {
-    if (optionHash.hash) {
-      options = optionHash.hash;
-    } else {
-      options = optionHash;
-    }
-  }
-
-  // you could provide a shopId in optionHash
-  if (!options.shopId) {
-    options.shopId = Reaction.getShopId();
-  }
-
-  // Get the shop to determine shopType
-  const shop = Shops.findOne({ _id: options.shopId }) || {};
-  const { shopType } = shop;
-
-  // remove audience permissions for owner (still needed here for older/legacy calls)
-  if (Reaction.hasOwnerAccess() && options.audience) {
-    delete options.audience;
-  }
-
-  //
-  // build filter to only get matching registry elements
-  //
-  for (key in options) {
-    if ({}.hasOwnProperty.call(options, key)) {
-      const value = options[key];
-      if (value) {
-        if (!(key === "enabled" || key === "name" || key === "shopId")) {
-          filter[`registry.${key}`] = Array.isArray(options[key]) ? { $in: value } : value;
-          registryFilter[key] = value;
-        } else {
-          // perhaps not the best way to check but lets admin see all packages
-          if (!Reaction.hasOwnerAccess()) {
-            if (key !== "shopId") {
-              registryFilter[key] = value;
-            }
-          }
-          filter[key] = value;
-        }
-      }
-    }
-  }
-
-  delete filter["registry.audience"]; // Temporarily remove "audience" key (see comment below)
-
-  // TODO: Review fix for filter on Packages.find(filter)
-  // The current "filter" setup uses "audience" field which is not present in the registry array in most (if not all) docs
-  // in the Packages coll.
-  // For now, the audience checks (after the Package.find call) filters out the registry items based on permissions. But
-  // part of the filtering should have been handled by the Package.find call, if the "audience" filter works as it should.
-  Packages.find(filter).forEach((app) => {
-    const matchingRegistry = _.filter(app.registry, (item) => {
-      const itemFilter = _.cloneDeep(registryFilter);
-
-      // check audience permissions only if they exist as part of optionHash and are part of the registry item
-      // ideally all routes should use it, safe for backwards compatibility though
-      // owner bypasses permissions
-      if (!Reaction.hasOwnerAccess() && item.permissions && registryFilter.audience) {
-        let hasAccess;
-
-        for (const permission of registryFilter.audience) {
-          // This checks that the registry item contains a permissions matches with the user's permission for the shop
-          const hasPermissionToRegistryItem = item.permissions.indexOf(permission) > -1;
-          // This checks that the user's permission set have the right value that is on the registry item
-          const hasRoleAccessForShop = Roles.userIsInRole(getUserId(), permission, Reaction.getShopId());
-
-          // both checks must pass for access to be granted
-          if (hasPermissionToRegistryItem && hasRoleAccessForShop) {
-            hasAccess = true;
-            break;
-          }
-        }
-
-        if (!hasAccess) {
-          return false;
-        }
-
-        // safe to clean up now, and isMatch can ignore audience
-        delete itemFilter.audience;
-      }
-
-      // Check that shopType matches showForShopType if option is present
-      if (item.showForShopTypes &&
-          Array.isArray(item.showForShopTypes) &&
-          !item.showForShopTypes.includes(shopType)) {
-        return false;
-      }
-
-      // Check that shopType does not match hideForShopType if option is present
-      if (item.hideForShopTypes &&
-          Array.isArray(item.hideForShopTypes) &&
-          item.hideForShopTypes.includes(shopType)) {
-        return false;
-      }
-
-      // Loop through all keys in the itemFilter
-      // each filter item should match exactly with the property in the registry or
-      // should be included in the array if that property is an array
-      return Object.keys(itemFilter).every((property) => {
-        const filterVal = itemFilter[property];
-        const itemVal = item[property];
-
-        // Check to see if the registry entry is an array.
-        // Legacy registry entries could exist that use a string even when the schema requires an array.
-        // If it's not an array, the filter should match exactly
-        return Array.isArray(itemVal) ? itemVal.includes(filterVal) : itemVal === filterVal;
-      });
-    });
-
-    for (const registry of matchingRegistry) {
-      reactionApps.push(registry);
-    }
-  });
-
-  // Sort apps by priority (registry.priority)
-  return reactionApps.sort((appA, appB) => appA.priority - appB.priority).slice();
-}
-
-/**
- *
- * @name reactionApps
- * @memberof BlazeTemplateHelpers
- * @summary Return an array of filtered, structured `reactionApps` as a Template Helper
- * @example {{#each reactionApps provides="settings" name=packageName container=container}}
- * @example {{#each reactionApps provides="userAccountDropdown" enabled=true}}
- * @param {optionHash} optionHash Option hash
- * @returns {Object[]} returns an array of filtered, structure reactionApps
- * ```[{
- *   enabled: true
- *   label: "Stripe"
- *   name: "reaction-stripe"
- *   packageId: "QqkGsQCDRhg2LSn8J"
- *   priority: 1
- *   provides: "paymentMethod"
- *   template: "stripePaymentForm"
- *   etc: "additional properties as defined in Packages.registry"
- *   ...
- *  }]```
- */
-Template.registerHelper("reactionApps", (optionHash) => Reaction.Apps(optionHash));
diff --git a/client/modules/core/helpers/permissions.js b/client/modules/core/helpers/permissions.js
index 5dca028c29..0b97c417f6 100644
--- a/client/modules/core/helpers/permissions.js
+++ b/client/modules/core/helpers/permissions.js
@@ -48,11 +48,3 @@ Template.registerHelper("hasAdminAccess", () => Reaction.hasAdminAccess());
  * @returns {Boolean} return true if user has dashboard permission
  */
 Template.registerHelper("hasDashboardAccess", () => Reaction.hasDashboardAccess());
-
-/**
- * @method allowGuestCheckout
- * @memberof BlazeTemplateHelpers
- * @summary check if guest users are allowed to checkout, uses [alanning:meteor-roles](http://alanning.github.io/meteor-roles/classes/Roles.html)
- * @returns {Boolean} return true if shop has guest checkout enabled
- */
-Template.registerHelper("allowGuestCheckout", () => Reaction.allowGuestCheckout());
diff --git a/client/modules/core/index.js b/client/modules/core/index.js
index acc465cfae..4cea1cb8cd 100644
--- a/client/modules/core/index.js
+++ b/client/modules/core/index.js
@@ -1,5 +1,4 @@
 import Core from "./main";
-import * as Apps from "./helpers/apps";
 import * as Globals from "./helpers/globals";
 import * as Utils from "./helpers/utils";
 import { Subscriptions } from "./subscriptions";
@@ -11,10 +10,8 @@ import { Router } from "/client/modules/router";
 import * as Collections from "/lib/collections";
 import * as Schemas from "/lib/collections/schemas";
 
-
 export const Reaction = Object.assign(
   Core,
-  Apps,
   Globals,
   Utils,
   { Subscriptions },
diff --git a/client/modules/core/main.js b/client/modules/core/main.js
index e3dc728ca8..9058bfe6b3 100644
--- a/client/modules/core/main.js
+++ b/client/modules/core/main.js
@@ -6,8 +6,7 @@ import { Tracker } from "meteor/tracker";
 import { ReactiveVar } from "meteor/reactive-var";
 import { ReactiveDict } from "meteor/reactive-dict";
 import { Roles } from "meteor/alanning:roles";
-import Logger from "/client/modules/logger";
-import { Packages, Shops } from "/lib/collections";
+import { Shops } from "/lib/collections";
 import { Router } from "/client/modules/router";
 import { DomainsMixin } from "./domains";
 import { getUserId } from "./helpers/utils";
@@ -485,19 +484,6 @@ export default {
     return slug;
   },
 
-  /**
-   * @name allowGuestCheckout
-   * @method
-   * @memberof Core/Client
-   * @returns {Boolean} is guest checkout allowed
-   */
-  allowGuestCheckout() {
-    const pkg = Packages.findOne({ name: "core", shopId: this.getShopId() }) || {};
-    const shopSettings = pkg.settings || {};
-    // we can disable in admin, let's check.
-    return !!(shopSettings.public && shopSettings.public.allowGuestCheckout);
-  },
-
   /**
    * (similar to server/api canInviteToGroup)
    * @name canInviteToGroup
@@ -580,15 +566,9 @@ export default {
 
       Session.set("admin/actionView", viewStack);
     } else {
-      const registryItem = this.getRegistryForCurrentRoute("settings");
-
-      if (registryItem) {
-        this.setActionView(registryItem);
-      } else {
-        this.setActionView({
-          template: "blankControls"
-        });
-      }
+      this.setActionView({
+        template: "blankControls"
+      });
     }
   },
 
@@ -608,13 +588,7 @@ export default {
       actionViewStack.push(viewData);
       Session.set("admin/actionView", actionViewStack);
     } else {
-      const registryItem = this.getRegistryForCurrentRoute("settings");
-
-      if (registryItem) {
-        this.pushActionView(registryItem);
-      } else {
-        this.pushActionView({ template: "blankControls" });
-      }
+      this.pushActionView({ template: "blankControls" });
     }
   },
 
@@ -809,40 +783,5 @@ export default {
     }
 
     return null;
-  },
-
-  /**
-   * @name getRegistryForCurrentRoute
-   * @method
-   * @memberof Core/Client
-   * @param {String} provides type of template from registry
-   * @returns {Object} settings data from this package
-   */
-  getRegistryForCurrentRoute(provides = "dashboard") {
-    this.Router.watchPathChange();
-    const currentRouteName = this.Router.getRouteName();
-    const currentRoute = this.Router.current();
-    const { template } = currentRoute.route.options;
-    // find registry entries for routeName
-    const reactionApp = Packages.findOne({
-      "registry.name": currentRouteName,
-      "registry.provides": provides,
-      "enabled": true
-    }, {
-      enabled: 1,
-      registry: 1,
-      route: 1,
-      name: 1,
-      label: 1,
-      settings: 1
-    });
-
-    // valid application
-    if (reactionApp) {
-      const settingsData = _.find(reactionApp.registry, (item) => item.provides && item.provides.includes(provides) && item.template === template);
-      return settingsData;
-    }
-    Logger.debug("getRegistryForCurrentRoute not found", template, provides);
-    return {};
   }
 };
diff --git a/imports/plugins/core/accounts/client/index.js b/imports/plugins/core/accounts/client/index.js
index 4707cbaebf..d7f6e0f0c2 100644
--- a/imports/plugins/core/accounts/client/index.js
+++ b/imports/plugins/core/accounts/client/index.js
@@ -62,16 +62,6 @@ registerOperatorRoute({
   sidebarI18nLabel: "admin.dashboard.accountsLabel"
 });
 
-registerOperatorRoute({
-  isNavigationLink: true,
-  isSetting: true,
-  path: "/login-services",
-  mainComponent: "accountsSettings",
-  // eslint-disable-next-line react/display-name, react/no-multi-comp
-  // SidebarIconComponent: (props) => <FontAwesomeIcon icon={faSignInAlt} {...props} />,
-  sidebarI18nLabel: "admin.settings.accountSettingsLabel"
-});
-
 registerOperatorRoute({
   isNavigationLink: false,
   isSetting: false,
diff --git a/imports/plugins/core/accounts/client/templates/dashboard/dashboard.html b/imports/plugins/core/accounts/client/templates/dashboard/dashboard.html
index 84b43b79f7..99fdfaee98 100644
--- a/imports/plugins/core/accounts/client/templates/dashboard/dashboard.html
+++ b/imports/plugins/core/accounts/client/templates/dashboard/dashboard.html
@@ -5,53 +5,3 @@
     </div>
   {{/if}}
 </template>
-
-<template name="accountsSettings">
-  {{#each service in services}}
-    <div class="panel panel-default">
-      <div class="panel-heading panel-heading-flex">
-        <div class="panel-title">
-          <i class="fa fa-{{service.name}}"></i>
-          {{service.label}}
-          <span data-i18n="accountsUI.signIn">Sign In</span>
-        </div>
-        <div class="panel-controls">
-          <input class="checkbox-switch" type="checkbox" name="enabled" value="{{service.name}}" {{checked service.enabled}}>
-        </div>
-      </div>
-      <div class="panel-body {{shown service.enabled}}">
-        <form name="{{service.name}}Settings">
-          <input type="hidden" value="{{service.name}}" name="service">
-          {{#each field in service.fields}}
-            <div class="form-group ">
-              <label for="{{name}}SettingsClientId"><span data-i18n="loginServices.{{field.property}}">{{field.label}}</span></label>
-
-              <div class="{{#if condition field.property "eq" "secret"}}form-inline{{/if}}">
-                <input
-                  class="form-control"
-                  id="{{service.name}}SettingsClientId"
-                  type="{{field.type}}"
-                  name="{{field.property}}"
-                  value="{{valueForField field.property service}}">
-
-                {{#if condition field.property "eq" "secret"}}
-                  <button class="btn btn-default" type="button" data-event-action="showSecret">Show</button>
-                {{/if}}
-              </div>
-
-            </div>
-          {{/each}}
-          <div class="form-group">
-            <button class="btn btn-primary" type="submit" data-i18n="app.updateSettings">Update Settings</button>
-          </div>
-        </form>
-      </div>
-    </div>
-    {{else}}
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <div class="panel-title" data-i18n="accountsDashboardControls.noAdditionalServices">No Additional login services available</div>
-      </div>
-    </div>
-  {{/each}}
-</template>
diff --git a/imports/plugins/core/accounts/client/templates/dashboard/dashboard.js b/imports/plugins/core/accounts/client/templates/dashboard/dashboard.js
index 5f12fe5c07..13963175e4 100644
--- a/imports/plugins/core/accounts/client/templates/dashboard/dashboard.js
+++ b/imports/plugins/core/accounts/client/templates/dashboard/dashboard.js
@@ -3,10 +3,8 @@ import { Components } from "@reactioncommerce/reaction-components";
 import { Meteor } from "meteor/meteor";
 import { Template } from "meteor/templating";
 import { Roles } from "meteor/alanning:roles";
-import { ServiceConfiguration } from "meteor/service-configuration";
-import { Reaction, i18next } from "/client/api";
+import { Reaction } from "/client/api";
 import * as Collections from "/lib/collections";
-import { ServiceConfigHelper } from "../../helpers/util";
 
 Template.accountsDashboard.onCreated(function () {
   this.autorun(() => {
@@ -90,111 +88,3 @@ Template.accountsDashboard.helpers({
     return Components.AccountsDashboard;
   }
 });
-
-Template.accountsSettings.onCreated(function () {
-  this.subscribe("ServiceConfiguration", Reaction.getUserId());
-});
-
-Template.accountsSettings.helpers({
-
-  /**
-   * services
-   * @returns {Array} available services
-   * @ignore
-   */
-  services() {
-    const serviceHelper = new ServiceConfigHelper();
-    const configurations = ServiceConfiguration.configurations.find().fetch();
-
-    // eslint-disable-next-line consistent-return
-    const services = serviceHelper.services((item) => {
-      const matchingConfigurations = _.filter(configurations, {
-        service: item.name
-      });
-      if (matchingConfigurations.length) {
-        return matchingConfigurations[0];
-      }
-    });
-
-    return services;
-  },
-
-  /**
-   * Template helper to add a hidden class if the condition is false
-   * @param  {Boolean} enabled Service enabled
-   * @returns {String}          "hidden" or ""
-   * @ignore
-   */
-  shown(enabled) {
-    return enabled !== true ? "hidden" : "";
-  },
-
-  /**
-   * Return checked classname if true
-   * @param  {Boolean} enabled Boolean value true/false
-   * @returns {String}          "checked" or ""
-   * @ignore
-   */
-  checked(enabled) {
-    return enabled === true ? "checked" : "";
-  },
-
-  /**
-   * Returns a value from the supplied service object with a field name
-   * @param  {String} fieldName name of field to retrive the value for.
-   * @param  {Object} service   Service object to find the value in.
-   * @returns {String}           A value or blank string if nothing is found.
-   * @ignore
-   */
-  valueForField(fieldName, service) {
-    return service[fieldName] || "";
-  }
-});
-
-Template.accountsSettings.events({
-  "submit form": (event) => {
-    event.preventDefault();
-
-    const service = event.target.service.value;
-    const serviceHelper = new ServiceConfigHelper();
-    const fields = serviceHelper.configFieldsForService(service);
-    // todo remove this after i18next 2 will be installed
-    // let niceName = serviceHelper.capitalizedServiceName(service);
-
-    for (const field of fields) {
-      field.value = event.target[field.property].value;
-    }
-
-    Meteor.call("accounts/updateServiceConfiguration", service, fields, (error) => {
-      if (!error) {
-        Alerts.toast(i18next.t(
-          "accountsUI.updatedServiceConfiguration",
-          { service: i18next.t(`social.${service}`) }
-        ));
-      }
-    });
-  },
-
-  "change input[name=enabled]": (event) => {
-    const service = event.target.value;
-    const fields = [{
-      property: "enabled",
-      value: event.target.checked
-    }];
-
-    Meteor.call("accounts/updateServiceConfiguration", service, fields);
-  },
-
-  "click [data-event-action=showSecret]": (event) => {
-    const button = Template.instance().$(event.currentTarget);
-    const input = button.closest(".form-group").find("input[name=secret]");
-
-    if (input.attr("type") === "password") {
-      input.attr("type", "text");
-      button.html("Hide");
-    } else {
-      input.attr("type", "password");
-      button.html("Show");
-    }
-  }
-});
diff --git a/imports/plugins/core/core/server/Reaction/importer.js b/imports/plugins/core/core/server/Reaction/importer.js
index f3b8a152e8..b284839e5e 100644
--- a/imports/plugins/core/core/server/Reaction/importer.js
+++ b/imports/plugins/core/core/server/Reaction/importer.js
@@ -255,25 +255,6 @@ Importer.product = function (key, product, shopId) {
   return this.object(Collections.Products, key, product);
 };
 
-/**
- * @name package
- * @method
- * @memberof Importer
- * @summary Store a package in the import buffer.
- * @param {Object} pkg The package data to be updated
- * @param {String} shopId The package data to be updated
- * @returns {undefined}
- */
-Importer.package = function (pkg, shopId) {
-  check(pkg, Object);
-  check(shopId, String);
-  const key = {
-    name: pkg.name,
-    shopId
-  };
-  return this.object(Collections.Packages, key, pkg);
-};
-
 //
 // Importer.translation
 // server/startup/i18n.js
diff --git a/imports/plugins/core/core/server/methods/shop/index.js b/imports/plugins/core/core/server/methods/shop/index.js
index 179a2c08f0..8704589937 100644
--- a/imports/plugins/core/core/server/methods/shop/index.js
+++ b/imports/plugins/core/core/server/methods/shop/index.js
@@ -1,11 +1,9 @@
 import createTag from "./createTag";
-import locateAddress from "./locateAddress";
 import updateBrandAssets from "./updateBrandAssets";
 import updateCurrencyConfiguration from "./updateCurrencyConfiguration";
 import updateDefaultParcelSize from "./updateDefaultParcelSize";
 import updateHeaderTags from "./updateHeaderTags";
 import updateLanguageConfiguration from "./updateLanguageConfiguration";
-import updateShopExternalServices from "./updateShopExternalServices";
 
 /**
  * @file Meteor methods for Shop
@@ -16,11 +14,9 @@ import updateShopExternalServices from "./updateShopExternalServices";
 
 export default {
   "shop/createTag": createTag,
-  "shop/locateAddress": locateAddress,
   "shop/updateBrandAssets": updateBrandAssets,
   "shop/updateCurrencyConfiguration": updateCurrencyConfiguration,
   "shop/updateDefaultParcelSize": updateDefaultParcelSize,
   "shop/updateHeaderTags": updateHeaderTags,
-  "shop/updateLanguageConfiguration": updateLanguageConfiguration,
-  "shop/updateShopExternalServices": updateShopExternalServices
+  "shop/updateLanguageConfiguration": updateLanguageConfiguration
 };
diff --git a/imports/plugins/core/core/server/methods/shop/locateAddress.js b/imports/plugins/core/core/server/methods/shop/locateAddress.js
deleted file mode 100644
index e75ff726bf..0000000000
--- a/imports/plugins/core/core/server/methods/shop/locateAddress.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { check, Match } from "meteor/check";
-import GeoCoder from "../../util/geocoder";
-
-/**
- * @name shop/locateAddress
- * @method
- * @memberof Shop/Methods
- * @summary determine user's full location for autopopulating addresses
- * @param {Number} latitude - latitude
- * @param {Number} longitude - longitude
- * @returns {Object} returns address
- */
-export default function locateAddress(latitude, longitude) {
-  check(latitude, Match.Optional(Number));
-  check(longitude, Match.Optional(Number));
-  let clientAddress;
-  this.unblock();
-
-  // if called from server, ip won't be defined.
-  if (this.connection !== null) {
-    ({ clientAddress } = this.connection);
-  } else {
-    clientAddress = "127.0.0.1";
-  }
-
-  // begin actual address lookups
-  if (latitude !== null && longitude !== null) {
-    const geo = new GeoCoder();
-    return geo.reverse(latitude, longitude);
-  }
-
-  // geocode reverse ip lookup
-  const geo = new GeoCoder();
-  return geo.geoip(clientAddress);
-}
diff --git a/imports/plugins/core/core/server/methods/shop/updateShopExternalServices.js b/imports/plugins/core/core/server/methods/shop/updateShopExternalServices.js
deleted file mode 100644
index af8945337d..0000000000
--- a/imports/plugins/core/core/server/methods/shop/updateShopExternalServices.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { check } from "meteor/check";
-import { Reaction } from "/lib/api";
-import ReactionError from "@reactioncommerce/reaction-error";
-import { Packages } from "/lib/collections";
-import * as Schemas from "/lib/collections/schemas";
-
-/**
- * @name shop/updateShopExternalServices
- * @method
- * @memberof Shop/Methods
- * @description On submit OpenExchangeRatesForm handler
- * @summary we need to rerun fetch exchange rates job on every form submit,
- * that's why we update autoform type to "method-update"
- * @param {Object} details An object with _id and modifier props
- * @fires Collections.Packages#update
- * @todo This method fires Packages collection, so maybe someday it could be moved to another file
- * @returns {undefined}
- */
-export default function updateShopExternalServices(details) {
-  check(details, {
-    _id: String,
-    modifier: Object // actual schema validation happens below
-  });
-
-  const { _id, modifier } = details;
-  Schemas.CorePackageConfig.validate(modifier, { modifier: true });
-
-  // must have core permissions
-  if (!Reaction.hasPermission("core")) {
-    throw new ReactionError("access-denied", "Access Denied");
-  }
-  this.unblock();
-
-  Packages.update(_id, modifier);
-}
diff --git a/imports/plugins/core/core/server/util/geocoder.js b/imports/plugins/core/core/server/util/geocoder.js
deleted file mode 100644
index 32fc201295..0000000000
--- a/imports/plugins/core/core/server/util/geocoder.js
+++ /dev/null
@@ -1,158 +0,0 @@
-import _ from "lodash";
-import Logger from "@reactioncommerce/logger";
-import { HTTP } from "meteor/http";
-import { Meteor } from "meteor/meteor";
-import { Packages } from "/lib/collections";
-import Reaction from "/imports/plugins/core/core/server/Reaction";
-
-/**
- * meteor-geocoder
- * modifed for reaction core.
- *
- * https://github.com/aldeed/meteor-geocoder
- * The MIT License (MIT)
- * Copyright (c) 2014 Eric Dobbertin
- * @ignore
- * @param {Object} options to pass
- * @returns {undefined}
- */
-function GeoCoder(options) {
-  let extra;
-  const self = this;
-  // fetch shop settings for api auth credentials
-  const shopSettings = Packages.findOne({
-    shopId: Reaction.getShopId(),
-    name: "core"
-  }, {
-    fields: {
-      settings: 1
-    }
-  });
-
-  if (shopSettings) {
-    if (shopSettings.settings.google) {
-      extra = {
-        clientId: shopSettings.settings.google.clientId,
-        apiKey: shopSettings.settings.google.apiKey
-      };
-    }
-  }
-
-  self.options = _.extend({
-    geocoderProvider: "google",
-    httpAdapter: "https",
-    extra
-  }, options || {});
-}
-
-/**
- * @param {String} address ip address
- * @param {Object} options options to pass
- * @param {Function} callback callback
- * @returns {undefined}
- */
-function gc(address, options, callback) {
-  const geocoder = require("node-geocoder")(
-    options.geocoderProvider, options.httpAdapter,
-    options.extra
-  );
-  geocoder.geocode(address, callback);
-}
-
-GeoCoder.prototype.geocode = function geoCoderGeocode(address, callback) {
-  let geoCallback = callback;
-  let geoAddress = address;
-  if (geoCallback) {
-    geoCallback = Meteor.bindEnvironment(geoCallback, (error) => {
-      if (error) throw error;
-    });
-    gc(geoAddress, this.options, geoCallback);
-  } else {
-    geoAddress = Meteor.wrapAsync(gc)(geoAddress, this.options);
-    return geoAddress[0];
-  }
-
-  return null;
-};
-
-/**
- * @param {String} lat latitude
- * @param {String} lng longitude
- * @param {Object} options geocoder options
- * @param {Function} callback callback
- * @returns {undefined}
- */
-function rv(lat, lng, options, callback) {
-  const geocoder = require("node-geocoder")(
-    options.geocoderProvider, options.httpAdapter,
-    options.extra
-  );
-  geocoder.reverse({
-    lat,
-    lon: lng
-  }, callback);
-}
-
-GeoCoder.prototype.reverse = function geoCoderReverse(lat, lng, callback) {
-  let geoCallback = callback;
-  if (geoCallback) {
-    geoCallback = Meteor.bindEnvironment(geoCallback, (error) => {
-      if (error) throw error;
-    });
-    return rv(lat, lng, this.options, geoCallback);
-  }
-  try {
-    const address = Meteor.wrapAsync(rv)(lat, lng, this.options);
-    return address[0];
-  } catch (_error) {
-    return {
-      latitude: null,
-      longitude: null,
-      country: "United States",
-      city: null,
-      state: null,
-      stateCode: null,
-      zipcode: null,
-      streetName: null,
-      streetNumber: null,
-      countryCode: "US"
-    };
-  }
-};
-
-/**
- * @param {String} address ip address
- * @param {Function} callback callback
- * @returns {undefined}
- */
-function gi(address, callback) {
-  let lookupAddress = address;
-  // short term solution to an haproxy ssl cert installation issue
-  process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0;
-  // if we're local, let's let freegeoip guess.
-  if (lookupAddress === "127.0.0.1" || lookupAddress === null) {
-    lookupAddress = "";
-  }
-  // calls a private reaction hosted version of freegeoip
-  HTTP.call("GET", `https://geo.getreaction.io/json/${lookupAddress}`, callback);
-}
-
-GeoCoder.prototype.geoip = function geoCoderGeocode(address, callback) {
-  let geoCallback = callback;
-  let geoAddress = address;
-  if (geoCallback) {
-    geoCallback = Meteor.bindEnvironment(geoCallback, (error) => {
-      if (error) throw error;
-    });
-    return gi(geoAddress, this.options, geoCallback);
-  }
-  try {
-    geoAddress = Meteor.wrapAsync(gi)(geoAddress);
-    return geoAddress.data;
-  } catch (error) {
-    Logger.warn("shop/getLocale geoip lookup failure", error);
-    return {};
-  }
-};
-
-export default GeoCoder;
diff --git a/imports/plugins/core/dashboard/client/components/index.js b/imports/plugins/core/dashboard/client/components/index.js
index 9e9f2f1992..5651282215 100644
--- a/imports/plugins/core/dashboard/client/components/index.js
+++ b/imports/plugins/core/dashboard/client/components/index.js
@@ -1,4 +1,2 @@
 export { default as ActionView } from "./actionView";
-export { default as PackageList } from "./packageList";
 export { default as Toolbar } from "./toolbar";
-export { default as ShortcutBar } from "./shortcutBar";
diff --git a/imports/plugins/core/dashboard/client/components/packageList.js b/imports/plugins/core/dashboard/client/components/packageList.js
deleted file mode 100644
index d0a763a480..0000000000
--- a/imports/plugins/core/dashboard/client/components/packageList.js
+++ /dev/null
@@ -1,122 +0,0 @@
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { map } from "lodash";
-import { Card, CardHeader, CardBody, CardGroup, ListItem } from "/imports/plugins/core/ui/client/components";
-import { getComponent } from "@reactioncommerce/reaction-components";
-
-class PackageList extends Component {
-  static propTypes = {
-    groupedPackages: PropTypes.object,
-    handleShowPackage: PropTypes.func,
-    onCardExpand: PropTypes.func
-  }
-
-  state = {}
-
-  isExpanded(cardName) {
-    if (this.state[`card_${cardName}`] && typeof this.state[`card_${cardName}`].isExpanded === "boolean") {
-      return this.state[`card_${cardName}`].isExpanded;
-    }
-
-    return true;
-  }
-
-  handleCardExpand(cardName) {
-    let isExpanded;
-
-    if (typeof this.state[`card_${cardName}`] === "undefined") {
-      isExpanded = false;
-    } else {
-      isExpanded = !this.state[`card_${cardName}`].isExpanded;
-    }
-
-    this.setState({
-      [`card_${cardName}`]: {
-        isExpanded
-      }
-    });
-
-    if (this.props.onCardExpand) {
-      this.props.onCardExpand(cardName);
-    }
-  }
-
-  renderSections() {
-    if (this.props.groupedPackages) {
-      // Loop through the groups of packages
-      return map(this.props.groupedPackages, (group, groupName) => {
-        // Loop through the individual cards of packages
-        if (Array.isArray(group.packages)) {
-          const items = group.packages.map((packageData, index) => {
-            const elements = [];
-
-            // Standard list element
-            elements.push((
-              <ListItem
-                key={index}
-                i18nKeyLabel={packageData.i18nKeyLabel}
-                icon={packageData.icon}
-                label={packageData.label}
-                onClick={this.props.handleShowPackage}
-                actionType="arrow"
-                value={packageData}
-              />
-            ));
-
-            // Look for a registered component_ActionDashboard component
-
-            let actionComponent;
-
-            try {
-              actionComponent = getComponent(`${packageData.template}_ActionDashboard`);
-            } catch (error) {
-              actionComponent = null;
-            } finally {
-              // If one exists, add it to the list of elements
-              if (actionComponent) {
-                elements.push(<Card expandable={true} key={`action-${index}`}>
-                  <CardBody>
-                    {React.createElement(actionComponent)}
-                  </CardBody>
-                </Card>);
-              }
-            }
-
-            return elements;
-          });
-
-          return (
-            <Card
-              key={groupName}
-              expanded={this.isExpanded(groupName)}
-              onExpand={this.handleCardExpand.bind(this, groupName)}
-            >
-              <CardHeader
-                actAsExpander={true}
-                title={group.title}
-                i18nKeyTitle={group.i18nKeyTitle}
-              />
-              <CardBody expandable={true} padded={false}>
-                {items}
-              </CardBody>
-            </Card>
-          );
-        }
-
-        return null;
-      });
-    }
-
-    return null;
-  }
-
-  render() {
-    return (
-      <CardGroup>
-        {this.renderSections()}
-      </CardGroup>
-    );
-  }
-}
-
-export default PackageList;
diff --git a/imports/plugins/core/dashboard/client/components/shortcutBar.js b/imports/plugins/core/dashboard/client/components/shortcutBar.js
deleted file mode 100644
index ece2ea8421..0000000000
--- a/imports/plugins/core/dashboard/client/components/shortcutBar.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { map, isEqual } from "lodash";
-import { FlatButton, Icon } from "/imports/plugins/core/ui/client/components";
-
-class ShortcutBar extends Component {
-  static propTypes = {
-    currentView: PropTypes.object,
-    groupedPackages: PropTypes.object,
-    handleOpenShortcut: PropTypes.func,
-    handleShowDashboard: PropTypes.func,
-    handleShowPackage: PropTypes.func
-  }
-
-  renderAdminButton() {
-    return (
-      <FlatButton onClick={this.props.handleShowDashboard}>
-        <Icon
-          icon="icon icon-reaction-logo"
-        />
-      </FlatButton>
-    );
-  }
-
-  renderSections() {
-    if (this.props.groupedPackages) {
-      // Loop through the groups of packages
-      return map(this.props.groupedPackages, (group, groupName) => {
-        // Loop through the individual cards of packages
-        if (Array.isArray(group.packages)) {
-          const items = group.packages.map((packageData, index) => {
-            const isActive = isEqual(this.props.currentView, packageData);
-
-            // Standard list element
-            return (
-              <FlatButton
-                active={isActive}
-                key={index}
-                i18nKeyTooltip={packageData.i18nKeyLabel}
-                icon={packageData.icon}
-                onClick={this.props.handleOpenShortcut}
-                tooltip={packageData.label}
-                value={packageData}
-                tooltipAttachment="middle left"
-              />
-            );
-          });
-
-          return (
-            <nav
-              key={groupName}
-              className="rui toolbar-group admin-controls-quicklinks"
-              style={{
-                marginBottom: 20
-              }}
-            >
-              {items}
-            </nav>
-          );
-        }
-
-        return null;
-      });
-    }
-
-    return null;
-  }
-
-  render() {
-    return (
-      <div className="rui toolbar toolbar-vertical admin-shortcut-bar">
-        <nav
-          style={{
-            height: 54,
-            alignItems: "center",
-            justifyContent: "center"
-          }}
-        >
-          {this.renderAdminButton()}
-        </nav>
-        {this.renderSections()}
-      </div>
-
-    );
-  }
-}
-
-export default ShortcutBar;
diff --git a/imports/plugins/core/dashboard/client/components/toolbar.js b/imports/plugins/core/dashboard/client/components/toolbar.js
index 2e04b3fae3..596dda7af8 100644
--- a/imports/plugins/core/dashboard/client/components/toolbar.js
+++ b/imports/plugins/core/dashboard/client/components/toolbar.js
@@ -5,7 +5,6 @@ import { Tracker } from "meteor/tracker";
 import { Components } from "@reactioncommerce/reaction-components";
 import {
   FlatButton,
-  Icon,
   VerticalDivider
 } from "/imports/plugins/core/ui/client/components";
 import { Translatable } from "/imports/plugins/core/ui/client/providers";
@@ -90,38 +89,6 @@ class PublishControls extends Component {
     return null;
   }
 
-  renderAdminButton() {
-    return (
-      <div className="hidden-xs">
-        <Components.ToolbarGroup visibleOnMobile={true}>
-          <VerticalDivider key={"divder-2"} />
-          <FlatButton
-            key="dashboard-button"
-            onClick={() => {
-              Reaction.showActionView({
-                i18nKeyTitle: "dashboard.coreTitle",
-                title: "Dashboard",
-                template: "dashboardPackages"
-              });
-            }}
-          >
-            <Icon icon="icon icon-reaction-logo" />
-          </FlatButton>
-        </Components.ToolbarGroup>
-      </div>
-    );
-  }
-
-  renderPackageButons() {
-    if (Array.isArray(this.props.packageButtons)) {
-      return this.props.packageButtons.map((packageButton, index) => (
-        <FlatButton {...packageButton} key={index} />
-      ));
-    }
-
-    return null;
-  }
-
   renderCustomControls() {
     if (this.props.dashboardHeaderTemplate && this.props.hasCreateProductAccess) {
       if (this.props.isEnabled) {
@@ -145,10 +112,8 @@ class PublishControls extends Component {
           {this.renderShopSelect()}
         </Components.ToolbarGroup>
         <Components.ToolbarGroup lastChild={true}>
-          {this.renderPackageButons()}
           {this.renderCustomControls()}
         </Components.ToolbarGroup>
-        {this.renderAdminButton()}
       </Components.Toolbar>
     );
   }
diff --git a/imports/plugins/core/dashboard/client/containers/actionViewContainer.js b/imports/plugins/core/dashboard/client/containers/actionViewContainer.js
index 8e45382e7d..98e196a48a 100644
--- a/imports/plugins/core/dashboard/client/containers/actionViewContainer.js
+++ b/imports/plugins/core/dashboard/client/containers/actionViewContainer.js
@@ -1,6 +1,5 @@
 import React from "react";
 import { StyleRoot } from "radium";
-import _ from "lodash";
 import { composeWithTracker } from "@reactioncommerce/reaction-components";
 import { Reaction } from "/client/api";
 import { AdminContextProvider } from "/imports/plugins/core/ui/client/providers";
@@ -44,27 +43,8 @@ function handleActionViewDetailClose() {
  * @returns {undefined}
  */
 function composer(props, onData) {
-  const shortcuts = Reaction.Apps({ provides: "shortcut", enabled: true });
   const items = [];
 
-  if (_.isArray(shortcuts)) {
-    for (const shortcut of shortcuts) {
-      if (!shortcut.container) {
-        items.push({
-          type: "link",
-          href: Reaction.Router.pathFor(shortcut.name),
-          className: Reaction.Router.isActiveClassName(shortcut.name),
-          icon: shortcut.icon,
-          tooltip: shortcut.label || "",
-          i18nKeyTooltip: shortcut.i18nKeyLabel,
-          tooltipPosition: "left middle"
-        });
-      }
-    }
-  }
-
-  items.push({ type: "seperator" });
-
   items.push({
     icon: "plus",
     tooltip: "Create Content",
diff --git a/imports/plugins/core/dashboard/client/containers/index.js b/imports/plugins/core/dashboard/client/containers/index.js
index 9ef44e181f..542ee73fc7 100644
--- a/imports/plugins/core/dashboard/client/containers/index.js
+++ b/imports/plugins/core/dashboard/client/containers/index.js
@@ -1,3 +1,2 @@
-export { default as PackageListContainer } from "./packageListContainer";
 export { default as ActionViewContainer } from "./actionViewContainer";
 export { default as ToolbarContainer } from "./toolbarContainer";
diff --git a/imports/plugins/core/dashboard/client/containers/packageListContainer.js b/imports/plugins/core/dashboard/client/containers/packageListContainer.js
deleted file mode 100644
index 6d11fb6fb5..0000000000
--- a/imports/plugins/core/dashboard/client/containers/packageListContainer.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import React from "react";
-import { composeWithTracker } from "@reactioncommerce/reaction-components";
-import { Template } from "meteor/templating";
-import { Roles } from "meteor/alanning:roles";
-import { Reaction } from "/client/api";
-
-/**
- * Push package into action view navigation stack
- * @param  {SyntheticEvent} event Original event
- * @param  {Object} app Package data
- * @returns {undefined} No return value
- * @private
- */
-function handleShowPackage(event, app) {
-  Reaction.pushActionView(app);
-}
-
-/**
- * Open full dashboard menu
- * @returns {undefined} No return value
- * @private
- */
-function handleShowDashboard() {
-  Reaction.hideActionViewDetail();
-  Reaction.showActionView({
-    i18nKeyTitle: "dashboard.coreTitle",
-    title: "Dashboard",
-    template: "dashboardPackages"
-  });
-}
-
-/**
- * Push dashboard & package into action view navigation stack
- * @param  {SyntheticEvent} event Original event
- * @param  {Object} app Package data
- * @returns {undefined} No return value
- * @private
- */
-function handleOpenShortcut(event, app) {
-  Reaction.hideActionViewDetail();
-  Reaction.showActionView(app);
-}
-
-/**
- * @private
- * @param {Object} props Props
- * @param {Function} onData Call this to update props
- * @returns {undefined}
- */
-function composer(props, onData) {
-  const audience = Roles.getRolesForUser(Reaction.getUserId(), Reaction.getShopId());
-  const settings = Reaction.Apps({ provides: "settings", enabled: true, audience }) || [];
-
-  const dashboard = Reaction.Apps({ provides: "dashboard", enabled: true, audience })
-    .filter((dash) => typeof Template[dash.template] !== "undefined") || [];
-
-  onData(null, {
-    currentView: Reaction.getActionView(),
-    groupedPackages: {
-      actions: {
-        title: "Actions",
-        i18nKeyTitle: "admin.dashboard.packageGroupActionsLabel",
-        packages: dashboard
-      },
-      settings: {
-        title: "Settings",
-        i18nKeyTitle: "admin.dashboard.packageGroupSettingsLabel",
-        packages: settings
-      }
-    },
-
-    // Callbacks
-    handleShowPackage,
-    handleShowDashboard,
-    handleOpenShortcut
-  });
-}
-
-/**
- * @name PackageListContainer
- * @param {React.Component} Comp wrapped component
- * @returns {React.Component} returns a React component
- */
-export default function PackageListContainer(Comp) {
-  /**
-   * @name CompositeComponent
-   * @param {Object} props Component props
-   * @returns {React.Component} Wrapped Toolbar component
-   */
-  function CompositeComponent(props) {
-    return (
-      <Comp {...props} />
-    );
-  }
-
-  return composeWithTracker(composer)(CompositeComponent);
-}
diff --git a/imports/plugins/core/dashboard/client/containers/toolbarContainer.js b/imports/plugins/core/dashboard/client/containers/toolbarContainer.js
index b14723871a..f82a492018 100644
--- a/imports/plugins/core/dashboard/client/containers/toolbarContainer.js
+++ b/imports/plugins/core/dashboard/client/containers/toolbarContainer.js
@@ -1,6 +1,6 @@
 import React from "react";
 import { composeWithTracker } from "@reactioncommerce/reaction-components";
-import { Reaction, i18next } from "/client/api";
+import { Reaction } from "/client/api";
 import { Shops } from "/lib/collections";
 import { AdminContextProvider } from "/imports/plugins/core/ui/client/providers";
 
@@ -25,7 +25,6 @@ const handleShopSelectChange = (event, shopId) => {
  */
 function composer(props, onData) {
   // Reactive data sources
-  const routeName = Reaction.Router.getRouteName();
   const shopIds = Reaction.getShopsForUser(["owner", "admin", "dashboard"]);
   const shops = Shops.find({
     _id: { $in: shopIds }
@@ -33,29 +32,6 @@ function composer(props, onData) {
   // Standard variables
   const packageButtons = [];
 
-  if (routeName !== "dashboard" && props.showPackageShortcuts) {
-    const registryItems = Reaction.Apps({ provides: "settings", container: "dashboard" });
-
-    for (const item of registryItems) {
-      if (Reaction.hasPermission(item.route, Reaction.getUserId())) {
-        let { icon } = item;
-        if (!item.icon && item.provides && item.provides.includes("settings")) {
-          icon = "gear";
-        }
-
-        packageButtons.push({
-          href: item.route,
-          icon,
-          tooltip: i18next.t(item.i18nKeyLabel, item.i18n),
-          tooltipPosition: "left middle",
-          onClick() {
-            Reaction.showActionView(item);
-          }
-        });
-      }
-    }
-  }
-
   onData(null, {
     packageButtons,
     dashboardHeaderTemplate: props.data.dashboardHeader,
diff --git a/imports/plugins/core/dashboard/client/index.js b/imports/plugins/core/dashboard/client/index.js
index 3f84efa510..c61ddc1cf1 100644
--- a/imports/plugins/core/dashboard/client/index.js
+++ b/imports/plugins/core/dashboard/client/index.js
@@ -6,7 +6,7 @@ import { registerBlock } from "/imports/plugins/core/components/lib";
 import { registerOperatorRoute } from "/imports/client/ui";
 import OperatorLanding from "/imports/plugins/core/dashboard/client/components/OperatorLanding";
 
-import PluginVersions from "./components/PluginVersions";
+import SystemInformation from "./components/SystemInformation";
 import ShopLogoUrls from "./components/ShopLogoUrls";
 import StorefrontUrls from "./components/StorefrontUrls";
 
@@ -14,23 +14,10 @@ import "./components/shopBrandImageOption";
 import "./components/ShopBrandMediaManager";
 import "./containers/CreateFirstShopForm.js";
 
-import "./templates/packages/grid/grid.html";
-import "./templates/packages/grid/grid.js";
-import "./templates/packages/grid/package.html";
-import "./templates/packages/grid/package.js";
-import "./templates/packages/packages.html";
-import "./templates/packages/packages.js";
-
-import "./templates/settings/settings.html";
-import "./templates/settings/settings.js";
-
 import "./templates/shop/settings/settings.html";
 import "./templates/shop/settings/settings.less";
 import "./templates/shop/settings/settings.js";
 
-import "./templates/dashboard.html";
-import "./templates/dashboard.js";
-
 // Default landing page
 registerOperatorRoute({
   isNavigationLink: false,
@@ -50,11 +37,13 @@ registerOperatorRoute({
   sidebarI18nLabel: "admin.settings.shopSettingsLabel"
 });
 
-registerBlock({
-  region: "ShopSettings",
-  name: "PluginVersions",
-  component: PluginVersions,
-  priority: 1
+registerOperatorRoute({
+  isNavigationLink: true,
+  isSetting: true,
+  mainComponent: SystemInformation,
+  path: "/system",
+  priority: 1000,
+  sidebarI18nLabel: "shopSettings.systemInfo.title"
 });
 
 registerBlock({
diff --git a/imports/plugins/core/dashboard/client/templates/dashboard.html b/imports/plugins/core/dashboard/client/templates/dashboard.html
deleted file mode 100644
index 7a3f72602b..0000000000
--- a/imports/plugins/core/dashboard/client/templates/dashboard.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<template name="dashboardControls">
-  <!-- dashboardControls -->
-</template>
-
-<template name="blankControls">
-  <!-- setActionView blankControls  -->
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h3 class="panel-title"><span data-i18n="blankControls.noControls">No controls for this view.</span></h3>
-    </div>
-  </div>
-</template>
-
-<template name="dashboardHeader">
-    <div class="nav nav-dashboard">
-      <div class="nav-dashboard-heading">
-        <h3 class="nav-dashboard-title">
-          {{#with registry}}
-           <span>{{i18n i18nKeyTitle label}}</span>
-          {{/with}}
-        </h3>
-      </div>
-      <div class="nav-dashboard-controls">
-        <!-- dashboardHeaderControls -->
-        {{> Template.dynamic template=dashboardHeaderControls}}
-      </div>
-    </div>
-</template>
diff --git a/imports/plugins/core/dashboard/client/templates/dashboard.js b/imports/plugins/core/dashboard/client/templates/dashboard.js
deleted file mode 100644
index 378f898ca9..0000000000
--- a/imports/plugins/core/dashboard/client/templates/dashboard.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Template } from "meteor/templating";
-import { Reaction } from "/client/api";
-import { translateRegistry } from "/lib/api";
-
-//
-// registry helper for the dashboard, assembles i18n labels
-//
-Template.dashboardHeader.helpers({
-  registry() {
-    // just some handle little helpers for default package i18nKey/i18nLabel
-    const route = Reaction.Router.getRouteName();
-    const registry = Reaction.getRegistryForCurrentRoute() || {};
-    if (registry && route) {
-      return translateRegistry(registry);
-    }
-
-    return null;
-  }
-});
-
-//
-// dashboard events
-//
-Template.dashboardHeader.events({
-  "click [data-event-action=showPackageSettings]"() {
-    Reaction.showActionView();
-  }
-});
diff --git a/imports/plugins/core/dashboard/client/templates/packages/README.md b/imports/plugins/core/dashboard/client/templates/packages/README.md
deleted file mode 100644
index 7d09df2c5f..0000000000
--- a/imports/plugins/core/dashboard/client/templates/packages/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Glossary
-graphs: provide dashboard graphs (there can be many, per package)
-
-control panel: the first card in the package drawer, used as nav element
-
-widgets: widgets are cards displayed within package drawer to the right of control panel
-
-app navbar:  if has widget = true display navigation to package below cards
-
-# registration parameters
-
-depends : analytics (this could be many analytics / any analtics but there must be one of these installed)
-
-hidden = dont show anywhere
-
-hasWidget = is an app, has dashboard widgets, shows as new nav in dashboard
-
-template = modal template, give modal same id as template name displays in dashboard control panel, if provided standard panel does not display
-
-settingsRoute = path to setting page,will use this for Route.go() and render to main
-
-overviewRoute = route to some functional page / first page
-
-
-
-Development:
-
-use <div class="dashboard-widget">  for widget cards.
diff --git a/imports/plugins/core/dashboard/client/templates/packages/grid/grid.html b/imports/plugins/core/dashboard/client/templates/packages/grid/grid.html
deleted file mode 100644
index da59bb90e2..0000000000
--- a/imports/plugins/core/dashboard/client/templates/packages/grid/grid.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<template name="packagesGrid">
-  <div class="rui items">
-    {{#each group in groups}}
-      <div class="rui item">
-        {{#cardGroup title=group}}
-          {{> packagesGridGroup apps=(appsInGroup group)}}
-        {{/cardGroup}}
-      </div>
-    {{/each}}
-  </div>
-</template>
-
-<template name="packagesGridGroup">
-  <div class="rui items flex third">
-    {{#each app in apps}}
-      {{#if (pkgPermissions app)}}
-        <div class="rui item flex vertical">
-          {{> gridPackage (packageProps app)}}
-        </div>
-      {{/if}}
-    {{/each}}
-  </div>
-
-</template>
diff --git a/imports/plugins/core/dashboard/client/templates/packages/grid/grid.js b/imports/plugins/core/dashboard/client/templates/packages/grid/grid.js
deleted file mode 100644
index a7e89cb2ee..0000000000
--- a/imports/plugins/core/dashboard/client/templates/packages/grid/grid.js
+++ /dev/null
@@ -1,153 +0,0 @@
-import _ from "lodash";
-import { Template } from "meteor/templating";
-import { ReactiveDict } from "meteor/reactive-dict";
-import { Meteor } from "meteor/meteor";
-import { Reaction, i18next } from "/client/api";
-import ReactionError from "@reactioncommerce/reaction-error";
-
-/**
- * @description checks to see if user has permissions to enable / disable package
- * @param {Object} pkg package to disable
- * @returns {Boolean} does the user have permission to enable / disable this package
- */
-function pkgPermissions(pkg) {
-  // if (Reaction.hasPermission("dashboard")) {
-  //   // route specific permissions
-  //   if (pkg.name) {
-  //     return Reaction.hasPermission(pkg.name);
-  //   }
-  //   // name is a global group role for packages
-  //   if (pkg.template) {
-  //     return Reaction.hasPermission(pkg.template);
-  //   }
-  // }
-  return Reaction.hasPermission(pkg.name);
-}
-
-/**
- * @description enables a reaction package
- * @param {Object} reactionPackage package to enable
- * @returns {String|null} alert or redirect to a package
- */
-function enableReactionPackage(reactionPackage) {
-  const self = reactionPackage;
-
-  Meteor.call("shop/togglePackage", self.packageId, false, (error, result) => {
-    if (result === 1) {
-      Alerts.toast(
-        i18next.t(
-          "gridPackage.pkgEnabled",
-          { app: i18next.t(self.i18nKeyLabel) }
-        ),
-        "error", {
-          type: `pkg-enabled-${self.name}`
-        }
-      );
-      if (self.name || self.route) {
-        const route = self.name || self.route;
-        return Reaction.Router.go(route);
-      }
-    } else if (error) {
-      return Alerts.toast(
-        i18next.t(
-          "gridPackage.pkgDisabled",
-          { app: i18next.t(self.i18nKeyLabel) }
-        ),
-        "warning"
-      );
-    }
-    return null;
-  });
-}
-
-/**
- * @description disables a reaction package
- * @param {Object} reactionPackage package to disable
- * @returns {undefined}
- */
-function disableReactionPackage(reactionPackage) {
-  const self = reactionPackage;
-
-  if (self.name === "core") {
-    return;
-  }
-
-  Alerts.alert(
-    "Disable Package",
-    i18next.t("gridPackage.disableConfirm", { app: i18next.t(self.i18nKeyLabel) }),
-    {
-      type: "warning",
-      showCancelButton: true
-    },
-    () => {
-      // eslint-disable-next-line consistent-return
-      Meteor.call("shop/togglePackage", self.packageId, true, (error, result) => {
-        if (result === 1) {
-          return Alerts.toast(
-            i18next.t("gridPackage.pkgDisabled", {
-              app: i18next.t(self.i18nKeyLabel)
-            }),
-            "success"
-          );
-        } else if (error) {
-          throw new ReactionError("error-disabling-package", error);
-        }
-      });
-    }
-  );
-}
-
-Template.packagesGrid.onCreated(function () {
-  this.state = new ReactiveDict();
-  this.state.setDefault({
-    groups: [],
-    appsByGroup: {},
-    apps: []
-  });
-
-  this.autorun(() => {
-    const apps = Reaction.Apps({ provides: "dashboard", enabled: true });
-    const groupedApps = _.groupBy(apps, (app) => app.container || "misc");
-    this.state.set("apps", apps);
-    this.state.set("appsByGroup", groupedApps);
-    this.state.set("groups", Object.keys(groupedApps));
-  });
-});
-
-/**
- * packagesGrid helpers
- */
-Template.packagesGrid.helpers({
-  groups() {
-    return Template.instance().state.get("groups");
-  },
-
-  appsInGroup(groupName) {
-    const group = Template.instance().state.get("appsByGroup") || {};
-    return group[groupName] || false;
-  },
-
-  shopId() {
-    return Reaction.getShopId();
-  },
-
-
-  pkgPermissions
-});
-
-Template.packagesGridGroup.helpers({
-  pkgPermissions,
-
-  packageProps(app) {
-    return {
-      package: app,
-      enablePackage(reactionPackage, value) {
-        if (value === true) {
-          enableReactionPackage(reactionPackage);
-        } else {
-          disableReactionPackage(reactionPackage);
-        }
-      }
-    };
-  }
-});
diff --git a/imports/plugins/core/dashboard/client/templates/packages/grid/package.html b/imports/plugins/core/dashboard/client/templates/packages/grid/package.html
deleted file mode 100644
index 543033a041..0000000000
--- a/imports/plugins/core/dashboard/client/templates/packages/grid/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<template name="gridPackage">
-  {{# card cardProps}}
-    <div class="content" data-event-action="{{showPackageManagementEvent package}}">
-      <h3 class="title">
-        <i class="{{package.icon}}"></i> <span data-i18n="{{package.i18nKeyLabel}}">{{package.label}}</span>
-      </h3>
-      <small data-i18n="{{package.i18nKeyDescription}}">{{{package.description}}}</small>
-    </div>
-  {{/card}}
-</template>
diff --git a/imports/plugins/core/dashboard/client/templates/packages/grid/package.js b/imports/plugins/core/dashboard/client/templates/packages/grid/package.js
deleted file mode 100644
index 0ed226e862..0000000000
--- a/imports/plugins/core/dashboard/client/templates/packages/grid/package.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import { Template } from "meteor/templating";
-import { Reaction } from "/client/api";
-/* eslint no-loop-func: 0 */
-
-/**
- * @typedef CardProps
- * @type Object
- * @property {Object} controls Reaction UI Button or other control props
- * @property {function} onContentClick y The Y
- * @ignore
- */
-
-Template.gridPackage.helpers({
-  /**
-   * Properties for the card
-   * @see packages/reaction-ui/client/components/cards/cards.js
-   * @returns {CardProps} Object of properties for the card component
-   * @ignore
-   */
-  cardProps() {
-    const instance = Template.instance();
-    const { data } = instance;
-    const apps = Reaction.Apps({
-      provides: "settings",
-      name: data.package.packageName
-    });
-
-    const controls = [];
-
-    if (data.package.priority > 1) {
-      controls.push({
-        icon: "fa fa-plus-square fa-fw",
-        onIcon: "fa fa-check-square fa-fw",
-        toggle: true,
-        toggleOn: data.package.enabled,
-        onClick() {
-          if (instance.data.enablePackage) {
-            instance.data.enablePackage(data.package, !data.package.enabled);
-          }
-        }
-      });
-    }
-
-    for (const app of apps) {
-      controls.push({
-        icon: app.icon || "fa fa-cog fa-fw",
-        onClick() {
-          Reaction.pushActionView(app);
-        }
-      });
-    }
-
-    if (data.package.route) {
-      controls.push({
-        icon: "angle-right",
-        onClick() {
-          Reaction.pushActionView(data.package);
-        }
-      });
-    }
-
-    return {
-      controls,
-      onContentClick() {
-        Reaction.pushActionView(data.package);
-      }
-    };
-  },
-
-  showPackageManagementEvent(pkg) {
-    if (pkg.name && pkg.route && pkg.template) {
-      return "showPackageManagement";
-    }
-    return null;
-  }
-});
diff --git a/imports/plugins/core/dashboard/client/templates/packages/packages.html b/imports/plugins/core/dashboard/client/templates/packages/packages.html
deleted file mode 100644
index d4affa9256..0000000000
--- a/imports/plugins/core/dashboard/client/templates/packages/packages.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<template name="dashboardPackages">
-  <div class="rui admin dashboard-list">
-    {{> React PackageListComponent}}
-  </div>
-</template>
diff --git a/imports/plugins/core/dashboard/client/templates/packages/packages.js b/imports/plugins/core/dashboard/client/templates/packages/packages.js
deleted file mode 100644
index 934d4850ce..0000000000
--- a/imports/plugins/core/dashboard/client/templates/packages/packages.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Template } from "meteor/templating";
-import { PackageList } from "../../components";
-import { PackageListContainer } from "../../containers";
-
-Template.dashboardPackages.helpers({
-  PackageListComponent() {
-    return {
-      component: PackageListContainer(PackageList)
-    };
-  }
-});
diff --git a/imports/plugins/core/dashboard/client/templates/settings/settings.html b/imports/plugins/core/dashboard/client/templates/settings/settings.html
deleted file mode 100644
index f94e393f60..0000000000
--- a/imports/plugins/core/dashboard/client/templates/settings/settings.html
+++ /dev/null
@@ -1,64 +0,0 @@
-
-<template name="settingsButton">
-  <button class="btn btn-default" data-event-action="showPackageSettings">
-    <i class="fa fa-gear"></i>
-    <span>Settings</span>
-  </button>
-</template>
-
-
-<template name="settingsHeader">
-  <div class="nav nav-settings">
-    <div class="nav-settings-heading">
-      {{#unless isActionViewAtRootView}}
-        <button class="js-back-button">
-          <i class="fa fa-arrow-left"></i>
-        </button>
-      {{/unless}}
-      <h3 class="nav-settings-title">
-        {{#with registry}}
-         <span data-i18n="{{i18nKeyLabel}}">
-           <span>{{label}}</span>
-         </span>
-        {{/with}}
-        {{> Template.dynamic template=settingsHeaderControls}}
-      </h3>
-    </div>
-
-    <div class="nav-settings-controls">
-      <button class="btn btn-default" data-event-action="closeSettings">
-        <i class="fa fa-times"></i>
-      </button>
-    </div>
-
-  </div>
-</template>
-
-
-<template name="settingsSidebar">
-  <div class="dashboard-nav">
-    <ul class="nav nav-pills nav-stacked nav-default">
-    {{#each reactionApps provides='dashboard'}}
-      {{#if pkgPermissions}}
-          {{> settingsSidebarItem}}
-      {{/if}}
-    {{/each}}
-    </ul>
-  </div>
-</template>
-
-
-<template name="settingsSidebarItem">
-
-  {{#if enabled}}
-  {{packageName}}
-    {{#each reactionApps provides="settings" name=packageName container=container}}
-      <li class="{{active name}}">
-        <a class="pkg-settings" title="{{i18n 'app.settings' 'Settings'}}" href="{{name}}">
-          <i class="{{../icon}}"></i> {{label}}
-        </a>
-      </li>
-    {{/each}}
-  {{/if}}
-
-</template>
diff --git a/imports/plugins/core/dashboard/client/templates/settings/settings.js b/imports/plugins/core/dashboard/client/templates/settings/settings.js
deleted file mode 100644
index 27b8c8af4f..0000000000
--- a/imports/plugins/core/dashboard/client/templates/settings/settings.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import _ from "lodash";
-import { Template } from "meteor/templating";
-import { Reaction } from "/client/api";
-import { Packages } from "/lib/collections";
-
-Template.settingsHeader.helpers({
-
-  /**
-   * Data pased to action view
-   * @returns {Object} Registry entry for item
-   * @ignore
-   */
-  registry() {
-    return Reaction.getActionView() || {};
-  },
-
-  isActionViewAtRootView() {
-    return Reaction.isActionViewAtRootView();
-  },
-
-  /**
-   * thisApp
-   * @returns {Object} Registry entry for item
-   * @ignore
-   */
-  thisApp() {
-    const reactionApp = Packages.findOne({
-      "registry.provides": "settings",
-      "registry.route": Reaction.Router.getRouteName()
-    }, {
-      enabled: 1,
-      registry: 1,
-      name: 1,
-      route: 1
-    });
-
-    if (reactionApp) {
-      const settingsData = _.find(reactionApp.registry, (item) => item.route === Reaction.Router.getRouteName() && item.provides && item.provides.includes("settings")); // eslint-disable-line max-len
-
-      return settingsData;
-    }
-    return reactionApp;
-  }
-
-});
-
-Template.settingsHeader.events({
-  "click [data-event-action=closeSettings]": () => {
-    Reaction.hideActionView();
-  },
-
-  "click .js-back-button"() {
-    Reaction.popActionView();
-  }
-});
-
-Template.settingsSidebar.helpers({
-  /**
-   * pkgPermissions Check package permissions
-   * @returns {Boolean} user has permission to see settings for this package
-   * @ignore
-   */
-  pkgPermissions() {
-    if (Reaction.hasPermission("dashboard")) {
-      if (this.name) {
-        return Reaction.hasPermission(this.name);
-      }
-
-      return Reaction.hasPermission(this.name);
-    }
-
-    return false;
-  }
-});
-
-Template.settingsSidebarItem.helpers({
-  /**
-   * label
-   * @returns {String} Label for item
-   * @ignore
-   */
-  label() {
-    return Template.parentData(1).label || this.label;
-  }
-});
diff --git a/imports/plugins/core/dashboard/client/templates/shop/settings/settings.html b/imports/plugins/core/dashboard/client/templates/shop/settings/settings.html
index e8b511166b..9bece83c8b 100644
--- a/imports/plugins/core/dashboard/client/templates/shop/settings/settings.html
+++ b/imports/plugins/core/dashboard/client/templates/shop/settings/settings.html
@@ -14,12 +14,6 @@
         </div>
       </div>
       <div id="general" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="General">
-        <div class="panel-body">
-          {{#autoForm collection=Collections.Packages schema=Schemas.CorePackageConfig
-          doc=packageData id="shopEditOptionsForm" type="update" autosave=true}}
-            {{> afFieldInput name='settings.public.allowGuestCheckout'}}
-          {{/autoForm}}
-        </div>
         <div class="panel-body">
           {{#autoForm collection=Collections.Shops doc=shop id="shopEditForm" type="update"}}
             {{> afQuickField name='name' placeholder="Shop Name"}}
@@ -66,34 +60,6 @@
         </div>
       </div>
     </div>
-
-    {{#each reactionApps provides='shopSettings'}}
-      <div class="panel panel-default">
-        <div class="panel-heading panel-heading-flex">
-          <div class="panel-title">
-            <a
-              href="#collapsable-{{template}}"
-              aria-controls="collapsable-{{template}}"
-              role="button"
-              data-toggle="collapse"
-              data-parent="#shopSettingsAccordian">
-              <i class="{{icon}}"></i>
-              <span data-i18n="{{i18nKeyLabel}}">{{label}}</span>
-            </a>
-          </div>
-          {{#if showAppSwitch template}}
-          <div class="panel-controls">
-            <input class="checkbox-switch" type="checkbox" name="enabled" data-id={{packageId}} data-key="{{settingsKey}}" {{checked enabled}}>
-          </div>
-          {{/if}}
-        </div>
-        <div id="collapsable-{{template}}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="collapsable-{{template}}">
-          <div class="panel-body {{shown enabled}}">
-            {{> React component=ReactComponentOrBlazeTemplate name=template props=.}}
-          </div>
-        </div>
-      </div>
-    {{/each}}
   </div>
 
   {{#if shopSettingsBlockProps.shopId}}
@@ -103,17 +69,6 @@
   {{/if}}
 </template>
 
-<template name="optionsShopSettings">
-  <div class="optionsShopSettings">
-    {{#autoForm collection=Collections.Packages schema=Schemas.CorePackageConfig
-    doc=packageData id="shopEditExternalServicesForm" type="method-update" meteormethod="shop/updateShopExternalServices"}}
-      {{> afQuickField name='settings.google.clientId'}}
-      {{> afQuickField name='settings.google.apiKey'}}
-      {{> shopSettingsSubmitButton}}
-    {{/autoForm}}
-  </div>
-</template>
-
 <template name="shopSettingsSubmitButton">
   <div class="clearfix">
     <button type="submit" class="btn btn-primary pull-right" data-i18n="app.saveChanges">Save Changes</button>
diff --git a/imports/plugins/core/dashboard/client/templates/shop/settings/settings.js b/imports/plugins/core/dashboard/client/templates/shop/settings/settings.js
index 51411095a6..92036966c7 100644
--- a/imports/plugins/core/dashboard/client/templates/shop/settings/settings.js
+++ b/imports/plugins/core/dashboard/client/templates/shop/settings/settings.js
@@ -1,11 +1,10 @@
-import { Meteor } from "meteor/meteor";
 import { Template } from "meteor/templating";
 import { AutoForm } from "meteor/aldeed:autoform";
 import { ReactiveDict } from "meteor/reactive-dict";
 import { Blocks } from "@reactioncommerce/reaction-components";
 import { Reaction, i18next } from "/client/api";
 import Logger from "/client/modules/logger";
-import { Packages, Shops } from "/lib/collections";
+import { Shops } from "/lib/collections";
 import getOpaqueIds from "/imports/plugins/core/core/client/util/getOpaqueIds";
 
 Template.shopSettings.onCreated(function onCreated() {
@@ -29,13 +28,6 @@ Template.shopSettings.onCreated(function onCreated() {
         Logger.error(error);
       });
   });
-
-  this.autorun(async () => {
-    const shopId = Reaction.getShopId();
-    if (shopId) {
-      this.subscribe("Packages", shopId);
-    }
-  });
 });
 
 /**
@@ -60,12 +52,6 @@ Template.shopSettings.helpers({
       _id: Reaction.getShopId()
     });
   },
-  packageData() {
-    return Packages.findOne({
-      name: "core",
-      shopId: Reaction.getShopId()
-    });
-  },
   addressBook() {
     const address = Shops.findOne({
       _id: Reaction.getShopId()
@@ -73,7 +59,7 @@ Template.shopSettings.helpers({
     return address[0];
   },
   showAppSwitch(template) {
-    if (template === "optionsShopSettings" || template === "ShopAddressValidationSettings") {
+    if (template === "ShopAddressValidationSettings") {
       // do not have switch for options card/panel
       return false;
     }
@@ -87,12 +73,10 @@ Template.shopSettings.helpers({
   shopSettingsBlockProps() {
     const shopId = Reaction.getShopId();
     const opaqueShopId = Template.instance().state.get("opaqueShopId");
-    const versionedPackages = Packages.find({ version: { $exists: true }, shopId }).fetch();
 
     return {
       internalShopId: shopId,
-      shopId: opaqueShopId,
-      versionedPackages
+      shopId: opaqueShopId
     };
   }
 });
@@ -122,51 +106,3 @@ AutoForm.hooks({
     }
   }
 });
-
-AutoForm.hooks({
-  shopEditExternalServicesForm: {
-    onSuccess() {
-      return Alerts.toast(i18next.t("admin.alerts.shopExternalServicesSettingsSaved"), "success");
-    },
-    onError(operation, error) {
-      return Alerts.toast(
-        `${i18next.t("admin.alerts.shopExternalServicesSettingsFailed")} ${error}`,
-        "error"
-      );
-    }
-  }
-});
-
-AutoForm.hooks({
-  shopEditOptionsForm: {
-    onSuccess() {
-      return Alerts.toast(i18next.t("admin.alerts.shopOptionsSettingsSaved"), "success");
-    },
-    onError(operation, error) {
-      return Alerts.toast(`${i18next.t("admin.alerts.shopOptionsSettingsFailed")} ${error}`, "error");
-    }
-  }
-});
-
-Template.shopSettings.events({
-  "change input[name=enabled]": (event) => {
-    const settingsKey = event.target.getAttribute("data-key");
-    const packageId = event.target.getAttribute("data-id");
-    const fields = [{
-      property: "enabled",
-      value: event.target.checked
-    }];
-
-    Meteor.call("registry/update", packageId, settingsKey, fields);
-    Meteor.call("shop/togglePackage", packageId, !event.target.checked);
-  }
-});
-
-Template.optionsShopSettings.helpers({
-  packageData() {
-    return Packages.findOne({
-      name: "core",
-      shopId: Reaction.getShopId()
-    });
-  }
-});
diff --git a/imports/plugins/core/layout/client/containers/adminContainer.js b/imports/plugins/core/layout/client/containers/adminContainer.js
deleted file mode 100644
index ba14981b95..0000000000
--- a/imports/plugins/core/layout/client/containers/adminContainer.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { composeWithTracker } from "@reactioncommerce/reaction-components";
-import { Reaction } from "/client/api";
-
-/**
- * @private
- * @param {Object} props Props
- * @param {Function} onData Call this to update props
- * @returns {undefined}
- */
-function composer(props, onData) {
-  const shortcuts = Reaction.Apps({ provides: "shortcut", enabled: true });
-  const items = [];
-
-  if (Array.isArray(shortcuts)) {
-    for (const shortcut of shortcuts) {
-      if (!shortcut.container) {
-        items.push({
-          type: "link",
-          href: Reaction.Router.pathFor(shortcut.name),
-          className: Reaction.Router.isActiveClassName(shortcut.name),
-          icon: shortcut.icon,
-          tooltip: shortcut.label || "",
-          i18nKeyTooltip: shortcut.i18nKeyLabel,
-          tooltipPosition: "left middle"
-        });
-      }
-    }
-  }
-
-  items.push({ type: "seperator" });
-
-  items.push({
-    icon: "plus",
-    tooltip: "Create Content",
-    i18nKeyTooltip: "app.createContent",
-    tooltipPosition: "left middle"
-  });
-
-  onData(null, {
-    actionView: Reaction.getActionView(),
-    data: props.data,
-    buttons: items,
-    actionViewIsOpen: Reaction.isActionViewOpen()
-  });
-}
-
-/**
- * @private
- * @param {Component} component component to wrap
- * @returns {Component} wrapped component
- */
-export default function AdminContainer(component) {
-  return composeWithTracker(composer)(component);
-}
diff --git a/imports/plugins/core/layout/client/containers/index.js b/imports/plugins/core/layout/client/containers/index.js
deleted file mode 100644
index a83eba0915..0000000000
--- a/imports/plugins/core/layout/client/containers/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as AdminContainer } from "./adminContainer";
diff --git a/imports/plugins/core/layout/client/containers/quickMenuContainer.js b/imports/plugins/core/layout/client/containers/quickMenuContainer.js
deleted file mode 100644
index 09fcec82ea..0000000000
--- a/imports/plugins/core/layout/client/containers/quickMenuContainer.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import _ from "lodash";
-import { composeWithTracker } from "@reactioncommerce/reaction-components";
-import { QuickMenu } from "../components";
-import { Reaction } from "/client/api";
-
-/**
- * @private
- * @param {Object} props Props
- * @param {Function} onData Call this to update props
- * @returns {undefined}
- */
-function composer(props, onData) {
-  const shortcuts = Reaction.Apps({ provides: "shortcut", enabled: true });
-  const items = [];
-
-  if (_.isArray(shortcuts)) {
-    for (const shortcut of shortcuts) {
-      if (!shortcut.container) {
-        items.push({
-          type: "link",
-          href: Reaction.Router.pathFor(shortcut.name),
-          className: Reaction.Router.isActiveClassName(shortcut.name),
-          icon: shortcut.icon,
-          tooltip: shortcut.label || "",
-          i18nKeyTooltip: shortcut.i18nKeyLabel,
-          tooltipPosition: "left middle"
-        });
-      }
-    }
-  }
-
-  items.push({ type: "seperator" });
-
-  items.push({
-    icon: "plus",
-    tooltip: "Create Content",
-    i18nKeyTooltip: "app.createContent",
-    tooltipPosition: "left middle"
-  });
-
-  onData(null, {
-    buttons: items
-  });
-}
-
-export default composeWithTracker(composer)(QuickMenu);
diff --git a/imports/plugins/core/router/lib/utils.js b/imports/plugins/core/router/lib/utils.js
deleted file mode 100644
index 8bccab78ae..0000000000
--- a/imports/plugins/core/router/lib/utils.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import Hooks from "./hooks";
-
-/**
- * assemble route name to be standard prefix/package name + registry name or route
- * @param  {String} packageName  [package name]
- * @param  {Object} registryItem [registry object]
- * @returns {String}              [route name]
- * @private
- */
-function getRegistryRouteName(packageName, registryItem) {
-  let routeName;
-  if (packageName && registryItem) {
-    if (registryItem.name) {
-      routeName = registryItem.name;
-    } else if (registryItem.template) {
-      routeName = `${packageName}/${registryItem.template}`;
-    } else {
-      routeName = packageName;
-    }
-    // dont include params in the name
-    [routeName] = routeName.split(":");
-    return routeName;
-  }
-  return null;
-}
-
-
-/**
- * allows overriding of prefix in route definitions
- * @param  {Array} packageRoutes package routes
- * @returns {Array} updatedRoutes
- */
-export function addRoutePrefixToPackageRoutes(packageRoutes) {
-  // add group and routes to routing table
-  const routes = [];
-  for (const route of packageRoutes) {
-    // allow overriding of prefix in route definitions
-    // define an "absolute" url by excluding "/"
-    route.group = {};
-
-    if (route.route.substring(0, 1) !== "/") {
-      route.route = `/${route.route}`;
-      route.group.prefix = "";
-    }
-
-    routes.push(route);
-  }
-  return routes;
-}
-
-/**
- * get package registry route configurations
- * @param  {Function} ReactionLayout ReactionLayout
- * @param  {Array} packages package routes
- * @returns {Array} enabled package routes
- */
-export function getEnabledPackageRoutes(ReactionLayout, packages) {
-  const enabledPackageRoutes = []; // enabledPackageRoutes
-  for (const pkg of packages) {
-    // pkg registry
-    if (pkg.registry && pkg.enabled) {
-      const registry = Array.from(pkg.registry);
-      for (const registryItem of registry) {
-        // registryItems
-        if (registryItem.route) {
-          const {
-            meta,
-            route,
-            permissions,
-            template,
-            layout,
-            workflow
-          } = registryItem;
-
-          const name = getRegistryRouteName(pkg.name, registryItem);
-
-          // define new route
-          // we could allow the options to be passed in the registry if we need to be more flexible
-          const reactionLayout = ReactionLayout({ template, workflow, layout, permissions });
-          const newRouteConfig = {
-            route,
-            name,
-            options: {
-              meta,
-              name,
-              template,
-              layout,
-              triggersEnter: Hooks.get("onEnter", name),
-              triggersExit: Hooks.get("onExit", name),
-              component: reactionLayout.component,
-              theme: reactionLayout.theme,
-              structure: reactionLayout.structure
-            }
-          };
-          // push shop route
-          enabledPackageRoutes.push({
-            ...newRouteConfig,
-            route: `/shop/:shopSlug${route}`,
-            options: {
-              ...newRouteConfig.options,
-              type: "shop-prefix"
-            }
-          });
-          // push top-level route
-          enabledPackageRoutes.push(newRouteConfig);
-        } // end registryItems
-      } // end package.registry
-    }
-  } // end package loop
-  return enabledPackageRoutes;
-}
-
diff --git a/imports/plugins/core/router/lib/utils.test.js b/imports/plugins/core/router/lib/utils.test.js
deleted file mode 100644
index 5ca2c05080..0000000000
--- a/imports/plugins/core/router/lib/utils.test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { getEnabledPackageRoutes } from "./utils";
-
-const fakeShopId = "FAKE_SHOP_ID";
-const ReactionLayout = jest.fn().mockName("ReactionLayout");
-const testPackage = {
-  _id: "FAKE_GROUP_ID",
-  shopId: fakeShopId,
-  enabled: true,
-  layout: [],
-  registry: [
-    {
-      route: "/account/login",
-      name: "account/login",
-      template: "loginForm"
-    },
-    {
-      route: "/not-found",
-      name: "not-found",
-      template: "notFoundPage"
-    }
-  ]
-};
-
-test("returns a complete array of the routes in the packages along with shop routes", async () => {
-  ReactionLayout.mockReturnValue({
-    theme: {},
-    structure: {},
-    component: () => {}
-  });
-
-  const packageRoutes = getEnabledPackageRoutes(ReactionLayout, [testPackage]);
-  // a shop route is also created for each of the route defined in the package; hence double
-  return expect(packageRoutes.length).toBe(testPackage.registry.length * 2);
-});
diff --git a/imports/plugins/core/ui/client/components/app/app.js b/imports/plugins/core/ui/client/components/app/app.js
index 343ba77097..b87c955bbe 100644
--- a/imports/plugins/core/ui/client/components/app/app.js
+++ b/imports/plugins/core/ui/client/components/app/app.js
@@ -4,13 +4,12 @@ import PropTypes from "prop-types";
 import classnames from "classnames";
 import ToolbarContainer from "/imports/plugins/core/dashboard/client/containers/toolbarContainer";
 import Toolbar from "/imports/plugins/core/dashboard/client/components/toolbar";
-import { ActionViewContainer, PackageListContainer } from "/imports/plugins/core/dashboard/client/containers";
-import { ActionView, ShortcutBar } from "/imports/plugins/core/dashboard/client/components";
+import { ActionViewContainer } from "/imports/plugins/core/dashboard/client/containers";
+import { ActionView } from "/imports/plugins/core/dashboard/client/components";
 import Dashboard from "/imports/client/ui/layouts/Dashboard";
 
 const ConnectedToolbarComponent = ToolbarContainer(Toolbar);
 const ConnectedAdminViewComponent = ActionViewContainer(ActionView);
-const ConnectedShortcutBarContainer = PackageListContainer(ShortcutBar);
 
 const styles = {
   customerApp: {
@@ -79,7 +78,6 @@ class App extends Component {
           </div>
         </div>
         {this.props.hasDashboardAccess && <ConnectedAdminViewComponent />}
-        {this.props.hasDashboardAccess && <ConnectedShortcutBarContainer />}
       </div>
     );
   }

From 3bf16dc31db31f11758e1faa54485f7d78abd921 Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 16:16:56 -0600
Subject: [PATCH 08/19] refactor: system info UI

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../client/components/PluginVersion.js        | 21 ------
 .../client/components/PluginVersions.js       | 34 ---------
 .../client/components/SystemInformation.js    | 69 +++++++++++++++++++
 3 files changed, 69 insertions(+), 55 deletions(-)
 delete mode 100644 imports/plugins/core/dashboard/client/components/PluginVersion.js
 delete mode 100644 imports/plugins/core/dashboard/client/components/PluginVersions.js
 create mode 100644 imports/plugins/core/dashboard/client/components/SystemInformation.js

diff --git a/imports/plugins/core/dashboard/client/components/PluginVersion.js b/imports/plugins/core/dashboard/client/components/PluginVersion.js
deleted file mode 100644
index 895af0f14a..0000000000
--- a/imports/plugins/core/dashboard/client/components/PluginVersion.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-
-
-export default class PluginVersion extends Component {
-  static propTypes = {
-    versionedPackage: PropTypes.shape({
-      name: PropTypes.string.isRequired,
-      version: PropTypes.string
-    }).isRequired
-  };
-
-  render() {
-    const { versionedPackage } = this.props;
-    return (
-      <div>
-        <p>{versionedPackage.name} {versionedPackage.version}</p>
-      </div>
-    );
-  }
-}
diff --git a/imports/plugins/core/dashboard/client/components/PluginVersions.js b/imports/plugins/core/dashboard/client/components/PluginVersions.js
deleted file mode 100644
index 68ff76cb01..0000000000
--- a/imports/plugins/core/dashboard/client/components/PluginVersions.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from "react";
-import PropTypes from "prop-types";
-import { i18next } from "/client/api";
-import Card from "@material-ui/core/Card";
-import CardHeader from "@material-ui/core/CardHeader";
-import CardContent from "@material-ui/core/CardContent";
-import PluginVersion from "./PluginVersion";
-
-/**
- * PluginVersions
- * @param {Object} props Component props
- * @returns {Node} React component
- */
-function PluginVersions(props) {
-  const { versionedPackages } = props;
-  return (
-    <Card>
-      <CardHeader
-        title={i18next.t("shopSettings.pluginVersions.title")}
-      />
-      <CardContent>
-        {versionedPackages.map((versionedPackage) => <PluginVersion versionedPackage={versionedPackage} key={versionedPackage._id}/>)}
-      </CardContent>
-    </Card>
-  );
-}
-
-PluginVersions.propTypes = {
-  versionedPackages: PropTypes.arrayOf(PropTypes.shape({
-    _id: PropTypes.string.isRequired
-  }))
-};
-
-export default PluginVersions;
diff --git a/imports/plugins/core/dashboard/client/components/SystemInformation.js b/imports/plugins/core/dashboard/client/components/SystemInformation.js
new file mode 100644
index 0000000000..e7d4eae502
--- /dev/null
+++ b/imports/plugins/core/dashboard/client/components/SystemInformation.js
@@ -0,0 +1,69 @@
+import React from "react";
+import gql from "graphql-tag";
+import i18next from "i18next";
+import { useQuery } from "@apollo/react-hooks";
+import Card from "@material-ui/core/Card";
+import CardHeader from "@material-ui/core/CardHeader";
+import CardContent from "@material-ui/core/CardContent";
+import { Components } from "@reactioncommerce/reaction-components";
+import useCurrentShopId from "/imports/client/ui/hooks/useCurrentShopId.js";
+
+const systemInfoQuery = gql`
+  query systemInformationQuery($shopId: ID!) {
+    systemInformation(shopId: $shopId) {
+      apiVersion
+      mongoVersion {
+        version
+      }
+      plugins {
+        name
+        version
+      }
+    }
+  }
+`;
+
+/**
+ * SystemInformation
+ * @param {Object} props Component props
+ * @returns {Node} React component
+ */
+export default function SystemInformation() {
+  const [shopId] = useCurrentShopId();
+
+  const {
+    data,
+    loading
+  } = useQuery(
+    systemInfoQuery,
+    {
+      variables: {
+        shopId
+      }
+    }
+  );
+
+  if (loading) return <Components.Loading />;
+
+  const { systemInformation = {} } = data || {};
+
+  return (
+    <Card>
+      <CardHeader title={i18next.t("shopSettings.systemInfo.title")} />
+      <CardContent>
+        <div>
+          <span>{i18next.t("shopSettings.systemInfo.apiVersionLabel")}:</span> {systemInformation.apiVersion}
+        </div>
+        <div>
+          <span>{i18next.t("shopSettings.systemInfo.mongoVersionLabel")}:</span> {systemInformation.mongoVersion && systemInformation.mongoVersion.version}
+        </div>
+        <div>
+          <span>{i18next.t("shopSettings.systemInfo.installedPluginsLabel")}:</span>
+        </div>
+        <ul>
+          {(systemInformation.plugins || []).map((plugin) => <li key={plugin.name}>{plugin.name} {plugin.version}</li>)}
+        </ul>
+      </CardContent>
+    </Card>
+  );
+}

From 2f21877b53957f8eae90fbfe8918f0ec86c8cd58 Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 16:17:36 -0600
Subject: [PATCH 09/19] feat: remove all SMTP email settings UI

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../email-smtp/client/actions/index.js        |   1 -
 .../email-smtp/client/actions/settings.js     | 108 -------------
 .../client/components/SMTPEmailConfig.js      | 144 ------------------
 .../client/components/SMTPEmailSettings.js    | 136 -----------------
 .../containers/SMTPEmailConfigContainer.js    | 139 -----------------
 .../containers/SMTPEmailSettingsContainer.js  |  44 ------
 .../included/email-smtp/client/index.js       |  10 --
 .../included/email-smtp/server/index.js       |   4 -
 .../email-smtp/server/methods/index.js        |  12 --
 .../email-smtp/server/methods/saveSettings.js |  40 -----
 10 files changed, 638 deletions(-)
 delete mode 100644 imports/plugins/included/email-smtp/client/actions/index.js
 delete mode 100644 imports/plugins/included/email-smtp/client/actions/settings.js
 delete mode 100644 imports/plugins/included/email-smtp/client/components/SMTPEmailConfig.js
 delete mode 100644 imports/plugins/included/email-smtp/client/components/SMTPEmailSettings.js
 delete mode 100644 imports/plugins/included/email-smtp/client/containers/SMTPEmailConfigContainer.js
 delete mode 100644 imports/plugins/included/email-smtp/client/containers/SMTPEmailSettingsContainer.js
 delete mode 100644 imports/plugins/included/email-smtp/client/index.js
 delete mode 100644 imports/plugins/included/email-smtp/server/index.js
 delete mode 100644 imports/plugins/included/email-smtp/server/methods/index.js
 delete mode 100644 imports/plugins/included/email-smtp/server/methods/saveSettings.js

diff --git a/imports/plugins/included/email-smtp/client/actions/index.js b/imports/plugins/included/email-smtp/client/actions/index.js
deleted file mode 100644
index fd818eab03..0000000000
--- a/imports/plugins/included/email-smtp/client/actions/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as settings } from "./settings";
diff --git a/imports/plugins/included/email-smtp/client/actions/settings.js b/imports/plugins/included/email-smtp/client/actions/settings.js
deleted file mode 100644
index 371b42bce2..0000000000
--- a/imports/plugins/included/email-smtp/client/actions/settings.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import _ from "lodash";
-import { Meteor } from "meteor/meteor";
-import Alert from "sweetalert2";
-import { i18next, Reaction } from "/client/api";
-import gql from "graphql-tag";
-import getOpaqueIds from "/imports/plugins/core/core/client/util/getOpaqueIds";
-
-const verifySMTPEmailSettings = gql`
-  mutation verifySMTPEmailSettings($input: VerifySMTPEmailSettingsInput!) {
-    verifySMTPEmailSettings(input: $input) {
-      clientMutationId
-      isVerified
-    }
-  }
-`;
-
-export default {
-  /**
-   * Save email settings
-   * @param {Object} settings - object of mail provider settings
-   * @param {Object} client - apollo client
-   * @param {Function} callback - optional callback
-   * @returns {Boolean} returns true if all fields provided and update method is called
-   */
-  async saveSettings(settings, client, callback) {
-    const { service, host, port, user, password } = settings;
-
-    if (!service) {
-      Alert(i18next.t("app.error"), i18next.t("mail.alerts.missingService"), "error");
-      return callback();
-    }
-
-    if (service !== "custom" && service !== "Maildev" && (!user || !password)) {
-      Alert(i18next.t("app.error"), i18next.t("mail.alerts.userPassRequired", { service }), "error");
-      return callback();
-    }
-
-    if (service === "custom" && (!host || !port)) {
-      Alert(i18next.t("app.error"), i18next.t("mail.alerts.allFieldsRequired"), "error");
-      return callback();
-    }
-
-    // make sure port is a Number
-    settings.port = Number(settings.port);
-
-    if (isNaN(settings.port)) {
-      Alert(i18next.t("app.error"), i18next.t("mail.alerts.portNaN"), "error");
-      return callback();
-    }
-
-    const save = () => {
-      Meteor.call("email/saveSettings", _.pick(settings, ["service", "host", "port", "user", "password"]), (err) => {
-        if (err) {
-          return Alert(
-            i18next.t("app.error"),
-            i18next.t("mail.alerts.saveFailed", { error: err.reason }),
-            "error"
-          );
-        }
-        return Alerts.toast(i18next.t("app.success"), "success");
-      });
-    };
-
-    const shopId = Reaction.getPrimaryShopId();
-    const [opaqueShopId] = await getOpaqueIds([{ namespace: "Shop", id: shopId }]);
-
-    let shouldSave = true;
-    try {
-      await client.mutate({
-        mutation: verifySMTPEmailSettings,
-        variables: {
-          input: {
-            host: settings.host,
-            password: settings.password,
-            port: settings.port,
-            service: settings.service,
-            shopId: opaqueShopId,
-            user: settings.user
-          }
-        }
-      });
-    } catch (error) {
-      shouldSave = false;
-    }
-
-    if (!shouldSave) {
-      try {
-        await Alert({
-          title: i18next.t("mail.alerts.connectionFailed"),
-          text: i18next.t("mail.alerts.saveAnyway"),
-          type: "warning",
-          showCancelButton: true,
-          cancelButtonText: i18next.t("app.cancel"),
-          confirmButtonColor: "#DD6B55",
-          confirmButtonText: i18next.t("app.save")
-        });
-      } catch (error) {
-        callback();
-        return error;
-      }
-    }
-
-    callback();
-    await save();
-
-    return true;
-  }
-};
diff --git a/imports/plugins/included/email-smtp/client/components/SMTPEmailConfig.js b/imports/plugins/included/email-smtp/client/components/SMTPEmailConfig.js
deleted file mode 100644
index 34651b8be5..0000000000
--- a/imports/plugins/included/email-smtp/client/components/SMTPEmailConfig.js
+++ /dev/null
@@ -1,144 +0,0 @@
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { Components } from "@reactioncommerce/reaction-components";
-import { Translation } from "/imports/plugins/core/ui/client/components";
-
-class SMTPEmailConfig extends Component {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      showPassword: false,
-      showSettings: false
-    };
-
-    this.togglePassword = this.togglePassword.bind(this);
-    this.toggleSettings = this.toggleSettings.bind(this);
-  }
-
-  togglePassword() {
-    this.setState({
-      showPassword: !this.state.showPassword
-    });
-  }
-
-  toggleSettings() {
-    this.setState({
-      showSettings: !this.state.showSettings
-    });
-  }
-
-  renderSettingsDisplay() {
-    const { settings, status } = this.props;
-    const { service, host, port, user, password } = settings;
-    const { showPassword } = this.state;
-
-    const NotSet = () => <span data-i18n="admin.settings.fieldNotSet">Not set</span>;
-
-    return (
-      <div>
-        <div className="pull-right">
-          <Components.IconButton
-            icon="fa fa-gear"
-            onClick={this.toggleSettings}
-          />
-        </div>
-        <div className="email-config-status">
-          <strong><Translation defaultValue="Status" i18nKey="admin.settings.status" /></strong>: {status ?
-            <i className={`fa fa-circle ${status}`} />
-            : <i className={"fa fa-refresh fa-spin"} />}
-        </div>
-        <div>
-          <strong><Translation defaultValue="Service" i18nKey="admin.settings.service" /></strong>: {service || <NotSet/>}
-        </div>
-        <div className="truncate">
-          <strong><Translation defaultValue="Host" i18nKey="admin.settings.host" /></strong>: {host || <NotSet/>}
-        </div>
-        <div>
-          <strong><Translation defaultValue="Port" i18nKey="admin.settings.port" /></strong>: {port || <NotSet/>}
-        </div>
-        <div className="truncate">
-          <strong><Translation defaultValue="User" i18nKey="admin.settings.user" /></strong>: {user || <NotSet/>}
-        </div>
-        <div>
-          <strong><Translation defaultValue="Password" i18nKey="admin.settings.password" /></strong>:&nbsp;&nbsp;
-          {password ?
-            <span>
-              {showPassword ? password : "********"}
-              <Components.Button
-                className={{
-                  "btn": false,
-                  "btn-default": false
-                }}
-                tagName="span"
-                onClick={this.togglePassword}
-              >
-                <span style={{ marginLeft: "1rem" }}>
-                  <em>{showPassword ?
-                    <span data-i18n="admin.settings.passwordHide">Hide</span>
-                    : <span data-i18n="admin.settings.passwordShow">Show</span>}
-                  </em>
-                </span>
-              </Components.Button>
-            </span>
-            : <NotSet/>}
-        </div>
-      </div>
-    );
-  }
-
-  renderSettingsUpdate() {
-    const { showSettings } = this.state;
-
-    if (showSettings === true) {
-      return (
-        <div>
-          <hr />
-          <h4>
-            <Translation
-              defaultValue="Edit Settings"
-              i18nKey="admin.settings.editSettings"
-            />
-          </h4>
-          <Components.SMTPEmailSettings showSettings={showSettings} />
-        </div>
-      );
-    }
-
-    return null;
-  }
-
-  render() {
-    return (
-      <Components.CardGroup>
-        <Components.Card>
-          <Components.CardHeader
-            actAsExpander={true}
-            i18nKeyTitle="admin.settings.mailProvider"
-            title="Mail Provider"
-          />
-          <Components.CardBody>
-            {this.renderSettingsDisplay()}
-            {this.renderSettingsUpdate()}
-          </Components.CardBody>
-        </Components.Card>
-      </Components.CardGroup>
-    );
-  }
-}
-
-SMTPEmailConfig.propTypes = {
-  settings: PropTypes.shape({
-    host: PropTypes.string,
-    password: PropTypes.string,
-    port: PropTypes.oneOfType([
-      PropTypes.number,
-      PropTypes.string
-    ]),
-    service: PropTypes.string,
-    user: PropTypes.string
-  }),
-  status: PropTypes.string
-};
-
-export default SMTPEmailConfig;
diff --git a/imports/plugins/included/email-smtp/client/components/SMTPEmailSettings.js b/imports/plugins/included/email-smtp/client/components/SMTPEmailSettings.js
deleted file mode 100644
index 27a48b8c0c..0000000000
--- a/imports/plugins/included/email-smtp/client/components/SMTPEmailSettings.js
+++ /dev/null
@@ -1,136 +0,0 @@
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { Components } from "@reactioncommerce/reaction-components";
-
-class SMTPEmailSettings extends Component {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      settings: props.settings,
-      hasAuth: !(props.settings.service === "Maildev"),
-      isSaving: false
-    };
-
-    this.handleStateChange = this.handleStateChange.bind(this);
-    this.handleSubmit = this.handleSubmit.bind(this);
-    this.handleSelect = this.handleSelect.bind(this);
-  }
-
-  handleStateChange(event) {
-    const { settings } = this.state;
-    settings[event.target.name] = event.target.value;
-    this.setState({ settings });
-  }
-
-  handleSubmit(event) {
-    event.preventDefault();
-    const { client, saveSettings, providers } = this.props;
-    const { settings } = this.state;
-    let newSettings = settings;
-    if (settings.service !== "custom") {
-      newSettings = Object.assign({}, settings, providers[settings.service]);
-    }
-    this.setState({ isSaving: true });
-    saveSettings(newSettings, client, () => this.setState({ isSaving: false }));
-  }
-
-  handleSelect(service) {
-    this.setState({ settings: { service }, hasAuth: !(service === "Maildev") });
-  }
-
-  render() {
-    const { providers } = this.props;
-    const { settings, hasAuth, isSaving } = this.state;
-
-    const providerNames = Object.keys(providers);
-
-    const emailProviders = providerNames.map((name) => (
-      { label: name, value: name }
-    ));
-
-    emailProviders.unshift({ label: "Custom", value: "custom" });
-
-    return (
-      <form onSubmit={this.handleSubmit}>
-        <Components.Select
-          clearable={false}
-          label="Service"
-          i18nKeyLabel="admin.settings.providerName"
-          placeholder="Select a Service"
-          i18nKeyPlaceholder="admin.settings.selectService"
-          name="service"
-          onChange={this.handleSelect}
-          options={emailProviders}
-          value={settings.service || ""}
-        />
-        {settings.service === "custom" &&
-          <div>
-            <Components.TextField
-              label="Host"
-              i18nKeyLabel="admin.settings.host"
-              type="text"
-              name="host"
-              value={settings.host}
-              onChange={this.handleStateChange}
-            />
-            <Components.TextField
-              label="Port"
-              i18nKeyLabel="admin.settings.port"
-              type="text"
-              name="port"
-              value={settings.port}
-              onChange={this.handleStateChange}
-            />
-          </div>
-        }
-        {hasAuth &&
-          <div>
-            <Components.TextField
-              label="User"
-              i18nKeyLabel="admin.settings.user"
-              type="text"
-              name="user"
-              value={settings.user}
-              onChange={this.handleStateChange}
-            />
-            <Components.TextField
-              label="Password"
-              i18nKeyLabel="admin.settings.password"
-              type="password"
-              name="password"
-              value={settings.password}
-              onChange={this.handleStateChange}
-            />
-          </div>
-        }
-        <Components.Button
-          primary={true}
-          bezelStyle="solid"
-          className="pull-right"
-          type="submit"
-          disabled={isSaving}
-        >
-          {isSaving ?
-            <i className="fa fa-refresh fa-spin"/>
-            : <span data-i18n="app.save">Save</span>}
-        </Components.Button>
-      </form>
-    );
-  }
-}
-
-SMTPEmailSettings.propTypes = {
-  client: PropTypes.object.isRequired,
-  providers: PropTypes.object.isRequired,
-  saveSettings: PropTypes.func.isRequired,
-  settings: PropTypes.shape({
-    service: PropTypes.string,
-    host: PropTypes.string,
-    port: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    user: PropTypes.string,
-    password: PropTypes.string
-  })
-};
-
-export default SMTPEmailSettings;
diff --git a/imports/plugins/included/email-smtp/client/containers/SMTPEmailConfigContainer.js b/imports/plugins/included/email-smtp/client/containers/SMTPEmailConfigContainer.js
deleted file mode 100644
index 8a06ac98a6..0000000000
--- a/imports/plugins/included/email-smtp/client/containers/SMTPEmailConfigContainer.js
+++ /dev/null
@@ -1,139 +0,0 @@
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import getServiceConfig from "nodemailer-wellknown";
-import { withApollo } from "react-apollo";
-import { compose, withProps } from "recompose";
-import { composeWithTracker } from "@reactioncommerce/reaction-components";
-import { Meteor } from "meteor/meteor";
-import { Packages } from "/lib/collections";
-import { Reaction } from "/client/api";
-import actions from "../actions";
-import SMTPEmailConfig from "../components/SMTPEmailConfig";
-import gql from "graphql-tag";
-import getOpaqueIds from "/imports/plugins/core/core/client/util/getOpaqueIds";
-
-const verifySMTPEmailSettings = gql`
-  mutation verifySMTPEmailSettings($input: VerifySMTPEmailSettingsInput!) {
-    verifySMTPEmailSettings(input: $input) {
-      clientMutationId
-      isVerified
-    }
-  }
-`;
-
-const wrapComponent = (Comp) => (
-  class SMTPEmailConfigContainer extends Component {
-    static propTypes = {
-      client: PropTypes.shape({
-        mutate: PropTypes.func.isRequired
-      }),
-      settings: PropTypes.shape({
-        host: PropTypes.string,
-        password: PropTypes.string,
-        port: PropTypes.oneOfType([
-          PropTypes.number,
-          PropTypes.string
-        ]),
-        service: PropTypes.string,
-        user: PropTypes.string
-      })
-    }
-
-    constructor(props) {
-      super(props);
-      this.state = {
-        status: "error",
-        error: null
-      };
-    }
-
-    componentDidMount() {
-      this._isMounted = true;
-      this.checkEmailStatus();
-    }
-
-    // eslint-disable-next-line camelcase
-    UNSAFE_componentWillReceiveProps(nextProps) {
-      const { settings } = this.props;
-      const { settings: nextSettings } = nextProps;
-      // if the email settings do not match check the email status
-      if (JSON.stringify(settings) !== JSON.stringify(nextSettings)) {
-        this.checkEmailStatus();
-      } else {
-        return;
-      }
-    }
-
-    componentWillUnmount() {
-      this._isMounted = false;
-    }
-
-    // checking email settings
-    // and updating status
-    checkEmailStatus = async () => {
-      const { client, settings } = this.props;
-      const { service, host, port, user, password } = settings;
-
-      if (host && password && port && service && user) {
-        const shopId = Reaction.getPrimaryShopId();
-        const [opaqueShopId] = await getOpaqueIds([{ namespace: "Shop", id: shopId }]);
-
-        const { data } = await client.mutate({
-          mutation: verifySMTPEmailSettings,
-          variables: {
-            input: {
-              host,
-              password,
-              port,
-              service,
-              shopId: opaqueShopId,
-              user
-            }
-          }
-        });
-
-        if (data) {
-          this.setState({ status: "valid" });
-        }
-      }
-    }
-
-    render() {
-      const { status } = this.state;
-      return (
-        <Comp {...this.props} status={status} />
-      );
-    }
-  }
-);
-
-const composer = (props, onData) => {
-  const shopId = Reaction.getShopId();
-  if (!shopId) return;
-
-  const pkgSub = Meteor.subscribe("Packages", shopId);
-  if (pkgSub.ready()) {
-    const pkg = Packages.findOne({ name: "core", shopId }) || {};
-    const shopSettings = pkg.settings || {};
-    const settings = shopSettings.mail || {};
-
-    if (settings.service && settings.service !== "custom") {
-      const config = getServiceConfig(settings.service);
-
-      // show localhost for test providers like Maildev that have no host
-      settings.host = config.host || "localhost";
-      settings.port = config.port;
-    }
-
-    onData(null, { settings });
-  }
-};
-
-const handlers = { saveSettings: actions.settings.saveSettings };
-
-export default compose(
-  composeWithTracker(composer),
-  withProps(handlers),
-  withApollo,
-  wrapComponent
-)(SMTPEmailConfig);
diff --git a/imports/plugins/included/email-smtp/client/containers/SMTPEmailSettingsContainer.js b/imports/plugins/included/email-smtp/client/containers/SMTPEmailSettingsContainer.js
deleted file mode 100644
index df60bf9101..0000000000
--- a/imports/plugins/included/email-smtp/client/containers/SMTPEmailSettingsContainer.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { compose, withProps } from "recompose";
-import { withApollo } from "react-apollo";
-import { registerComponent, composeWithTracker } from "@reactioncommerce/reaction-components";
-import { Meteor } from "meteor/meteor";
-import { Reaction } from "/client/api";
-import { Packages } from "/lib/collections";
-import actions from "../actions";
-import SMTPEmailSettings from "../components/SMTPEmailSettings";
-
-const providers = require("nodemailer-wellknown/services.json");
-
-const composer = (props, onData) => {
-  const shopId = Reaction.getShopId();
-  if (!shopId) return;
-
-  const pkgSub = Meteor.subscribe("Packages", shopId);
-  if (pkgSub.ready()) {
-    const pkg = Packages.findOne({ name: "core", shopId }) || {};
-    const shopSettings = pkg.settings || {};
-    const settings = shopSettings.mail || {};
-
-    const { service, host, port, user, password } = settings;
-
-    if (host && port && user && password && !service) {
-      settings.service = "custom";
-    }
-
-    onData(null, { providers, settings });
-  }
-};
-
-const handlers = { saveSettings: actions.settings.saveSettings };
-
-registerComponent("SMTPEmailSettings", SMTPEmailSettings, [
-  composeWithTracker(composer),
-  withProps(handlers),
-  withApollo
-]);
-
-export default compose(
-  composeWithTracker(composer),
-  withProps(handlers),
-  withApollo
-)(SMTPEmailSettings);
diff --git a/imports/plugins/included/email-smtp/client/index.js b/imports/plugins/included/email-smtp/client/index.js
deleted file mode 100644
index d1e8c629e0..0000000000
--- a/imports/plugins/included/email-smtp/client/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { registerBlock } from "@reactioncommerce/reaction-components";
-import SMTPEmailConfig from "./containers/SMTPEmailConfigContainer";
-import "./containers/SMTPEmailSettingsContainer";
-
-registerBlock({
-  region: "EmailSettings",
-  name: "SMTPEmailConfig",
-  component: SMTPEmailConfig,
-  priority: 1
-});
diff --git a/imports/plugins/included/email-smtp/server/index.js b/imports/plugins/included/email-smtp/server/index.js
deleted file mode 100644
index 4a5a37165e..0000000000
--- a/imports/plugins/included/email-smtp/server/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { Meteor } from "meteor/meteor";
-import methods from "./methods";
-
-Meteor.methods(methods);
diff --git a/imports/plugins/included/email-smtp/server/methods/index.js b/imports/plugins/included/email-smtp/server/methods/index.js
deleted file mode 100644
index cdc1113798..0000000000
--- a/imports/plugins/included/email-smtp/server/methods/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import saveSettings from "./saveSettings";
-
-/**
- * @file Methods for sending emails, retrying failed emails and verifying email configuration.
- * Run these methods using `Meteor.call()`
- *
- * @namespace Email/Methods
-*/
-
-export default {
-  "email/saveSettings": saveSettings
-};
diff --git a/imports/plugins/included/email-smtp/server/methods/saveSettings.js b/imports/plugins/included/email-smtp/server/methods/saveSettings.js
deleted file mode 100644
index e6d514e093..0000000000
--- a/imports/plugins/included/email-smtp/server/methods/saveSettings.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import Logger from "@reactioncommerce/logger";
-import { check, Match } from "meteor/check";
-import { Packages } from "/lib/collections";
-import Reaction from "/imports/plugins/core/core/server/Reaction";
-import ReactionError from "@reactioncommerce/reaction-error";
-
-/**
- * @name email/saveSettings
- * @method
- * @summary Save new email configuration
- * @memberof Email/Methods
- * @param {Object} settings - mail provider settings
- * @returns {Boolean} - returns true if update succeeds
- */
-export default function saveSettings(settings) {
-  if (!Reaction.hasPermission(["owner", "admin", "dashboard"], this.userId)) {
-    Logger.error("email/saveSettings: Access Denied");
-    throw new ReactionError("access-denied", "Access Denied");
-  }
-
-  check(settings, {
-    service: String,
-    host: Match.Optional(String),
-    port: Match.Optional(Number),
-    user: Match.Optional(String),
-    password: Match.Optional(String)
-  });
-
-  Packages.update({ name: "core", shopId: Reaction.getShopId() }, {
-    $set: {
-      "settings.mail": settings
-    }
-  });
-
-  delete settings.password;
-
-  Logger.info(settings, "Email settings updated");
-
-  return true;
-}

From 77c68120f5720f869e427a12e66230b70ab33f30 Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 16:17:57 -0600
Subject: [PATCH 10/19] fix: check args in Templates publish

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../plugins/core/layout/server/publications/templates.js    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/imports/plugins/core/layout/server/publications/templates.js b/imports/plugins/core/layout/server/publications/templates.js
index 49b1ee096c..a75d845745 100644
--- a/imports/plugins/core/layout/server/publications/templates.js
+++ b/imports/plugins/core/layout/server/publications/templates.js
@@ -1,9 +1,13 @@
 import { Meteor } from "meteor/meteor";
+import { check, Match } from "meteor/check";
 import { Counts } from "meteor/tmeasday:publish-counts";
 import Reaction from "/imports/plugins/core/core/server/Reaction";
 import { Templates } from "/lib/collections";
 
-Meteor.publish("Templates", function () {
+Meteor.publish("Templates", function (_, __) {
+  // These checks are to avoid errors from the audit-argument-checks package
+  check(_, Match.Maybe(Object));
+  check(__, Match.Maybe(Object));
   const shopId = Reaction.getShopId();
 
   Counts.publish(this, "templates-count", Templates.find({ shopId }));

From 7e460dda509c60fec116aecbd747ce8f563f8205 Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 16:18:25 -0600
Subject: [PATCH 11/19] refactor: remove unused Stripe pkg code

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../included/payments-stripe/client/index.js  |  2 --
 .../client/settings/stripe.html               |  8 -----
 .../payments-stripe/client/settings/stripe.js | 35 -------------------
 .../payments-stripe/client/util/constants.js  |  2 --
 4 files changed, 47 deletions(-)
 delete mode 100644 imports/plugins/included/payments-stripe/client/index.js
 delete mode 100644 imports/plugins/included/payments-stripe/client/settings/stripe.html
 delete mode 100644 imports/plugins/included/payments-stripe/client/settings/stripe.js
 delete mode 100644 imports/plugins/included/payments-stripe/client/util/constants.js

diff --git a/imports/plugins/included/payments-stripe/client/index.js b/imports/plugins/included/payments-stripe/client/index.js
deleted file mode 100644
index 7c3150f042..0000000000
--- a/imports/plugins/included/payments-stripe/client/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import "./settings/stripe.html";
-import "./settings/stripe.js";
diff --git a/imports/plugins/included/payments-stripe/client/settings/stripe.html b/imports/plugins/included/payments-stripe/client/settings/stripe.html
deleted file mode 100644
index 3d46148e34..0000000000
--- a/imports/plugins/included/payments-stripe/client/settings/stripe.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<template name="stripeSettings">
-  <div>
-    {{#autoForm collection=Collections.Packages schema=StripePackageConfig doc=packageData type="update" id="stripe-update-form"}}
-    <button type="submit" class="btn btn-primary pull-right"><span data-i18n="app.saveChanges">Save
-        Changes</span></button>
-    {{/autoForm}}
-  </div>
-</template>
diff --git a/imports/plugins/included/payments-stripe/client/settings/stripe.js b/imports/plugins/included/payments-stripe/client/settings/stripe.js
deleted file mode 100644
index fca8811034..0000000000
--- a/imports/plugins/included/payments-stripe/client/settings/stripe.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Template } from "meteor/templating";
-import { AutoForm } from "meteor/aldeed:autoform";
-import { Reaction, i18next } from "/client/api";
-import { Packages } from "/lib/collections";
-import { StripePackageConfig } from "../../lib/collections/schemas";
-import { STRIPE_PACKAGE_NAME } from "../util/constants";
-
-/**
- * @summary get Stripe Package record
- * @returns {Object} Package data
- */
-function packageData() {
-  return Packages.findOne({
-    name: STRIPE_PACKAGE_NAME,
-    shopId: Reaction.getShopId()
-  });
-}
-
-Template.stripeSettings.helpers({
-  StripePackageConfig() {
-    return StripePackageConfig;
-  },
-  packageData
-});
-
-AutoForm.hooks({
-  "stripe-update-form": {
-    onSuccess() {
-      return Alerts.toast(i18next.t("admin.settings.saveSuccess"), "success");
-    },
-    onError(error) {
-      return Alerts.toast(`${i18next.t("admin.settings.saveFailed")} ${error}`, "error");
-    }
-  }
-});
diff --git a/imports/plugins/included/payments-stripe/client/util/constants.js b/imports/plugins/included/payments-stripe/client/util/constants.js
deleted file mode 100644
index bab08656d3..0000000000
--- a/imports/plugins/included/payments-stripe/client/util/constants.js
+++ /dev/null
@@ -1,2 +0,0 @@
-
-export const STRIPE_PACKAGE_NAME = "reaction-stripe";

From 96c57d63ed1a5816afb364ecae03c426c0bc3615 Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 16:18:52 -0600
Subject: [PATCH 12/19] fix: use correct default page size on tax rates table

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../taxes-rates/client/components/CustomTaxRatesSettings.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/imports/plugins/included/taxes-rates/client/components/CustomTaxRatesSettings.js b/imports/plugins/included/taxes-rates/client/components/CustomTaxRatesSettings.js
index 91a4309103..3826c606c0 100644
--- a/imports/plugins/included/taxes-rates/client/components/CustomTaxRatesSettings.js
+++ b/imports/plugins/included/taxes-rates/client/components/CustomTaxRatesSettings.js
@@ -25,7 +25,7 @@ const useStyles = makeStyles((theme) => ({
 
 const cellWithDefaultText = ({ value }) => ((value && value.length) ? value : i18next.t("admin.taxGrid.any"));
 
-const DEFAULT_PAGE_SIZE = 2;
+const DEFAULT_PAGE_SIZE = 20;
 
 /**
  * @summary React component that renders the custom tax rate settings card,

From 83c79cc36a02ffe3020b4c1ece8ad59f796a3a8d Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 16:19:33 -0600
Subject: [PATCH 13/19] refactor: remove handling of example settings form

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../exampleSettingsFormContainer.js           | 44 +------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

diff --git a/imports/plugins/included/payments-example/client/settings/containers/exampleSettingsFormContainer.js b/imports/plugins/included/payments-example/client/settings/containers/exampleSettingsFormContainer.js
index f4e856fbb6..47558b43cd 100644
--- a/imports/plugins/included/payments-example/client/settings/containers/exampleSettingsFormContainer.js
+++ b/imports/plugins/included/payments-example/client/settings/containers/exampleSettingsFormContainer.js
@@ -1,9 +1,5 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
-import { composeWithTracker } from "@reactioncommerce/reaction-components";
-import { Meteor } from "meteor/meteor";
-import { Packages } from "/lib/collections";
-import { Reaction, i18next } from "/client/api";
 import { ExampleSettingsForm } from "../components";
 
 class ExampleSettingsFormContainer extends Component {
@@ -15,8 +11,6 @@ class ExampleSettingsFormContainer extends Component {
     };
 
     this.handleChange = this.handleChange.bind(this);
-    this.handleSubmit = this.handleSubmit.bind(this);
-    this.saveUpdate = this.saveUpdate.bind(this);
   }
 
   handleChange(event) {
@@ -24,32 +18,10 @@ class ExampleSettingsFormContainer extends Component {
     this.setState({ apiKey: event.target.value });
   }
 
-  handleSubmit(settings) {
-    const packageId = this.props.packageData._id;
-    const { settingsKey } = this.props.packageData.registry[0];
-
-    const fields = [{
-      property: "apiKey",
-      value: settings.apiKey
-    }];
-
-    this.saveUpdate(fields, packageId, settingsKey);
-  }
-
-  saveUpdate(fields, id, settingsKey) {
-    Meteor.call("registry/update", id, settingsKey, fields, (err) => {
-      if (err) {
-        return Alerts.toast(i18next.t("admin.settings.saveFailed"), "error");
-      }
-      return Alerts.toast(i18next.t("admin.settings.saveSuccess"), "success");
-    });
-  }
-
   render() {
     return (
       <ExampleSettingsForm
         onChange={this.handleChange}
-        onSubmit={this.handleSubmit}
         settings={this.props.packageData.settings}
       />
     );
@@ -60,18 +32,4 @@ ExampleSettingsFormContainer.propTypes = {
   packageData: PropTypes.object
 };
 
-const composer = (props, onData) => {
-  const shopId = Reaction.getShopId();
-  if (!shopId) return;
-
-  const pkgSub = Meteor.subscribe("Packages", shopId);
-  if (pkgSub.ready()) {
-    const packageData = Packages.findOne({
-      name: "example-paymentmethod",
-      shopId: Reaction.getShopId()
-    });
-    onData(null, { packageData });
-  }
-};
-
-export default composeWithTracker(composer)(ExampleSettingsFormContainer);
+export default ExampleSettingsFormContainer;

From 73fb2a44dfbf0e6ce82f15e98199abce04034c58 Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 16:20:20 -0600
Subject: [PATCH 14/19] refactor: remove unused notification click handler

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../client/components/notificationRoute.js    | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/imports/plugins/included/notifications/client/components/notificationRoute.js b/imports/plugins/included/notifications/client/components/notificationRoute.js
index 2fbfcb78d3..b74931a332 100644
--- a/imports/plugins/included/notifications/client/components/notificationRoute.js
+++ b/imports/plugins/included/notifications/client/components/notificationRoute.js
@@ -1,6 +1,5 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
-import { Reaction } from "/client/api";
 import { Components, withMoment, registerComponent } from "@reactioncommerce/reaction-components";
 import { Link } from "@reactioncommerce/reaction-router";
 
@@ -20,30 +19,6 @@ class NotificationRoute extends Component {
     return null;
   }
 
-  handleClick = (event, notify) => {
-    if (notify.type === "forAdmin") {
-      const actionViewData = Reaction.Apps({
-        name: "reaction-orders",
-        provides: "dashboard"
-      });
-      Reaction.showActionView(actionViewData);
-    } else {
-      // Determine if url's basename ends in a file extension (i.e. /sitemap.xml).
-      // If so, use window.location to break out of the Reaction app, otherwise navigate via Reaction router
-      const { url } = notify;
-      const urlSplit = url.split("/");
-      const doesBasenameHavePeriod = urlSplit[urlSplit.length - 1].includes(".");
-      if (doesBasenameHavePeriod) {
-        window.location = url;
-      } else {
-        Reaction.Router.go(url);
-      }
-    }
-
-    const { markOneAsRead } = this.props;
-    return markOneAsRead(notify._id);
-  }
-
   handleMarkAllAsRead = () => {
     const { notificationList, markAllAsRead } = this.props;
     markAllAsRead(notificationList);

From 283f549285cefee4dfafe76a659beb9492f0744e Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 17:43:08 -0600
Subject: [PATCH 15/19] feat: fix and update Shipping Settings page

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 imports/client/ui/hooks/useCurrentShop.js     |  58 ++++++
 .../components/DefaultParcelSizeForm.js       | 191 ++++++++++++++++++
 .../shipping/client/components/Shipping.js    |  55 ++++-
 .../core/shipping/client/components/index.js  |   1 -
 .../client/components/parcelSizeSettings.js   | 121 -----------
 .../core/shipping/client/containers/index.js  |   1 -
 .../client/containers/parcelSizeSettings.js   | 102 ----------
 imports/plugins/core/shipping/client/index.js |   3 -
 .../core/shipping/client/templates/index.js   |   2 -
 .../client/templates/settings/shipping.html   |  22 --
 .../client/templates/settings/shipping.js     |  49 -----
 .../included/shipping-rates/client/index.js   |  10 +-
 .../components/ShippingRatesSettings.js       |  18 +-
 .../containers/ShippingRatesSettings.js       |   4 +-
 14 files changed, 316 insertions(+), 321 deletions(-)
 create mode 100644 imports/client/ui/hooks/useCurrentShop.js
 create mode 100644 imports/plugins/core/shipping/client/components/DefaultParcelSizeForm.js
 delete mode 100644 imports/plugins/core/shipping/client/components/index.js
 delete mode 100644 imports/plugins/core/shipping/client/components/parcelSizeSettings.js
 delete mode 100644 imports/plugins/core/shipping/client/containers/index.js
 delete mode 100644 imports/plugins/core/shipping/client/containers/parcelSizeSettings.js
 delete mode 100644 imports/plugins/core/shipping/client/templates/index.js
 delete mode 100644 imports/plugins/core/shipping/client/templates/settings/shipping.html
 delete mode 100644 imports/plugins/core/shipping/client/templates/settings/shipping.js

diff --git a/imports/client/ui/hooks/useCurrentShop.js b/imports/client/ui/hooks/useCurrentShop.js
new file mode 100644
index 0000000000..fdfae75076
--- /dev/null
+++ b/imports/client/ui/hooks/useCurrentShop.js
@@ -0,0 +1,58 @@
+import { useLazyQuery } from "@apollo/react-hooks";
+import gql from "graphql-tag";
+import useCurrentShopId from "./useCurrentShopId.js";
+
+const getShopQuery = gql`
+  query getShop($id: ID!) {
+    shop(id: $id) {
+      _id
+      brandAssets {
+        navbarBrandImageId
+      }
+      defaultParcelSize {
+        height
+        length
+        weight
+        width
+      }
+      language
+      name
+      shopLogoUrls {
+        primaryShopLogoUrl
+      }
+      storefrontUrls {
+        storefrontHomeUrl
+        storefrontLoginUrl
+        storefrontOrderUrl
+        storefrontOrdersUrl
+        storefrontAccountProfileUrl
+      }
+    }
+  }
+`;
+
+/**
+ * React Hook that gets the globally current shop
+ * @return {Object} Object with `shop` and `shopId` props
+ */
+export default function useCurrentShop() {
+  const [shopId] = useCurrentShopId();
+
+  const [getShop, { called, data, loading, refetch }] = useLazyQuery(getShopQuery, {
+    fetchPolicy: "network-only"
+  });
+
+  // Wait until we're sure we have a shop ID to call the query
+  if (shopId && !called) {
+    getShop({
+      variables: { id: shopId }
+    });
+  }
+
+  return {
+    isLoadingShop: loading,
+    refetchShop: refetch,
+    shop: data && data.shop,
+    shopId
+  };
+}
diff --git a/imports/plugins/core/shipping/client/components/DefaultParcelSizeForm.js b/imports/plugins/core/shipping/client/components/DefaultParcelSizeForm.js
new file mode 100644
index 0000000000..6829885579
--- /dev/null
+++ b/imports/plugins/core/shipping/client/components/DefaultParcelSizeForm.js
@@ -0,0 +1,191 @@
+import React, { useState } from "react";
+import PropTypes from "prop-types";
+import i18next from "i18next";
+import { useMutation } from "@apollo/react-hooks";
+import gql from "graphql-tag";
+import { useSnackbar } from "notistack";
+import SimpleSchema from "simpl-schema";
+import Button from "@reactioncommerce/catalyst/Button";
+import Grid from "@material-ui/core/Grid";
+import TextField from "@material-ui/core/TextField";
+import { makeStyles } from "@material-ui/styles";
+import muiOptions from "reacto-form/cjs/muiOptions";
+import useReactoForm from "reacto-form/cjs/useReactoForm";
+
+const updateShopMutation = gql`
+  mutation updateShopMutation($input: UpdateShopInput!) {
+    updateShop(input: $input) {
+      shop {
+        _id
+      }
+    }
+  }
+`;
+
+const useStyles = makeStyles((theme) => ({
+  rightAlignedGrid: {
+    textAlign: "right"
+  },
+  textField: {
+    marginBottom: theme.spacing(4),
+    minWidth: 350
+  }
+}));
+
+const formSchema = new SimpleSchema({
+  weight: {
+    type: Number,
+    min: 0,
+    optional: true
+  },
+  height: {
+    type: Number,
+    min: 0,
+    optional: true
+  },
+  length: {
+    type: Number,
+    min: 0,
+    optional: true
+  },
+  width: {
+    type: Number,
+    min: 0,
+    optional: true
+  }
+});
+const validator = formSchema.getFormValidator();
+
+/**
+ * @summary React component that renders the form for adding, updating, or deleting
+ *   a custom tax rate record.
+ * @param {Object} props React props
+ * @return {React.Node} React node
+ */
+export default function DefaultParcelSizeForm(props) {
+  const classes = useStyles();
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const { enqueueSnackbar } = useSnackbar();
+
+  const {
+    doc,
+    onSuccess = () => {},
+    shopId
+  } = props;
+
+  const [updateShop] = useMutation(updateShopMutation, {
+    ignoreResults: true,
+    onCompleted() {
+      setIsSubmitting(false);
+      enqueueSnackbar(i18next.t("changesSaved"), { variant: "success" });
+      onSuccess();
+    },
+    onError() {
+      setIsSubmitting(false);
+      enqueueSnackbar(i18next.t("changesNotSaved"), { variant: "warning" });
+    }
+  });
+
+  const {
+    getFirstErrorMessage,
+    getInputProps,
+    hasErrors,
+    submitForm
+  } = useReactoForm({
+    async onSubmit(formData) {
+      setIsSubmitting(true);
+
+      await updateShop({
+        variables: {
+          input: {
+            defaultParcelSize: formSchema.clean(formData),
+            shopId
+          }
+        }
+      });
+    },
+    validator(formData) {
+      return validator(formSchema.clean(formData));
+    },
+    value: doc
+  });
+
+  return (
+    <div>
+      <TextField
+        className={classes.textField}
+        error={hasErrors(["weight"])}
+        fullWidth
+        helperText={getFirstErrorMessage(["weight"])}
+        label={i18next.t("productVariant.weight")}
+        onKeyPress={(event) => {
+          if (event.key === "Enter") submitForm();
+        }}
+        {...getInputProps("weight", muiOptions)}
+      />
+      <TextField
+        className={classes.textField}
+        error={hasErrors(["length"])}
+        fullWidth
+        helperText={getFirstErrorMessage(["length"])}
+        label={i18next.t("productVariant.length")}
+        onKeyPress={(event) => {
+          if (event.key === "Enter") submitForm();
+        }}
+        {...getInputProps("length", muiOptions)}
+      />
+      <TextField
+        className={classes.textField}
+        error={hasErrors(["width"])}
+        fullWidth
+        helperText={getFirstErrorMessage(["width"])}
+        label={i18next.t("productVariant.width")}
+        onKeyPress={(event) => {
+          if (event.key === "Enter") submitForm();
+        }}
+        {...getInputProps("width", muiOptions)}
+      />
+      <TextField
+        className={classes.textField}
+        error={hasErrors(["height"])}
+        fullWidth
+        helperText={getFirstErrorMessage(["height"])}
+        label={i18next.t("productVariant.height")}
+        onKeyPress={(event) => {
+          if (event.key === "Enter") submitForm();
+        }}
+        {...getInputProps("height", muiOptions)}
+      />
+      <Grid className={classes.rightAlignedGrid} item xs={12}>
+        <Button
+          color="primary"
+          isDisabled={isSubmitting}
+          onClick={submitForm}
+          variant="contained"
+        >
+          {i18next.t("app.save")}
+        </Button>
+      </Grid>
+    </div>
+  );
+}
+
+DefaultParcelSizeForm.propTypes = {
+  /**
+   * Document to edit. Provide this to put the form into update mode
+   */
+  doc: PropTypes.shape({
+    height: PropTypes.number,
+    length: PropTypes.number,
+    weight: PropTypes.number,
+    width: PropTypes.number
+  }),
+  /**
+   * Function to call after form is successfully submitted
+   */
+  onSuccess: PropTypes.func,
+  /**
+   * Shop ID to create/edit/delete address validation rule for
+   */
+  shopId: PropTypes.string.isRequired
+};
diff --git a/imports/plugins/core/shipping/client/components/Shipping.js b/imports/plugins/core/shipping/client/components/Shipping.js
index 7af44e6df9..c3e45a1690 100644
--- a/imports/plugins/core/shipping/client/components/Shipping.js
+++ b/imports/plugins/core/shipping/client/components/Shipping.js
@@ -1,13 +1,46 @@
-import React, { Component } from "react";
-import Blaze from "meteor/gadicc:blaze-react-component";
-
-export default class Shipping extends Component {
-  render() {
-    return (
-      <div>
-        <h4>Shipping</h4>
-        <Blaze template="shippingSettings" {...this.props} />
-      </div>
-    );
+import React from "react";
+import { makeStyles } from "@material-ui/styles";
+import Card from "@material-ui/core/Card";
+import CardContent from "@material-ui/core/CardContent";
+import CardHeader from "@material-ui/core/CardHeader";
+import { Blocks } from "@reactioncommerce/reaction-components";
+import { i18next } from "/client/api";
+import useCurrentShop from "/imports/client/ui/hooks/useCurrentShop.js";
+import DefaultParcelSizeForm from "./DefaultParcelSizeForm.js";
+
+const useStyles = makeStyles((theme) => ({
+  topCard: {
+    marginBottom: theme.spacing(2)
   }
+}));
+
+/**
+ * @summary Renders shipping page
+ * @param {Object} props Component props
+ * @return {React.Node} React node
+ */
+export default function Shipping(props) {
+  const classes = useStyles();
+  const { refetchShop, shop } = useCurrentShop();
+
+  if (!shop) return null;
+
+  return (
+    <div>
+      <h4>Shipping</h4>
+      <Card className={classes.topCard}>
+        <CardHeader
+          title={i18next.t("defaultParcelSize.label")}
+        />
+        <CardContent>
+          <DefaultParcelSizeForm
+            doc={shop.defaultParcelSize}
+            onSuccess={refetchShop}
+            shopId={shop._id}
+          />
+        </CardContent>
+      </Card>
+      <Blocks region="ShippingSettings" blockProps={props} />
+    </div>
+  );
 }
diff --git a/imports/plugins/core/shipping/client/components/index.js b/imports/plugins/core/shipping/client/components/index.js
deleted file mode 100644
index 7487dd216b..0000000000
--- a/imports/plugins/core/shipping/client/components/index.js
+++ /dev/null
@@ -1 +0,0 @@
-import "./parcelSizeSettings";
diff --git a/imports/plugins/core/shipping/client/components/parcelSizeSettings.js b/imports/plugins/core/shipping/client/components/parcelSizeSettings.js
deleted file mode 100644
index b10a5b781a..0000000000
--- a/imports/plugins/core/shipping/client/components/parcelSizeSettings.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { Components, registerComponent } from "@reactioncommerce/reaction-components";
-import { ShippingParcel } from "/lib/collections/schemas";
-
-
-/**
- * @file ParcelSizeSettings - React Component wrapper for shop default parcel size form displayed in shipping settings
- * @module ParcelSizeSettings
- * @extends Component
-*/
-class ParcelSizeSettings extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      expanded: false,
-      settings: props.doc
-    };
-  }
-
-  /**
-  * @name handleSubmit
-  * @summary Handle form submission
-  * @param {Object} event - onChange event when typing in input field
-  * @param {Object} formData - the data of the whole form
-  * @returns {function} state for field value
-  */
-  handleSubmit = (event, formData) => {
-    const parcel = formData.doc;
-    this.props.saveDefaultSize(parcel);
-  }
-
-  /**
-  * @name handleCardExpand
-  * @summary Handle card expansion
-  * @param {Object} event - onChange event when expander is clicked
-  * @param {Object} card - card component
-  * @param {String} cardName - card name
-  * @param {Boolean} isExpanded - boolean value from card component
-  * @returns {undefined}
-  */
-  handleCardExpand = (event, card, cardName, isExpanded) => {
-    if (this.props.onCardExpand) {
-      this.props.onCardExpand(isExpanded ? cardName : undefined);
-      this.setState({
-        expanded: this.props.getEditFocus() === cardName
-      });
-    }
-  }
-
-  /**
-  * @name renderComponent
-  * @summary React component for displaying default parcel size form
-  * @returns {Node} React node containing form view
-  */
-  render() {
-    const { hiddenFields, shownFields, fieldsProp } = this.props;
-    return (
-      <div className="parcel-setting">
-        <Components.CardGroup>
-          <Components.Card
-            expanded={this.state.expanded}
-            name={"parcelSize"}
-            onExpand={this.handleCardExpand}
-          >
-            <Components.CardHeader
-              actAsExpander={true}
-              i18nKeyTitle="defaultParcelSize.label"
-              title="Default Parcel Size"
-            />
-            <Components.CardBody expandable={true}>
-              <Components.Form
-                autoSave
-                renderFromFields
-                fieldsProp={fieldsProp}
-                onSubmit={this.handleSubmit}
-                schema={ShippingParcel}
-                doc={this.state.settings}
-                fields={shownFields}
-                hideFields={hiddenFields}
-              />
-            </Components.CardBody>
-          </Components.Card>
-        </Components.CardGroup>
-      </div>
-    );
-  }
-}
-
-/**
-  * @name ParcelSizeSettings propTypes
-  * @type {propTypes}
-  * @param {Object} props - React PropTypes
-  * @property {Function} doc the parcel object
-  * @property {Object} fieldsProp properties of the fields
-  * @property {Function} getEditFocus provides function that gets edit/focus value in Reaction state
-  * @property {Array} hiddenFields fields not to be shown
-  * @property {Function} onCardExpand provides function that controls card expansion
-  * @property {Function} saveDefaultSize provides function / action when form is submitted
-  * @property {Object} shownFields fields to be shown and how to be shown
-  * @returns {Array} React propTypes
-*/
-
-ParcelSizeSettings.propTypes = {
-  doc: PropTypes.shape({
-    weight: PropTypes.number,
-    height: PropTypes.number,
-    length: PropTypes.number,
-    width: PropTypes.number
-  }),
-  fieldsProp: PropTypes.object,
-  getEditFocus: PropTypes.func,
-  hiddenFields: PropTypes.array,
-  onCardExpand: PropTypes.func,
-  saveDefaultSize: PropTypes.func,
-  shownFields: PropTypes.object
-};
-
-registerComponent("ParcelSizeSettings", ParcelSizeSettings);
-
-export default ParcelSizeSettings;
diff --git a/imports/plugins/core/shipping/client/containers/index.js b/imports/plugins/core/shipping/client/containers/index.js
deleted file mode 100644
index 7487dd216b..0000000000
--- a/imports/plugins/core/shipping/client/containers/index.js
+++ /dev/null
@@ -1 +0,0 @@
-import "./parcelSizeSettings";
diff --git a/imports/plugins/core/shipping/client/containers/parcelSizeSettings.js b/imports/plugins/core/shipping/client/containers/parcelSizeSettings.js
deleted file mode 100644
index 2cd865f3cd..0000000000
--- a/imports/plugins/core/shipping/client/containers/parcelSizeSettings.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import { Meteor } from "meteor/meteor";
-import { registerComponent, composeWithTracker } from "@reactioncommerce/reaction-components";
-import { Reaction, i18next, Logger } from "/client/api/";
-import { Shops } from "/lib/collections";
-import { ShippingParcel } from "/lib/collections/schemas";
-import ParcelSizeSettings from "../components/parcelSizeSettings";
-
-/**
- * @method saveDefaultSize
- * @summary call "shop/updateDefaultParcelSize" method
- * @param {Object} size - size object to be saved
- * @since 1.1.12
- * @returns {Function} callback
-*/
-const saveDefaultSize = (size) => {
-  const parcel = ShippingParcel.clean(size);
-  try {
-    ShippingParcel.validate(parcel);
-  } catch (error) {
-    Logger.error(error);
-    Alerts.toast(i18next.t("shippingSettings.parcelSize.saveFailed"), "error");
-    return;
-  }
-  Meteor.call("shop/updateDefaultParcelSize", parcel, (error) => {
-    if (error) {
-      Alerts.toast(i18next.t("shippingSettings.parcelSize.saveFailed"), "error");
-    }
-  });
-};
-
-/**
- * @method onCardExpand
- * @summary set "edit/focus" in current Reaction state
- * @param {String} cardName - card name to be set
- * @since 1.1.12
- * @returns {Function} callback
-*/
-const onCardExpand = (cardName) => {
-  Reaction.state.set("edit/focus", cardName);
-};
-
-/**
- * @method getEditFocus
- * @summary get "edit/focus" value from current Reaction state
- * @since 1.1.12
- * @returns {String} focus value
-*/
-const getEditFocus = () => Reaction.state.get("edit/focus");
-
-/**
- * @private
- * @param {Object} props Props
- * @param {Function} onData Call this to update props
- * @returns {undefined}
- */
-const composer = (props, onData) => {
-  const shop = Shops.findOne({
-    _id: Reaction.getShopId()
-  });
-  const doc = shop.defaultParcelSize;
-  const formSettings = {
-    shownFields: {
-      weight: ShippingParcel._schema.weight,
-      length: ShippingParcel._schema.length,
-      width: ShippingParcel._schema.width,
-      height: ShippingParcel._schema.height
-    },
-    hiddenFields: [
-      "container"
-    ],
-    fieldsProp: {
-      weight: {
-        renderComponent: "string",
-        inputType: "number"
-      },
-      length: {
-        renderComponent: "string",
-        inputType: "number"
-      },
-      width: {
-        renderComponent: "string",
-        inputType: "number"
-      },
-      height: {
-        renderComponent: "string",
-        inputType: "number"
-      }
-    }
-  };
-
-  onData(null, {
-    getEditFocus,
-    onCardExpand,
-    doc,
-    ...formSettings,
-    saveDefaultSize
-  });
-};
-
-registerComponent("ParcelSizeSettings", ParcelSizeSettings, composeWithTracker(composer));
-
-export default composeWithTracker(composer)(ParcelSizeSettings);
diff --git a/imports/plugins/core/shipping/client/index.js b/imports/plugins/core/shipping/client/index.js
index 46dc68de15..cd648e91db 100644
--- a/imports/plugins/core/shipping/client/index.js
+++ b/imports/plugins/core/shipping/client/index.js
@@ -4,9 +4,6 @@ import { faShippingFast } from "@fortawesome/free-solid-svg-icons";
 
 import { registerOperatorRoute } from "/imports/client/ui";
 import Shipping from "./components/Shipping";
-import "./components";
-import "./containers";
-import "./templates";
 
 registerOperatorRoute({
   isNavigationLink: true,
diff --git a/imports/plugins/core/shipping/client/templates/index.js b/imports/plugins/core/shipping/client/templates/index.js
deleted file mode 100644
index 8a74766b1a..0000000000
--- a/imports/plugins/core/shipping/client/templates/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import "./settings/shipping.html";
-import "./settings/shipping.js";
diff --git a/imports/plugins/core/shipping/client/templates/settings/shipping.html b/imports/plugins/core/shipping/client/templates/settings/shipping.html
deleted file mode 100644
index 3af2adfa7c..0000000000
--- a/imports/plugins/core/shipping/client/templates/settings/shipping.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<template name="shippingSettings">
-  {{#each reactionApps provides='shippingSettings'}}
-  <div class="panel panel-default">
-    <div class="panel-heading panel-heading-flex">
-      <div class="panel-title">
-        <i class="fa fa-{{name}}"></i>
-        <span data-i18n="{{i18nKeyLabel}}">{{label}}</span>
-      </div>
-      <div class="panel-controls">
-        <input class="checkbox-switch shipping-settings" type="checkbox" name="enabled" data-id={{packageId}} data-key="{{settingsKey}}" {{checked enabled}}>
-      </div>
-    </div>
-    <div class="panel-body {{shown enabled}}">
-      {{> React component=ReactComponentOrBlazeTemplate name=template props=.}}
-    </div>
-  </div>
-  {{/each}}
-
-  <div>
-    {{> React component=parcelSizeSettings}}
-  </div>
-</template>
diff --git a/imports/plugins/core/shipping/client/templates/settings/shipping.js b/imports/plugins/core/shipping/client/templates/settings/shipping.js
deleted file mode 100644
index 677c7e2634..0000000000
--- a/imports/plugins/core/shipping/client/templates/settings/shipping.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Template } from "meteor/templating";
-import { Meteor } from "meteor/meteor";
-import { Components } from "@reactioncommerce/reaction-components";
-
-/*
- * Template shipping helpers
- */
-Template.shippingSettings.onCreated(function () {
-  this.autorun(() => {
-    this.subscribe("Shipping");
-  });
-});
-
-Template.shippingSettings.helpers({
-  checked(enabled) {
-    if (enabled === true) {
-      return "checked";
-    }
-    return "";
-  },
-  shown(enabled) {
-    if (enabled !== true) {
-      return "hidden";
-    }
-    return "";
-  },
-  parcelSizeSettings() {
-    return Components.ParcelSizeSettings;
-  }
-});
-
-// toggle shipping methods visibility
-// also toggles shipping method settings
-Template.shippingSettings.events({
-  "change input.checkbox-switch.shipping-settings[name=enabled]": (event) => {
-    event.preventDefault();
-    const settingsKey = event.target.getAttribute("data-key");
-    const packageId = event.target.getAttribute("data-id");
-    const fields = [{
-      property: "enabled",
-      value: event.target.checked
-    }];
-    // save shipping registry updates
-    if (packageId) {
-      // update package registry
-      Meteor.call("registry/update", packageId, settingsKey, fields);
-    }
-  }
-});
diff --git a/imports/plugins/included/shipping-rates/client/index.js b/imports/plugins/included/shipping-rates/client/index.js
index 5ac5555cb0..9cbee7bff2 100644
--- a/imports/plugins/included/shipping-rates/client/index.js
+++ b/imports/plugins/included/shipping-rates/client/index.js
@@ -1 +1,9 @@
-export { default as ShippingRatesSettings } from "../containers/ShippingRatesSettings";
+import { registerBlock } from "/imports/plugins/core/components/lib";
+import ShippingRatesSettings from "../containers/ShippingRatesSettings";
+
+registerBlock({
+  region: "ShippingSettings",
+  name: "ShippingRatesSettings",
+  component: ShippingRatesSettings,
+  priority: 1
+});
diff --git a/imports/plugins/included/shipping-rates/components/ShippingRatesSettings.js b/imports/plugins/included/shipping-rates/components/ShippingRatesSettings.js
index bc50106f2d..fc3597c0ab 100644
--- a/imports/plugins/included/shipping-rates/components/ShippingRatesSettings.js
+++ b/imports/plugins/included/shipping-rates/components/ShippingRatesSettings.js
@@ -3,6 +3,9 @@ import React, { Component } from "react";
 import PropTypes from "prop-types";
 import SimpleSchema from "simpl-schema";
 import { Meteor } from "meteor/meteor";
+import Card from "@material-ui/core/Card";
+import CardContent from "@material-ui/core/CardContent";
+import CardHeader from "@material-ui/core/CardHeader";
 import { Shipping } from "/lib/collections";
 import { Reaction, formatPriceString, i18next } from "/client/api";
 import { IconButton, Loading, SortableTable } from "/imports/plugins/core/ui/client/components";
@@ -323,11 +326,16 @@ export default class ShippingRatesSettings extends Component {
     const { isEditing = false } = this.state;
 
     return (
-      <div>
-        {this.renderShippingGrid()}
-        {this.renderEditButton()}
-        {isEditing && this.renderShippingMethodForm()}
-      </div>
+      <Card>
+        <CardHeader
+          title={i18next.t("admin.shippingSettings.flatRateLabel")}
+        />
+        <CardContent>
+          {this.renderShippingGrid()}
+          {this.renderEditButton()}
+          {isEditing && this.renderShippingMethodForm()}
+        </CardContent>
+      </Card>
     );
   }
 }
diff --git a/imports/plugins/included/shipping-rates/containers/ShippingRatesSettings.js b/imports/plugins/included/shipping-rates/containers/ShippingRatesSettings.js
index 4e5de83028..fb40b02768 100644
--- a/imports/plugins/included/shipping-rates/containers/ShippingRatesSettings.js
+++ b/imports/plugins/included/shipping-rates/containers/ShippingRatesSettings.js
@@ -1,5 +1,5 @@
 import { Meteor } from "meteor/meteor";
-import { registerComponent, composeWithTracker } from "@reactioncommerce/reaction-components";
+import { composeWithTracker } from "@reactioncommerce/reaction-components";
 import { Shipping } from "/lib/collections";
 import ShippingRatesSettings from "../components/ShippingRatesSettings";
 
@@ -18,6 +18,4 @@ function composer(props, onData) {
   });
 }
 
-registerComponent("ShippingRatesSettings", ShippingRatesSettings, composeWithTracker(composer));
-
 export default composeWithTracker(composer)(ShippingRatesSettings);

From dda1e0a228e5b5b503e290267d2c443d6196e16b Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Wed, 18 Dec 2019 17:43:37 -0600
Subject: [PATCH 16/19] fix: use correct address validation settings form i18n
 key

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../client/components/AddressValidationSettingsForm.js      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/imports/plugins/core/address/client/components/AddressValidationSettingsForm.js b/imports/plugins/core/address/client/components/AddressValidationSettingsForm.js
index 58d2389e09..6fca12602a 100644
--- a/imports/plugins/core/address/client/components/AddressValidationSettingsForm.js
+++ b/imports/plugins/core/address/client/components/AddressValidationSettingsForm.js
@@ -96,7 +96,7 @@ export default function AddressValidationSettingsForm(props) {
     },
     onError() {
       setIsSubmitting(false);
-      enqueueSnackbar(i18next.t("admin.taxSettings.shopCustomTaxRatesFailed"), { variant: "warning" });
+      enqueueSnackbar(i18next.t("addressValidation.saveFailed"), { variant: "warning" });
     }
   });
 
@@ -108,7 +108,7 @@ export default function AddressValidationSettingsForm(props) {
     },
     onError() {
       setIsSubmitting(false);
-      enqueueSnackbar(i18next.t("admin.taxSettings.shopCustomTaxRatesFailed"), { variant: "warning" });
+      enqueueSnackbar(i18next.t("addressValidation.saveFailed"), { variant: "warning" });
     }
   });
 
@@ -120,7 +120,7 @@ export default function AddressValidationSettingsForm(props) {
     },
     onError() {
       setIsSubmitting(false);
-      enqueueSnackbar(i18next.t("admin.taxSettings.shopCustomTaxRatesFailed"), { variant: "warning" });
+      enqueueSnackbar(i18next.t("addressValidation.saveFailed"), { variant: "warning" });
     }
   });
 

From 849afe920b78282be1a87b2e01286baa722ac5c5 Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Thu, 19 Dec 2019 11:05:28 -0600
Subject: [PATCH 17/19] feat: fix and reorg payments and discounts

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../core/discounts/client/DiscountsPage.js    |  13 ++
 .../plugins/core/discounts/client/index.js    |  15 +++
 .../core/graphql/lib/helpers/simpleClient.js  |  12 --
 .../enablePaymentMethodForShop.graphql        |  10 --
 .../lib/queries/paymentMethods.graphql        |   9 --
 .../core/payments/client/PaymentSettings.js   | 111 ++++++++++++++++++
 imports/plugins/core/payments/client/index.js |   6 +-
 .../core/payments/client/settings/index.js    |   2 -
 .../payments/client/settings/settings.html    |  53 ---------
 .../core/payments/client/settings/settings.js |  97 ---------------
 .../discount-codes/client/DiscountCodes.js    |  35 ++++++
 .../included/discount-codes/client/index.js   |   9 ++
 .../included/payments-example/client/index.js |   1 -
 .../components/exampleSettingsForm.js         |  64 ----------
 .../client/settings/components/index.js       |   1 -
 .../exampleSettingsFormContainer.js           |  35 ------
 .../client/settings/containers/index.js       |   1 -
 .../client/settings/templates/example.html    |   5 -
 .../client/settings/templates/example.js      |  11 --
 19 files changed, 185 insertions(+), 305 deletions(-)
 create mode 100644 imports/plugins/core/discounts/client/DiscountsPage.js
 create mode 100644 imports/plugins/core/discounts/client/index.js
 delete mode 100644 imports/plugins/core/graphql/lib/mutations/enablePaymentMethodForShop.graphql
 delete mode 100644 imports/plugins/core/graphql/lib/queries/paymentMethods.graphql
 create mode 100644 imports/plugins/core/payments/client/PaymentSettings.js
 delete mode 100644 imports/plugins/core/payments/client/settings/index.js
 delete mode 100644 imports/plugins/core/payments/client/settings/settings.html
 delete mode 100644 imports/plugins/core/payments/client/settings/settings.js
 create mode 100644 imports/plugins/included/discount-codes/client/DiscountCodes.js
 delete mode 100644 imports/plugins/included/payments-example/client/index.js
 delete mode 100644 imports/plugins/included/payments-example/client/settings/components/exampleSettingsForm.js
 delete mode 100644 imports/plugins/included/payments-example/client/settings/components/index.js
 delete mode 100644 imports/plugins/included/payments-example/client/settings/containers/exampleSettingsFormContainer.js
 delete mode 100644 imports/plugins/included/payments-example/client/settings/containers/index.js
 delete mode 100644 imports/plugins/included/payments-example/client/settings/templates/example.html
 delete mode 100644 imports/plugins/included/payments-example/client/settings/templates/example.js

diff --git a/imports/plugins/core/discounts/client/DiscountsPage.js b/imports/plugins/core/discounts/client/DiscountsPage.js
new file mode 100644
index 0000000000..53fbe11b96
--- /dev/null
+++ b/imports/plugins/core/discounts/client/DiscountsPage.js
@@ -0,0 +1,13 @@
+import React from "react";
+import { Blocks } from "@reactioncommerce/reaction-components";
+
+/**
+ * @summary Renders discounts page
+ * @param {Object} props Component props
+ * @return {React.Node} React node
+ */
+export default function DiscountsPage(props) {
+  return (
+    <Blocks region="Discounts" blockProps={props} />
+  );
+}
diff --git a/imports/plugins/core/discounts/client/index.js b/imports/plugins/core/discounts/client/index.js
new file mode 100644
index 0000000000..0fff9ac67f
--- /dev/null
+++ b/imports/plugins/core/discounts/client/index.js
@@ -0,0 +1,15 @@
+import React from "react";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faPercent } from "@fortawesome/free-solid-svg-icons";
+import { registerOperatorRoute } from "/imports/client/ui";
+import DiscountsPage from "./DiscountsPage.js";
+
+registerOperatorRoute({
+  isNavigationLink: true,
+  priority: 60,
+  path: "/discounts",
+  mainComponent: DiscountsPage,
+  // eslint-disable-next-line react/display-name
+  SidebarIconComponent: (props) => <FontAwesomeIcon icon={faPercent} {...props} />,
+  sidebarI18nLabel: "admin.shortcut.discountsLabel"
+});
diff --git a/imports/plugins/core/graphql/lib/helpers/simpleClient.js b/imports/plugins/core/graphql/lib/helpers/simpleClient.js
index e2530d3477..04de5826ab 100644
--- a/imports/plugins/core/graphql/lib/helpers/simpleClient.js
+++ b/imports/plugins/core/graphql/lib/helpers/simpleClient.js
@@ -4,8 +4,6 @@ import { Meteor } from "meteor/meteor";
 import createFlatRateFulfillmentMethod from "../mutations/createFlatRateFulfillmentMethod.graphql";
 import updateFlatRateFulfillmentMethod from "../mutations/updateFlatRateFulfillmentMethod.graphql";
 import deleteFlatRateFulfillmentMethod from "../mutations/deleteFlatRateFulfillmentMethod.graphql";
-import enablePaymentMethodForShop from "../mutations/enablePaymentMethodForShop.graphql";
-import paymentMethods from "../queries/paymentMethods.graphql";
 
 const { graphQlApiUrlHttp } = Meteor.settings.public;
 
@@ -55,19 +53,9 @@ export default {
       setTokenHeader();
       return client.mutate(deleteFlatRateFulfillmentMethod)(variables);
     },
-    enablePaymentMethodForShop: (variables) => {
-      setTokenHeader();
-      return client.mutate(enablePaymentMethodForShop)(variables);
-    },
     updateFlatRateFulfillmentMethod: (variables) => {
       setTokenHeader();
       return client.mutate(updateFlatRateFulfillmentMethod)(variables);
     }
-  },
-  queries: {
-    paymentMethods: (variables) => {
-      setTokenHeader();
-      return client.query(paymentMethods)(variables);
-    }
   }
 };
diff --git a/imports/plugins/core/graphql/lib/mutations/enablePaymentMethodForShop.graphql b/imports/plugins/core/graphql/lib/mutations/enablePaymentMethodForShop.graphql
deleted file mode 100644
index 37faa91390..0000000000
--- a/imports/plugins/core/graphql/lib/mutations/enablePaymentMethodForShop.graphql
+++ /dev/null
@@ -1,10 +0,0 @@
-enablePaymentMethodForShop($input: EnablePaymentMethodForShopInput!) {
-  enablePaymentMethodForShop(input: $input) {
-    paymentMethods {
-      name
-      displayName
-      isEnabled
-      pluginName
-    }
-  }
-}
diff --git a/imports/plugins/core/graphql/lib/queries/paymentMethods.graphql b/imports/plugins/core/graphql/lib/queries/paymentMethods.graphql
deleted file mode 100644
index 125fa11630..0000000000
--- a/imports/plugins/core/graphql/lib/queries/paymentMethods.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-getPaymentMethods($shopId: ID!) {
-  paymentMethods(shopId: $shopId) {
-    canRefund
-    displayName
-    isEnabled
-    name
-    pluginName
-  }
-}
diff --git a/imports/plugins/core/payments/client/PaymentSettings.js b/imports/plugins/core/payments/client/PaymentSettings.js
new file mode 100644
index 0000000000..ff959cc690
--- /dev/null
+++ b/imports/plugins/core/payments/client/PaymentSettings.js
@@ -0,0 +1,111 @@
+import React, { useState } from "react";
+import gql from "graphql-tag";
+import { useSnackbar } from "notistack";
+import { useMutation, useLazyQuery } from "@apollo/react-hooks";
+import { makeStyles } from "@material-ui/styles";
+import Button from "@material-ui/core/Button";
+import Card from "@material-ui/core/Card";
+import CardContent from "@material-ui/core/CardContent";
+import CardHeader from "@material-ui/core/CardHeader";
+import { Blocks } from "@reactioncommerce/reaction-components";
+import { i18next } from "/client/api";
+import useCurrentShopId from "/imports/client/ui/hooks/useCurrentShopId.js";
+
+const useStyles = makeStyles((theme) => ({
+  topCard: {
+    marginBottom: theme.spacing(2)
+  }
+}));
+
+const getPaymentMethodsQuery = gql`
+  query getPaymentMethods($shopId: ID!) {
+    paymentMethods(shopId: $shopId) {
+      displayName
+      isEnabled
+      name
+    }
+  }
+`;
+
+const enablePaymentMethodForShopMutation = gql`
+  mutation enablePaymentMethodForShopMutation($isEnabled: Boolean!, $paymentMethodName: String!, $shopId: ID!) {
+    enablePaymentMethodForShop(input: {
+      isEnabled: $isEnabled,
+      paymentMethodName: $paymentMethodName,
+      shopId: $shopId
+    }) {
+      paymentMethods {
+        name
+      }
+    }
+  }
+`;
+
+/**
+ * @summary Renders payment settings page
+ * @param {Object} props Component props
+ * @return {React.Node} React node
+ */
+export default function PaymentSettings(props) {
+  const classes = useStyles();
+  const [shopId] = useCurrentShopId();
+  const { enqueueSnackbar } = useSnackbar();
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [getPaymentMethods, {
+    called,
+    data,
+    refetch: refetchPaymentMethods
+  }] = useLazyQuery(getPaymentMethodsQuery);
+  const [enablePaymentMethodForShop] = useMutation(enablePaymentMethodForShopMutation, {
+    ignoreResults: true,
+    onCompleted() {
+      setIsSubmitting(false);
+      refetchPaymentMethods();
+    },
+    onError() {
+      setIsSubmitting(false);
+      enqueueSnackbar(i18next.t("changesNotSaved"), { variant: "warning" });
+    }
+  });
+
+  if (shopId && !called) {
+    getPaymentMethods({
+      variables: {
+        shopId
+      }
+    });
+  }
+
+  return (
+    <div>
+      <Card className={classes.topCard}>
+        <CardHeader
+          title={i18next.t("shopSettings.paymentMethods")}
+        />
+        <CardContent>
+          {data && data.paymentMethods.map((paymentMethod) => (
+            <div key={paymentMethod.name}>
+              {paymentMethod.displayName}
+              <Button
+                disabled={isSubmitting}
+                onClick={() => {
+                  setIsSubmitting(true);
+                  enablePaymentMethodForShop({
+                    variables: {
+                      isEnabled: !paymentMethod.isEnabled,
+                      paymentMethodName: paymentMethod.name,
+                      shopId
+                    }
+                  });
+                }}
+              >
+                {paymentMethod.isEnabled ? "Enabled" : "Disabled"}
+              </Button>
+            </div>
+          ))}
+        </CardContent>
+      </Card>
+      <Blocks region="PaymentSettings" blockProps={props} />
+    </div>
+  );
+}
diff --git a/imports/plugins/core/payments/client/index.js b/imports/plugins/core/payments/client/index.js
index a92ac2e440..b19288299d 100644
--- a/imports/plugins/core/payments/client/index.js
+++ b/imports/plugins/core/payments/client/index.js
@@ -1,15 +1,13 @@
 import React from "react";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faCreditCard } from "@fortawesome/free-solid-svg-icons";
-
 import { registerOperatorRoute } from "/imports/client/ui";
-
-import "./settings";
+import PaymentSettings from "./PaymentSettings.js";
 
 registerOperatorRoute({
   isNavigationLink: true,
   isSetting: true,
-  mainComponent: "paymentSettings",
+  mainComponent: PaymentSettings,
   priority: 20,
   path: "/payment",
   // eslint-disable-next-line react/display-name
diff --git a/imports/plugins/core/payments/client/settings/index.js b/imports/plugins/core/payments/client/settings/index.js
deleted file mode 100644
index a6e7c5aa72..0000000000
--- a/imports/plugins/core/payments/client/settings/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import "./settings.html";
-import "./settings.js";
diff --git a/imports/plugins/core/payments/client/settings/settings.html b/imports/plugins/core/payments/client/settings/settings.html
deleted file mode 100644
index eec01cb286..0000000000
--- a/imports/plugins/core/payments/client/settings/settings.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<template name="paymentSettings">
-  <div class="panel-group" id="paymentSettingsAccordian" role="tablist" aria-multiselectable="true">
-    {{> discountsPaymentSettings}}
-
-    {{#each paymentPlugins}}
-    <div class="panel panel-default">
-      <div class="panel-heading panel-heading-flex">
-        <div class="panel-title">
-          <i class="fa fa-{{name}}"></i>
-          <span data-i18n="{{i18nKeyLabel}}">{{label}}</span>
-        </div>
-      </div>
-      <div class="panel-body">
-        <label><span data-i18n="shopSettings.paymentMethods">Payment methods</span></label>
-        <div class="rui list-group">
-          {{#each paymentMethodsForPlugin}}
-            <div class="rui list-group-item" role="button" tabindex={{@index}}>
-              <div class="rui list-item-content">
-                <span>{{displayName}}</span>
-              </div>
-              <div class="rui list-item-action">
-                <span><label class="rui switch"><input name="paymentMethodEnabled" type="checkbox"><div class="switch-control {{#if isEnabled}}active{{/if}}"></div></label></span>
-              </div>
-            </div>
-          {{/each}}
-        </div>
-        <div>
-          {{> React component=ReactComponentOrBlazeTemplate name=template props=.}}
-        </div>
-      </div>
-    </div>
-    {{/each}}
-  </div>
-</template>
-
-<template name="discountsPaymentSettings">
-  {{#each reactionApps packageName='discount-codes' provides='paymentSettings'}}
-  <div class="panel panel-default">
-    <div class="panel-heading panel-heading-flex">
-      <div class="panel-title">
-        <i class="fa fa-{{name}}"></i>
-        <span data-i18n="{{i18nKeyLabel}}">{{label}}</span>
-      </div>
-      <div class="panel-controls">
-        <input class="checkbox-switch" type="checkbox" name="enabled" {{checked enabled}}>
-      </div>
-    </div>
-    <div class="panel-body {{shown enabled}}">
-      {{> React component=ReactComponentOrBlazeTemplate name=template props=.}}
-    </div>
-  </div>
-  {{/each}}
-</template>
diff --git a/imports/plugins/core/payments/client/settings/settings.js b/imports/plugins/core/payments/client/settings/settings.js
deleted file mode 100644
index 0b6b0f33a4..0000000000
--- a/imports/plugins/core/payments/client/settings/settings.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import _ from "lodash";
-import getOpaqueIds from "/imports/plugins/core/core/client/util/getOpaqueIds";
-import simpleGraphQLClient from "/imports/plugins/core/graphql/lib/helpers/simpleClient";
-import { Template } from "meteor/templating";
-import { Meteor } from "meteor/meteor";
-import { Reaction } from "/client/api";
-import { ReactiveDict } from "meteor/reactive-dict";
-
-Template.paymentSettings.onCreated(async function () {
-  this.state = new ReactiveDict();
-  this.state.setDefault({ paymentMethods: [], shopId: null });
-
-  this.autorun(async () => {
-    const shopId = Reaction.getShopId();
-    if (!shopId) {
-      this.state.set({ paymentMethods: [], shopId: null });
-      return;
-    }
-
-    const [opaqueShopId] = await getOpaqueIds([{ namespace: "Shop", id: shopId }]);
-    const { paymentMethods } = await simpleGraphQLClient.queries.paymentMethods({ shopId: opaqueShopId });
-    this.state.set({ paymentMethods, shopId: opaqueShopId });
-  });
-
-  this.autorun(async () => {
-    const shopId = Reaction.getShopId();
-    if (shopId) {
-      this.subscribe("Packages", shopId);
-    }
-  });
-});
-
-Template.paymentSettings.helpers({
-  paymentPlugins() {
-    const plugins = Reaction.Apps({ provides: "paymentSettings" });
-
-    // Omit discounts, which we have a separate template for
-    return plugins.filter(({ packageName }) => packageName !== "discount-codes");
-  },
-  paymentMethodsForPlugin() {
-    const paymentMethods = Template.instance().state.get("paymentMethods");
-    if (!Array.isArray(paymentMethods)) return [];
-
-    return paymentMethods.filter((method) => method.pluginName === this.packageName);
-  }
-});
-
-// toggle payment methods visibility
-Template.paymentSettings.events({
-  async "change input[name=paymentMethodEnabled]"(event) {
-    event.preventDefault();
-
-    const { state } = Template.instance();
-    const isEnabled = event.target.checked;
-
-    const response = await simpleGraphQLClient.mutations.enablePaymentMethodForShop({
-      input: {
-        shopId: state.get("shopId"),
-        paymentMethodName: this.name,
-        isEnabled
-      }
-    });
-    const paymentMethods = _.get(response, "enablePaymentMethodForShop.paymentMethods");
-    state.set("paymentMethods", paymentMethods);
-  }
-});
-
-// Handle legacy discount codes payment method
-Template.discountsPaymentSettings.helpers({
-  checked(enabled) {
-    if (enabled === true) {
-      return "checked";
-    }
-    return "";
-  },
-  shown(enabled) {
-    if (enabled !== true) {
-      return "hidden";
-    }
-    return "";
-  }
-});
-
-Template.discountsPaymentSettings.events({
-  "change input[name=enabled]"(event) {
-    event.preventDefault();
-
-    const isEnabled = event.target.checked;
-    const fields = [{
-      property: "enabled",
-      value: isEnabled
-    }];
-
-    Meteor.call("registry/update", this.packageId, this.settingsKey, fields);
-    Meteor.call("shop/togglePackage", this.packageId, !isEnabled);
-  }
-});
diff --git a/imports/plugins/included/discount-codes/client/DiscountCodes.js b/imports/plugins/included/discount-codes/client/DiscountCodes.js
new file mode 100644
index 0000000000..c12fe3d0ca
--- /dev/null
+++ b/imports/plugins/included/discount-codes/client/DiscountCodes.js
@@ -0,0 +1,35 @@
+import React from "react";
+import { makeStyles } from "@material-ui/styles";
+import Card from "@material-ui/core/Card";
+import CardContent from "@material-ui/core/CardContent";
+import CardHeader from "@material-ui/core/CardHeader";
+import { i18next } from "/client/api";
+import ReactComponentOrBlazeTemplate from "/imports/plugins/core/components/lib/ReactComponentOrBlazeTemplate";
+import useCurrentInternalShopId from "/imports/client/ui/hooks/useCurrentInternalShopId.js";
+
+const useStyles = makeStyles((theme) => ({
+  topCard: {
+    marginBottom: theme.spacing(2)
+  }
+}));
+
+/**
+ * @summary Renders discounts page
+ * @param {Object} props Component props
+ * @return {React.Node} React node
+ */
+export default function DiscountCodes(props) {
+  const classes = useStyles();
+  const [internalShopId] = useCurrentInternalShopId();
+
+  return (
+    <Card className={classes.topCard}>
+      <CardHeader
+        title={i18next.t("admin.paymentSettings.codesLabel")}
+      />
+      <CardContent>
+        <ReactComponentOrBlazeTemplate name="customDiscountCodes" props={{ ...props, shopId: internalShopId }} />
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/imports/plugins/included/discount-codes/client/index.js b/imports/plugins/included/discount-codes/client/index.js
index d55ed08856..58e97f6888 100644
--- a/imports/plugins/included/discount-codes/client/index.js
+++ b/imports/plugins/included/discount-codes/client/index.js
@@ -1,2 +1,11 @@
+import { registerBlock } from "/imports/plugins/core/components/lib";
 import "./collections/codes";
 import "./templates";
+import DiscountCodes from "./DiscountCodes.js";
+
+registerBlock({
+  region: "Discounts",
+  name: "DiscountCodes",
+  component: DiscountCodes,
+  priority: 1
+});
diff --git a/imports/plugins/included/payments-example/client/index.js b/imports/plugins/included/payments-example/client/index.js
deleted file mode 100644
index 5ee134e3df..0000000000
--- a/imports/plugins/included/payments-example/client/index.js
+++ /dev/null
@@ -1 +0,0 @@
-import "./settings/templates/example";
diff --git a/imports/plugins/included/payments-example/client/settings/components/exampleSettingsForm.js b/imports/plugins/included/payments-example/client/settings/components/exampleSettingsForm.js
deleted file mode 100644
index b7445f1c5a..0000000000
--- a/imports/plugins/included/payments-example/client/settings/components/exampleSettingsForm.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { TextField, Translation } from "/imports/plugins/core/ui/client/components";
-
-class ExampleSettingsForm extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      settings: {
-        apiKey: props.settings.apiKey
-      }
-    };
-  }
-
-  handleStateChange = (event) => {
-    const { settings } = this.state;
-    settings[event.target.name] = event.target.value;
-    this.setState({ settings });
-  }
-
-  handleSubmit = (event) => {
-    event.preventDefault();
-    return this.props.onSubmit(this.state.settings);
-  }
-
-
-  render() {
-    const { settings } = this.props;
-    const setting = this.state.settings;
-
-    return (
-      <div>
-        { !settings.apiKey &&
-          <div className="alert alert-info">
-            <Translation defaultValue="Example Credentials" i18nKey="admin.paymentSettings.exampleCredentials"/>
-          </div>
-        }
-
-        <form onSubmit={this.handleSubmit}>
-          <TextField
-            label="API Key"
-            name="apiKey"
-            type="text"
-            onChange={this.handleStateChange}
-            value={setting.apiKey}
-          />
-
-          <button className="btn btn-primary pull-right" type="submit">
-            <Translation defaultValue="Save Changes" i18nKey="app.saveChanges"/>
-          </button>
-        </form>
-
-      </div>
-    );
-  }
-}
-
-ExampleSettingsForm.propTypes = {
-  onChange: PropTypes.func.isRequired,
-  onSubmit: PropTypes.func.isRequired,
-  settings: PropTypes.object
-};
-
-export default ExampleSettingsForm;
diff --git a/imports/plugins/included/payments-example/client/settings/components/index.js b/imports/plugins/included/payments-example/client/settings/components/index.js
deleted file mode 100644
index b49222b0c7..0000000000
--- a/imports/plugins/included/payments-example/client/settings/components/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as ExampleSettingsForm } from "./exampleSettingsForm.js";
diff --git a/imports/plugins/included/payments-example/client/settings/containers/exampleSettingsFormContainer.js b/imports/plugins/included/payments-example/client/settings/containers/exampleSettingsFormContainer.js
deleted file mode 100644
index 47558b43cd..0000000000
--- a/imports/plugins/included/payments-example/client/settings/containers/exampleSettingsFormContainer.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { ExampleSettingsForm } from "../components";
-
-class ExampleSettingsFormContainer extends Component {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      apiKey: "278302390293"
-    };
-
-    this.handleChange = this.handleChange.bind(this);
-  }
-
-  handleChange(event) {
-    event.preventDefault();
-    this.setState({ apiKey: event.target.value });
-  }
-
-  render() {
-    return (
-      <ExampleSettingsForm
-        onChange={this.handleChange}
-        settings={this.props.packageData.settings}
-      />
-    );
-  }
-}
-
-ExampleSettingsFormContainer.propTypes = {
-  packageData: PropTypes.object
-};
-
-export default ExampleSettingsFormContainer;
diff --git a/imports/plugins/included/payments-example/client/settings/containers/index.js b/imports/plugins/included/payments-example/client/settings/containers/index.js
deleted file mode 100644
index a04ab5d142..0000000000
--- a/imports/plugins/included/payments-example/client/settings/containers/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as ExampleSettingsFormContainer } from "./exampleSettingsFormContainer";
diff --git a/imports/plugins/included/payments-example/client/settings/templates/example.html b/imports/plugins/included/payments-example/client/settings/templates/example.html
deleted file mode 100644
index f70d175325..0000000000
--- a/imports/plugins/included/payments-example/client/settings/templates/example.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<template name="exampleSettings">
-  <div>
-    {{> React ExampleSettings}}
-  </div>
-</template>
diff --git a/imports/plugins/included/payments-example/client/settings/templates/example.js b/imports/plugins/included/payments-example/client/settings/templates/example.js
deleted file mode 100644
index 3d7ca2c086..0000000000
--- a/imports/plugins/included/payments-example/client/settings/templates/example.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Template } from "meteor/templating";
-import { ExampleSettingsFormContainer } from "../containers";
-import "./example.html";
-
-Template.exampleSettings.helpers({
-  ExampleSettings() {
-    return {
-      component: ExampleSettingsFormContainer
-    };
-  }
-});

From 46e359fcdbeaa6f538475e997a51fc5159be7943 Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Thu, 19 Dec 2019 16:29:42 -0600
Subject: [PATCH 18/19] fix: fix file uploads and URLs

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .env.example                                  |   1 +
 client/modules/core/domains.js                |  83 ---------
 client/modules/core/domains.test.js           |  98 ----------
 client/modules/core/main.js                   |  12 +-
 client/modules/router/helpers.js              |   9 -
 .../client/components/productImage.js         |   2 +-
 .../core/core/server/Reaction/absoluteUrl.js  |  82 ---------
 .../plugins/core/core/server/Reaction/core.js |  44 +----
 imports/plugins/core/core/server/config.js    |   8 +
 .../publications/collections/product.js       |   2 +-
 .../core/server/startup/browser-policy.js     |   9 +-
 .../plugins/core/core/server/startup/index.js |   2 +
 .../client/components/shopBrandImageOption.js |   2 +-
 imports/plugins/core/files/client/index.js    |   5 +-
 .../tags/client/pages/TagFormPageWithData.js  |   2 +-
 .../ui/client/components/media/mediaItem.js   |   2 +-
 .../client/components/media/mediaUploader.js  |   2 +-
 .../ui/client/containers/tagListContainer.js  |   9 +-
 .../server/publications/notifications.js      |   2 +-
 .../client/components/ProductList.js          |   2 +-
 .../client/components/ProductMediaGallery.js  |   2 +-
 .../client/components/ProductMediaItem.js     |   2 +-
 .../client/components/VariantTable.js         |   2 +-
 .../product-admin/client/hocs/withProduct.js  |   3 +-
 .../product-admin/client/hocs/withVariant.js  |   3 +-
 .../components/productGridItems.js            |   2 +-
 .../product-variant/components/products.js    |   9 +-
 imports/test-utils/helpers/mockContext.js     |   4 -
 imports/utils/tests/mockContext.js            |   4 -
 lib/api/account-validation.js                 |  10 +-
 lib/api/match.js                              |  32 ----
 lib/core/url-common.js                        |  89 ---------
 lib/selectors/tags.js                         |  16 --
 lib/selectors/variants.js                     |   9 -
 package-lock.json                             | 172 ++++++++++++++----
 package.json                                  |   2 +-
 36 files changed, 197 insertions(+), 542 deletions(-)
 delete mode 100644 client/modules/core/domains.js
 delete mode 100644 client/modules/core/domains.test.js
 delete mode 100644 imports/plugins/core/core/server/Reaction/absoluteUrl.js
 delete mode 100644 lib/api/match.js
 delete mode 100644 lib/core/url-common.js
 delete mode 100644 lib/selectors/tags.js
 delete mode 100644 lib/selectors/variants.js

diff --git a/.env.example b/.env.example
index 6b6a0f168c..ca172c1f47 100644
--- a/.env.example
+++ b/.env.example
@@ -5,6 +5,7 @@ MONGO_URL=mongodb://mongo:27017/reaction
 PORT=4080
 PUBLIC_GRAPHQL_API_URL_HTTP=http://localhost:3000/graphql-beta
 PUBLIC_GRAPHQL_API_URL_WS=ws://localhost:3000/graphql-beta
+PUBLIC_FILES_BASE_URL=http://localhost:3000
 PUBLIC_I18N_BASE_URL=http://localhost:3000
 PUBLIC_STOREFRONT_HOME_URL=http://localhost:4000
 ROOT_URL=http://localhost:4080
diff --git a/client/modules/core/domains.js b/client/modules/core/domains.js
deleted file mode 100644
index 7308a2ca3e..0000000000
--- a/client/modules/core/domains.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/* eslint-disable node/no-deprecated-api */
-/* TODO: revisit `url.parse` throughout Reaction */
-import url from "url";
-import { composeUrl } from "/lib/core/url-common";
-
-export const DomainsMixin = {
-  shopDomain() {
-    // We must use host rather than hostname in order to get the port, too, if present
-    return document.location.host;
-  },
-
-  /**
-   * absoluteUrl
-   * @summary a wrapper method for composeUrl (formerly Meteor.absoluteUrl)
-   * which sets the rootUrl to the current URL (instead of defaulting to
-   * ROOT_URL)
-   * @param {String} [pathOrOptions] A path to append to the root URL. Do not
-   *                 include a leading "`/`". absoluteUrl can be called with a
-   *                 single parameter, where pathOrOptions can be the path
-   *                 (String) or the options (Object)
-   * @param {Object} [optionalOptions] Optional options
-   * @param {Boolean} optionalOptions.secure Create an HTTPS URL.
-   * @param {Boolean} optionalOptions.replaceLocalhost Replace localhost with
-   *                  127.0.0.1. Useful for services that don't recognize
-   *                  localhost as a domain name.
-   * @param {String} optionalOptions.rootUrl Override the default ROOT_URL from
-   *                 the server environment.
-   *                 For example: "`http://foo.example.com`"
-   * @returns {String} URL for the given path and options
-   */
-  absoluteUrl(pathOrOptions, optionalOptions) {
-    let path;
-    let options;
-
-    // path is optional
-    if (!optionalOptions && typeof pathOrOptions === "object") {
-      path = undefined;
-      options = Object.assign({}, pathOrOptions);
-    } else {
-      path = pathOrOptions;
-      options = Object.assign({}, optionalOptions);
-    }
-
-    const hasRootUrl = "rootUrl" in options;
-
-    // presumably, you could simply access window.location.href here, but when
-    // we get to server-side rendering, it is better to use a variable that gets
-    // assigned when we are sure we are rendering in the browser
-    const domain = this.shopDomain();
-
-    if (!hasRootUrl && domain) {
-      // unfortunately, the scheme/protocol is not available here, so let's
-      // get it from the default Meteor absoluteUrl options, then replace the
-      // host
-      const rootUrl = url.parse(composeUrl.defaultOptions.rootUrl);
-      rootUrl.host = domain;
-      options.rootUrl = rootUrl.format();
-    }
-
-    return composeUrl(path, options);
-  },
-
-  /**
-   * getDomain
-   * @summary extracts the domain name from the absoluteUrl.
-   * @param {Object} [options] inherited from absoluteUrl
-   * @param {Boolean} options.replaceLocalhost Replace localhost with 127.0.0.1.
-   *                  Useful for services that don't recognize localhost as a
-   *                  domain name.
-   * @param {String} options.rootUrl Override the default ROOT_URL from the
-   *                 server environment. For example: "`http://foo.example.com`"
-   * @returns {String} Domain/hostname for the given options
-   */
-  getDomain(options) {
-    const absoluteUrl = this.absoluteUrl(options);
-
-    if (!absoluteUrl) { return null; }
-
-    const { hostname } = url.parse(absoluteUrl);
-
-    return hostname;
-  }
-};
diff --git a/client/modules/core/domains.test.js b/client/modules/core/domains.test.js
deleted file mode 100644
index cb93098173..0000000000
--- a/client/modules/core/domains.test.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/* eslint-disable require-jsdoc */
-jest.mock("/lib/core/url-common");
-
-import { composeUrl } from "/lib/core/url-common";
-import { DomainsMixin } from "./domains";
-
-describe("DomainsMixin", () => {
-  let path;
-  let connectionHost;
-  let rootUrl;
-
-  beforeEach(() => {
-    // commonly used test vars
-    path = randomString();
-    connectionHost = `${randomString()}.reactioncommerce.com`;
-  });
-
-  describe("#absoluteUrl", () => {
-    beforeEach(() => {
-      // mocking $ROOT_URL
-      const ROOT_URL = `https://${randomString()}.reactioncommerce.com`;
-
-      if (!composeUrl.defaultOptions) {
-        composeUrl.defaultOptions = {};
-      }
-      composeUrl.defaultOptions.rootUrl = ROOT_URL;
-
-      rootUrl = `https://${document.location.host}/`;
-    });
-
-    describe("before the domain is set", () => {
-      test("wraps composeUrl without parameters", () => {
-        DomainsMixin.absoluteUrl();
-
-        expect(composeUrl).toHaveBeenCalledWith(undefined, { rootUrl });
-      });
-
-      test("wraps composeUrl with path only", () => {
-        DomainsMixin.absoluteUrl(path);
-
-        expect(composeUrl).toHaveBeenCalledWith(path, { rootUrl });
-      });
-
-      test("wraps composeUrl with options only", () => {
-        const options = { optionA: 1, optionB: 2 };
-
-        DomainsMixin.absoluteUrl(options);
-
-        expect(composeUrl).toHaveBeenCalledWith(undefined, { ...options, rootUrl });
-      });
-
-      test("wraps composeUrl both a path and options", () => {
-        const options = { optionA: 1, optionB: 2 };
-
-        DomainsMixin.absoluteUrl(path, options);
-
-        expect(composeUrl).toHaveBeenCalledWith(path, { ...options, rootUrl });
-      });
-    });
-
-    describe("within the domain set", () => {
-      beforeEach(() => {
-        jest.spyOn(DomainsMixin, "shopDomain").mockReturnValue(connectionHost);
-
-        DomainsMixin.absoluteUrl();
-      });
-
-      test("uses the current connection's host", () => {
-        expect(composeUrl)
-          .toHaveBeenCalledWith(undefined, expect.objectContaining({
-            rootUrl: expect.stringContaining(connectionHost)
-          }));
-      });
-
-      test("uses $ROOT_URL's protocol/scheme", () => {
-        // this would he http:// if $ROOT_URL had not used https://
-        expect(composeUrl)
-          .toHaveBeenCalledWith(undefined, expect.objectContaining({
-            rootUrl: expect.stringMatching(/^https:\/\//)
-          }));
-      });
-    });
-  });
-
-  describe("#getDomain", () => {
-    test("returns the domain portion of absoluteUrl", () => {
-      jest.spyOn(DomainsMixin, "absoluteUrl")
-        .mockReturnValue(`https://${connectionHost}:80/${path}`);
-
-      expect(DomainsMixin.getDomain())
-        .toEqual(connectionHost);
-    });
-  });
-
-  function randomString() {
-    return Math.random().toString(36);
-  }
-});
diff --git a/client/modules/core/main.js b/client/modules/core/main.js
index 9058bfe6b3..f026f3ef4c 100644
--- a/client/modules/core/main.js
+++ b/client/modules/core/main.js
@@ -8,7 +8,6 @@ import { ReactiveDict } from "meteor/reactive-dict";
 import { Roles } from "meteor/alanning:roles";
 import { Shops } from "/lib/collections";
 import { Router } from "/client/modules/router";
-import { DomainsMixin } from "./domains";
 import { getUserId } from "./helpers/utils";
 
 /**
@@ -32,8 +31,6 @@ let slugify;
 const latinLangs = ["az", "da", "de", "en", "es", "ff", "fr", "ha", "hr", "hu", "ig", "is", "it", "jv", "ku", "ms", "nl", "no", "om", "pl", "pt", "ro", "sv", "sw", "tl", "tr", "uz", "vi", "yo"]; // eslint-disable-line max-len
 
 export default {
-  ...DomainsMixin,
-
   /**
    * @summary The active shop
    * @memberof Core/Client
@@ -361,13 +358,8 @@ export default {
     const activeShopId = this.getUserShopId();
     if (activeShopId) return Shops.findOne({ _id: activeShopId });
 
-    // If no chosen shop, look up the shop by domain
-    let shop = Shops.findOne({ domains: this.getDomain() });
-
-    // Finally fall back to primary shop
-    if (!shop) shop = Shops.findOne({ shopType: "primary" });
-
-    return shop;
+    // If no chosen shop, fall back to primary shop
+    return Shops.findOne({ shopType: "primary" });
   },
 
   /**
diff --git a/client/modules/router/helpers.js b/client/modules/router/helpers.js
index a9228454b4..a79bc447a5 100644
--- a/client/modules/router/helpers.js
+++ b/client/modules/router/helpers.js
@@ -1,5 +1,4 @@
 import { Template } from "meteor/templating";
-import { Reaction } from "/client/api";
 import Router from "./main";
 
 /**
@@ -10,14 +9,6 @@ import Router from "./main";
  */
 Template.registerHelper("pathFor", Router.pathFor);
 
-/**
- * @method urlFor
- * @memberof BlazeTemplateHelpers
- * @summary template helper to return absolute + path
- * @returns {String} username
- */
-Template.registerHelper("urlFor", (path, params) => Reaction.absoluteUrl(Router.pathFor(path, params).substr(1)));
-
 /**
  * @method active
  * @memberof BlazeTemplateHelpers
diff --git a/imports/plugins/core/checkout/client/components/productImage.js b/imports/plugins/core/checkout/client/components/productImage.js
index 964eba0aa1..f6a907d805 100644
--- a/imports/plugins/core/checkout/client/components/productImage.js
+++ b/imports/plugins/core/checkout/client/components/productImage.js
@@ -46,7 +46,7 @@ class ProductImage extends Component {
 
     let mediaUrl;
     if (fileRecord) {
-      mediaUrl = fileRecord.url({ store: size });
+      mediaUrl = fileRecord.url({ absolute: true, store: size });
     } else {
       mediaUrl = MEDIA_PLACEHOLDER;
     }
diff --git a/imports/plugins/core/core/server/Reaction/absoluteUrl.js b/imports/plugins/core/core/server/Reaction/absoluteUrl.js
deleted file mode 100644
index 959b541341..0000000000
--- a/imports/plugins/core/core/server/Reaction/absoluteUrl.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/* eslint-disable node/no-deprecated-api */
-/* TODO: revisit `url.parse` throughout Reaction */
-import url from "url";
-import { DDP } from "meteor/ddp-client";
-import { composeUrl } from "/lib/core/url-common";
-
-export const AbsoluteUrlMixin = {
-  /**
-   * connectionDomain
-   * @summary inspects the current connection to the client to get the host
-   * @returns {String} - the current host (domain sans protocol) or undefined
-   */
-  connectionDomain() {
-    const invocation =
-      DDP._CurrentMethodInvocation.get() ||
-      DDP._CurrentPublicationInvocation.get();
-
-    if (!invocation) { return null; }
-
-    const { connection } = invocation;
-
-    if (!connection) { return null; }
-
-    return connection.httpHeaders.host;
-  },
-
-  /**
-   * absoluteUrl
-   * @summary a wrapper method for Meteor.absoluteUrl which sets the rootUrl to
-   * the current URL (instead of defaulting to ROOT_URL)
-   * @param {String} [pathOrOptions] A path to append to the root URL. Do not include a leading "`/`".
-   *                                 absoluteUrl can be called with a single
-   *                                 parameter, where pathOrOptions can be the
-   *                                 path (String) or the options (Object)
-   * @param {Object} [optionalOptions] Optional options
-   * @param {Boolean} optionalOptions.secure Create an HTTPS URL.
-   * @param {Boolean} optionalOptions.replaceLocalhost Replace localhost with 127.0.0.1. Useful for services that don't recognize localhost as a domain name.
-   * @param {String} optionalOptions.rootUrl Override the default ROOT_URL from the server environment. For example: "`http://foo.example.com`"
-   * @returns {String} - the constructed URL
-   */
-  absoluteUrl(pathOrOptions, optionalOptions) {
-    let path;
-    let options;
-    // path is optional
-    if (!optionalOptions && typeof pathOrOptions === "object") {
-      path = undefined;
-      options = Object.assign({}, pathOrOptions);
-    } else {
-      path = pathOrOptions;
-      options = Object.assign({}, optionalOptions);
-    }
-
-    const hasRootUrl = "rootUrl" in options;
-
-    if (!hasRootUrl) {
-      const domain = this.connectionDomain();
-
-      if (domain) {
-        // composeUrl will default to http unless the scheme is set on rootUrl.
-        // the "connection domain" does not inform us of ssl, so we use
-        // composeUrl.defaultOptions.rootUrl to inform us (i.e., if this is
-        // returning "http://" update your $ROOT_URL)
-        const rootUrl = url.parse(composeUrl.defaultOptions.rootUrl);
-        rootUrl.host = domain;
-        options.rootUrl = rootUrl.format();
-      }
-    }
-
-    return composeUrl(path, options);
-  },
-
-  /**
-   * @name getDomain
-   * @method
-   * @memberof Core
-   * @summary Get shop domain for URL
-   * @returns {String} Shop domain
-   */
-  getDomain() {
-    return url.parse(this.absoluteUrl()).hostname;
-  }
-};
diff --git a/imports/plugins/core/core/server/Reaction/core.js b/imports/plugins/core/core/server/Reaction/core.js
index 4e9c4e005d..29ff569a3b 100644
--- a/imports/plugins/core/core/server/Reaction/core.js
+++ b/imports/plugins/core/core/server/Reaction/core.js
@@ -1,3 +1,4 @@
+import { URL } from "url";
 import Logger from "@reactioncommerce/logger";
 import _ from "lodash";
 import { Meteor } from "meteor/meteor";
@@ -5,7 +6,7 @@ import { check } from "meteor/check";
 import { Roles } from "meteor/alanning:roles";
 import * as Collections from "/lib/collections";
 import ConnectionDataStore from "/imports/plugins/core/core/server/util/connectionDataStore";
-import { AbsoluteUrlMixin } from "./absoluteUrl";
+import config from "../config.js";
 import { getUserId } from "./accountUtils";
 
 /**
@@ -18,8 +19,6 @@ import { getUserId } from "./accountUtils";
 const { Shops, Accounts: AccountsCollection } = Collections;
 
 export default {
-  ...AbsoluteUrlMixin,
-
   /**
    * @summary Called to indicate that startup is done, causing all
    *   `onAppStartupComplete` callbacks to run in series.
@@ -241,42 +240,6 @@ export default {
     return `/${this.getSlug(this.getPrimaryShopName().toLowerCase())}`;
   },
 
-  /**
-   * @summary **DEPRECATED** This method has been deprecated in favor of using getShopId
-   * and getPrimaryShopId. To be removed.
-   * @deprecated
-   * @memberof Core
-   * @method getCurrentShopCursor
-   * @returns {Cursor} cursor of shops that match the current domain
-   */
-  getCurrentShopCursor() {
-    const domain = this.getDomain();
-    const cursor = Shops.find({
-      domains: domain
-    });
-    if (!cursor.count()) {
-      Logger.debug(domain, "Add a domain entry to shops for ");
-    }
-    return cursor;
-  },
-
-  /**
-   * @summary **DEPRECATED** This method has been deprecated in favor of using getShopId
-   * and getPrimaryShopId. To be removed.
-   * @deprecated
-   * @memberof Core
-   * @method getCurrentShop
-   * @returns {Object} returns the first shop object from the shop cursor
-   */
-  getCurrentShop() {
-    const currentShopCursor = this.getCurrentShopCursor();
-    // also, we could check in such a way: `currentShopCursor instanceof Object` but not instanceof something.Cursor
-    if (typeof currentShopCursor === "object") {
-      return currentShopCursor.fetch()[0];
-    }
-    return null;
-  },
-
   /**
    * @name getShopId
    * @method
@@ -350,7 +313,8 @@ export default {
    * @returns {StringId} shopId
    */
   getShopIdByDomain() {
-    const domain = this.getDomain();
+    const parsedUrl = new URL(config.ROOT_URL);
+    const domain = parsedUrl.hostname;
     const primaryShop = this.getPrimaryShop();
 
     // in cases where the domain could match multiple shops, we first check
diff --git a/imports/plugins/core/core/server/config.js b/imports/plugins/core/core/server/config.js
index 4e547216a5..5874cb4532 100644
--- a/imports/plugins/core/core/server/config.js
+++ b/imports/plugins/core/core/server/config.js
@@ -12,6 +12,10 @@ export default envalid.cleanEnv(process.env, {
     desc: "A URL that is accessible from browsers and accepts GraphQL WebSocket connections",
     example: "ws://localhost:3000/graphql-beta"
   }),
+  PUBLIC_FILES_BASE_URL: str({
+    desc: "A URL that has /assets/files and /assets/uploads endpoints for uploading and downloading files",
+    example: "http://localhost:3000"
+  }),
   PUBLIC_I18N_BASE_URL: str({
     desc: "A URL that has /locales/namespaces.json and /locales/resources.json endpoints for loading translations",
     example: "http://localhost:3000"
@@ -24,5 +28,9 @@ export default envalid.cleanEnv(process.env, {
     default: 0,
     desc: "Numeric time at which the command to start the server was run. As output by `Date.now()`. For logging how long startup took.",
     example: "1574809954951"
+  }),
+  ROOT_URL: str({
+    desc: "The canonical root URL for the Reaction Admin server",
+    example: "http://localhost:4080"
   })
 });
diff --git a/imports/plugins/core/core/server/publications/collections/product.js b/imports/plugins/core/core/server/publications/collections/product.js
index b243acbe4c..019e783245 100644
--- a/imports/plugins/core/core/server/publications/collections/product.js
+++ b/imports/plugins/core/core/server/publications/collections/product.js
@@ -51,7 +51,7 @@ function flattenCatalogProductVariants(product) {
  * @returns {Object} return product cursor
  */
 Meteor.publish("Product", function (productIdOrHandle, shopIdOrSlug) {
-  check(productIdOrHandle, Match.OptionalOrNull(String));
+  check(productIdOrHandle, Match.Maybe(String));
   check(shopIdOrSlug, Match.Maybe(String));
 
   if (!productIdOrHandle) {
diff --git a/imports/plugins/core/core/server/startup/browser-policy.js b/imports/plugins/core/core/server/startup/browser-policy.js
index 07cc26901c..f11226bd86 100644
--- a/imports/plugins/core/core/server/startup/browser-policy.js
+++ b/imports/plugins/core/core/server/startup/browser-policy.js
@@ -1,6 +1,7 @@
+import { URL } from "url";
 import { BrowserPolicy } from "meteor/browser-policy-common";
 import { WebApp } from "meteor/webapp";
-import { Reaction } from "/lib/api";
+import config from "../config.js";
 
 /**
  * Set headers for Reaction CDN
@@ -26,11 +27,11 @@ if (process.env.NODE_ENV === "development") {
 }
 
 // get current hostname of app
-const hostname = Reaction.getDomain();
+const parsedUrl = new URL(config.ROOT_URL);
 
 // allow websockets (Safari fails without this)
-BrowserPolicy.content.allowConnectOrigin(`ws://${hostname}`);
-BrowserPolicy.content.allowConnectOrigin(`wss://${hostname}`);
+BrowserPolicy.content.allowConnectOrigin(`ws://${parsedUrl.hostname}`);
+BrowserPolicy.content.allowConnectOrigin(`wss://${parsedUrl.hostname}`);
 
 BrowserPolicy.content.allowOriginForAll("*.facebook.com");
 BrowserPolicy.content.allowOriginForAll("*.fbcdn.net");
diff --git a/imports/plugins/core/core/server/startup/index.js b/imports/plugins/core/core/server/startup/index.js
index 0d8d8206f4..e3f4858f91 100644
--- a/imports/plugins/core/core/server/startup/index.js
+++ b/imports/plugins/core/core/server/startup/index.js
@@ -9,6 +9,7 @@ import RateLimiters from "./rate-limits";
 const {
   PUBLIC_GRAPHQL_API_URL_HTTP,
   PUBLIC_GRAPHQL_API_URL_WS,
+  PUBLIC_FILES_BASE_URL,
   PUBLIC_I18N_BASE_URL,
   PUBLIC_STOREFRONT_HOME_URL,
   REACTION_METEOR_APP_COMMAND_START_TIME
@@ -37,6 +38,7 @@ export default function startup() {
   // Meteor's settings feature.
   // See https://docs.meteor.com/api/core.html#Meteor-settings
   Object.assign(Meteor.settings.public, {
+    filesBaseUrl: PUBLIC_FILES_BASE_URL,
     graphQlApiUrlHttp: PUBLIC_GRAPHQL_API_URL_HTTP,
     graphQlApiUrlWebSocket: PUBLIC_GRAPHQL_API_URL_WS,
     i18nBaseUrl: PUBLIC_I18N_BASE_URL,
diff --git a/imports/plugins/core/dashboard/client/components/shopBrandImageOption.js b/imports/plugins/core/dashboard/client/components/shopBrandImageOption.js
index e528632db6..0994bee342 100644
--- a/imports/plugins/core/dashboard/client/components/shopBrandImageOption.js
+++ b/imports/plugins/core/dashboard/client/components/shopBrandImageOption.js
@@ -51,7 +51,7 @@ function ShopBrandImageOption(props) {
   };
 
   const handleRemoveMedia = (mediaToRemove) => {
-    const imageUrl = mediaToRemove.url({ store: "medium" });
+    const imageUrl = mediaToRemove.url({ absolute: true, store: "medium" });
     const mediaRecordId = mediaToRemove._id;
 
     Alerts.alert({
diff --git a/imports/plugins/core/files/client/index.js b/imports/plugins/core/files/client/index.js
index 5bb5b66f42..528a4f7e00 100644
--- a/imports/plugins/core/files/client/index.js
+++ b/imports/plugins/core/files/client/index.js
@@ -1,11 +1,12 @@
 import { Meteor } from "meteor/meteor";
-import { DomainsMixin } from "/client/modules/core/domains";
 import { MeteorFileCollection, FileRecord } from "@reactioncommerce/file-collections";
 import { MediaRecords } from "/lib/collections";
 
+const { filesBaseUrl } = Meteor.settings.public;
+
 FileRecord.downloadEndpointPrefix = "/assets/files";
 FileRecord.uploadEndpoint = "/assets/uploads";
-FileRecord.absoluteUrlPrefix = DomainsMixin.absoluteUrl();
+FileRecord.absoluteUrlPrefix = filesBaseUrl;
 
 export const Media = new MeteorFileCollection("Media", {
   // The backing Meteor Mongo collection, which you must make sure is published to clients as necessary
diff --git a/imports/plugins/core/tags/client/pages/TagFormPageWithData.js b/imports/plugins/core/tags/client/pages/TagFormPageWithData.js
index d70812e25e..224158a88a 100644
--- a/imports/plugins/core/tags/client/pages/TagFormPageWithData.js
+++ b/imports/plugins/core/tags/client/pages/TagFormPageWithData.js
@@ -66,7 +66,7 @@ class TagFormPageWithData extends Component {
     });
 
     // Do the upload. chunkSize is optional and defaults to 5MB
-    fileRecord.upload({})
+    fileRecord.upload()
       // We insert only AFTER the server has confirmed that all chunks were uploaded
       .then(async () => {
         const refetchQueries = [{
diff --git a/imports/plugins/core/ui/client/components/media/mediaItem.js b/imports/plugins/core/ui/client/components/media/mediaItem.js
index e774680284..894fde8e0d 100644
--- a/imports/plugins/core/ui/client/components/media/mediaItem.js
+++ b/imports/plugins/core/ui/client/components/media/mediaItem.js
@@ -121,7 +121,7 @@ class MediaItem extends Component {
   getSource = (size) => {
     const { defaultSource, source } = this.props;
 
-    return (source && source.url({ store: size })) || defaultSource;
+    return (source && source.url({ absolute: true, store: size })) || defaultSource;
   };
 
   renderImage() {
diff --git a/imports/plugins/core/ui/client/components/media/mediaUploader.js b/imports/plugins/core/ui/client/components/media/mediaUploader.js
index f03742015f..14aabee2d6 100644
--- a/imports/plugins/core/ui/client/components/media/mediaUploader.js
+++ b/imports/plugins/core/ui/client/components/media/mediaUploader.js
@@ -46,7 +46,7 @@ function MediaUploader(props) {
         }
       }
 
-      await fileRecord.upload({});
+      await fileRecord.upload();
 
       // We insert only AFTER the server has confirmed that all chunks were uploaded
       return createMediaRecord({
diff --git a/imports/plugins/core/ui/client/containers/tagListContainer.js b/imports/plugins/core/ui/client/containers/tagListContainer.js
index 566575f892..b7157c6b09 100644
--- a/imports/plugins/core/ui/client/containers/tagListContainer.js
+++ b/imports/plugins/core/ui/client/containers/tagListContainer.js
@@ -8,9 +8,16 @@ import { Meteor } from "meteor/meteor";
 import { Reaction, i18next } from "/client/api";
 import TagList from "../components/tags/tagList";
 import { Tags } from "/lib/collections";
-import { getTagIds } from "/lib/selectors/tags";
 import getTagSuggestions from "../helpers/getTagSuggestions";
 
+const getTagIds = (state) => {
+  if (Array.isArray(state.tags)) {
+    return state.tags.map((tag) => tag._id);
+  }
+
+  return [];
+};
+
 const wrapComponent = (Comp) => (
   class TagListContainer extends Component {
     static propTypes = {
diff --git a/imports/plugins/included/notifications/server/publications/notifications.js b/imports/plugins/included/notifications/server/publications/notifications.js
index 3892b81c59..e5ef2f7ced 100644
--- a/imports/plugins/included/notifications/server/publications/notifications.js
+++ b/imports/plugins/included/notifications/server/publications/notifications.js
@@ -9,7 +9,7 @@ import { Notifications } from "/lib/collections";
  * @returns {Object} return notification cursor
  */
 Meteor.publish("Notification", function (userId) {
-  check(userId, Match.OptionalOrNull(String));
+  check(userId, Match.Maybe(String));
 
   if (!userId) {
     Logger.debug("Ignoring null request on Notification Subscription");
diff --git a/imports/plugins/included/product-admin/client/components/ProductList.js b/imports/plugins/included/product-admin/client/components/ProductList.js
index 981183bb11..e0801dfdc0 100644
--- a/imports/plugins/included/product-admin/client/components/ProductList.js
+++ b/imports/plugins/included/product-admin/client/components/ProductList.js
@@ -76,7 +76,7 @@ function ProductList({ items, title, onCreate, selectedVariantId }) {
               {(Array.isArray(item.media) && item.media.length &&
                 <img
                   alt=""
-                  src={item.media[0].url({ store: "thumbnail" })}
+                  src={item.media[0].url({ absolute: true, store: "thumbnail" })}
                   width={36}
                 />
               ) || ""}
diff --git a/imports/plugins/included/product-admin/client/components/ProductMediaGallery.js b/imports/plugins/included/product-admin/client/components/ProductMediaGallery.js
index a7ae7707df..67151a8c83 100644
--- a/imports/plugins/included/product-admin/client/components/ProductMediaGallery.js
+++ b/imports/plugins/included/product-admin/client/components/ProductMediaGallery.js
@@ -56,7 +56,7 @@ function ProductMediaGallery(props) {
   const [updateMediaRecordPriority] = useMutation(updateMediaRecordPriorityMutation, { ignoreResults: true });
 
   const handleRemoveMedia = (mediaToRemove) => {
-    const imageUrl = mediaToRemove.url({ store: "medium" });
+    const imageUrl = mediaToRemove.url({ absolute: true, store: "medium" });
     const mediaRecordId = mediaToRemove._id;
 
     Alerts.alert({
diff --git a/imports/plugins/included/product-admin/client/components/ProductMediaItem.js b/imports/plugins/included/product-admin/client/components/ProductMediaItem.js
index 34f32bdca7..fe560b907b 100644
--- a/imports/plugins/included/product-admin/client/components/ProductMediaItem.js
+++ b/imports/plugins/included/product-admin/client/components/ProductMediaItem.js
@@ -38,7 +38,7 @@ function ProductMediaItem(props) {
     source
   } = props;
 
-  const imageSrc = (props && source.url({ store: size })) || defaultSource;
+  const imageSrc = (props && source.url({ absolute: true, store: size })) || defaultSource;
 
   return (
     <TableRow>
diff --git a/imports/plugins/included/product-admin/client/components/VariantTable.js b/imports/plugins/included/product-admin/client/components/VariantTable.js
index acd2c12d32..c4210aee23 100644
--- a/imports/plugins/included/product-admin/client/components/VariantTable.js
+++ b/imports/plugins/included/product-admin/client/components/VariantTable.js
@@ -111,7 +111,7 @@ function VariantTable(props) {
               </TableCell>
               <TableCell>
                 {(Array.isArray(item.media) && item.media.length &&
-                  <img alt="" src={item.media[0].url({ store: "thumbnail" })} width={36} />
+                  <img alt="" src={item.media[0].url({ absolute: true, store: "thumbnail" })} width={36} />
                 ) || "-"}
               </TableCell>
               <TableCell>
diff --git a/imports/plugins/included/product-admin/client/hocs/withProduct.js b/imports/plugins/included/product-admin/client/hocs/withProduct.js
index 6ea1d1e745..265ce53a19 100644
--- a/imports/plugins/included/product-admin/client/hocs/withProduct.js
+++ b/imports/plugins/included/product-admin/client/hocs/withProduct.js
@@ -12,9 +12,10 @@ import { Meteor } from "meteor/meteor";
 import { Reaction, formatPriceString, i18next } from "/client/api";
 import { getPrimaryMediaForItem, ReactionProduct, Catalog } from "/lib/api";
 import { Tags, Templates } from "/lib/collections";
-import { getVariantIds } from "/lib/selectors/variants";
 import getOpaqueIds from "/imports/plugins/core/core/client/util/getOpaqueIds";
 
+const getVariantIds = (variants) => Array.isArray(variants) && variants.map((variant) => variant._id);
+
 const ARCHIVE_PRODUCTS = gql`
   mutation archiveProducts($input: ArchiveProductsInput!) {
     archiveProducts(input: $input) {
diff --git a/imports/plugins/included/product-admin/client/hocs/withVariant.js b/imports/plugins/included/product-admin/client/hocs/withVariant.js
index c1a494600a..ea534728fd 100644
--- a/imports/plugins/included/product-admin/client/hocs/withVariant.js
+++ b/imports/plugins/included/product-admin/client/hocs/withVariant.js
@@ -10,9 +10,10 @@ import { Catalog, ReactionProduct } from "/lib/api";
 import { Products } from "/lib/collections";
 import { Reaction, formatPriceString, i18next } from "/client/api";
 import { Media } from "/imports/plugins/core/files/client";
-import { getVariantIds } from "/lib/selectors/variants";
 import getOpaqueIds from "/imports/plugins/core/core/client/util/getOpaqueIds";
 
+const getVariantIds = (variants) => Array.isArray(variants) && variants.map((variant) => variant._id);
+
 const CREATE_VARIANT = gql`
 mutation createProductVariant($input: CreateProductVariantInput!) {
   createProductVariant(input: $input) {
diff --git a/imports/plugins/included/product-variant/components/productGridItems.js b/imports/plugins/included/product-variant/components/productGridItems.js
index 74e8f86bca..8537a32cde 100644
--- a/imports/plugins/included/product-variant/components/productGridItems.js
+++ b/imports/plugins/included/product-variant/components/productGridItems.js
@@ -71,7 +71,7 @@ class ProductGridItems extends Component {
     const fileRecord = productMedia.primaryMedia;
 
     if (fileRecord) {
-      const mediaUrl = fileRecord.url({ store: "thumbnail" });
+      const mediaUrl = fileRecord.url({ absolute: true, store: "thumbnail" });
       return (
         <img alt="" src={mediaUrl} height={30} />
       );
diff --git a/imports/plugins/included/product-variant/components/products.js b/imports/plugins/included/product-variant/components/products.js
index 777bce9cb3..41b0cb8cbe 100644
--- a/imports/plugins/included/product-variant/components/products.js
+++ b/imports/plugins/included/product-variant/components/products.js
@@ -1,7 +1,14 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { Components } from "@reactioncommerce/reaction-components";
-import { getTagIds as getIds } from "/lib/selectors/tags";
+
+const getIds = (state) => {
+  if (Array.isArray(state.tags)) {
+    return state.tags.map((tag) => tag._id);
+  }
+
+  return [];
+};
 
 /** Class representing the Products React component
  * @summary PropTypes for Product React component
diff --git a/imports/test-utils/helpers/mockContext.js b/imports/test-utils/helpers/mockContext.js
index 6974e2277f..9e7a34d855 100644
--- a/imports/test-utils/helpers/mockContext.js
+++ b/imports/test-utils/helpers/mockContext.js
@@ -10,10 +10,6 @@ const mockContext = {
     getShopsUserHasPermissionForFunctionForUser: jest.fn().mockName("getShopsUserHasPermissionForFunctionForUser").mockImplementation(() => () => [])
   },
   collections: {},
-  getAbsoluteUrl: jest.fn().mockName("getAbsoluteUrl").mockImplementation((path) => {
-    const adjustedPath = path[0] === "/" ? path : `/${path}`;
-    return `https://app.mock${adjustedPath}`;
-  }),
   getFunctionsOfType: jest.fn().mockName("getFunctionsOfType").mockReturnValue([]),
   mutations: {},
   queries: {},
diff --git a/imports/utils/tests/mockContext.js b/imports/utils/tests/mockContext.js
index 46e1e32db5..e2b6704ac8 100644
--- a/imports/utils/tests/mockContext.js
+++ b/imports/utils/tests/mockContext.js
@@ -12,10 +12,6 @@ const mockContext = {
     getShopsUserHasPermissionForFunctionForUser: jest.fn().mockName("getShopsUserHasPermissionForFunctionForUser").mockImplementation(() => () => [])
   },
   collections: {},
-  getAbsoluteUrl: jest.fn().mockName("getAbsoluteUrl").mockImplementation((path) => {
-    const adjustedPath = path[0] === "/" ? path : `/${path}`;
-    return `https://app.mock${adjustedPath}`;
-  }),
   getFunctionsOfType: jest.fn().mockName("getFunctionsOfType").mockReturnValue([]),
   mutations: {},
   queries: {},
diff --git a/lib/api/account-validation.js b/lib/api/account-validation.js
index 91798bf3bf..7091c28083 100644
--- a/lib/api/account-validation.js
+++ b/lib/api/account-validation.js
@@ -20,7 +20,7 @@ const validationMethods = {
    * @returns {Boolean|Object} true if valid, error object if invalid
    */
   username(username) {
-    check(username, Match.OptionalOrNull(String));
+    check(username, Match.Maybe(String));
 
     // Valid
     if (username.length >= 3) {
@@ -47,8 +47,8 @@ const validationMethods = {
    * @returns {Boolean|Object} Returns true if valid; Returns an error object if invalid
    */
   email(email, optional) {
-    check(email, Match.OptionalOrNull(String));
-    check(optional, Match.OptionalOrNull(Boolean));
+    check(email, Match.Maybe(String));
+    check(optional, Match.Maybe(Boolean));
 
     if (email) {
       const processedEmail = email.trim();
@@ -85,8 +85,8 @@ const validationMethods = {
    * @returns {Boolean|Object} true if valid | Error object otherwise: {error: String, reason: String}
    */
   password(password, options) {
-    check(password, Match.OptionalOrNull(String));
-    check(options, Match.OptionalOrNull(Object));
+    check(password, Match.Maybe(String));
+    check(options, Match.Maybe(Object));
 
     const passwordOptions = options || {};
     const errors = [];
diff --git a/lib/api/match.js b/lib/api/match.js
deleted file mode 100644
index 59db4a37af..0000000000
--- a/lib/api/match.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Match } from "meteor/check";
-
-/**
- * @file **Meteor Match** - Extending {@link http://docs.meteor.com/api/check.html Meteor Match} argument checking
- * @see https://github.com/meteor/meteor/tree/master/packages/check
- * @extends Meteor/Check
- * @namespace Match
- */
-
-/**
- * @name OptionalOrNull
- * @method
- * @memberof Match
- * @summary Return whether an argument is optional or null
- * @example check(options, Match.OptionalOrNull(Object))
- * @param {String} pattern - match pattern
- * @returns {Boolean} matches - void, null, or pattern
- */
-Match.OptionalOrNull = function (pattern) {
-  return Match.OneOf(undefined, null, pattern);
-};
-
-/**
- * @name OrderHookOption
- * @method
- * @memberof Match
- * @example check(options, Match.OrderHookOptions())
- * @returns {Boolean} matches - void, null, or pattern
- */
-Match.OrderHookOptions = function () {
-  return Match.OneOf(Object);
-};
diff --git a/lib/core/url-common.js b/lib/core/url-common.js
deleted file mode 100644
index c799d45eb4..0000000000
--- a/lib/core/url-common.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * @summary Generate an absolute URL pointing to the application. The server
- * reads from the `ROOT_URL` environment variable to determine where it is
- * running. This is taken care of automatically for apps deployed to Galaxy,
- * but must be provided when using `meteor build`.
- * (this code is based on Meteor.absoluteUrl)
- * @param {String} [pathOrOptions] A path to append to the root URL. Do not
- *                 include a leading "`/`".
- * @param {Object} [optionalOptions] URL composition options
- * @param {Boolean} optionalOptions.secure Create an HTTPS URL.
- * @param {Boolean} optionalOptions.replaceLocalhost Replace localhost with
- *                  127.0.0.1. Useful for services that don't recognize
- *                  localhost as a domain name.
- * @param {String} options.rootUrl Override the default ROOT_URL from the server
- *                 environment. For example: "`http://foo.example.com`"
- * @returns {String} the crafted URL
- */
-export function composeUrl(pathOrOptions, optionalOptions) {
-  let path;
-  let options;
-
-  // path is optional
-  if (!optionalOptions && typeof pathOrOptions === "object") {
-    path = undefined;
-    options = Object.assign({}, pathOrOptions);
-  } else {
-    path = pathOrOptions;
-    options = Object.assign({}, optionalOptions);
-  }
-  // merge options with defaults
-  options = Object.assign({}, composeUrl.defaultOptions, options || {});
-
-  let url = options.rootUrl;
-
-  if (!url) {
-    throw new Error("Must pass options.rootUrl or set ROOT_URL in the server environment");
-  }
-
-  if (!/^http[s]?:\/\//i.test(url)) { // url starts with 'http://' or 'https://'
-    url = `http://${url}`; // we will later fix to https if options.secure is set
-  }
-
-  if (!url.endsWith("/")) {
-    url += "/";
-  }
-
-  if (path) {
-    // join url and path with a / separator
-    while (path.startsWith("/")) {
-      path = path.slice(1);
-    }
-    url += path;
-  }
-
-  // turn http to https if secure option is set, and we're not talking
-  // to localhost.
-  if (options.secure &&
-      /^http:/.test(url) && // url starts with 'http:'
-      !/http:\/\/localhost[:/]/.test(url) && // doesn't match localhost
-      !/http:\/\/127\.0\.0\.1[:/]/.test(url)) { // or 127.0.0.1
-    url = url.replace(/^http:/, "https:");
-  }
-
-  if (options.replaceLocalhost) {
-    url = url.replace(/^http:\/\/localhost([:/].*)/, "http://127.0.0.1$1");
-  }
-
-  return url;
-}
-
-// allow later packages to override default options
-composeUrl.defaultOptions = {};
-
-// client-side environment
-const location = typeof window === "object" && window.location;
-
-// server-side environment
-if (typeof process === "object" && process.env.ROOT_URL) {
-  composeUrl.defaultOptions.rootUrl = process.env.ROOT_URL;
-} else if (location && location.protocol && location.host) {
-  composeUrl.defaultOptions.rootUrl = `${location.protocol}//${location.host}`;
-}
-
-// Make absolute URLs use HTTPS by default if the current window.location
-// uses HTTPS. Since this is just a default, it can be overridden by
-// passing { secure: false } if necessary.
-if (location && location.protocol === "https:") {
-  composeUrl.defaultOptions.secure = true;
-}
diff --git a/lib/selectors/tags.js b/lib/selectors/tags.js
deleted file mode 100644
index c84acb0080..0000000000
--- a/lib/selectors/tags.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @method getTagIds
- * @memberof Core
- * @summary Get an array of IDs of tags
- * @example getTagIds({ tags: subTagGroups })
- * @param  {Object} state object
- * @param  {Array}  state.tags Array of tags
- * @returns {Array}  Array of tag IDs
- */
-export const getTagIds = (state) => {
-  if (Array.isArray(state.tags)) {
-    return state.tags.map((tag) => tag._id);
-  }
-
-  return [];
-};
diff --git a/lib/selectors/variants.js b/lib/selectors/variants.js
deleted file mode 100644
index 12fadb902b..0000000000
--- a/lib/selectors/variants.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @method getVariantIds
- * @memberof Core
- * @summary Get array of IDs of variants
- * @example getVariantIds(newVariantOrder)
- * @param  {Array} variants Array of variant objects
- * @returns {Array}          Array of variant object IDs
- */
-export const getVariantIds = (variants) => Array.isArray(variants) && variants.map((variant) => variant._id);
diff --git a/package-lock.json b/package-lock.json
index 78c368b36f..281d14dd9a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2928,11 +2928,11 @@
       "dev": true
     },
     "@reactioncommerce/file-collections": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@reactioncommerce/file-collections/-/file-collections-0.7.0.tgz",
-      "integrity": "sha512-Tqhfz3nFC8ivjKseogu3qnU7HauklD89eJjPJNZJrf61ayjEfNfoCHLnijHRQ/B8pT0qy8/jLp9RUukQuS7lrg==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@reactioncommerce/file-collections/-/file-collections-0.7.3.tgz",
+      "integrity": "sha512-32l54DjwLGzyTyeGVy2K0FGbCa09jllMuQeO6jfcIUUu3siDnN/JF4xQ7nWEvz35+ny2jpX+L0vM22ZImzjePQ==",
       "requires": {
-        "babel-runtime": "^6.26.0",
+        "@babel/runtime-corejs2": "^7.7.6",
         "content-disposition": "^0.5.2",
         "debug": "^3.1.0",
         "extend": "~3.0.2",
@@ -2942,6 +2942,15 @@
         "tus-node-server": "~0.3.2"
       },
       "dependencies": {
+        "@babel/runtime-corejs2": {
+          "version": "7.7.7",
+          "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.7.7.tgz",
+          "integrity": "sha512-P91T3dFYQL7aj44PxOMIAbo66Ag3NbmXG9fseSYaXxapp3K9XTct5HU9IpTOm2D0AoktKusgqzN5YcSxZXEKBQ==",
+          "requires": {
+            "core-js": "^2.6.5",
+            "regenerator-runtime": "^0.13.2"
+          }
+        },
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
@@ -2954,6 +2963,11 @@
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "regenerator-runtime": {
+          "version": "0.13.3",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
+          "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="
         }
       }
     },
@@ -3677,11 +3691,11 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
-      "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
       "requires": {
-        "lodash": "^4.17.10"
+        "lodash": "^4.17.14"
       }
     },
     "async-each": {
@@ -3775,13 +3789,13 @@
       }
     },
     "aws-sdk": {
-      "version": "2.521.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.521.0.tgz",
-      "integrity": "sha512-YRViGahZoHq0lEsy0Cq7bqaLzP8OTzjg35Hz08Rv88ltk+b5UWVpDgIWls7mXCBNTBTYjbfbeGXzNaHJBLKlpA==",
+      "version": "2.594.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.594.0.tgz",
+      "integrity": "sha512-z6PTM6Tz+UHB5o/5cG63E5san9788mSRH/7A7Qz0hNC4nVe9GlKrPcgf3+bceaP8YB0hf1TJ51Ki3BhkM9nfKg==",
       "requires": {
         "buffer": "4.9.1",
         "events": "1.1.1",
-        "ieee754": "1.1.8",
+        "ieee754": "1.1.13",
         "jmespath": "0.15.0",
         "querystring": "0.2.0",
         "sax": "1.2.1",
@@ -3792,7 +3806,7 @@
       "dependencies": {
         "buffer": {
           "version": "4.9.1",
-          "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
           "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
           "requires": {
             "base64-js": "^1.0.2",
@@ -3801,9 +3815,9 @@
           }
         },
         "ieee754": {
-          "version": "1.1.8",
-          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-          "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
+          "version": "1.1.13",
+          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+          "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
         },
         "punycode": {
           "version": "1.3.2",
@@ -3846,9 +3860,9 @@
       },
       "dependencies": {
         "is-buffer": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
-          "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
         }
       }
     },
@@ -5017,6 +5031,15 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
       "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok="
     },
+    "combine-errors": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/combine-errors/-/combine-errors-3.0.3.tgz",
+      "integrity": "sha1-9N9nQAg+VwOjGBEQwrEFUfAD2oY=",
+      "requires": {
+        "custom-error-instance": "2.1.1",
+        "lodash.uniqby": "4.5.0"
+      }
+    },
     "combined-stream": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
@@ -5052,9 +5075,9 @@
       },
       "dependencies": {
         "mime-db": {
-          "version": "1.41.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.41.0.tgz",
-          "integrity": "sha512-B5gxBI+2K431XW8C2rcc/lhppbuji67nf9v39eH8pkWoZDxnAL0PxdpH32KYRScniF8qDHBDlI+ipgg5WrCUYw=="
+          "version": "1.42.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz",
+          "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="
         }
       }
     },
@@ -5111,9 +5134,12 @@
       "dev": true
     },
     "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
     },
     "convert-css-length": {
       "version": "2.0.1",
@@ -5334,6 +5360,11 @@
         "pad": "^3.2.0"
       }
     },
+    "custom-error-instance": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/custom-error-instance/-/custom-error-instance-2.1.1.tgz",
+      "integrity": "sha1-PPY5FIemYppiR+sMoM4ACBt+Nho="
+    },
     "damerau-levenshtein": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz",
@@ -8415,9 +8446,9 @@
       }
     },
     "hash-stream-validation": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.1.tgz",
-      "integrity": "sha1-7Mm5l7IYvluzEphii7gHhptz3NE=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/hash-stream-validation/-/hash-stream-validation-0.2.2.tgz",
+      "integrity": "sha512-cMlva5CxWZOrlS/cY0C+9qAzesn5srhFA8IT1VPiHc9bWWBLkJfEUIZr7MWoi89oOOGmpg8ymchaOjiArsGu5A==",
       "requires": {
         "through2": "^2.0.0"
       }
@@ -12167,6 +12198,14 @@
         "lodash._baseisequal": "^3.0.0"
       }
     },
+    "lodash._baseiteratee": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseiteratee/-/lodash._baseiteratee-4.7.0.tgz",
+      "integrity": "sha1-NKm1VDVycnw9sueO2uPA6eZr0QI=",
+      "requires": {
+        "lodash._stringtopath": "~4.8.0"
+      }
+    },
     "lodash._basematches": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash._basematches/-/lodash._basematches-3.2.0.tgz",
@@ -12176,16 +12215,48 @@
         "lodash.pairs": "^3.0.0"
       }
     },
+    "lodash._basetostring": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz",
+      "integrity": "sha1-kyfJ3FFYhmt/pLnUL0Y45XZt2d8="
+    },
+    "lodash._baseuniq": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz",
+      "integrity": "sha1-DrtE5FaBSveQXGIS+iybLVG4Qeg=",
+      "requires": {
+        "lodash._createset": "~4.0.0",
+        "lodash._root": "~3.0.0"
+      }
+    },
     "lodash._bindcallback": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
       "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4="
     },
+    "lodash._createset": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz",
+      "integrity": "sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY="
+    },
     "lodash._getnative": {
       "version": "3.9.1",
       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
       "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
     },
+    "lodash._root": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
+      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI="
+    },
+    "lodash._stringtopath": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/lodash._stringtopath/-/lodash._stringtopath-4.8.0.tgz",
+      "integrity": "sha1-lBvPDmQmbl/B1m/tCmlZVExXaCQ=",
+      "requires": {
+        "lodash._basetostring": "~4.12.0"
+      }
+    },
     "lodash.assign": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
@@ -12378,6 +12449,15 @@
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
       "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
     },
+    "lodash.uniqby": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.5.0.tgz",
+      "integrity": "sha1-o6F7v2LutiQPSRhG6XwcTipeHiE=",
+      "requires": {
+        "lodash._baseiteratee": "~4.7.0",
+        "lodash._baseuniq": "~4.6.0"
+      }
+    },
     "lodash.uniqueid": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/lodash.uniqueid/-/lodash.uniqueid-4.0.1.tgz",
@@ -14559,6 +14639,15 @@
       "integrity": "sha1-AMLa7t2iDofjeCs0Stuhzd1q1wk=",
       "dev": true
     },
+    "proper-lockfile": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.1.tgz",
+      "integrity": "sha1-FZ+wYZPTIAP0s2kd0uwaY0qoDR0=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "retry": "^0.10.0"
+      }
+    },
     "protocols": {
       "version": "1.4.7",
       "resolved": "https://registry.npmjs.org/protocols/-/protocols-1.4.7.tgz",
@@ -15799,6 +15888,11 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
+    "retry": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
+      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q="
+    },
     "retry-axios": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/retry-axios/-/retry-axios-0.3.2.tgz",
@@ -17156,9 +17250,9 @@
       }
     },
     "stream-shift": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
     },
     "strict-uri-encode": {
       "version": "1.1.0",
@@ -17979,14 +18073,16 @@
       }
     },
     "tus-js-client": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/tus-js-client/-/tus-js-client-1.7.1.tgz",
-      "integrity": "sha512-38NMOvjZm/HQTdmwLctXqctsUUsiuZsdUGBew6xn3/s1D7ofzjW/VBRAp+uAWrzN0ziAmo2WuiZ9FMP9UeU0UQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/tus-js-client/-/tus-js-client-1.8.0.tgz",
+      "integrity": "sha512-qPX3TywqzxocTxUZtcS8X7Aik72SVMa0jKi4hWyfvRV+s9raVzzYGaP4MoJGaF0yOgm2+b6jXaVEHogxcJ8LGw==",
       "requires": {
         "buffer-from": "^0.1.1",
-        "extend": "^3.0.0",
+        "combine-errors": "^3.0.3",
+        "extend": "^3.0.2",
         "js-base64": "^2.4.9",
         "lodash.throttle": "^4.1.1",
+        "proper-lockfile": "^2.0.1",
         "url-parse": "^1.4.3"
       }
     },
@@ -18683,9 +18779,9 @@
       "dev": true
     },
     "xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
     },
     "y18n": {
       "version": "3.2.1",
diff --git a/package.json b/package.json
index 36cc65218c..f9e7510245 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "@reactioncommerce/catalyst": "~1.14.1",
     "@reactioncommerce/components": "^0.67.2",
     "@reactioncommerce/components-context": "1.2.0",
-    "@reactioncommerce/file-collections": "0.7.0",
+    "@reactioncommerce/file-collections": "^0.7.3",
     "@reactioncommerce/logger": "1.1.1",
     "@reactioncommerce/random": "1.0.1",
     "@reactioncommerce/reaction-error": "^1.0.1",

From f3a9d8bb8d35b06a87fae6424f7e64af9d9e1db9 Mon Sep 17 00:00:00 2001
From: Eric Dobbertin <eric@dairystatedesigns.com>
Date: Thu, 19 Dec 2019 17:28:52 -0600
Subject: [PATCH 19/19] fix: get Accounts page working again

Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
---
 .../accounts/client/components/editGroup.js   | 235 +++++++++++++++++-
 .../client/components/manageGroups.js         |   4 +-
 .../containers/accountsDashboardContainer.js  |   9 +-
 .../client/containers/editGroupContainer.js   |  20 +-
 .../accounts/client/helpers/accountsHelper.js |  79 +-----
 5 files changed, 248 insertions(+), 99 deletions(-)

diff --git a/imports/plugins/core/accounts/client/components/editGroup.js b/imports/plugins/core/accounts/client/components/editGroup.js
index 886057db87..5091a04b67 100644
--- a/imports/plugins/core/accounts/client/components/editGroup.js
+++ b/imports/plugins/core/accounts/client/components/editGroup.js
@@ -9,14 +9,234 @@ import { Reaction, i18next } from "/client/api";
 import Card from "@material-ui/core/Card";
 import CardContent from "@material-ui/core/CardContent";
 import CardHeader from "@material-ui/core/CardHeader";
-import { groupPermissions } from "../helpers/accountsHelper";
+
+const permissionList = [
+  {
+    name: "reaction-dashboard",
+    label: "Dashboard",
+    permissions: [
+      {
+        permission: "dashboard",
+        label: "Dashboard"
+      },
+      {
+        permission: "shopSettings",
+        label: "Shop Settings"
+      }
+    ]
+  },
+  {
+    name: "reaction-taxes-rates",
+    label: "Taxes Rates",
+    permissions: []
+  },
+  {
+    name: "reaction-file-collections",
+    label: "File Collections",
+    permissions: [
+      {
+        permission: "media/create",
+        label: "Create Media"
+      },
+      {
+        permission: "media/update",
+        label: "Update Media"
+      },
+      {
+        permission: "media/delete",
+        label: "Delete Media"
+      }
+    ]
+  },
+  {
+    name: "reaction-taxes",
+    label: "Taxes",
+    permissions: []
+  },
+  {
+    name: "reaction-i18n",
+    label: "I18n",
+    permissions: []
+  },
+  {
+    name: "reaction-product-admin",
+    label: "Product Admin",
+    permissions: [
+      {
+        permission: "product/admin",
+        label: "Product Admin"
+      },
+      {
+        permission: "product/archive",
+        label: "Archive Product"
+      },
+      {
+        permission: "product/clone",
+        label: "Clone Product"
+      },
+      {
+        permission: "product/create",
+        label: "Create Product"
+      },
+      {
+        permission: "product/publish",
+        label: "Publish Product"
+      },
+      {
+        permission: "product/update",
+        label: "Update Product"
+      }
+    ]
+  },
+  {
+    name: "reaction-email",
+    label: "Email",
+    permissions: []
+  },
+  {
+    label: "Address",
+    permissions: []
+  },
+  {
+    name: "reaction-orders",
+    label: "Orders",
+    permissions: [
+      {
+        permission: "order/fulfillment",
+        label: "Order Fulfillment"
+      },
+      {
+        permission: "order/view",
+        label: "Order View"
+      }
+    ]
+  },
+  {
+    name: "reaction-product-variant",
+    label: "Product Variant",
+    permissions: [
+      {
+        permission: "tag",
+        label: "/tag/:slug?"
+      },
+      {
+        permission: "createProduct",
+        label: "Add Product"
+      }
+    ]
+  },
+  {
+    name: "reaction-tags",
+    label: "Tags",
+    permissions: [
+      {
+        permission: "tag/admin",
+        label: "Tag Admin"
+      },
+      {
+        permission: "tag/edit",
+        label: "Edit Tag"
+      }
+    ]
+  },
+  {
+    name: "reaction-accounts",
+    label: "Accounts",
+    permissions: [
+      {
+        permission: "accounts",
+        label: "Accounts"
+      },
+      {
+        permission: "account/verify",
+        label: "Account Verify"
+      },
+      {
+        permission: "reaction-accounts/accountsSettings",
+        label: "Account Settings"
+      },
+      {
+        permission: "dashboard/accounts",
+        label: "Accounts"
+      },
+      {
+        permission: "account/profile",
+        label: "Profile"
+      },
+      {
+        permission: "reset-password",
+        label: "reset-password"
+      },
+      {
+        permission: "account/enroll",
+        label: "Account Enroll"
+      },
+      {
+        permission: "account/invite",
+        label: "Account Invite"
+      }
+    ]
+  },
+  {
+    name: "discount-codes",
+    label: "discount Codes",
+    permissions: [
+      {
+        permission: "discounts/apply",
+        label: "Apply Discounts"
+      }
+    ]
+  },
+  {
+    name: "reaction-shipping",
+    label: "Shipping",
+    permissions: [
+      {
+        permission: "shipping",
+        label: "Shipping"
+      }
+    ]
+  },
+  {
+    name: "reaction-notification",
+    label: "Notification",
+    permissions: [
+      {
+        permission: "notifications",
+        label: "Notifications"
+      }
+    ]
+  },
+  {
+    name: "reaction-templates",
+    label: "Templates",
+    permissions: []
+  },
+  {
+    name: "reaction-discounts",
+    label: "Discounts",
+    permissions: []
+  },
+  {
+    label: "Hydra Oauth",
+    permissions: [
+      {
+        permission: "account/login",
+        label: "OAuth Login"
+      },
+      {
+        permission: "not-found",
+        label: "not-found"
+      }
+    ]
+  }
+];
 
 class EditGroup extends Component {
   static propTypes = {
     accounts: PropTypes.array,
     groups: PropTypes.array,
     onChangeGroup: PropTypes.func,
-    packages: PropTypes.array,
     selectedGroup: PropTypes.object
   };
 
@@ -142,10 +362,11 @@ class EditGroup extends Component {
         {this.state.groups.map((grp, index) => (
           <div key={index} className={this.groupListClass(grp)}>
             <Components.ListItem label={grp.name} onClick={this.selectGroup(grp)} listItemClassName="flex flex-justify-spaceBetween">
-              <Components.IconButton
-                icon="fa fa-pencil"
-                onClick={this.showForm(grp)}
-              />
+              {grp.slug !== "owner" ?
+                <Components.IconButton
+                  icon="fa fa-pencil"
+                  onClick={this.showForm(grp)}
+                /> : null}
             </Components.ListItem>
           </div>
         ))}
@@ -162,7 +383,7 @@ class EditGroup extends Component {
     }
     return (
       <Components.PermissionsList
-        permissions={groupPermissions(this.props.packages)}
+        permissions={permissionList}
         group={this.state.selectedGroup}
         updateGroup={this.updateGroup}
       />
diff --git a/imports/plugins/core/accounts/client/components/manageGroups.js b/imports/plugins/core/accounts/client/components/manageGroups.js
index 17d173a676..a9a3edae75 100644
--- a/imports/plugins/core/accounts/client/components/manageGroups.js
+++ b/imports/plugins/core/accounts/client/components/manageGroups.js
@@ -54,9 +54,7 @@ class ManageGroups extends Component {
         {this.props.isAdmin &&
           <div className={classes.editGroup}>
             <Components.EditGroup
-              // filter out owner group from editable groups.
-              // The edit group meteor method also prevents editing owner group
-              groups={this.state.groups.filter((grp) => grp.slug !== "owner")}
+              groups={this.state.groups}
               selectedGroup={this.state.group}
               onChangeGroup={this.props.onChangeGroup}
             />
diff --git a/imports/plugins/core/accounts/client/containers/accountsDashboardContainer.js b/imports/plugins/core/accounts/client/containers/accountsDashboardContainer.js
index d20596120e..9adcd16ce7 100644
--- a/imports/plugins/core/accounts/client/containers/accountsDashboardContainer.js
+++ b/imports/plugins/core/accounts/client/containers/accountsDashboardContainer.js
@@ -115,8 +115,15 @@ const composer = (props, onData) => {
     const adminGroups = groups.filter((group) => group.slug !== "customer" && group.slug !== "guest");
 
     // Find all accounts that are in any of the admin groups
+    // or not in any group
     const adminGroupIds = adminGroups.map((group) => group._id);
-    const accounts = Accounts.find({ groups: { $in: adminGroupIds } }).fetch();
+    const accounts = Accounts.find({
+      $or: [
+        { groups: { $in: adminGroupIds } },
+        { groups: null },
+        { groups: { $size: 0 } }
+      ]
+    }).fetch();
 
     onData(null, { accounts, adminGroups, groups });
   }
diff --git a/imports/plugins/core/accounts/client/containers/editGroupContainer.js b/imports/plugins/core/accounts/client/containers/editGroupContainer.js
index b67f6c8b9e..2f1f1babe7 100644
--- a/imports/plugins/core/accounts/client/containers/editGroupContainer.js
+++ b/imports/plugins/core/accounts/client/containers/editGroupContainer.js
@@ -1,20 +1,6 @@
-import { composeWithTracker, registerComponent } from "@reactioncommerce/reaction-components";
-import { Meteor } from "meteor/meteor";
-import { Packages } from "/lib/collections";
-import { Reaction } from "/client/api";
+import { registerComponent } from "@reactioncommerce/reaction-components";
 import EditGroup from "../components/editGroup";
 
-const composer = (props, onData) => {
-  const shopId = Reaction.getShopId();
-  if (!shopId) return;
+registerComponent("EditGroup", EditGroup);
 
-  const pkgSub = Meteor.subscribe("Packages", shopId);
-  if (pkgSub.ready()) {
-    const packages = Packages.find({ shopId }).fetch();
-    onData(null, { packages, ...props });
-  }
-};
-
-registerComponent("EditGroup", EditGroup, composeWithTracker(composer));
-
-export default composeWithTracker(composer)(EditGroup);
+export default EditGroup;
diff --git a/imports/plugins/core/accounts/client/helpers/accountsHelper.js b/imports/plugins/core/accounts/client/helpers/accountsHelper.js
index e85f6e1065..6b17f750ed 100644
--- a/imports/plugins/core/accounts/client/helpers/accountsHelper.js
+++ b/imports/plugins/core/accounts/client/helpers/accountsHelper.js
@@ -16,6 +16,14 @@ export default function sortUsersIntoGroups({ accounts, groups }) {
     group.users = _.compact(matchingAccounts);
     return group;
   });
+  const accountsWithoutGroup = accounts.filter((acc) => !acc.groups || acc.groups.length === 0);
+  if (accountsWithoutGroup.length) {
+    newGroups.push({
+      name: "Not In Any Group",
+      slug: "_none",
+      users: accountsWithoutGroup
+    });
+  }
   return newGroups;
 }
 
@@ -75,64 +83,6 @@ export function getDefaultUserInviteGroup(groups) {
   return result;
 }
 
-/**
- * @method groupPermissions
- * @memberof Accounts
- * @summary Return all permissions for packages
- * @todo Review hardcoded `reaction` in package names
- * @param  {Array} packages [description]
- * @returns {Object}          [description]
- */
-export function groupPermissions(packages) {
-  return packages.reduce((registeredPackages, pkg) => {
-    const permissions = [];
-    if (pkg.registry && pkg.enabled) {
-      for (const registryItem of pkg.registry) {
-        if (!registryItem.route) {
-          continue;
-        }
-
-        // Get all permissions, add them to an array
-        if (registryItem.permissions) {
-          for (const permission of registryItem.permissions) {
-            // check needed because of non-object perms in the permissions array (e.g "admin", "owner")
-            if (typeof permission === "object") {
-              permission.shopId = Reaction.getShopId();
-              permissions.push(permission);
-            }
-          }
-        }
-
-        // Also create an object map of those same permissions as above
-        const permissionMap = getPermissionMap(permissions);
-        if (!permissionMap[registryItem.route]) {
-          permissions.push({
-            shopId: pkg.shopId,
-            permission: registryItem.name || `${pkg.name}/${registryItem.template}`,
-            icon: registryItem.icon,
-            // TODO: Rethink naming convention for permissions list
-            label: registryItem.label || registryItem.route
-          });
-        }
-      }
-      // TODO review this, hardcoded WIP "reaction"
-      const label = pkg.name.replace("reaction", "").replace(/(-.)/g, (string) => ` ${string[1].toUpperCase()}`);
-
-      const newObj = {
-        shopId: pkg.shopId,
-        icon: pkg.icon,
-        name: pkg.name,
-        label,
-        permissions: _.uniq(permissions)
-      };
-
-      registeredPackages.push(newObj);
-    }
-
-    return registeredPackages;
-  }, []);
-}
-
 /**
  * @method getUserByEmail
  * @memberOf Accounts
@@ -143,16 +93,3 @@ export function groupPermissions(packages) {
 export function getUserByEmail(email) {
   return Collections.Accounts.findOne({ "emails.address": email });
 }
-
-/**
- *
- * @param {Array} permissions permissions
- * @returns {Array} permissions mapped by label
- */
-function getPermissionMap(permissions) {
-  const permissionMap = {};
-  permissions.forEach(({ label, permission }) => {
-    permissionMap[permission] = label;
-  });
-  return permissionMap;
-}