Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos #3380

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/BugReport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ body:
- type: textarea
attributes:
label: .bru file to reproduce the bug
description: Attach your .bru file here that can reqroduce the problem.
description: Attach your .bru file here that can reproduce the problem.
validations:
required: false
- type: textarea
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default class QueryEditor extends React.Component {
this.props.onPrettifyQuery();
}
},
/* Shift-Ctrl-P is hard coded in Firefox for private browsing so adding an alternative to Pretiffy */
/* Shift-Ctrl-P is hard coded in Firefox for private browsing so adding an alternative to Prettify */
'Shift-Ctrl-F': () => {
if (this.props.onPrettifyQuery) {
this.props.onPrettifyQuery();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const CloneCollection = ({ onClose, collection }) => {
const browse = () => {
dispatch(browseDirectory())
.then((dirPath) => {
// When the user closes the diolog without selecting anything dirPath will be false
// When the user closes the dialog without selecting anything dirPath will be false
if (typeof dirPath === 'string') {
formik.setFieldValue('collectionLocation', dirPath);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const CollectionItem = ({ item, collection, searchText }) => {
const [newRequestModalOpen, setNewRequestModalOpen] = useState(false);
const [newFolderModalOpen, setNewFolderModalOpen] = useState(false);
const [runCollectionModalOpen, setRunCollectionModalOpen] = useState(false);
const [itemIsCollapsed, setItemisCollapsed] = useState(item.collapsed);
const [itemIsCollapsed, setItemIsCollapsed] = useState(item.collapsed);

const [{ isDragging }, drag] = useDrag({
type: `COLLECTION_ITEM_${collection.uid}`,
Expand All @@ -66,9 +66,9 @@ const CollectionItem = ({ item, collection, searchText }) => {

useEffect(() => {
if (searchText && searchText.length) {
setItemisCollapsed(false);
setItemIsCollapsed(false);
} else {
setItemisCollapsed(item.collapsed);
setItemIsCollapsed(item.collapsed);
}
}, [searchText, item]);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const CreateCollection = ({ onClose }) => {
const browse = () => {
dispatch(browseDirectory())
.then((dirPath) => {
// When the user closes the diolog without selecting anything dirPath will be false
// When the user closes the dialog without selecting anything dirPath will be false
if (typeof dirPath === 'string') {
formik.setFieldValue('collectionLocation', dirPath);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const GoldenEdition = ({ onClose }) => {
});
};

const goldenEditonIndividuals = [
const goldenEditionIndividuals = [
'Inbuilt Bru File Explorer',
'Visual Git (Like Gitlens for Vscode)',
'GRPC, Websocket, SocketIO, MQTT',
Expand All @@ -97,7 +97,7 @@ const GoldenEdition = ({ onClose }) => {
'Custom Themes'
];

const goldenEditonOrganizations = [
const goldenEditionOrganizations = [
'Centralized License Management',
'Integration with Secret Managers',
'Private Collection Registry',
Expand Down Expand Up @@ -179,7 +179,7 @@ const GoldenEdition = ({ onClose }) => {
</li>
{pricingOption === 'individuals' ? (
<>
{goldenEditonIndividuals.map((item, index) => (
{goldenEditionIndividuals.map((item, index) => (
<li className="flex items-center space-x-3" key={index}>
<CheckIcon />
<span>{item}</span>
Expand All @@ -192,7 +192,7 @@ const GoldenEdition = ({ onClose }) => {
<IconPlus size={16} strokeWidth={1.5} style={{ marginLeft: '2px' }} />
<span>Everything in the Individual Plan</span>
</li>
{goldenEditonOrganizations.map((item, index) => (
{goldenEditionOrganizations.map((item, index) => (
<li className="flex items-center space-x-3" key={index}>
<CheckIcon />
<span>{item}</span>
Expand Down
2 changes: 1 addition & 1 deletion packages/bruno-app/src/hooks/useOnClickOutside/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const useOnClickOutside = (ref, handler) => {
useEffect(
() => {
const listener = (event) => {
// Do nothing if clicking ref's element or descendent elements
// Do nothing if clicking ref's element or descendant elements
if (!ref.current || ref.current.contains(event.target)) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ export const copyEnvironment = (name, baseEnvUid, collectionUid) => (dispatch, g

const baseEnv = findEnvironmentInCollection(collection, baseEnvUid);
if (!collection) {
return reject(new Error('Environmnent not found'));
return reject(new Error('Environment not found'));
}

ipcRenderer
Expand Down Expand Up @@ -1096,15 +1096,15 @@ export const createCollection = (collectionName, collectionFolderName, collectio
.catch(reject);
});
};
export const cloneCollection = (collectionName, collectionFolderName, collectionLocation, perviousPath) => () => {
export const cloneCollection = (collectionName, collectionFolderName, collectionLocation, previousPath) => () => {
const { ipcRenderer } = window;

return ipcRenderer.invoke(
'renderer:clone-collection',
collectionName,
collectionFolderName,
collectionLocation,
perviousPath
previousPath
);
};
export const openCollection = () => () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const readFile = (files) => {
};

const ensureUrl = (url) => {
// emoving multiple slashes after the protocol if it exists, or after the beginning of the string otherwise
// removing multiple slashes after the protocol if it exists, or after the beginning of the string otherwise
return url.replace(/([^:])\/{2,}/g, '$1/');
};

Expand Down
4 changes: 2 additions & 2 deletions packages/bruno-cli/src/commands/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ const builder = async (yargs) => {
type: 'string'
})
.option('sandbox', {
describe: 'Javscript sandbox to use; available sandboxes are "developer" (default) or "safe"',
describe: 'Javascript sandbox to use; available sandboxes are "developer" (default) or "safe"',
default: 'developer',
type: 'string'
})
Expand Down Expand Up @@ -705,7 +705,7 @@ const handler = async function (argv) {
nJumps++;
if (nJumps > 10000) {
console.error(chalk.red(`Too many jumps, possible infinite loop`));
process.exit(constants.EXIT_STATUS.ERROR_INFINTE_LOOP);
process.exit(constants.EXIT_STATUS.ERROR_INFINITE_LOOP);
}
if (nextRequestName === null) {
break;
Expand Down
2 changes: 1 addition & 1 deletion packages/bruno-cli/src/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const EXIT_STATUS = {
// The specified output dir does not exist
ERROR_MISSING_OUTPUT_DIR: 2,
// request chain caused an endless loop
ERROR_INFINTE_LOOP: 3,
ERROR_INFINITE_LOOP: 3,
// bru was called outside of a collection root
ERROR_NOT_IN_COLLECTION: 4,
// The specified file was not found
Expand Down
38 changes: 19 additions & 19 deletions packages/bruno-common/src/interpolate/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -297,46 +297,46 @@ describe('interpolate - recursive', () => {
expect(result).toBe('{{recursion3}}');
});

it('should replace repetead placeholders with 1 level of recursion with values from the object', () => {
const inputString = '{{repetead}}';
it('should replace repeated placeholders with 1 level of recursion with values from the object', () => {
const inputString = '{{repeated}}';
const inputObject = {
repetead: '{{repetead2}} {{repetead2}}',
repetead2: 'repetead2'
repeated: '{{repeated2}} {{repeated2}}',
repeated2: 'repeated2'
};

const result = interpolate(inputString, inputObject);

expect(result).toBe(new Array(2).fill('repetead2').join(' '));
expect(result).toBe(new Array(2).fill('repeated2').join(' '));
});

it('should replace repetead placeholders with 2 level of recursion with values from the object', () => {
const inputString = '{{repetead}}';
it('should replace repeated placeholders with 2 level of recursion with values from the object', () => {
const inputString = '{{repeated}}';
const inputObject = {
repetead: '{{repetead2}} {{repetead2}}',
repetead2: '{{repetead3}} {{repetead3}} {{repetead3}}',
repetead3: 'repetead3'
repeated: '{{repeated2}} {{repeated2}}',
repeated2: '{{repeated3}} {{repeated3}} {{repeated3}}',
repeated3: 'repeated3'
};

const result = interpolate(inputString, inputObject);

expect(result).toBe(new Array(6).fill('repetead3').join(' '));
expect(result).toBe(new Array(6).fill('repeated3').join(' '));
});

it('should replace repetead placeholders with 3 level of recursion with values from the object', () => {
const inputString = '{{repetead}}';
it('should replace repeated placeholders with 3 level of recursion with values from the object', () => {
const inputString = '{{repeated}}';
const inputObject = {
repetead: '{{repetead2}} {{repetead2}}',
repetead2: '{{repetead3}} {{repetead3}} {{repetead3}}',
repetead3: '{{repetead4}} {{repetead4}} {{repetead4}} {{repetead4}}',
repetead4: 'repetead4'
repeated: '{{repeated2}} {{repeated2}}',
repeated2: '{{repeated3}} {{repeated3}} {{repeated3}}',
repeated3: '{{repeated4}} {{repeated4}} {{repeated4}} {{repeated4}}',
repeated4: 'repeated4'
};

const result = interpolate(inputString, inputObject);

expect(result).toBe(new Array(24).fill('repetead4').join(' '));
expect(result).toBe(new Array(24).fill('repeated4').join(' '));
});

it('should replace mutiple interdependent variables in the same input string', () => {
it('should replace multiple interdependent variables in the same input string', () => {
const inputString = `{
"x": "{{v2}} {{v1}}"
}`;
Expand Down
2 changes: 1 addition & 1 deletion packages/bruno-electron/src/cache/requestUids.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* In the past, we used to generate unique ids based on the
* pathname of the request, but we faced problems when implementing
* functionality where the user can move the request to a different
* location. In that case, the uid would change, and the we would
* location. In that case, the uid would change, and we would
* lose the request's draft state if the user has made some changes
*/

Expand Down
6 changes: 3 additions & 3 deletions packages/bruno-electron/src/ipc/collection.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
// write the bruno.json to new dir
await writeFile(path.join(dirPath, 'bruno.json'), cont);

// Now copy all the files with extension name .bru along with there dir
// Now copy all the files with extension name .bru along with the dir
const files = searchForBruFiles(previousPath);

for (const sourceFilePath of files) {
Expand Down Expand Up @@ -381,12 +381,12 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection

/**
* If it is windows OS
* And it is not WSL path (meaning its not linux running on windows using WSL)
* And it is not WSL path (meaning it's not linux running on windows using WSL)
* And it has sub directories
* Only then we need to use the temp dir approach to rename the folder
*
* Windows OS would sometimes throw error when renaming a folder with sub directories
* This is a alternative approach to avoid that error
* This is an alternative approach to avoid that error
*/
if (isWindowsOSAndNotWSLAndItemHasSubDirectories) {
await fsExtra.copy(oldPath, tempDir);
Expand Down
2 changes: 1 addition & 1 deletion packages/bruno-electron/src/store/bruno-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

const config = {};

// collectionUid is a hash based on the collection path)
// collectionUid is a hash based on the collection path
const getBrunoConfig = (collectionUid) => {
return config[collectionUid] || {};
};
Expand Down
2 changes: 1 addition & 1 deletion packages/bruno-electron/src/store/oauth2.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class Oauth2Store {
this.store.set('oauth2', updatedOauth2Data);
}

// Create a new oauth2 Session Id for a collection
// Create a new oauth2 Session ID for a collection
createNewOauth2SessionIdForCollection(collectionUid) {
let oauth2DataForCollection = this.getOauth2DataOfCollection(collectionUid);

Expand Down
2 changes: 1 addition & 1 deletion packages/bruno-electron/src/store/process-env.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

const dotEnvVars = {};

// collectionUid is a hash based on the collection path)
// collectionUid is a hash based on the collection path
const getProcessEnvVars = (collectionUid) => {
// if there are no .env vars for this collection, return the process.env
if (!dotEnvVars[collectionUid]) {
Expand Down
2 changes: 1 addition & 1 deletion packages/bruno-electron/src/utils/form-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const path = require('path');

/**
* @param {Array.<object>} params The request body Array
* @returns {object} Returns an obj with repeating key as a array of values
* @returns {object} Returns an obj with repeating key as an array of values
* {item: 2, item: 3, item1: 4} becomes {item: [2,3], item1: 4}
*/
const buildFormUrlEncodedPayload = (params) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/bruno-lang/v2/src/jsonToBru.js
Original file line number Diff line number Diff line change
Expand Up @@ -439,4 +439,4 @@ ${indentString(docs)}

module.exports = jsonToBru;

// alternative to writing the below code to avoif undefined
// alternative to writing the below code to avoid undefined