random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2025-12-19 17:01:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to ADO 5ed9b2130da7f822153531489d802c28986f5d30

Browse Source
This commit is contained in:
Steve Faulkner
2020-05-26 13:53:41 -05:00
parent 36581fb6d9
commit 0494da4162
42 changed files with 1186 additions and 2242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/GitHub/GitHubClient.ts
View File

@@ -28,8 +28,6 @@ export interface IGitHubFile {
path: string;
content?: string;
sha: string;
url: string;
html_url: string;
// Custom properties
children?: IGitHubFile[];
@@ -68,6 +66,10 @@ export class GitHubClient {
}
};
private static readonly samplesBranch: IGitHubBranch = {
name: "master"
};
private static readonly samplesTopCommit: IGitHubCommit = {
sha: "41b964f442b638097a75a3f3b6a6451db05a12bf",
committer: {
@@ -82,8 +84,6 @@ export class GitHubClient {
path: ".github",
sha: "5e6794a8177a0c07a8719f6e1d7b41cce6f92e1e",
size: 0,
url: "https://api.github.com/repos/Azure-Samples/cosmos-notebooks/contents/.github?ref=master",
html_url: "https://github.com/Azure-Samples/cosmos-notebooks/tree/master/.github",
type: "dir"
},
{
@@ -91,8 +91,6 @@ export class GitHubClient {
path: ".gitignore",
sha: "3e759b75bf455ac809d0987d369aab89137b5689",
size: 5582,
url: "https://api.github.com/repos/Azure-Samples/cosmos-notebooks/contents/.gitignore?ref=master",
html_url: "https://github.com/Azure-Samples/cosmos-notebooks/blob/master/.gitignore",
type: "file"
},
{
@@ -100,8 +98,6 @@ export class GitHubClient {
path: "1. GettingStarted.ipynb",
sha: "0732ff5366e4aefdc4c378c61cbd968664f0acec",
size: 3933,
url: "https://api.github.com/repos/Azure-Samples/cosmos-notebooks/contents/1.%20GettingStarted.ipynb?ref=master",
html_url: "https://github.com/Azure-Samples/cosmos-notebooks/blob/master/1.%20GettingStarted.ipynb",
type: "file"
},
{
@@ -109,8 +105,6 @@ export class GitHubClient {
path: "2. Visualization.ipynb",
sha: "f480134ac4adf2f50ce5fe66836c6966749d3ca1",
size: 814261,
url: "https://api.github.com/repos/Azure-Samples/cosmos-notebooks/contents/2.%20Visualization.ipynb?ref=master",
html_url: "https://github.com/Azure-Samples/cosmos-notebooks/blob/master/2.%20Visualization.ipynb",
type: "file"
},
{
@@ -118,8 +112,6 @@ export class GitHubClient {
path: "3. RequestUnits.ipynb",
sha: "252b79a4adc81e9f2ffde453231b695d75e270e8",
size: 9490,
url: "https://api.github.com/repos/Azure-Samples/cosmos-notebooks/contents/3.%20RequestUnits.ipynb?ref=master",
html_url: "https://github.com/Azure-Samples/cosmos-notebooks/blob/master/3.%20RequestUnits.ipynb",
type: "file"
},
{
@@ -127,8 +119,6 @@ export class GitHubClient {
path: "4. Indexing.ipynb",
sha: "e10dd67bd1c55c345226769e4f80e43659ef9cd5",
size: 10394,
url: "https://api.github.com/repos/Azure-Samples/cosmos-notebooks/contents/4.%20Indexing.ipynb?ref=master",
html_url: "https://github.com/Azure-Samples/cosmos-notebooks/blob/master/4.%20Indexing.ipynb",
type: "file"
},
{
@@ -136,9 +126,6 @@ export class GitHubClient {
path: "5. StoredProcedures.ipynb",
sha: "949941949920de4d2d111149e2182e9657cc8134",
size: 11818,
url:
"https://api.github.com/repos/Azure-Samples/cosmos-notebooks/contents/5.%20StoredProcedures.ipynb?ref=master",
html_url: "https://github.com/Azure-Samples/cosmos-notebooks/blob/master/5.%20StoredProcedures.ipynb",
type: "file"
},
{
@@ -146,9 +133,6 @@ export class GitHubClient {
path: "6. GlobalDistribution.ipynb",
sha: "b91c31dacacbc9e35750d9054063dda4a5309f3b",
size: 11375,
url:
"https://api.github.com/repos/Azure-Samples/cosmos-notebooks/contents/6.%20GlobalDistribution.ipynb?ref=master",
html_url: "https://github.com/Azure-Samples/cosmos-notebooks/blob/master/6.%20GlobalDistribution.ipynb",
type: "file"
},
{
@@ -156,9 +140,6 @@ export class GitHubClient {
path: "7. IoTAnomalyDetection.ipynb",
sha: "82057ae52a67721a5966e2361317f5dfbd0ee595",
size: 377939,
url:
"https://api.github.com/repos/Azure-Samples/cosmos-notebooks/contents/7.%20IoTAnomalyDetection.ipynb?ref=master",
html_url: "https://github.com/Azure-Samples/cosmos-notebooks/blob/master/7.%20IoTAnomalyDetection.ipynb",
type: "file"
},
{
@@ -166,8 +147,6 @@ export class GitHubClient {
path: "All_API_quickstarts",
sha: "07054293e6c8fc00771fccd0cde207f5c8053978",
size: 0,
url: "https://api.github.com/repos/Azure-Samples/cosmos-notebooks/contents/All_API_quickstarts?ref=master",
html_url: "https://github.com/Azure-Samples/cosmos-notebooks/tree/master/All_API_quickstarts",
type: "dir"
},
{
@@ -175,8 +154,6 @@ export class GitHubClient {
path: "CSharp_quickstarts",
sha: "10e7f5704e6b56a40cac74bc39f15b7708954f52",
size: 0,
url: "https://api.github.com/repos/Azure-Samples/cosmos-notebooks/contents/CSharp_quickstarts?ref=master",
html_url: "https://github.com/Azure-Samples/cosmos-notebooks/tree/master/CSharp_quickstarts",
type: "dir"
}
];
@@ -315,7 +292,9 @@ export class GitHubClient {
if (GitHubClient.isSamplesCall(owner, repo, branch) && path === "") {
return {
status: HttpStatusCodes.OK,
data: GitHubClient.samplesFiles
data: GitHubClient.samplesFiles.map(file =>
GitHubClient.toGitHubFile(file, GitHubClient.samplesRepo, GitHubClient.samplesBranch)
)
};
}
@@ -515,8 +494,6 @@ export class GitHubClient {
path: element.path,
content: element.content,
sha: element.sha,
url: element.url,
html_url: element.html_url,
repo,
branch
};

12
src/GitHub/GitHubContentProvider.test.ts
View File

@@ -3,13 +3,13 @@ import { fixture } from "@nteract/fixtures";
import { HttpStatusCodes } from "../Common/Constants";
import { GitHubClient, IGitHubCommit, IGitHubFile } from "./GitHubClient";
import { GitHubContentProvider } from "./GitHubContentProvider";
import { GitHubUtils } from "../Utils/GitHubUtils";
const gitHubClient = new GitHubClient("token", () => {});
const gitHubContentProvider = new GitHubContentProvider({
gitHubClient,
promptForCommitMsg: () => Promise.resolve("commit msg")
});
const sampleGitHubUri = `https://github.com/login/repo/blob/branch/dir/name.ipynb`;
const sampleFile: IGitHubFile = {
type: "file",
encoding: "encoding",
@@ -18,8 +18,6 @@ const sampleFile: IGitHubFile = {
path: "dir/name.ipynb",
content: btoa(fixture),
sha: "sha",
url: "url",
html_url: sampleGitHubUri,
repo: {
owner: {
login: "login"
@@ -31,9 +29,15 @@ const sampleFile: IGitHubFile = {
name: "branch"
}
};
const sampleGitHubUri = GitHubUtils.toContentUri(
sampleFile.repo.owner.login,
sampleFile.repo.name,
sampleFile.branch.name,
sampleFile.path
);
const sampleNotebookModel: IContent<"notebook"> = {
name: sampleFile.name,
path: sampleFile.html_url,
path: sampleGitHubUri,
type: "notebook",
writable: true,
created: "",

67
src/GitHub/GitHubContentProvider.ts
View File

@@ -7,6 +7,7 @@ import { Logger } from "../Common/Logger";
import { NotebookUtil } from "../Explorer/Notebook/NotebookUtil";
import { GitHubClient, IGitHubFile, IGitHubResponse, IGitHubCommit } from "./GitHubClient";
import { GitHubUtils } from "../Utils/GitHubUtils";
import UrlUtility from "../Common/UrlUtility";
export interface GitHubContentProviderParams {
gitHubClient: GitHubClient;
@@ -53,12 +54,12 @@ export class GitHubContentProvider implements IContentProvider {
throw new GitHubContentProviderError("Failed to get content", content.status);
}
const gitHubInfo = GitHubUtils.fromGitHubUri(uri);
const contentInfo = GitHubUtils.fromContentUri(uri);
const commitResponse = await this.params.gitHubClient.getCommitsAsync(
gitHubInfo.owner,
gitHubInfo.repo,
gitHubInfo.branch,
gitHubInfo.path,
contentInfo.owner,
contentInfo.repo,
contentInfo.branch,
contentInfo.path,
1,
1
);
@@ -95,7 +96,7 @@ export class GitHubContentProvider implements IContentProvider {
gitHubFile.branch.name,
commitMsg,
gitHubFile.path,
GitHubUtils.fromGitHubUri(newUri).path
GitHubUtils.fromContentUri(newUri).path
);
if (response.status !== HttpStatusCodes.OK) {
throw new GitHubContentProviderError("Failed to rename", response.status);
@@ -134,8 +135,8 @@ export class GitHubContentProvider implements IContentProvider {
throw new GitHubContentProviderError("Unsupported content type");
}
const gitHubInfo = GitHubUtils.fromGitHubUri(uri);
if (!gitHubInfo) {
const contentInfo = GitHubUtils.fromContentUri(uri);
if (!contentInfo) {
throw new GitHubContentProviderError(`Failed to parse ${uri}`);
}
@@ -151,14 +152,14 @@ export class GitHubContentProvider implements IContentProvider {
};
const name = `Untitled-${new Date().toLocaleString("default", options)}.ipynb`;
let path = name;
if (gitHubInfo.path) {
path = `${gitHubInfo.path}/${name}`;
if (contentInfo.path) {
path = UrlUtility.createUri(contentInfo.path, name);
}
const response = await this.params.gitHubClient.createOrUpdateFileAsync(
gitHubInfo.owner,
gitHubInfo.repo,
gitHubInfo.branch,
contentInfo.owner,
contentInfo.repo,
contentInfo.branch,
path,
commitMsg,
content
@@ -167,12 +168,7 @@ export class GitHubContentProvider implements IContentProvider {
throw new GitHubContentProviderError("Failed to create", response.status);
}
const newUri = GitHubUtils.toGitHubUriForRepoAndBranch(
gitHubInfo.owner,
gitHubInfo.repo,
gitHubInfo.branch,
path
);
const newUri = GitHubUtils.toContentUri(contentInfo.owner, contentInfo.repo, contentInfo.branch, path);
const newContentResponse = await this.getContent(newUri);
if (newContentResponse.status !== HttpStatusCodes.OK) {
throw new GitHubContentProviderError("Failed to get content after creating", newContentResponse.status);
@@ -288,9 +284,9 @@ export class GitHubContentProvider implements IContentProvider {
}
private getContent(uri: string): Promise<IGitHubResponse<IGitHubFile | IGitHubFile[]>> {
const gitHubInfo = GitHubUtils.fromGitHubUri(uri);
if (gitHubInfo) {
const { owner, repo, branch, path } = gitHubInfo;
const contentInfo = GitHubUtils.fromContentUri(uri);
if (contentInfo) {
const { owner, repo, branch, path } = contentInfo;
return this.params.gitHubClient.getContentsAsync(owner, repo, branch, path);
}
@@ -324,7 +320,7 @@ export class GitHubContentProvider implements IContentProvider {
commit: IGitHubCommit
): IContent<"directory"> {
return {
name: NotebookUtil.getContentName(uri),
name: GitHubUtils.fromContentUri(uri).path,
path: uri,
type: "directory",
writable: true, // TODO: tamitta: we don't know this info here
@@ -333,9 +329,14 @@ export class GitHubContentProvider implements IContentProvider {
mimetype: undefined,
content: gitHubFiles?.map(
(file: IGitHubFile) =>
this.createContentModel(GitHubUtils.toGitHubUriForFile(file), file, commit, {
content: 0
}) as IEmptyContent<FileType>
this.createContentModel(
GitHubUtils.toContentUri(file.repo.owner.login, file.repo.name, file.branch.name, file.path),
file,
commit,
{
content: 0
}
) as IEmptyContent<FileType>
),
format: "json"
};
@@ -350,7 +351,12 @@ export class GitHubContentProvider implements IContentProvider {
gitHubFile.content && params.content !== 0 ? JSON.parse(atob(gitHubFile.content)) : undefined;
return {
name: gitHubFile.name,
path: GitHubUtils.toGitHubUriForFile(gitHubFile),
path: GitHubUtils.toContentUri(
gitHubFile.repo.owner.login,
gitHubFile.repo.name,
gitHubFile.branch.name,
gitHubFile.path
),
type: "notebook",
writable: true, // TODO: tamitta: we don't know this info here
created: "", // TODO: tamitta: we don't know this info here
@@ -369,7 +375,12 @@ export class GitHubContentProvider implements IContentProvider {
const content: string = gitHubFile.content && params.content !== 0 ? atob(gitHubFile.content) : undefined;
return {
name: gitHubFile.name,
path: GitHubUtils.toGitHubUriForFile(gitHubFile),
path: GitHubUtils.toContentUri(
gitHubFile.repo.owner.login,
gitHubFile.repo.name,
gitHubFile.branch.name,
gitHubFile.path
),
type: "file",
writable: true, // TODO: tamitta: we don't know this info here
created: "", // TODO: tamitta: we don't know this info here