Merge pull request #1951 from exogee-technology/dependabot/npm_and_yarn/src/apollo/server-5.0.0

Bump @apollo/server from 4.12.2 to 5.0.0 in /src

Author: thekevinbrown

src/examples/aws-cognito/package.json

@@ -19,7 +19,7 @@
 		"version": "npm version --no-git-tag-version"
 	},
 	"dependencies": {
-		"@apollo/server": "4.12.2",
+		"@apollo/server": "5.0.0",
 		"@as-integrations/aws-lambda": "3.1.0",
 		"@exogee/graphweaver": "workspace:*",
 		"@exogee/graphweaver-admin-ui-components": "workspace:*",

src/examples/databases/package.json

@@ -18,7 +18,7 @@
 		"version": "npm version --no-git-tag-version"
 	},
 	"dependencies": {
-		"@apollo/server": "4.12.2",
+		"@apollo/server": "5.0.0",
 		"@as-integrations/aws-lambda": "3.1.0",
 		"@exogee/graphweaver": "workspace:*",
 		"@exogee/graphweaver-admin-ui-components": "workspace:*",

src/examples/federation/package.json

@@ -20,7 +20,7 @@
 		"version": "npm version --no-git-tag-version"
 	},
 	"dependencies": {
-		"@apollo/server": "4.12.2",
+		"@apollo/server": "5.0.0",
 		"@exogee/graphweaver": "workspace:*",
 		"@exogee/graphweaver-admin-ui-components": "workspace:*",
 		"@exogee/graphweaver-server": "workspace:*",

src/examples/s3-storage/package.json

@@ -21,7 +21,7 @@
 	},
 	"dependencies": {
 		"@apollo/client": "3.13.5",
-		"@apollo/server": "4.12.2",
+		"@apollo/server": "5.0.0",
 		"@as-integrations/aws-lambda": "3.1.0",
 		"@exogee/graphweaver": "workspace:*",
 		"@exogee/graphweaver-admin-ui-components": "workspace:*",

src/examples/xero/package.json

@@ -23,7 +23,7 @@
 	],
 	"dependencies": {
 		"@apollo/client": "3.13.5",
-		"@apollo/server": "4.12.2",
+		"@apollo/server": "5.0.0",
 		"@as-integrations/aws-lambda": "3.1.0",
 		"@exogee/graphweaver": "workspace:*",
 		"@exogee/graphweaver-admin-ui": "workspace:*",

src/packages/admin-ui-components/src/detail-panel/component.tsx

@@ -21,6 +21,7 @@ import {
 	EntityField,
 	queryForEntityEdit,
 	routeFor,
+	unwrapGraphQLErrors,
 	useSchema,
 	useSelectedEntity,
 } from '../utils';
@@ -548,7 +549,7 @@ export const DetailPanel = () => {
 					panelMode === PanelMode.EDIT ? await updateEntity(options) : await createEntity(options);
 			} catch (error: any) {
 				console.error(error);
-				return toast.error(`Error from server: ${error.message}`, { duration: 5000 });
+				return toast.error(unwrapGraphQLErrors(error), { duration: 5000 });
 			}
 
 			if (!result?.data) {

src/packages/admin-ui-components/src/utils/utils.ts

@@ -28,3 +28,18 @@ export const getOrderByQuery = ({
 				? { [primaryKeyField]: 'ASC' }
 				: {}),
 });
+
+export const unwrapGraphQLErrors = (error: any) => {
+	const visitedErrors = new Set();
+	let currentError = error;
+	while (currentError.cause && !visitedErrors.has(currentError.cause)) {
+		visitedErrors.add(currentError.cause);
+		currentError = currentError.cause;
+	}
+
+	if (currentError.result?.errors?.length) {
+		return currentError.result.errors.map((error: any) => error.message).join(', ');
+	}
+
+	return currentError.message;
+};

src/packages/auth/package.json

@@ -24,7 +24,7 @@
 		"lib"
 	],
 	"dependencies": {
-		"@apollo/server": "4.12.2",
+		"@apollo/server": "5.0.0",
 		"@exogee/graphweaver": "workspace:*",
 		"@exogee/graphweaver-scalars": "workspace:*",
 		"@exogee/graphweaver-server": "workspace:*",

src/packages/core/package.json

@@ -22,7 +22,7 @@
 		"lib"
 	],
 	"dependencies": {
-		"@apollo/server": "4.12.2",
+		"@apollo/server": "5.0.0",
 		"@exogee/graphweaver-scalars": "workspace:*",
 		"@exogee/logger": "workspace:*",
 		"@graphql-tools/utils": "10.9.1",

src/packages/mikroorm/package.json

@@ -25,7 +25,7 @@
 		"lib"
 	],
 	"dependencies": {
-		"@apollo/server": "4.12.2",
+		"@apollo/server": "5.0.0",
 		"@aws-sdk/client-secrets-manager": "3.888.0",
 		"@exogee/graphweaver": "workspace:*",
 		"@exogee/graphweaver-server": "workspace:*",