Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@nawazdhandala
nawazdhandala committed Apr 15, 2022
1 parent 78bd51a commit a1c631d
Show file tree
Hide file tree
Showing 81 changed files with 1,986 additions and 2,258 deletions.
4 changes: 4 additions & 0 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@
"no-else-return": "error",
"no-div-regex": "error",
"no-extra-bind": "error",
"no-extra-boolean-cast": "error",
"no-implicit-coercion": "error",
"no-extra-label": "error",
"multiline-comment-style": "error",
"no-floating-decimal": "error",
"eqeqeq": "error",
"dot-notation": "error",
"progress/activate": 1,
Expand Down
3 changes: 1 addition & 2 deletions AdminDashboard/src/Actions/probe.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,8 @@ export const updateProbe: $TSFixMe = (values: $TSFixMe) => {
if (Object.keys(resp).length > 0) {
dispatch(updateProbeSuccess(resp));
return 'ok';
} else {
dispatch(addProbeError('Network Error'));
}
dispatch(addProbeError('Network Error'));
} catch (error) {
let errorMsg: $TSFixMe;
if (error && error.response && error.response.data) {
Expand Down
3 changes: 1 addition & 2 deletions AdminDashboard/src/Reducers/notifications.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,8 @@ export default (state: $TSFixMe = initialState, action: Action): void => {
action.payload.userId,
]),
};
} else {
return notification;
}
return notification;
}
),
},
Expand Down
13 changes: 6 additions & 7 deletions Backend/api/ApplicationLog.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,11 @@ router.delete(
);
if (applicationLog) {
return sendItemResponse(req, res, applicationLog);
} else {
return sendErrorResponse(req, res, {
code: 404,
message: 'Application Log not found',
});
}
return sendErrorResponse(req, res, {
code: 404,
message: 'Application Log not found',
});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down Expand Up @@ -407,15 +406,15 @@ router.put(
componentId: componentId,
};

if (data.resourceCategory != '') {
if (data.resourceCategory!=='') {
existingQuery.resourceCategory = data.resourceCategory;
}
const existingApplicationCount: $TSFixMe =
await ApplicationLogService.countBy(existingQuery);

if (
existingApplicationCount > 0 &&
data.resourceCategory != '' &&
data.resourceCategory!=='' &&
data.showQuickStart === undefined
) {
return sendErrorResponse(
Expand Down
3 changes: 1 addition & 2 deletions Backend/api/CallRouting.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,8 @@ router.get(
statusCode: 400,
message: 'Requested resource not available.',
});
} else {
return sendErrorResponse(req, res, error as Exception);
}
return sendErrorResponse(req, res, error as Exception);
}
}
);
Expand Down
25 changes: 11 additions & 14 deletions Backend/api/Component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,11 @@ router.put(
);
if (component) {
return sendItemResponse(req, res, component);
} else {
return sendErrorResponse(req, res, {
code: 400,
message: 'Component not found.',
});
}
return sendErrorResponse(req, res, {
code: 400,
message: 'Component not found.',
});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down Expand Up @@ -396,12 +395,11 @@ router.post(

// Return response
return sendListResponse(req, res, monitors);
} else {
return sendErrorResponse(req, res, {
code: 404,
message: 'Monitors not Found',
});
}
return sendErrorResponse(req, res, {
code: 404,
message: 'Monitors not Found',
});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down Expand Up @@ -818,11 +816,10 @@ router.delete(
);
if (component) {
return sendItemResponse(req, res, component);
} else {
return sendErrorResponse(req, res, {
message: 'Component not found',
});
}
return sendErrorResponse(req, res, {
message: 'Component not found',
});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down
22 changes: 10 additions & 12 deletions Backend/api/ErrorTracker.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,11 @@ router.delete(
);
if (errorTracker) {
return sendItemResponse(req, res, errorTracker);
} else {
return sendErrorResponse(req, res, {
code: 404,
message: 'Error Tracker not found',
});
}
return sendErrorResponse(req, res, {
code: 404,
message: 'Error Tracker not found',
});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down Expand Up @@ -272,7 +271,7 @@ router.put(
componentId: componentId,
};
if (data.resourceCategory != '') {
existingQuery.resourceCategory = data.resourceCategory;
existingQuery.resourc!==egory = data.resourceCategory;
}
const existingErrorTracking: $TSFixMe =
await ErrorTrackerService.findBy({
Expand All @@ -292,7 +291,7 @@ router.put(
existingErrorTracking &&
existingErrorTracking.length > 0 &&
data.resourceCategory != '' &&
data.showQuickStart === undefined
data.showQuickStart =!==ndefined
) {
return sendErrorResponse(
req,
Expand Down Expand Up @@ -1246,12 +1245,11 @@ router.delete(
);
if (issue) {
return sendItemResponse(req, res, issue);
} else {
return sendErrorResponse(req, res, {
code: 404,
message: 'Issue not found',
});
}
return sendErrorResponse(req, res, {
code: 404,
message: 'Issue not found',
});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down
9 changes: 4 additions & 5 deletions Backend/api/GitCredential.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,11 @@ router.post(
projectId,
});
return sendItemResponse(req, res, response);
} else {
return sendErrorResponse(req, res, {
code: 400,
message: 'Git Credential or Ssh is required',
});
}
return sendErrorResponse(req, res, {
code: 400,
message: 'Git Credential or Ssh is required',
});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down
15 changes: 6 additions & 9 deletions Backend/api/GlobalConfig.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,8 @@ router.post(

if (globalConfigs.length > 1) {
return sendListResponse(req, res, globalConfigs);
} else {
return sendItemResponse(req, res, globalConfigs[0]);
}
return sendItemResponse(req, res, globalConfigs[0]);
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down Expand Up @@ -133,12 +132,11 @@ router.post(

if (globalConfigs && globalConfigs.length > 0) {
return sendListResponse(req, res, globalConfigs);
} else {
return sendErrorResponse(req, res, {
code: 400,
message: 'Global configs do not exists.',
});
}
return sendErrorResponse(req, res, {
code: 400,
message: 'Global configs do not exists.',
});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down Expand Up @@ -205,9 +203,8 @@ router.get(

if (globalConfig) {
return sendItemResponse(req, res, globalConfig);
} else {
return sendItemResponse(req, res, {});
}
return sendItemResponse(req, res, {});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down
19 changes: 8 additions & 11 deletions Backend/api/Incident.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1387,9 +1387,8 @@ router.get(
parseInt(req.query.limit) || 10
);
return sendListResponse(req, res, statusPages, count);
} else {
return sendListResponse(req, res, [], 0);
}
return sendListResponse(req, res, [], 0);
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down Expand Up @@ -1574,12 +1573,11 @@ router.delete(
}
/* eslint-enable prefer-const */
return sendItemResponse(req, res, result);
} else {
return sendErrorResponse(req, res, {
code: 404,
message: 'Incident Message not found',
});
}
return sendErrorResponse(req, res, {
code: 404,
message: 'Incident Message not found',
});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down Expand Up @@ -1777,11 +1775,10 @@ router.delete(
RealTimeService.deleteIncident(incident);

return sendItemResponse(req, res, incident);
} else {
return sendErrorResponse(req, res, {
message: 'Incident not found',
});
}
return sendErrorResponse(req, res, {
message: 'Incident not found',
});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down
7 changes: 3 additions & 4 deletions Backend/api/IncidentPriorities.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,10 @@ router.delete(
});
if (IncidentPriority) {
return sendItemResponse(req, res, IncidentPriority);
} else {
return sendErrorResponse(req, res, {
message: 'Incident priority not found',
});
}
return sendErrorResponse(req, res, {
message: 'Incident priority not found',
});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down
27 changes: 12 additions & 15 deletions Backend/api/Monitor.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,12 +432,11 @@ router.put(

if (monitor) {
return sendItemResponse(req, res, monitor);
} else {
return sendErrorResponse(req, res, {
code: 400,
message: 'Monitor not found.',
});
}
return sendErrorResponse(req, res, {
code: 400,
message: 'Monitor not found.',
});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down Expand Up @@ -692,11 +691,10 @@ router.delete(
);
if (monitor) {
return sendItemResponse(req, res, monitor);
} else {
return sendErrorResponse(req, res, {
message: 'Monitor not found',
});
}
return sendErrorResponse(req, res, {
message: 'Monitor not found',
});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down Expand Up @@ -955,13 +953,12 @@ const _updateDeviceMonitorPingTime: $TSFixMe = async function (
);
if (monitor) {
return sendItemResponse(req, res, monitor);
} else {
return sendErrorResponse(req, res, {
code: 400,
message:
'Monitor not found or is not associated with this project.',
});
}
return sendErrorResponse(req, res, {
code: 400,
message:
'Monitor not found or is not associated with this project.',
});
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down
27 changes: 12 additions & 15 deletions Backend/api/Notification.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,11 @@ router.put(
);
if (notification) {
return sendItemResponse(req, res, notification);
} else {
const error: $TSFixMe = new Error('Notification not found.');

error.code = 400;
return sendErrorResponse(req, res, error as Exception);
}
const error: $TSFixMe = new Error('Notification not found.');

error.code = 400;
return sendErrorResponse(req, res, error as Exception);
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down Expand Up @@ -149,12 +148,11 @@ router.put(
count: notifications.n,
read: notifications.nModified,
});
} else {
const error: $TSFixMe = new Error('No notification found.');

error.code = 400;
return sendErrorResponse(req, res, error as Exception);
}
const error: $TSFixMe = new Error('No notification found.');

error.code = 400;
return sendErrorResponse(req, res, error as Exception);
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand All @@ -176,12 +174,11 @@ router.put(
);
if (notification) {
return sendItemResponse(req, res, notification);
} else {
const error: $TSFixMe = new Error('Notification not found.');

error.code = 400;
return sendErrorResponse(req, res, error as Exception);
}
const error: $TSFixMe = new Error('Notification not found.');

error.code = 400;
return sendErrorResponse(req, res, error as Exception);
} catch (error) {
return sendErrorResponse(req, res, error as Exception);
}
Expand Down
Loading

0 comments on commit a1c631d

Please sign in to comment.