Merge pull request #42 from firecamp-io/ui/storybook

monaco <= storybook

Author: Nishchit14

.vscode/settings.json

@@ -1,6 +1,7 @@
 {
     "cSpell.words": [
-        "Auths"
+        "Auths",
+        "testid"
     ],
     "[javascript]": {
         "editor.formatOnSave": true,

package.json

@@ -60,6 +60,7 @@
     "@babel/preset-react": "^7.16.7",
     "@babel/preset-typescript": "^7.16.7",
     "@babel/register": "^7.0.0",
+    "@types/ramda": "^0.28.15",
     "babel-eslint": "^7.1.0",
     "babel-loader": "^8.2.4",
     "babel-plugin-add-module-exports": "^1.0.4",
@@ -126,6 +127,7 @@
     "prettify-xml": "^1.2.0",
     "pug-cli": "^1.0.0-alpha6",
     "querystring": "^0.2.1",
+    "ramda": "^0.28.0",
     "react-file-drop": "^3.1.5"
   },
   "workspaces": [

packages/firecamp-core/package.json

@@ -87,7 +87,7 @@
     "react-dnd": "^16.0.0",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "17.0.2",
-    "react-error-boundary": "^3.1.3",
+    "react-error-boundary": "^3.1.4",
     "react-file-drop": "^3.1.5",
     "react-ga": "^3.1.2",
     "react-hook-form": "^6.8.1",

packages/firecamp-core/src/components/activity-bar/explorer/Explorer.tsx

@@ -23,19 +23,18 @@ import { VscNewFolder } from '@react-icons/all-files/vsc/VscNewFolder';
 // import { VscFileSymlinkFile } from '@react-icons/all-files/vsc/VscFileSymlinkFile';
 import { VscFolder } from '@react-icons/all-files/vsc/VscFolder';
 
-import { useTabStore } from '../../../store/tab';
 import { useWorkspaceStore } from '../../../store/workspace';
 import { WorkspaceCollectionsProvider } from './WorkspaceCollectionsProvider';
 import treeRenderer from './treeItemRenderer';
 import AppService from '../../../services/app';
 import { RE } from '../../../types'
+import { platformEmitter as emitter } from '../../../services/platform-emitter'
+import { EPlatformTabs } from '../../../services/platform-emitter/events'
 
 const Explorer: FC<any> = () => {
   const environmentRef = useRef();
   const treeRef = useRef();
 
-  const { openSavedTab } = useTabStore((s) => ({ openSavedTab: s.open.saved }), shallow);
-
   let {
     workspace,
     explorer,
@@ -115,31 +114,30 @@ const Explorer: FC<any> = () => {
   };
 
   const _openReqInTab = (request: any) => {
-    // console.log(`node`, request);
-    openSavedTab(request);
+    console.log(`node`, request);
+    emitter.emit(EPlatformTabs.openSaved, request);
   };
 
-  const _onNodeSelect = (nodeIdxs: TreeItemIndex[]) => {
-    // console.log({ nodeIdxs });
+  const _onNodeSelect = (nodeIndexes: TreeItemIndex[]) => {
+    // console.log({ nodeIndexes });
     // return
 
-    let nodeIndex = nodeIdxs[0];
-    let colItem = [...collections, ...folders, ...requests].find(
+    let nodeIndex = nodeIndexes[0];
+    let nodeItem = [...collections, ...folders, ...requests].find(
       (c) => c._meta.id == nodeIndex
     );
-    // console.log({ colItem });
+    // console.log({ nodeItem });
     if (
-      colItem &&
+      nodeItem &&
       [
         ERequestTypes.Rest,
         ERequestTypes.GraphQL,
         ERequestTypes.SocketIO,
         ERequestTypes.WebSocket,
-      ].includes(colItem.meta.type)
+      ].includes(nodeItem.meta.type)
     ) {
-      // console.log({ colItem });
-
-      _openReqInTab(colItem);
+      // console.log({ nodeItem });
+      _openReqInTab(nodeItem);
     }
   };
 

packages/firecamp-core/src/components/common/environment/environment-widget/EnvironmentDD.tsx

@@ -52,20 +52,7 @@ const EnvironmentDD: FC<IEnvironmentDD> = ({
           ? 'Manage Workspace Environment'
           : 'Manage Collection Environment',
       onClick: () => {
-        // if (scope === EEnvironmentScope.Workspace) {
-        //   F.appStore.environment.update.activeProject('global');
-        //   F.ModalService.open(
-        //     EModals.WORKSPACE_SETTING,
-        //     EWorkspaceSettingTabs.ENVIRONMENT
-        //   );
-        // } else {
-        //   F.appStore.environment.update.activeProject(collectionId);
-        //   F.ModalService.open(
-        //     EModals.PROJECT_SETTING,
-        //     ECollectionSettingTabs.ENVIRONMENT,
-        //     { collectionId }
-        //   );
-        // }
+        
       },
     },
   ];

packages/firecamp-core/src/components/common/environment/environment-widget/WorkspaceEnvDD.tsx

@@ -63,20 +63,7 @@ const WorkspaceEnvDD: FC<IWorkspaceEnvDD> = ({
           ? 'Manage Workspace Environment'
           : 'Manage Collection Environment',
       onClick: () => {
-        // if (scope === EEnvironmentScope.Workspace) {
-        //   F.appStore.environment.update.activeProject('global');
-        //   F.ModalService.open(
-        //     EModals.WORKSPACE_SETTING,
-        //     EWorkspaceSettingTabs.ENVIRONMENT
-        //   );
-        // } else {
-        //   F.appStore.environment.update.activeProject(id);
-        //   F.ModalService.open(
-        //     EModals.PROJECT_SETTING,
-        //     ECollectionSettingTabs.ENVIRONMENT,
-        //     { id }
-        //   );
-        // }
+       
       },
     },
   ];

packages/firecamp-core/src/components/common/error-boundary/ErrorPopup.tsx

@@ -1,15 +1,10 @@
 import { FC, useState } from 'react';
+import { FallbackProps } from 'react-error-boundary';
 import { Modal } from '@firecamp/ui-kit';
 
 import './ErrorPopup.sass';
 
-const ErrorPopup: FC<IErrorPopup> = ({
-  message = `An unexpected error occurs. 
-We'll surely fix it out for you soon. We appreciate your patience.`,
-  onClose = () => {},
-}) => {
-  // console.log(`in error popup`, message, isOpen)
-
+const ErrorPopup: FC<FallbackProps> = ({ error }) => {
   const bg = {
     modal: {
       background: '#c84a1782',
@@ -21,7 +16,7 @@ We'll surely fix it out for you soon. We appreciate your patience.`,
 
   let _onClose = async () => {
     // on close, refresh app
-    onClose();
+    // onClose();
     // await initApp();
     toggleOpen(false);
   };
@@ -40,24 +35,10 @@ We'll surely fix it out for you soon. We appreciate your patience.`,
           paddingRight: '60px',
         }}
       >
-        {message || ''}
+        {error.message || ''}
       </div>
     </Modal>
   );
 };
 
 export default ErrorPopup;
-
-/**
- * Handle firecamp errors and show popup menu to instruct users about the same
- */
-interface IErrorPopup {
-  /**
-   * Error message
-   */
-  message?: string;
-  /**
-   * Close error popup
-   */
-  onClose?: () => void;
-}