Skip to content

Commit f7eadc5

Browse files
committed
integrate toast notification at few more places
1 parent 48d565b commit f7eadc5

File tree

3 files changed

+64
-53
lines changed

3 files changed

+64
-53
lines changed

src/components/molecules/flow/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ const Flow = ({ collectionId }) => {
277277
setEdges(result.edges);
278278
})
279279
.catch((error) => {
280-
// TODO: show error in UI
281280
console.log(error);
282281
toast.error(`Error while generating flow data`);
283282
});

src/components/molecules/sidebar/content/Environment.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ const Environment = ({ collectionId, collection }) => {
7979
);
8080
})
8181
.catch((error) => {
82-
// TODO: show error in UI
8382
console.log(
8483
`Error deleting environment: name = ${envToDelete}, collectionId = ${collectionId} and error: ${error}`,
8584
);

src/service/collection.js

Lines changed: 64 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { v4 as uuidv4 } from 'uuid';
33
import { findItemInCollectionByPathname } from 'stores/utils';
44
import { useEventStore } from 'stores/EventListenerStore';
55
import { OBJ_TYPES } from 'constants/Common';
6+
import { toast } from 'react-toastify';
67

78
export const createCollection = (openAPISpecFilePath, collectionFolderPath) => {
89
const { ipcRenderer } = window;
@@ -32,7 +33,7 @@ export const openCollection = (openAPISpecFilePath, collectionFolderPath) => {
3233
}
3334
} catch (error) {
3435
console.log(`Error opening collection: ${error}`);
35-
// TODO: show error in UI
36+
toast.error('Error opening collection');
3637
}
3738
};
3839

@@ -51,7 +52,7 @@ export const deleteCollection = (collectionId) => {
5152
}
5253
} catch (error) {
5354
console.log(`Error deleting collection: ${error}`);
54-
// TODO: show error in UI
55+
toast.error('Error deleting collection');
5556
}
5657
};
5758

@@ -75,7 +76,7 @@ export const createFolder = (folderName, folderPath, collectionId) => {
7576
}
7677
} catch (error) {
7778
console.log(`Error creating new folder: ${error}`);
78-
// TODO: show error in UI
79+
toast.error('Error creating new folder');
7980
}
8081
};
8182

@@ -97,74 +98,86 @@ export const deleteFolder = (folderPath, collectionId) => {
9798
return Promise.reject(new Error('Collection not found'));
9899
}
99100
} catch (error) {
100-
console.log(`Error deleting new folder: ${error}`);
101-
// TODO: show error in UI
101+
console.log(`Error deleting folder: ${error}`);
102+
toast.error('Error deleting folder');
102103
}
103104
};
104105

105106
export const createEnvironmentFile = (name, collectionId) => {
106-
const { ipcRenderer } = window;
107+
try {
108+
const { ipcRenderer } = window;
107109

108-
const collection = useCollectionStore.getState().collections.find((c) => c.id === collectionId);
110+
const collection = useCollectionStore.getState().collections.find((c) => c.id === collectionId);
109111

110-
if (collection) {
111-
const existingEnv = collection.environments.find((e) => e.name === `${name}.env`);
112-
if (existingEnv) {
113-
return Promise.reject(new Error('An environment with the same name already exists'));
114-
} else {
115-
return new Promise((resolve, reject) => {
116-
ipcRenderer.invoke('renderer:create-environment', collection.pathname, name).then(resolve).catch(reject);
117-
useEventStore.getState().addEvent({
118-
id: uuidv4(),
119-
type: 'OPEN_NEW_ENVIRONMENT',
120-
collectionId,
121-
name,
112+
if (collection) {
113+
const existingEnv = collection.environments.find((e) => e.name === `${name}.env`);
114+
if (existingEnv) {
115+
return Promise.reject(new Error('An environment with the same name already exists'));
116+
} else {
117+
return new Promise((resolve, reject) => {
118+
ipcRenderer.invoke('renderer:create-environment', collection.pathname, name).then(resolve).catch(reject);
119+
useEventStore.getState().addEvent({
120+
id: uuidv4(),
121+
type: 'OPEN_NEW_ENVIRONMENT',
122+
collectionId,
123+
name,
124+
});
122125
});
123-
});
126+
}
127+
} else {
128+
return Promise.reject(new Error('Collection not found'));
124129
}
125-
} else {
126-
return Promise.reject(new Error('Collection not found'));
130+
} catch (error) {
131+
toast.error('Error creating new environment');
127132
}
128133
};
129134

130135
export const updateEnvironmentFile = (name, collectionId, variables) => {
131-
const { ipcRenderer } = window;
136+
try {
137+
const { ipcRenderer } = window;
132138

133-
const collection = useCollectionStore.getState().collections.find((c) => c.id === collectionId);
139+
const collection = useCollectionStore.getState().collections.find((c) => c.id === collectionId);
134140

135-
if (collection) {
136-
const existingEnv = collection.enviroments.find((e) => e.name === name);
137-
if (existingEnv) {
138-
return new Promise((resolve, reject) => {
139-
ipcRenderer
140-
.invoke('renderer:update-environment', collection.pathname, name, variables)
141-
.then(resolve)
142-
.catch(reject);
143-
});
141+
if (collection) {
142+
const existingEnv = collection.enviroments.find((e) => e.name === name);
143+
if (existingEnv) {
144+
return new Promise((resolve, reject) => {
145+
ipcRenderer
146+
.invoke('renderer:update-environment', collection.pathname, name, variables)
147+
.then(resolve)
148+
.catch(reject);
149+
});
150+
} else {
151+
return Promise.reject(new Error('An environment with the name does not exists'));
152+
}
144153
} else {
145-
return Promise.reject(new Error('An environment with the name does not exists'));
154+
return Promise.reject(new Error('Collection not found'));
146155
}
147-
} else {
148-
return Promise.reject(new Error('Collection not found'));
156+
} catch (error) {
157+
toast.error('Error updating environment');
149158
}
150159
};
151160

152161
export const deleteEnvironmentFile = (name, collectionId) => {
153-
const { ipcRenderer } = window;
162+
try {
163+
const { ipcRenderer } = window;
154164

155-
const collection = useCollectionStore.getState().collections.find((c) => c.id === collectionId);
165+
const collection = useCollectionStore.getState().collections.find((c) => c.id === collectionId);
156166

157-
if (collection) {
158-
const existingEnv = collection.environments.find((e) => e.name === name);
159-
if (existingEnv) {
160-
return new Promise((resolve, reject) => {
161-
ipcRenderer.invoke('renderer:delete-environment', collection.pathname, name).then(resolve).catch(reject);
162-
});
167+
if (collection) {
168+
const existingEnv = collection.environments.find((e) => e.name === name);
169+
if (existingEnv) {
170+
return new Promise((resolve, reject) => {
171+
ipcRenderer.invoke('renderer:delete-environment', collection.pathname, name).then(resolve).catch(reject);
172+
});
173+
} else {
174+
return Promise.reject(new Error('An environment with the name does not exists'));
175+
}
163176
} else {
164-
return Promise.reject(new Error('An environment with the name does not exists'));
177+
return Promise.reject(new Error('Collection not found'));
165178
}
166-
} else {
167-
return Promise.reject(new Error('Collection not found'));
179+
} catch (error) {
180+
toast.error('Error deleting environment');
168181
}
169182
};
170183

@@ -214,7 +227,7 @@ export const createFlowTest = (name, folderPath, collectionId) => {
214227
}
215228
} catch (error) {
216229
console.log(`Error creating new flowtest: ${error}`);
217-
// TODO: show error in UI
230+
toast.error('Error creating new flowtest');
218231
}
219232
};
220233

@@ -244,7 +257,7 @@ export const readFlowTest = (pathname, collectionId) => {
244257
}
245258
} catch (error) {
246259
console.log(`Error reading flowtest: ${error}`);
247-
// TODO: show error in UI
260+
toast.error('Error reading flowtest');
248261
}
249262
};
250263

@@ -269,7 +282,7 @@ export const updateFlowTest = (pathname, flowData, collectionId) => {
269282
}
270283
} catch (error) {
271284
console.log(`Error updating flowtest: ${error}`);
272-
// TODO: show error in UI
285+
toast.error('Error updating flowtest');
273286
}
274287
};
275288

@@ -292,6 +305,6 @@ export const deleteFlowTest = (pathname, collectionId) => {
292305
}
293306
} catch (error) {
294307
console.log(`Error deleting flowtest: ${error}`);
295-
// TODO: show error in UI
308+
toast.error('Error deleting flowtest');
296309
}
297310
};

0 commit comments

Comments
 (0)