Skip to content

Commit

Permalink
Merge branch 'main' into task/throw-error-on-implicit-flow
Browse files Browse the repository at this point in the history
  • Loading branch information
thewahome authored Nov 4, 2024
2 parents 6541afc + c05b5cd commit 3c47e2d
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 50 deletions.
2 changes: 1 addition & 1 deletion it/python/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ async-timeout==4.0.3 ; python_version >= '3.6'

attrs==24.2.0 ; python_version >= '3.7'

azure-core==1.31.0 ; python_version >= '3.7'
azure-core==1.32.0 ; python_version >= '3.7'

azure-identity==1.19.0

Expand Down
78 changes: 39 additions & 39 deletions it/typescript/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions it/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
},
"dependencies": {
"@azure/identity": "^4.5.0",
"@microsoft/kiota-abstractions": "^1.0.0-preview.71",
"@microsoft/kiota-authentication-azure": "^1.0.0-preview.71",
"@microsoft/kiota-http-fetchlibrary": "^1.0.0-preview.71",
"@microsoft/kiota-serialization-form": "^1.0.0-preview.71",
"@microsoft/kiota-serialization-json": "^1.0.0-preview.71",
"@microsoft/kiota-serialization-multipart": "^1.0.0-preview.71",
"@microsoft/kiota-serialization-text": "^1.0.0-preview.71",
"@microsoft/kiota-abstractions": "^1.0.0-preview.72",
"@microsoft/kiota-authentication-azure": "^1.0.0-preview.72",
"@microsoft/kiota-http-fetchlibrary": "^1.0.0-preview.72",
"@microsoft/kiota-serialization-form": "^1.0.0-preview.72",
"@microsoft/kiota-serialization-json": "^1.0.0-preview.72",
"@microsoft/kiota-serialization-multipart": "^1.0.0-preview.72",
"@microsoft/kiota-serialization-text": "^1.0.0-preview.72",
"express": "^5.0.1",
"node-fetch": "^2.7.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public Task<IDictionary<string, SearchResult>> SearchAsync(string term, string?
if (term.Split(termSeparator, StringSplitOptions.RemoveEmptyEntries).Any(Keywords.Contains))
{
return Task.FromResult<IDictionary<string, SearchResult>>(new Dictionary<string, SearchResult> {
{ "petstore", new SearchResult(ApiTitle, ApiDescription, new Uri("https://petstore.swagger.io/v1"), new Uri("https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/examples/v3.0/petstore.yaml"), new List<string> { "1.0.0" }) }
{ "petstore", new SearchResult(ApiTitle, ApiDescription, new Uri("https://petstore.swagger.io/v1"), new Uri("https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/tests/v3.0/pass/petstore.yaml"), new List<string> { "1.0.0" }) }
});
}
return Task.FromResult<IDictionary<string, SearchResult>>(new Dictionary<string, SearchResult>());
Expand Down
3 changes: 1 addition & 2 deletions vscode/microsoft-kiota/src/providers/openApiTreeProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,6 @@ function createKiotaOpenApiNode(
type IconSet = string | vscode.Uri | { light: string | vscode.Uri; dark: string | vscode.Uri } | vscode.ThemeIcon;
export class OpenApiTreeNode extends vscode.TreeItem {
private static readonly selectedSet: IconSet = new vscode.ThemeIcon('check');
private static readonly unselectedSet: IconSet = new vscode.ThemeIcon('circle-slash');

constructor(
public readonly path: string,
Expand All @@ -434,7 +433,7 @@ export class OpenApiTreeNode extends vscode.TreeItem {
super(label, collapsibleState);
this.id = `${path}_${filterTokens.join('_')}`; // so the collapsed state is NOT persisted between filter changes
this.contextValue = label === pathSeparator + " (" + apiTitle + ")" ? 'apiTitle' : (this.documentationUrl ? 'documentationUrl' : '');
this.iconPath = selected ? OpenApiTreeNode.selectedSet : OpenApiTreeNode.unselectedSet;
this.iconPath = selected ? OpenApiTreeNode.selectedSet : ' ';
if (clientNameOrPluginName) {
this.label = clientNameOrPluginName;
this.contextValue = 'clientNameOrPluginName';
Expand Down

0 comments on commit 3c47e2d

Please sign in to comment.