Skip to content

Apply Pagination Fix to MSGraph Branch #932

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.

Sign up for GitHub

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

Merged
dolauli merged 9 commits into from
Apr 28, 2022
Merged

Apply Pagination Fix to MSGraph Branch #932

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
518987a
Serialize hashtables.
peombwa Dec 10, 2021
dcc0f49
Bump version.
peombwa Dec 10, 2021
14266ac
Merge branch 'Azure:msgraph' into msgraph
peombwa Dec 15, 2021
9a0da01
Add missing LicenseSet HashSet.
peombwa Dec 16, 2021
4fde921
Bump nodeJS range.
peombwa Dec 16, 2021
f856fbd
Apply pagination by loop to MSGraph branch.
peombwa Apr 21, 2022
d909b5f
Merge branch 'Azure:msgraph' into msgraph
peombwa Apr 21, 2022
e3e503c
Merge branch 'msgraph' into RecursionFix
peombwa Apr 21, 2022
7e3154b
Fix request message nextLink URI.
peombwa Apr 21, 2022
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
29 changes: 21 additions & 8 deletions powershell/cmdlets/class.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { escapeString, docComment, serialize, pascalCase, DeepPartial } from '@a
import { items, values, Dictionary, length } from '@azure-tools/linq';
import {
Access, Attribute, BackedProperty, Catch, Class, ClassType, Constructor, dotnet, Else, Expression, Finally, ForEach, If, LambdaProperty, LiteralExpression, LocalVariable, Method, Modifier, Namespace, OneOrMoreStatements, Parameter, Property, Return, Statements, BlockStatement, StringExpression,
Switch, System, TerminalCase, toExpression, Try, Using, valueOf, Field, IsNull, Or, ExpressionOrLiteral, TerminalDefaultCase, xmlize, TypeDeclaration, And, IsNotNull, PartialMethod, Case
Switch, System, TerminalCase, toExpression, Try, Using, valueOf, Field, IsNull, Or, ExpressionOrLiteral, TerminalDefaultCase, xmlize, TypeDeclaration, And, IsNotNull, PartialMethod, Case, While
} from '@azure-tools/codegen-csharp';
import { ClientRuntime, EventListener, Schema, ArrayOf, EnumImplementation } from '../llcsharp/exports';
import { Alias, ArgumentCompleterAttribute, AsyncCommandRuntime, AsyncJob, CmdletAttribute, ErrorCategory, ErrorRecord, Events, InvocationInfo, OutputTypeAttribute, ParameterAttribute, PSCmdlet, PSCredential, SwitchParameter, ValidateNotNull, verbEnum, GeneratedAttribute, DescriptionAttribute, CategoryAttribute, ParameterCategory, ProfileAttribute, PSObject, InternalExportAttribute, ExportAsAttribute, DefaultRunspace, RunspaceFactory, AllowEmptyCollectionAttribute } from '../internal/powershell-declarations';
Expand Down Expand Up @@ -719,14 +719,27 @@ export class CmdletClass extends Class {
}
const nl = getVirtualPropertyFromPropertyName(each.schema.details.csharp.virtualProperties, nextLinkProperty.serializedName);
if (nl) {
$this.add(new Field('_isFirst', dotnet.Bool, {
access: Access.Private,
initialValue: new LiteralExpression(`true`),
description: `A flag to tell whether it is the first onOK call.`
}));
$this.add(new Field('_nextLink', dotnet.String, {
access: Access.Private,
description: `Link to retrieve next page.`
}));
const nextLinkName = `${result.value}.${nl.name}`;
yield (If(`${nextLinkName} != null`,
If('responseMessage.RequestMessage is System.Net.Http.HttpRequestMessage requestMessage ', function* () {
yield `requestMessage = requestMessage.Clone(new global::System.Uri( ${nextLinkName} ),${ClientRuntime.Method.Get} );`;
yield $this.eventListener.signal(Events.FollowingNextLink);
yield `await this.${$this.$<Property>('Client').invokeMethod(`${apiCall.details.csharp.name}_Call`, ...[toExpression('requestMessage'), ...callbackMethods, dotnet.This, pipeline]).implementation}`;
})
));
yield `_nextLink = ${nextLinkName};`
yield (If(`_isFirst`, function* () {
yield `_isFirst = false;`
yield (While(`_nextLink != null`,
If('responseMessage.RequestMessage is System.Net.Http.HttpRequestMessage requestMessage ', function* () {
yield `requestMessage = requestMessage.Clone(new global::System.Uri( _nextLink ),${ClientRuntime.Method.Get} );`;
yield $this.eventListener.signal(Events.FollowingNextLink);
yield `await this.${$this.$<Property>('Client').invokeMethod(`${apiCall.details.csharp.name}_Call`, ...[toExpression('requestMessage'), ...callbackMethods, dotnet.This, pipeline]).implementation}`;
})
))
}));
}
return;
} else if (valueProperty) {
Expand Down