@usebruno/converters refactor

package.json

@@ -6,6 +6,7 @@
     "packages/bruno-electron",
     "packages/bruno-cli",
     "packages/bruno-common",
+    "packages/bruno-converters",
     "packages/bruno-schema",
     "packages/bruno-query",
     "packages/bruno-js",
@@ -38,6 +39,7 @@
     "dev:electron": "npm run dev --workspace=packages/bruno-electron",
     "dev:electron:debug": "npm run debug --workspace=packages/bruno-electron",
     "build:bruno-common": "npm run build --workspace=packages/bruno-common",
+    "build:bruno-converters": "npm run build --workspace=packages/bruno-converters",
     "build:bruno-query": "npm run build --workspace=packages/bruno-query",
     "build:graphql-docs": "npm run build --workspace=packages/bruno-graphql-docs",
     "build:electron": "node ./scripts/build-electron.js",

packages/bruno-app/src/components/Sidebar/Collections/Collection/ExportCollection/index.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import exportBrunoCollection from 'utils/collections/export';
 import exportPostmanCollection from 'utils/exporters/postman-collection';
-import { toastError } from 'utils/common/error';
 import cloneDeep from 'lodash/cloneDeep';
 import Modal from 'components/Modal';
 import { transformCollectionToSaveToExportAsFile } from 'utils/collections/index';

packages/bruno-app/src/components/Sidebar/ImportCollection/index.js

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import importBrunoCollection from 'utils/importers/bruno-collection';
 import importPostmanCollection from 'utils/importers/postman-collection';
 import importInsomniaCollection from 'utils/importers/insomnia-collection';
@@ -7,14 +7,6 @@ import { toastError } from 'utils/common/error';
 import Modal from 'components/Modal';
 
 const ImportCollection = ({ onClose, handleSubmit }) => {
-  const [options, setOptions] = useState({
-    enablePostmanTranslations: {
-      enabled: true,
-      label: 'Auto translate postman scripts',
-      subLabel:
-        "When enabled, Bruno will try as best to translate the scripts from the imported collection to Bruno's format."
-    }
-  });
   const handleImportBrunoCollection = () => {
     importBrunoCollection()
       .then(({ collection }) => {
@@ -24,9 +16,9 @@ const ImportCollection = ({ onClose, handleSubmit }) => {
   };
 
   const handleImportPostmanCollection = () => {
-    importPostmanCollection(options)
-      .then(({ collection, translationLog }) => {
-        handleSubmit({ collection, translationLog });
+    importPostmanCollection()
+      .then(({ collection }) => {
+        handleSubmit({ collection });
       })
       .catch((err) => toastError(err, 'Postman Import collection failed'));
   };
@@ -46,15 +38,6 @@ const ImportCollection = ({ onClose, handleSubmit }) => {
       })
       .catch((err) => toastError(err, 'OpenAPI v3 Import collection failed'));
   };
-  const toggleOptions = (event, optionKey) => {
-    setOptions({
-      ...options,
-      [optionKey]: {
-        ...options[optionKey],
-        enabled: !options[optionKey].enabled
-      }
-    });
-  };
   const CollectionButton = ({ children, className, onClick }) => {
     return (
       <button
@@ -77,31 +60,6 @@ const ImportCollection = ({ onClose, handleSubmit }) => {
           <CollectionButton onClick={handleImportInsomniaCollection}>Insomnia Collection</CollectionButton>
           <CollectionButton onClick={handleImportOpenapiCollection}>OpenAPI V3 Spec</CollectionButton>
         </div>
-        <div className="flex justify-start w-full mt-4 max-w-[450px]">
-          {Object.entries(options || {}).map(([key, option]) => (
-            <div key={key} className="relative flex items-start">
-              <div className="flex h-6 items-center">
-                <input
-                  id="comments"
-                  aria-describedby="comments-description"
-                  name="comments"
-                  type="checkbox"
-                  checked={option.enabled}
-                  onChange={(e) => toggleOptions(e, key)}
-                  className="h-3.5 w-3.5 rounded border-zinc-300 dark:ring-offset-zinc-800 bg-transparent text-indigo-600 dark:text-indigo-500 focus:ring-indigo-600 dark:focus:ring-indigo-500"
-                />
-              </div>
-              <div className="ml-2 text-sm leading-6">
-                <label htmlFor="comments" className="font-medium text-gray-900 dark:text-zinc-50">
-                  {option.label}
-                </label>
-                <p id="comments-description" className="text-zinc-500 text-xs dark:text-zinc-400">
-                  {option.subLabel}
-                </p>
-              </div>
-            </div>
-          ))}
-        </div>
       </div>
     </Modal>
   );

packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/index.js

@@ -4,105 +4,8 @@ import { useFormik } from 'formik';
 import * as Yup from 'yup';
 import { browseDirectory } from 'providers/ReduxStore/slices/collections/actions';
 import Modal from 'components/Modal';
-import { IconAlertTriangle, IconArrowRight, IconCaretDown, IconCaretRight, IconCopy } from '@tabler/icons';
-import toast from 'react-hot-toast';
 
-const TranslationLog = ({ translationLog }) => {
-  const [showDetails, setShowDetails] = useState(false);
-  const preventSetShowDetails = (e) => {
-    e.stopPropagation();
-    e.preventDefault();
-    setShowDetails(!showDetails);
-  };
-  const copyClipboard = (e, value) => {
-    e.stopPropagation();
-    e.preventDefault();
-    navigator.clipboard.writeText(value);
-    toast.success('Copied to clipboard');
-  };
-  return (
-    <div className="flex flex-col mt-2">
-      <div className="border-l-2 border-amber-500 dark:border-amber-300 bg-amber-50 dark:bg-amber-50/10 p-1.5 rounded-r">
-        <div className="flex items-center">
-          <div className="flex-shrink-0">
-            <IconAlertTriangle className="h-4 w-4 text-amber-500 dark:text-amber-300" aria-hidden="true" />
-          </div>
-          <div className="ml-2">
-            <p className="text-xs text-amber-700 dark:text-amber-300">
-              <span className="font-semibold">Warning:</span> Some commands were not translated.{' '}
-            </p>
-          </div>
-        </div>
-      </div>
-      <button
-        onClick={(e) => preventSetShowDetails(e)}
-        className="flex w-fit items-center rounded px-2.5 py-1 mt-2 text-xs font-semibold ring-1 ring-inset bg-slate-50 dark:bg-slate-400/10 text-slate-700 dark:text-slate-300 ring-slate-600/10 dark:ring-slate-400/20"
-      >
-        See details
-        {showDetails ? <IconCaretDown size={16} className="ml-1" /> : <IconCaretRight size={16} className="ml-1" />}
-      </button>
-      {showDetails && (
-        <div className="flex relative flex-col text-xs max-w-[364px] max-h-[300px] overflow-scroll mt-2 p-2 bg-slate-50 dark:bg-slate-400/10 ring-1 ring-inset rounded text-slate-700 dark:text-slate-300 ring-slate-600/20 dark:ring-slate-400/20">
-          <span className="font-semibold flex items-center">
-            Impacted Collections: {Object.keys(translationLog || {}).length}
-          </span>
-          <span className="font-semibold flex items-center">
-            Impacted Lines:{' '}
-            {Object.values(translationLog || {}).reduce(
-              (acc, curr) => acc + (curr.script?.length || 0) + (curr.test?.length || 0),
-              0
-            )}
-          </span>
-          <span className="my-1">
-            The numbers after 'script' and 'test' indicate the line numbers of incomplete translations.
-          </span>
-          <ul>
-            {Object.entries(translationLog || {}).map(([name, value]) => (
-              <li key={name} className="list-none text-xs font-semibold">
-                <div className="font-semibold flex items-center text-xs whitespace-nowrap">
-                  <IconCaretRight className="min-w-4 max-w-4 -ml-1" />
-                  {name}
-                </div>
-                <div className="flex flex-col">
-                  {value.script && (
-                    <div className="flex items-center text-xs font-light mb-1 flex-wrap">
-                      <span className="mr-2">script :</span>
-                      {value.script.map((scriptValue, index) => (
-                        <span className="flex items-center" key={`script_${name}_${index}`}>
-                          <span className="text-xs font-light">{scriptValue}</span>
-                          {index < value.script.length - 1 && <> - </>}
-                        </span>
-                      ))}
-                    </div>
-                  )}
-                  {value.test && (
-                    <div className="flex items-center text-xs font-light mb-1 flex-wrap">
-                      <span className="mr-2">test :</span>
-                      {value.test.map((testValue, index) => (
-                        <div className="flex items-center" key={`test_${name}_${index}`}>
-                          <span className="text-xs font-light">{testValue}</span>
-                          {index < value.test.length - 1 && <> - </>}
-                        </div>
-                      ))}
-                    </div>
-                  )}
-                </div>
-              </li>
-            ))}
-          </ul>
-          <button
-            className="absolute top-1 right-1 flex w-fit items-center rounded p-2 text-xs font-semibold ring-1 ring-inset bg-slate-50 dark:bg-slate-400/10 text-slate-700 dark:text-slate-300 ring-slate-600/10 dark:ring-slate-400/20"
-            onClick={(e) => copyClipboard(e, JSON.stringify(translationLog))}
-          >
-            <IconCopy size={16} />
-          </button>
-        </div>
-      )}
-    </div>
-  );
-};
-
-const ImportCollectionLocation = ({ onClose, handleSubmit, collectionName, translationLog }) => {
+const ImportCollectionLocation = ({ onClose, handleSubmit, collectionName }) => {
   const inputRef = useRef();
   const dispatch = useDispatch();
 
@@ -150,9 +53,6 @@ const ImportCollectionLocation = ({ onClose, handleSubmit, collectionName, trans
             Name
           </label>
           <div className="mt-2">{collectionName}</div>
-          {translationLog && Object.keys(translationLog).length > 0 && (
-            <TranslationLog translationLog={translationLog} />
-          )}
           <>
             <label htmlFor="collectionLocation" className="block font-semibold mt-3">
               Location