@capillarytech/creatives-library 8.0.136-alpha.0 → 8.0.136-alpha.2

package/index.js

@@ -138,8 +138,10 @@ const FTPContainer = {FTP, FTPReducer, FTPSagas};
 export {default as TagList} from './v2Containers/TagList/index';
 export {default as TagListSaga} from './v2Containers/TagList/sagas';
 export {default as TagListReducer} from './v2Containers/TagList/reducer';
-export {default as TemplatePreview} from './components/TemplatePreview';
-export {default as EmailPreview} from './components/EmailPreview';
+
+export {default as TemplatePreview} from './v2Components/TemplatePreview';
+export {default as EmailPreview} from './v2Components/EmailPreview';
+
 export {default as EmailPreviewV2} from './v2Components/EmailPreviewV2';
 export {default as CallTaskPreview} from './v2Components/CallTaskPreview';
 export {default as EmailMobilePreview} from './v2Components/EmailMobilePreview';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "8.0.136-alpha.0",
+  "version": "8.0.136-alpha.2",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/routes.js

@@ -1,212 +1,146 @@
 import withReactRouterV3Compatibility from './hoc/withReactRouterV3Compatibility';
-import Dashboard from './containers/Dashboard';
-import SmsCreate from './containers/Sms/Create';
-import SmsEdit from './containers/Sms/Edit';
-import Templates from './containers/Templates';
-import Gallary from './containers/Assets/Gallery';
-import WeChatMapTemplate from './containers/WeChat/MapTemplates';
-import WeChatRichmediaCreate from './containers/WeChat/RichmediaTemplates/Create';
-import WeChatRichmediaEdit from './containers/WeChat/RichmediaTemplates/Edit';
-import Email from './containers/Email';
-import Ebill from './containers/Ebill';
-import MobilePushCreate from './containers/MobilePush/Create';
-import MobilePushEdit from './containers/MobilePush/Edit';
-import LineCreate from './containers/Line/Create';
+
 import SomethingWentWrong from '@capillarytech/cap-ui-library/CapSomethingWentWrong';
-import NotFoundPage from './containers/NotFoundPage';
+import NotFoundPage from './v2Containers/NotFoundPage';
 import TemplatesV2 from './v2Containers/TemplatesV2';
-import { updateCharCount } from './utils/smsCharCountV2';
 
-const routes = [
-  {
-    exact: true,
-    path: '/',
-    component: withReactRouterV3Compatibility(Dashboard),
-  },
-  //sms routes v1
-  {
-    exact: true,
-    path: '/sms/create',
-    name: 'create',
-    component: withReactRouterV3Compatibility(SmsCreate),
-  },
-  {
-    exact: true,
-    path: '/sms/view',
-    name: 'view',
-    component: withReactRouterV3Compatibility(SmsCreate),
-  },
-  {
-    exact: true,
-    path: '/sms/edit/:id',
-    name: 'edit',
-    component: withReactRouterV3Compatibility(SmsEdit),
-  },
-  {
-    exact: true,
-    path: '/sms',
-    name: 'sms',
-    component: withReactRouterV3Compatibility(Templates),
-  },
-  //wechat routes v1
-  {
-    exact: true,
-    path: '/wechat',
-    name: 'wechat',
-    component: withReactRouterV3Compatibility(Templates),
-  },
-  {
-    exact: true,
-    path: '/wechat/create',
-    name: 'create weChat',
-    component: withReactRouterV3Compatibility(WeChatMapTemplate),
-  },
-  {
-    exact: true,
-    path: '/wechat/edit/:id',
-    name: 'edit weChat',
-    component: withReactRouterV3Compatibility(WeChatMapTemplate),
-  },
-  {
-    exact: true,
-    path: '/wechat/richmedia/create',
-    name: 'wechat_richmedia_create',
-    component: withReactRouterV3Compatibility(WeChatRichmediaCreate),
-  },
-  {
-    exact: true,
-    path: '/wechat/richmedia/edit/:id',
-    name: 'wechat_richmedia_edit',
-    component: withReactRouterV3Compatibility(WeChatRichmediaEdit),
-  },
-  //email routes v1
-  {
-    exact: true,
-    path: '/email',
-    name: 'email',
-    component: withReactRouterV3Compatibility(Templates),
-  },
-  {
-    exact: true,
-    path: '/email/create',
-    name: 'EmailCreate',
-    component: withReactRouterV3Compatibility(Email),
-  },
-  {
-    exact: true,
-    path: '/email/view',
-    name: 'EmailView',
-    component: withReactRouterV3Compatibility(Email),
-  },
-  {
-    exact: true,
-    path: '/email/edit/:id',
-    name: 'EmailEdit',
-    component: withReactRouterV3Compatibility(Email),
-  },
-  //ebill routes v1
-  {
-    exact: true,
-    path: '/ebill',
-    name: 'Ebill',
-    component: withReactRouterV3Compatibility(Templates),
-  },
-  {
-    exact: true,
-    path: '/ebill/create',
-    name: 'Ebill',
-    component: withReactRouterV3Compatibility(Ebill),
-  },
-  {
-    exact: true,
-    path: '/ebill/edit/:id',
-    name: 'Ebill',
-    component: withReactRouterV3Compatibility(Ebill),
-  },
-  //mobilepush routes v1
-  {
-    exact: true,
-    path: '/mobilepush',
-    name: 'mobilepush',
-    component: withReactRouterV3Compatibility(Templates),
-  },
-  {
-    exact: true,
-    path: '/mobilepush/create/:mode',
-    name: 'create',
-    component: withReactRouterV3Compatibility(MobilePushCreate),
-  },
-  {
-    exact: true,
-    path: '/mobilepush/edit/:id',
-    name: 'edit',
-    component: withReactRouterV3Compatibility(MobilePushEdit),
-  },
-  // assets routes v1
-  {
-    exact: true,
-    path: '/assets',
-    name: 'GALLERY',
-    component: withReactRouterV3Compatibility(Gallary),
-  },
-  // line routes v1
-  {
-    exact: true,
-    path: '/line',
-    name: 'line',
-    component: withReactRouterV3Compatibility(Templates),
-  },
-  {
-    exact: true,
-    path: '/line/create/:mode',
-    name: 'create line',
-    component: withReactRouterV3Compatibility(LineCreate),
-  },
-  {
-    exact: true,
-    path: '/line/view/:mode',
-    name: 'view',
-    component: withReactRouterV3Compatibility(LineCreate),
-  },
-  {
-    exact: true,
-    path: '/line/edit/text/:id',
-    name: 'edit_text',
-    component: withReactRouterV3Compatibility(LineCreate),
-  },
-  {
-    exact: true,
-    path: '/line/edit/image/:id',
-    name: 'edit_image',
-    component: withReactRouterV3Compatibility(LineCreate),
-  },
-  {
-    exact: true,
-    path: '/v2/somethingwentwrong',
-    name: 'somethingwentwrong',
-    component: withReactRouterV3Compatibility(SomethingWentWrong),
-  },
-  {
-    exact: true,
-    path: '/v2',
-    name: 'templatesV2',
-    component: withReactRouterV3Compatibility(TemplatesV2),
-  },
-  {
-    exact: true,
-    path: '/v2/loyalty',
-    name: 'loyalty',
-    component: withReactRouterV3Compatibility(TemplatesV2),
-  },
-  {
+// Utility function to detect if we're in embedded mode
+const isEmbeddedMode = () => {
+  // Check if we're in embedded mode by looking for embedded mode indicators
+  // This could be from URL params, environment variables, or build configuration
+  if (typeof window !== 'undefined') {
+    const urlParams = new URLSearchParams(window.location.search);
+    return urlParams.get('type') === 'embedded';
+  }
+  // Fallback: check if containers folder exists (indicating non-embedded mode)
+  try {
+    // This will throw an error in embedded mode since containers are excluded
+    require('./containers/Dashboard');
+    return false;
+  } catch (error) {
+    return true;
+  }
+};
+
+// Check if we're in embedded mode at module load time
+const isEmbedded = isEmbeddedMode();
+
+// Clean all-or-nothing approach for static imports
+const getStaticImports = () => {
+  if (isEmbedded) return {}; // Only v2 uses static imports
+
+  try {
+    return {
+      Dashboard: require('./containers/Dashboard').default,
+      SmsCreate: require('./containers/Sms/Create').default,
+      SmsEdit: require('./containers/Sms/Edit').default,
+      Templates: require('./containers/Templates').default,
+      WeChatMapTemplate: require('./containers/WeChat/MapTemplates').default,
+      Gallary: require('./containers/Assets/Gallery').default,
+      WeChatRichmediaCreate: require('./containers/WeChat/RichmediaTemplates/Create').default,
+      WeChatRichmediaEdit: require('./containers/WeChat/RichmediaTemplates/Edit').default,
+      Email: require('./containers/Email').default,
+      Ebill: require('./containers/Ebill').default,
+      MobilePushCreate: require('./containers/MobilePush/Create').default,
+      MobilePushEdit: require('./containers/MobilePush/Edit').default,
+      LineCreate: require('./containers/Line/Create').default,
+    };
+  } catch (error) {
+    console.log('Error importing v1 components:', error.message);
+    return {}; // Fallback to v2 only
+  }
+};
+
+// Declarative route configuration
+const ROUTES = [
+  // ✅ V2 Routes (always included)
+  { path: '/v2/somethingwentwrong', name: 'somethingwentwrong', component: SomethingWentWrong },
+  { path: '/v2', name: 'templatesV2', component: TemplatesV2 },
+  { path: '/v2/loyalty', name: 'loyalty', component: TemplatesV2 },
+
+  // ✅ V1 Routes (conditional based on `!isEmbedded`)
+  { path: '/', componentKey: 'Dashboard' },
+  
+  // SMS routes v1
+  { path: '/sms/create', name: 'create', componentKey: 'SmsCreate' },
+  { path: '/sms/view', name: 'view', componentKey: 'SmsCreate' },
+  { path: '/sms/edit/:id', name: 'edit', componentKey: 'SmsEdit' },
+  { path: '/sms', name: 'sms', componentKey: 'Templates' },
+  
+  // WeChat routes v1
+  { path: '/wechat', name: 'wechat', componentKey: 'Templates' },
+  { path: '/wechat/create', name: 'create weChat', componentKey: 'WeChatMapTemplate' },
+  { path: '/wechat/edit/:id', name: 'edit weChat', componentKey: 'WeChatMapTemplate' },
+  { path: '/wechat/richmedia/create', name: 'wechat_richmedia_create', componentKey: 'WeChatRichmediaCreate' },
+  { path: '/wechat/richmedia/edit/:id', name: 'wechat_richmedia_edit', componentKey: 'WeChatRichmediaEdit' },
+  
+  // Email routes v1
+  { path: '/email', name: 'email', componentKey: 'Templates' },
+  { path: '/email/create', name: 'EmailCreate', componentKey: 'Email' },
+  { path: '/email/view', name: 'EmailView', componentKey: 'Email' },
+  { path: '/email/edit/:id', name: 'EmailEdit', componentKey: 'Email' },
+  
+  // Ebill routes v1
+  { path: '/ebill', name: 'Ebill', componentKey: 'Templates' },
+  { path: '/ebill/create', name: 'Ebill', componentKey: 'Ebill' },
+  { path: '/ebill/edit/:id', name: 'Ebill', componentKey: 'Ebill' },
+  
+  // MobilePush routes v1
+  { path: '/mobilepush', name: 'mobilepush', componentKey: 'Templates' },
+  { path: '/mobilepush/create/:mode', name: 'create', componentKey: 'MobilePushCreate' },
+  { path: '/mobilepush/edit/:id', name: 'edit', componentKey: 'MobilePushEdit' },
+  
+  // Assets routes v1
+  { path: '/assets', name: 'GALLERY', componentKey: 'Gallary' },
+  
+  // Line routes v1
+  { path: '/line', name: 'line', componentKey: 'Templates' },
+  { path: '/line/create/:mode', name: 'create line', componentKey: 'LineCreate' },
+  { path: '/line/view/:mode', name: 'view', componentKey: 'LineCreate' },
+  { path: '/line/edit/text/:id', name: 'edit_text', componentKey: 'LineCreate' },
+  { path: '/line/edit/image/:id', name: 'edit_image', componentKey: 'LineCreate' },
+];
+
+// Simplified route creation
+const createRoutes = (components = {}) => {
+  const routes = ROUTES.flatMap(({ path, component, componentKey, name }) => {
+    // V2 component is statically imported
+    if (component) {
+      return [{
+        exact: true,
+        path,
+        name,
+        component: withReactRouterV3Compatibility(component),
+      }];
+    }
+
+    // V1 component: only include if available
+    const resolved = components[componentKey];
+    if (resolved) {
+      return [{
+        exact: true,
+        path,
+        name,
+        component: withReactRouterV3Compatibility(resolved),
+      }];
+    }
+
+    return []; // Skip if not in embedded or missing
+  });
+
+  // Catch-all fallback
+  routes.push({
     path: '*',
     name: 'notfound',
     component: withReactRouterV3Compatibility(NotFoundPage),
-  },
-];
+  });
+
+  return routes;
+};
 
-// export function createRoutes(store) {
-//   updateCharCount("", false); // TODO:: React18, need to see why this call was made from here and can we remove this?
-// }
+// Initialize routes synchronously with available components
+const staticImports = getStaticImports();
+const routes = createRoutes(staticImports);
 
+// Export the routes array
 export default routes;

package/utils/authWrapper.js

@@ -8,7 +8,7 @@ import { routerActions } from 'connected-react-router';
 // import { routerActions } from 'react-router-redux';
 // import { UserAuthWrapper } from 'redux-auth-wrapper';
 import { createSelector } from 'reselect';
-import { makeSelectAuthenticated } from '../containers/Cap/selectors';
+import { makeSelectAuthenticated } from '../v2Containers/Cap/selectors';
 // import config from '../config/app';
 const orginUrl = window.location.origin;
 // const loginUrl = '/auth/login';