fix(server.sidebar): change exchange config (#1020)

Author: lizardK

packages/manager/modules/server-sidebar/src/sidebar.constants.js

@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import { DEDICATED, CLOUD } from './constants';
 
 export const DEDICATED_SERVER_CONFIG = {
@@ -108,41 +109,6 @@ export const NETWORKS_CONFIG = {
   regions: ['EU', 'CA'],
 };
 
-export const OLD_MICROSOFT_CONFIG = {
-  id: 'microsoft',
-  children: [
-    {
-      id: 'exchange',
-      types: [
-        {
-          path: '/email/exchange',
-          icon: 'ms-Icon ms-Icon--ExchangeLogo',
-          loadOnState: 'app.microsoft.exchange',
-          stateParams: ['organizationId'],
-          app: [DEDICATED],
-          types: [
-            {
-              path: '/email/exchange/:organizationId/service',
-              icon: 'ms-Icon ms-Icon--ExchangeLogo',
-              state: 'app.microsoft.exchange',
-              stateParams: ['organizationId', 'productId'], // TODO: state
-              app: [DEDICATED],
-            },
-          ],
-        },
-      ],
-      loadOnState: 'app.microsoft.exchange',
-      icon: 'ms-Icon ms-Icon--ExchangeLogo',
-      app: [DEDICATED],
-    },
-  ],
-  forceDisplaySearch: true,
-  loadOnState: 'app.microsoft',
-  icon: 'ms-Icon ms-Icon--WindowsLogo',
-  app: [DEDICATED],
-  regions: ['CA'],
-};
-
 export const MICROSOFT_CONFIG = {
   id: 'microsoft_exchange',
   types: [
@@ -154,7 +120,7 @@ export const MICROSOFT_CONFIG = {
       app: [DEDICATED],
       types: [
         {
-          path: '/email/exchange/:organization/service',
+          path: '/email/exchange',
           icon: 'ms-Icon ms-Icon--ExchangeLogo',
           getState: ({ offer }) => {
             const states = {
@@ -163,8 +129,7 @@ export const MICROSOFT_CONFIG = {
               dedicatedCluster: 'app.microsoft.exchange.dedicatedCluster',
               hosted: 'app.microsoft.exchange.hosted',
             };
-
-            return states[offer];
+            return get(states, offer);
           },
           stateParams: ['organization', 'productId'],
           app: [DEDICATED],

packages/manager/modules/server-sidebar/src/web.constants.js

@@ -167,7 +167,7 @@ export const MICROSOFT_CONFIG = {
       id: 'exchange',
       types: [
         {
-          path: '/email/exchange/*/service',
+          path: '/email/exchange',
           icon: 'ms-Icon ms-Icon--ExchangeLogo',
           getState: ({ offer }) => {
             const states = {
@@ -224,41 +224,6 @@ export const MICROSOFT_CONFIG = {
   regions: ['EU'],
 };
 
-/* export const MICROSOFT_CONFIG = {
-  id: 'microsoft_exchange',
-  types: [
-    {
-      path: '/email/exchange',
-      icon: 'ms-Icon ms-Icon--ExchangeLogo',
-      loadOnState: 'app.microsoft.exchange',
-      stateParams: ['organization'],
-      app: [WEB],
-      types: [
-        {
-          path: '/email/exchange/:organization/service',
-          icon: 'ms-Icon ms-Icon--ExchangeLogo',
-          getState: ({ offer }) => {
-            const states = {
-              provider: 'app.microsoft.exchange.provider',
-              dedicated: 'app.microsoft.exchange.dedicated',
-              dedicatedCluster: 'app.microsoft.exchange.dedicatedCluster',
-              hosted: 'app.microsoft.exchange.hosted',
-            };
-
-            return states[offer];
-          },
-          stateParams: ['organization', 'productId'],
-          app: [WEB],
-        },
-      ],
-    },
-  ],
-  loadOnState: 'app.microsoft.exchange',
-  icon: 'ms-Icon ms-Icon--ExchangeLogo',
-  app: [WEB],
-  regions: ['CA'],
-};
-*/
 export const WEB_SIDEBAR_CONFIG = [
   DOMAIN_CONFIG,
   HOSTING_CONFIG,