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/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..f026f3ef4c 100644 --- a/client/modules/core/main.js +++ b/client/modules/core/main.js @@ -6,10 +6,8 @@ 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"; /** @@ -33,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 @@ -362,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" }); }, /** @@ -485,19 +476,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 +558,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 +580,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 +775,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/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/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/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/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) => (
- + {grp.slug !== "owner" ? + : null}
))} @@ -162,7 +383,7 @@ class EditGroup extends Component { } return ( 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 ( - - {userImage} - {userName}  - - - ); - } - - renderAdminIcons() { - return ( - Reaction.Apps(this.props.adminShortcuts).map((shortcut) => ( - - )) - ); - } - - renderUserIcons() { - return ( - Reaction.Apps(this.props.userShortcuts).map((option) => ( - - )) - ); - } - - renderSignOutButton() { - return ( - - ); - } - - renderSignInComponent() { - return ( -
-
- - - - -
-
- -
-
- ); - } - - render() { - return ( -
- {this.props.currentAccount ? -
- - {this.renderUserIcons()} - {this.renderAdminIcons()} - {this.renderSignOutButton()} - -
- : -
- {this.renderSignInComponent()} -
- } -
- ); - } -} - -export default MainDropdown; 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 &&
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/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/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; -} diff --git a/imports/plugins/core/accounts/client/index.js b/imports/plugins/core/accounts/client/index.js index f8f5e588b3..d7f6e0f0c2 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"; @@ -64,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) => , - 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 @@
{{/if}} - - 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/address/client/components/AddressValidationSettingsForm.js b/imports/plugins/core/address/client/components/AddressValidationSettingsForm.js index bd90ec83d1..6fca12602a 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("addressValidation.saveFailed"), { 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("addressValidation.saveFailed"), { variant: "warning" }); + } + }); + + const [updateRule] = useMutation(updateRuleMutation, { + ignoreResults: true, + onCompleted() { + setIsSubmitting(false); + onSuccess(); + }, + onError() { + setIsSubmitting(false); + enqueueSnackbar(i18next.t("addressValidation.saveFailed"), { 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 ( -
{ 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 ( +
+ { + if (event.key === "Enter") submitForm(); + }} + select + {...getInputProps("serviceName", muiOptions)} + > + {serviceOptions.map((option) => ( + + {option.label} + + ))} + + { + if (event.key === "Enter") submitForm(); + }} + select + SelectProps={{ multiple: true }} + {...countryCodesInputProps} + // Avoid "value must be an array" error + value={countryCodesInputProps.value || []} > - - -
- {{/if}} - -
-
- {{> React component=ReactComponentOrBlazeTemplate name=template props=.}} -
-
- - {{/each}} {{#if shopSettingsBlockProps.shopId}} @@ -103,17 +69,6 @@ {{/if}} - -