Merge branch 'node-google-admin-overhaul' of https://github.com/digit…

…al-boss/n8n into node-google-admin-overhaul
n8n-io · Feb 5, 2025 · e2bbb46 · e2bbb46
2 parents 6bb6d49 + d5d2a57
commit e2bbb46
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/DeviceDescription.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/DeviceDescription.ts
@@ -63,7 +63,7 @@ export const deviceFields: INodeProperties[] = [
 	/*                               device:getAll                                */
 	/* -------------------------------------------------------------------------- */
 	{
-		displayName: 'Return All?',
+		displayName: 'Return All',
 		name: 'returnAll',
 		type: 'boolean',
 		default: false,
@@ -145,7 +145,7 @@ export const deviceFields: INodeProperties[] = [
 					'A comma-separated list of schema names. All fields from these schemas are fetched. This should only be set when projection=custom. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
 			},
 			{
-				displayName: 'Include Children?',
+				displayName: 'Include Children',
 				name: 'includeChildOrgunits',
 				type: 'boolean',
 				default: false,

diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GroupDescripion.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GroupDescripion.ts
@@ -135,7 +135,6 @@ export const groupFields: INodeProperties[] = [
 				displayName: 'By ID',
 				name: 'GroupId',
 				type: 'string',
-				hint: 'Enter the group id',
 				placeholder: 'e.g. 0123kx3o1habcdf',
 			},
 		],
@@ -174,7 +173,6 @@ export const groupFields: INodeProperties[] = [
 				displayName: 'By ID',
 				name: 'groupId',
 				type: 'string',
-				hint: 'Enter the group id',
 				placeholder: 'e.g. 0123kx3o1habcdf',
 			},
 		],
@@ -248,7 +246,7 @@ export const groupFields: INodeProperties[] = [
 				placeholder: 'e.g. name:contact* email:contact*',
 				default: '',
 				description:
-					'Query string to filter the results. Follow Google Admin SDK documentation <a href="https://developers.google.com/admin-sdk/directory/v1/guides/search-groups#examples"</a>.',
+					'Query string to filter the results. Follow Google Admin SDK documentation. <a href="https://developers.google.com/admin-sdk/directory/v1/guides/search-groups#examples" target="_blank">More info</a>.',
 			},
 			{
 				displayName: 'User ID',
@@ -286,7 +284,7 @@ export const groupFields: INodeProperties[] = [
 								value: 'email',
 							},
 						],
-						default: '',
+						default: 'email',
 						description: 'Field to sort the results by',
 					},
 					{
@@ -340,8 +338,6 @@ export const groupFields: INodeProperties[] = [
 				displayName: 'By ID',
 				name: 'groupId',
 				type: 'string',
-				hint: 'Enter the group id',
-
 				placeholder: 'e.g. 0123kx3o1habcdf',
 			},
 		],
@@ -366,6 +362,9 @@ export const groupFields: INodeProperties[] = [
 				name: 'description',
 				type: 'string',
 				default: '',
+				typeOptions: {
+					rows: 2,
+				},
 				description:
 					'An extended description to help users determine the purpose of a group. For example, you can include information about who should join the group, the types of messages to send to the group, links to FAQs about the group, or related groups.',
 			},

diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/UserDescription.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/UserDescription.ts
@@ -142,7 +142,6 @@ export const userFields: INodeProperties[] = [
 				displayName: 'By ID',
 				name: 'groupId',
 				type: 'string',
-				hint: 'Enter the group id',
 				placeholder: 'e.g. 0123kx3o1habcdf',
 			},
 		],
@@ -576,7 +575,7 @@ export const userFields: INodeProperties[] = [
 	/*                                 user:delete                                */
 	/* -------------------------------------------------------------------------- */
 	{
-		displayName: 'User ID',
+		displayName: 'User',
 		name: 'userId',
 		default: {
 			mode: 'list',
@@ -629,7 +628,7 @@ export const userFields: INodeProperties[] = [
 	/*                                 user:get                                   */
 	/* -------------------------------------------------------------------------- */
 	{
-		displayName: 'User ID',
+		displayName: 'User',
 		name: 'userId',
 		type: 'resourceLocator',
 		required: true,
@@ -733,7 +732,7 @@ export const userFields: INodeProperties[] = [
 		description: 'Fields to include in the response when "Select Included Fields" is chosen',
 	},
 	{
-		displayName: 'Projection',
+		displayName: 'Custom Fields',
 		name: 'projection',
 		type: 'options',
 		required: true,
@@ -780,7 +779,7 @@ export const userFields: INodeProperties[] = [
 		},
 		default: [],
 		description:
-			'A comma-separated list of schema names. All fields from these schemas are fetched. This should only be set when projection=custom. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+			'A comma-separated list of schema names. All fields from these schemas are fetched. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                 user:getAll                                */
@@ -871,7 +870,7 @@ export const userFields: INodeProperties[] = [
 		description: 'Fields to include in the response when "Select Included Fields" is chosen',
 	},
 	{
-		displayName: 'Projection',
+		displayName: 'Custom Fields',
 		name: 'projection',
 		type: 'options',
 		required: true,
@@ -918,7 +917,7 @@ export const userFields: INodeProperties[] = [
 		},
 		default: [],
 		description:
-			'A comma-separated list of schema names. All fields from these schemas are fetched. This should only be set when projection=custom. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+			'A comma-separated list of schema names. All fields from these schemas are fetched. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
 	},
 	{
 		displayName: 'Filter',
@@ -954,7 +953,7 @@ export const userFields: INodeProperties[] = [
 				placeholder: 'e.g. name:contact* email:contact*',
 				default: '',
 				description:
-					'Query string to filter the results. Follow Google Admin SDK documentation <a href="https://developers.google.com/admin-sdk/directory/v1/guides/search-users#examples"</a>.',
+					'Query string to filter the results. Follow Google Admin SDK documentation. <a href="https://developers.google.com/admin-sdk/directory/v1/guides/search-users#examples" target="_blank">More info</a>.',
 			},
 			{
 				displayName: 'Show Deleted',
@@ -1109,7 +1108,6 @@ export const userFields: INodeProperties[] = [
 				displayName: 'By ID',
 				name: 'groupId',
 				type: 'string',
-				hint: 'Enter the group id',
 				placeholder: 'e.g. 0123kx3o1habcdf',
 			},
 		],
@@ -1118,7 +1116,7 @@ export const userFields: INodeProperties[] = [
 	/*                                 user:update                                */
 	/* -------------------------------------------------------------------------- */
 	{
-		displayName: 'User ID',
+		displayName: 'User',
 		name: 'userId',
 		type: 'resourceLocator',
 		required: true,