random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2024-11-24 22:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use graphql in GitHubClient and misc fixes (#8)

Browse Source 
* Use graphql in GitHubClient

* Replace usage of Array.find with _.find
This commit is contained in:
Tanuj Mittal 2020-06-05 12:22:41 -07:00 committed by GitHub
parent e9d3160b57
commit aa8236666e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 761 additions and 657 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
package-lock.json generated
View File

@ -2422,32 +2422,42 @@
} }
}, },
"@octokit/auth-token": { "@octokit/auth-token": {
"version": "2.4.0", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.0.tgz", "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.1.tgz",
"integrity": "sha512-eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg==", "integrity": "sha512-NB81O5h39KfHYGtgfWr2booRxp2bWOJoqbWwbyUg2hw6h35ArWYlAST5B3XwAkbdcx13yt84hFXyFP5X0QToWA==",
"requires": { "requires": {
"@octokit/types": "^2.0.0" "@octokit/types": "^4.0.1"
},
"dependencies": {
"@octokit/types": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/@octokit/types/-/types-4.0.2.tgz",
"integrity": "sha512-+4X6qfhT/fk/5FD66395NrFLxCzD6FsGlpPwfwvnukdyfYbhiZB/FJltiT1XM5Q63rGGBSf9FPaNV3WpNHm54A==",
"requires": {
"@types/node": ">= 8"
}
}
} }
}, },
"@octokit/core": { "@octokit/core": {
"version": "2.5.0", "version": "2.5.3",
"resolved": "https://registry.npmjs.org/@octokit/core/-/core-2.5.0.tgz", "resolved": "https://registry.npmjs.org/@octokit/core/-/core-2.5.3.tgz",
"integrity": "sha512-uvzmkemQrBgD8xuGbjhxzJN1darJk9L2cS+M99cHrDG2jlSVpxNJVhoV86cXdYBqdHCc9Z995uLCczaaHIYA6Q==", "integrity": "sha512-23AHK9xBW0v79Ck8h5U+5iA4MW7aosqv+Yr6uZXolVGNzzHwryNH5wM386/6+etiKUTwLFZTqyMU9oQpIBZcFA==",
"requires": { "requires": {
"@octokit/auth-token": "^2.4.0", "@octokit/auth-token": "^2.4.0",
"@octokit/graphql": "^4.3.1", "@octokit/graphql": "^4.3.1",
"@octokit/request": "^5.4.0", "@octokit/request": "^5.4.0",
"@octokit/types": "^2.0.0", "@octokit/types": "^4.0.1",
"before-after-hook": "^2.1.0", "before-after-hook": "^2.1.0",
"universal-user-agent": "^5.0.0" "universal-user-agent": "^5.0.0"
} }
}, },
"@octokit/endpoint": { "@octokit/endpoint": {
"version": "6.0.1", "version": "6.0.2",
"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.1.tgz", "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.2.tgz",
"integrity": "sha512-pOPHaSz57SFT/m3R5P8MUu4wLPszokn5pXcB/pzavLTQf2jbU+6iayTvzaY6/BiotuRS0qyEUkx3QglT4U958A==", "integrity": "sha512-xs1mmCEZ2y4shXCpFjNq3UbmNR+bLzxtZim2L0zfEtj9R6O6kc4qLDvYw66hvO6lUsYzPTM5hMkltbuNAbRAcQ==",
"requires": { "requires": {
"@octokit/types": "^2.11.1", "@octokit/types": "^4.0.1",
"is-plain-object": "^3.0.0", "is-plain-object": "^3.0.0",
"universal-user-agent": "^5.0.0" "universal-user-agent": "^5.0.0"
}, },
@ -2468,21 +2478,21 @@
} }
}, },
"@octokit/graphql": { "@octokit/graphql": {
"version": "4.4.0", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.4.0.tgz", "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.5.0.tgz",
"integrity": "sha512-Du3hAaSROQ8EatmYoSAJjzAz3t79t9Opj/WY1zUgxVUGfIKn0AEjg+hlOLscF6fv6i/4y/CeUvsWgIfwMkTccw==", "integrity": "sha512-StJWfn0M1QfhL3NKBz31e1TdDNZrHLLS57J2hin92SIfzlOVBuUaRkp31AGkGOAFOAVtyEX6ZiZcsjcJDjeb5g==",
"requires": { "requires": {
"@octokit/request": "^5.3.0", "@octokit/request": "^5.3.0",
"@octokit/types": "^2.0.0", "@octokit/types": "^4.0.1",
"universal-user-agent": "^5.0.0" "universal-user-agent": "^5.0.0"
} }
}, },
"@octokit/plugin-paginate-rest": { "@octokit/plugin-paginate-rest": {
"version": "2.2.0", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.2.0.tgz", "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.2.1.tgz",
"integrity": "sha512-KoNxC3PLNar8UJwR+1VMQOw2IoOrrFdo5YOiDKnBhpVbKpw+zkBKNMNKwM44UWL25Vkn0Sl3nYIEGKY+gW5ebw==", "integrity": "sha512-/tHpIF2XpN40AyhIq295YRjb4g7Q5eKob0qM3thYJ0Z+CgmNsWKM/fWse/SUR8+LdprP1O4ZzSKQE+71TCwK+w==",
"requires": { "requires": {
"@octokit/types": "^2.12.1" "@octokit/types": "^4.0.1"
} }
}, },
"@octokit/plugin-request-log": { "@octokit/plugin-request-log": {
@ -2491,22 +2501,22 @@
"integrity": "sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw==" "integrity": "sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw=="
}, },
"@octokit/plugin-rest-endpoint-methods": { "@octokit/plugin-rest-endpoint-methods": {
"version": "3.7.1", "version": "3.12.3",
"resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-3.7.1.tgz", "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-3.12.3.tgz",
"integrity": "sha512-YOlcE3bbk2ohaOVdRj9ww7AUYfmnS9hwJJGSj3/rFlNfMGOId4G8dLlhghXpdNSn05H0FRoI94UlFUKnn30Cyw==", "integrity": "sha512-9nrVDP1tBd7EtobGr5hZcYGTM0kBNmIvPJazrUd5OJO0NZWiQaQOqAnzApmC9cZ4o7RempV21ScpWkKGhrT51A==",
"requires": { "requires": {
"@octokit/types": "^2.11.1", "@octokit/types": "^4.0.0",
"deprecation": "^2.3.1" "deprecation": "^2.3.1"
} }
}, },
"@octokit/request": { "@octokit/request": {
"version": "5.4.2", "version": "5.4.4",
"resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.2.tgz", "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.4.tgz",
"integrity": "sha512-zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw==", "integrity": "sha512-vqv1lz41c6VTxUvF9nM+a6U+vvP3vGk7drDpr0DVQg4zyqlOiKVrY17DLD6de5okj+YLHKcoqaUZTBtlNZ1BtQ==",
"requires": { "requires": {
"@octokit/endpoint": "^6.0.1", "@octokit/endpoint": "^6.0.1",
"@octokit/request-error": "^2.0.0", "@octokit/request-error": "^2.0.0",
"@octokit/types": "^2.11.1", "@octokit/types": "^4.0.1",
"deprecation": "^2.0.0", "deprecation": "^2.0.0",
"is-plain-object": "^3.0.0", "is-plain-object": "^3.0.0",
"node-fetch": "^2.3.0", "node-fetch": "^2.3.0",
@ -2530,39 +2540,32 @@
} }
}, },
"@octokit/request-error": { "@octokit/request-error": {
"version": "2.0.0", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.0.tgz", "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.1.tgz",
"integrity": "sha512-rtYicB4Absc60rUv74Rjpzek84UbVHGHJRu4fNVlZ1mCcyUPPuzFfG9Rn6sjHrd95DEsmjSt1Axlc699ZlbDkw==", "integrity": "sha512-5lqBDJ9/TOehK82VvomQ6zFiZjPeSom8fLkFVLuYL3sKiIb5RB8iN/lenLkY7oBmyQcGP7FBMGiIZTO8jufaRQ==",
"requires": { "requires": {
"@octokit/types": "^2.0.0", "@octokit/types": "^4.0.1",
"deprecation": "^2.0.0", "deprecation": "^2.0.0",
"once": "^1.4.0" "once": "^1.4.0"
} }
}, },
"@octokit/rest": { "@octokit/rest": {
"version": "17.5.1", "version": "17.9.2",
"resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-17.5.1.tgz", "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-17.9.2.tgz",
"integrity": "sha512-0rGY7eo0cw8FYX7jAtUgfy3j+05zhs9JvkPFegx00HAaayodM1ixlHhCOB5yirGbsVOxbRIWVkvKc2yY9367gg==", "integrity": "sha512-UXxiE0HhGQAPB3WDHTEu7lYMHH2uRcs/9f26XyHpGGiiXht8hgHWEk6fA7WglwwEvnj8V7mkJOgIntnij132UA==",
"requires": { "requires": {
"@octokit/core": "^2.4.3", "@octokit/core": "^2.4.3",
"@octokit/plugin-paginate-rest": "^2.1.0", "@octokit/plugin-paginate-rest": "^2.2.0",
"@octokit/plugin-request-log": "^1.0.0", "@octokit/plugin-request-log": "^1.0.0",
"@octokit/plugin-rest-endpoint-methods": "3.7.1" "@octokit/plugin-rest-endpoint-methods": "^3.12.2"
} }
}, },
"@octokit/types": { "@octokit/types": {
"version": "2.16.2", "version": "4.0.2",
"resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz", "resolved": "https://registry.npmjs.org/@octokit/types/-/types-4.0.2.tgz",
"integrity": "sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==", "integrity": "sha512-+4X6qfhT/fk/5FD66395NrFLxCzD6FsGlpPwfwvnukdyfYbhiZB/FJltiT1XM5Q63rGGBSf9FPaNV3WpNHm54A==",
"requires": { "requires": {
"@types/node": ">= 8" "@types/node": ">= 8"
},
"dependencies": {
"@types/node": {
"version": "14.0.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.1.tgz",
"integrity": "sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA=="
}
} }
}, },
"@peculiar/asn1-schema": { "@peculiar/asn1-schema": {
@ -3195,8 +3198,7 @@
"@types/node": { "@types/node": {
"version": "12.11.1", "version": "12.11.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.1.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.1.tgz",
"integrity": "sha512-TJtwsqZ39pqcljJpajeoofYRfeZ7/I/OMUQ5pR4q5wOKf2ocrUvBAZUMhWsOvKx3dVc/aaV5GluBivt0sWqA5A==", "integrity": "sha512-TJtwsqZ39pqcljJpajeoofYRfeZ7/I/OMUQ5pR4q5wOKf2ocrUvBAZUMhWsOvKx3dVc/aaV5GluBivt0sWqA5A=="
"dev": true
}, },
"@types/promise.prototype.finally": { "@types/promise.prototype.finally": {
"version": "2.0.3", "version": "2.0.3",

2
package.json
View File

@ -32,7 +32,7 @@
"@nteract/transform-plotly": "6.1.6", "@nteract/transform-plotly": "6.1.6",
"@nteract/transform-vdom": "4.0.11", "@nteract/transform-vdom": "4.0.11",
"@nteract/transform-vega": "7.0.6", "@nteract/transform-vega": "7.0.6",
"@octokit/rest": "17.5.1", "@octokit/rest": "17.9.2",
"@phosphor/widgets": "1.9.3", "@phosphor/widgets": "1.9.3",
"@uifabric/react-cards": "0.109.53", "@uifabric/react-cards": "0.109.53",
"@uifabric/styling": "7.11.2", "@uifabric/styling": "7.11.2",

3
src/Explorer/Controls/DialogReactComponent/DialogComponent.tsx
View File

@ -54,7 +54,8 @@ export class DialogComponent extends React.Component<DialogProps, {}> {
styles: { styles: {
title: { fontSize: DIALOG_TITLE_FONT_SIZE, fontWeight: DIALOG_TITLE_FONT_WEIGHT }, title: { fontSize: DIALOG_TITLE_FONT_SIZE, fontWeight: DIALOG_TITLE_FONT_WEIGHT },
subText: { fontSize: DIALOG_SUBTEXT_FONT_SIZE } subText: { fontSize: DIALOG_SUBTEXT_FONT_SIZE }
} },
showCloseButton: false
}, },
modalProps: { isBlocking: this.props.isModal }, modalProps: { isBlocking: this.props.isModal },
minWidth: DIALOG_MIN_WIDTH, minWidth: DIALOG_MIN_WIDTH,

3
src/Explorer/Controls/Directory/DefaultDirectoryDropdownComponent.tsx
View File

@ -2,6 +2,7 @@
* React component for Switch Directory * React component for Switch Directory
*/ */
import _ from "underscore";
import * as React from "react"; import * as React from "react";
import { Dropdown, IDropdownOption, IDropdownProps } from "office-ui-fabric-react/lib/Dropdown"; import { Dropdown, IDropdownOption, IDropdownProps } from "office-ui-fabric-react/lib/Dropdown";
import { Tenant } from "../../../Contracts/DataModels"; import { Tenant } from "../../../Contracts/DataModels";
@ -60,7 +61,7 @@ export class DefaultDirectoryDropdownComponent extends React.Component<DefaultDi
return; return;
} }
const selectedDirectory = this.props.directories.find(d => d.tenantId === option.key); const selectedDirectory = _.find(this.props.directories, d => d.tenantId === option.key);
if (!selectedDirectory) { if (!selectedDirectory) {
return; return;
} }

3
src/Explorer/Controls/Directory/DirectoryListComponent.tsx
View File

@ -1,3 +1,4 @@
import _ from "underscore";
import * as React from "react"; import * as React from "react";
import { DefaultButton, IButtonProps } from "office-ui-fabric-react/lib/Button"; import { DefaultButton, IButtonProps } from "office-ui-fabric-react/lib/Button";
@ -114,7 +115,7 @@ export class DirectoryListComponent extends React.Component<DirectoryListProps,
} }
const buttonElement = e.currentTarget; const buttonElement = e.currentTarget;
const selectedDirectoryId = buttonElement.getElementsByClassName("directoryListItemId")[0].textContent; const selectedDirectoryId = buttonElement.getElementsByClassName("directoryListItemId")[0].textContent;
const selectedDirectory = this.props.directories.find(d => d.tenantId === selectedDirectoryId); const selectedDirectory = _.find(this.props.directories, d => d.tenantId === selectedDirectoryId);
this.props.onNewDirectorySelected(selectedDirectory); this.props.onNewDirectorySelected(selectedDirectory);
}; };

2
src/Explorer/Controls/GitHub/AddRepoComponent.tsx
View File

@ -93,7 +93,7 @@ export class AddRepoComponent extends React.Component<AddRepoComponentProps, Add
const repo = await this.props.getRepo(repoInfo.owner, repoInfo.repo); const repo = await this.props.getRepo(repoInfo.owner, repoInfo.repo);
if (repo) { if (repo) {
const item: RepoListItem = { const item: RepoListItem = {
key: GitHubUtils.toRepoFullName(repo.owner.login, repo.name), key: GitHubUtils.toRepoFullName(repo.owner, repo.name),
repo, repo,
branches: [ branches: [
{ {

11
src/Explorer/Controls/GitHub/ReposListComponent.tsx
View File

@ -18,7 +18,7 @@ import {
Text Text
} from "office-ui-fabric-react"; } from "office-ui-fabric-react";
import * as React from "react"; import * as React from "react";
import { IGitHubBranch } from "../../../GitHub/GitHubClient"; import { IGitHubBranch, IGitHubPageInfo } from "../../../GitHub/GitHubClient";
import { GitHubUtils } from "../../../Utils/GitHubUtils"; import { GitHubUtils } from "../../../Utils/GitHubUtils";
import { RepoListItem } from "./GitHubReposComponent"; import { RepoListItem } from "./GitHubReposComponent";
import { import {
@ -41,6 +41,7 @@ export interface ReposListComponentProps {
export interface BranchesProps { export interface BranchesProps {
branches: IGitHubBranch[]; branches: IGitHubBranch[];
lastPageInfo?: IGitHubPageInfo;
hasMore: boolean; hasMore: boolean;
isLoading: boolean; isLoading: boolean;
loadMore: () => void; loadMore: () => void;
@ -139,7 +140,7 @@ export class ReposListComponent extends React.Component<ReposListComponentProps>
} }
const checkboxProps: ICheckboxProps = { const checkboxProps: ICheckboxProps = {
...ReposListComponent.getCheckboxPropsForLabel(GitHubUtils.toRepoFullName(item.repo.owner.login, item.repo.name)), ...ReposListComponent.getCheckboxPropsForLabel(GitHubUtils.toRepoFullName(item.repo.owner, item.repo.name)),
styles: ReposListCheckboxStyles, styles: ReposListCheckboxStyles,
defaultChecked: true, defaultChecked: true,
onChange: () => this.props.unpinRepo(item) onChange: () => this.props.unpinRepo(item)
@ -153,7 +154,7 @@ export class ReposListComponent extends React.Component<ReposListComponentProps>
return <></>; return <></>;
} }
const branchesProps = this.props.branchesProps[GitHubUtils.toRepoFullName(item.repo.owner.login, item.repo.name)]; const branchesProps = this.props.branchesProps[GitHubUtils.toRepoFullName(item.repo.owner, item.repo.name)];
const options: IDropdownOption[] = branchesProps.branches.map(branch => ({ const options: IDropdownOption[] = branchesProps.branches.map(branch => ({
key: branch.name, key: branch.name,
text: branch.name, text: branch.name,
@ -222,7 +223,7 @@ export class ReposListComponent extends React.Component<ReposListComponentProps>
private onRenderPinnedReposBranchesDropdownOption(option: IDropdownOption): JSX.Element { private onRenderPinnedReposBranchesDropdownOption(option: IDropdownOption): JSX.Element {
const item: RepoListItem = option.data; const item: RepoListItem = option.data;
const branchesProps = this.props.branchesProps[GitHubUtils.toRepoFullName(item.repo.owner.login, item.repo.name)]; const branchesProps = this.props.branchesProps[GitHubUtils.toRepoFullName(item.repo.owner, item.repo.name)];
if (option.index === ReposListComponent.FooterIndex) { if (option.index === ReposListComponent.FooterIndex) {
const linkProps: ILinkProps = { const linkProps: ILinkProps = {
@ -267,7 +268,7 @@ export class ReposListComponent extends React.Component<ReposListComponentProps>
} }
const checkboxProps: ICheckboxProps = { const checkboxProps: ICheckboxProps = {
...ReposListComponent.getCheckboxPropsForLabel(GitHubUtils.toRepoFullName(item.repo.owner.login, item.repo.name)), ...ReposListComponent.getCheckboxPropsForLabel(GitHubUtils.toRepoFullName(item.repo.owner, item.repo.name)),
styles: ReposListCheckboxStyles, styles: ReposListCheckboxStyles,
onChange: () => { onChange: () => {
const repoListItem = { ...item }; const repoListItem = { ...item };

2
src/Explorer/Explorer.ts
View File

@ -2583,7 +2583,7 @@ export default class Explorer implements ViewModels.Explorer {
const item = NotebookUtil.createNotebookContentItem(name, path, "file"); const item = NotebookUtil.createNotebookContentItem(name, path, "file");
const parent = this.resourceTree.myNotebooksContentRoot; const parent = this.resourceTree.myNotebooksContentRoot;
if (parent && this.isNotebookEnabled() && this.notebookClient) { if (parent && parent.children && this.isNotebookEnabled() && this.notebookClient) {
if (this._filePathToImportAndOpen === path) { if (this._filePathToImportAndOpen === path) {
this._filePathToImportAndOpen = null; // we don't want to try opening this path again this._filePathToImportAndOpen = null; // we don't want to try opening this path again
} }

6
src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
View File

@ -1,3 +1,4 @@
import _ from "underscore";
import * as React from "react"; import * as React from "react";
import * as ViewModels from "../../../Contracts/ViewModels"; import * as ViewModels from "../../../Contracts/ViewModels";
import { Observable } from "knockout"; import { Observable } from "knockout";
@ -46,7 +47,7 @@ export class CommandBarUtil {
text: btn.commandButtonLabel || btn.tooltipText, text: btn.commandButtonLabel || btn.tooltipText,
"data-test": btn.commandButtonLabel || btn.tooltipText, "data-test": btn.commandButtonLabel || btn.tooltipText,
title: btn.tooltipText, title: btn.tooltipText,
name: "menuitem", name: btn.commandButtonLabel || btn.tooltipText,
disabled: btn.disabled, disabled: btn.disabled,
ariaLabel: btn.ariaLabel, ariaLabel: btn.ariaLabel,
buttonStyles: { buttonStyles: {
@ -126,6 +127,9 @@ export class CommandBarUtil {
} }
if (btn.isDropdown) { if (btn.isDropdown) {
const selectedChild = _.find(btn.children, child => child.dropdownItemKey === btn.dropdownSelectedKey);
result.name = selectedChild?.commandButtonLabel || btn.dropdownPlaceholder;
const dropdownStyles: Partial<IDropdownStyles> = { const dropdownStyles: Partial<IDropdownStyles> = {
root: { margin: 5 }, root: { margin: 5 },
dropdown: { width: btn.dropdownWidth }, dropdown: { width: btn.dropdownWidth },

19
src/Explorer/Notebook/NotebookComponent/actions.ts
View File

@ -17,25 +17,6 @@ export const closeNotebook = (payload: { contentRef: ContentRef }): CloseNoteboo
}; };
}; };
export const UPDATE_LAST_MODIFIED = "UPDATE_LAST_MODIFIED";
export interface UpdateLastModifiedAction {
type: "UPDATE_LAST_MODIFIED";
payload: {
contentRef: ContentRef;
lastModified: string;
};
}
export const updateLastModified = (payload: {
contentRef: ContentRef;
lastModified: string;
}): UpdateLastModifiedAction => {
return {
type: UPDATE_LAST_MODIFIED,
payload
};
};
export const EXECUTE_FOCUSED_CELL_AND_FOCUS_NEXT = "EXECUTE_FOCUSED_CELL_AND_FOCUS_NEXT"; export const EXECUTE_FOCUSED_CELL_AND_FOCUS_NEXT = "EXECUTE_FOCUSED_CELL_AND_FOCUS_NEXT";
export interface ExecuteFocusedCellAndFocusNextAction { export interface ExecuteFocusedCellAndFocusNextAction {
type: "EXECUTE_FOCUSED_CELL_AND_FOCUS_NEXT"; type: "EXECUTE_FOCUSED_CELL_AND_FOCUS_NEXT";

71
src/Explorer/Notebook/NotebookComponent/epics.ts
View File

@ -1,4 +1,4 @@
import { empty, merge, of, timer, interval, concat, Subject, Subscriber, Observable, Observer } from "rxjs"; import { empty, merge, of, timer, concat, Subject, Subscriber, Observable, Observer } from "rxjs";
import { webSocket } from "rxjs/webSocket"; import { webSocket } from "rxjs/webSocket";
import { ActionsObservable, StateObservable } from "redux-observable"; import { ActionsObservable, StateObservable } from "redux-observable";
import { ofType } from "redux-observable"; import { ofType } from "redux-observable";
@ -10,7 +10,6 @@ import {
map, map,
switchMap, switchMap,
take, take,
distinctUntilChanged,
filter, filter,
catchError, catchError,
first, first,
@ -21,7 +20,6 @@ import {
AppState, AppState,
ServerConfig as JupyterServerConfig, ServerConfig as JupyterServerConfig,
JupyterHostRecordProps, JupyterHostRecordProps,
JupyterHostRecord,
RemoteKernelProps, RemoteKernelProps,
castToSessionId, castToSessionId,
createKernelRef, createKernelRef,
@ -29,8 +27,7 @@ import {
ContentRef, ContentRef,
KernelInfo, KernelInfo,
actions, actions,
selectors, selectors
IContentProvider
} from "@nteract/core"; } from "@nteract/core";
import { message, JupyterMessage, Channels, createMessage, childOf, ofMessageType } from "@nteract/messaging"; import { message, JupyterMessage, Channels, createMessage, childOf, ofMessageType } from "@nteract/messaging";
import { sessions, kernels } from "rx-jupyter"; import { sessions, kernels } from "rx-jupyter";
@ -752,69 +749,6 @@ export const cleanKernelOnConnectionLostEpic = (
); );
}; };
/**
* Workaround for issue: https://github.com/nteract/nteract/issues/4583
* We reajust the property
* @param action$
* @param state$
*/
const adjustLastModifiedOnSaveEpic = (
action$: ActionsObservable<actions.SaveFulfilled>,
state$: StateObservable<AppState>,
dependencies: { contentProvider: IContentProvider }
): Observable<{} | CdbActions.UpdateLastModifiedAction> => {
return action$.pipe(
ofType(actions.SAVE_FULFILLED),
mergeMap(action => {
const pollDelayMs = 500;
const nbAttempts = 4;
// Retry updating last modified
const currentHost = selectors.currentHost(state$.value);
const serverConfig = selectors.serverConfig(currentHost as JupyterHostRecord);
const filepath = selectors.filepath(state$.value, { contentRef: action.payload.contentRef });
const content = selectors.content(state$.value, { contentRef: action.payload.contentRef });
const lastSaved = (content.lastSaved as any) as string;
const contentProvider = dependencies.contentProvider;
// Query until value is stable
return interval(pollDelayMs)
.pipe(take(nbAttempts))
.pipe(
mergeMap(x =>
contentProvider.get(serverConfig, filepath, { content: 0 }).pipe(
map(xhr => {
if (xhr.status !== 200 || typeof xhr.response === "string") {
return undefined;
}
const model = xhr.response;
const lastModified = model.last_modified;
if (lastModified === lastSaved) {
return undefined;
}
// Return last modified
return lastModified;
})
)
),
distinctUntilChanged(),
mergeMap(lastModified => {
if (!lastModified) {
return empty();
}
return of(
CdbActions.updateLastModified({
contentRef: action.payload.contentRef,
lastModified
})
);
})
);
})
);
};
/** /**
* Execute focused cell and focus next cell * Execute focused cell and focus next cell
* @param action$ * @param action$
@ -917,7 +851,6 @@ export const allEpics = [
acquireKernelInfoEpic, acquireKernelInfoEpic,
handleKernelConnectionLostEpic, handleKernelConnectionLostEpic,
cleanKernelOnConnectionLostEpic, cleanKernelOnConnectionLostEpic,
adjustLastModifiedOnSaveEpic,
executeFocusedCellAndFocusNextEpic, executeFocusedCellAndFocusNextEpic,
closeUnsupportedMimetypesEpic, closeUnsupportedMimetypesEpic,
closeContentFailedToFetchEpic, closeContentFailedToFetchEpic,

5
src/Explorer/Notebook/NotebookComponent/reducers.ts
View File

@ -51,11 +51,6 @@ export const coreReducer = (state: CoreRecord, action: Action) => {
.setIn(path.concat("displayName"), kernelspecs.displayName) .setIn(path.concat("displayName"), kernelspecs.displayName)
.setIn(path.concat("language"), kernelspecs.language); .setIn(path.concat("language"), kernelspecs.language);
} }
case cdbActions.UPDATE_LAST_MODIFIED: {
typedAction = action as cdbActions.UpdateLastModifiedAction;
const path = ["entities", "contents", "byRef", typedAction.payload.contentRef, "lastSaved"];
return state.setIn(path, typedAction.payload.lastModified);
}
default: default:
return nteractReducers.core(state as any, action as any); return nteractReducers.core(state as any, action as any);
} }

127
src/Explorer/Notebook/NotebookSamples.ts Normal file
View File

@ -0,0 +1,127 @@
import { IGitHubRepo, IGitHubBranch } from "../../GitHub/GitHubClient";
export const SamplesRepo: IGitHubRepo = {
name: "cosmos-notebooks",
owner: "Azure-Samples",
private: false
};
export const SamplesBranch: IGitHubBranch = {
name: "master"
};
export const isSamplesCall = (owner: string, repo: string, branch?: string): boolean => {
return owner === SamplesRepo.owner && repo === SamplesRepo.name && (!branch || branch === SamplesBranch.name);
};
// GitHub API calls have a rate limit of 5000 requests per hour. So if we get high traffic on Data Explorer
// loading samples exceed that limit. Using this hard coded response for samples until we fix that.
export const SamplesContentsQueryResponse = {
repository: {
owner: {
login: "Azure-Samples"
},
name: "cosmos-notebooks",
isPrivate: false,
ref: {
name: "master",
target: {
history: {
nodes: [
{
oid: "cda7facb9e039b173f3376200c26c859896e7974",
message:
"Merge pull request #45 from Azure-Samples/users/deborahc/pythonSampleUpdates\n\nAdd bokeh version to notebook",
committer: {
date: "2020-05-28T11:28:01-07:00"
}
}
]
}
}
},
object: {
entries: [
{
name: ".github",
type: "tree",
object: {}
},
{
name: ".gitignore",
type: "blob",
object: {
oid: "3e759b75bf455ac809d0987d369aab89137b5689",
byteSize: 5582
}
},
{
name: "1. GettingStarted.ipynb",
type: "blob",
object: {
oid: "0732ff5366e4aefdc4c378c61cbd968664f0acec",
byteSize: 3933
}
},
{
name: "2. Visualization.ipynb",
type: "blob",
object: {
oid: "6b16b0740a77afdd38a95bc6c3ebd0f2f17d9465",
byteSize: 820317
}
},
{
name: "3. RequestUnits.ipynb",
type: "blob",
object: {
oid: "252b79a4adc81e9f2ffde453231b695d75e270e8",
byteSize: 9490
}
},
{
name: "4. Indexing.ipynb",
type: "blob",
object: {
oid: "e10dd67bd1c55c345226769e4f80e43659ef9cd5",
byteSize: 10394
}
},
{
name: "5. StoredProcedures.ipynb",
type: "blob",
object: {
oid: "949941949920de4d2d111149e2182e9657cc8134",
byteSize: 11818
}
},
{
name: "6. GlobalDistribution.ipynb",
type: "blob",
object: {
oid: "b91c31dacacbc9e35750d9054063dda4a5309f3b",
byteSize: 11375
}
},
{
name: "7. IoTAnomalyDetection.ipynb",
type: "blob",
object: {
oid: "82057ae52a67721a5966e2361317f5dfbd0ee595",
byteSize: 377939
}
},
{
name: "All_API_quickstarts",
type: "tree",
object: {}
},
{
name: "CSharp_quickstarts",
type: "tree",
object: {}
}
]
}
}
};

14
src/Explorer/OpenActions.ts
View File

@ -155,19 +155,7 @@ function openPane(action: ActionContracts.OpenPane, explorer: ViewModels.Explore
} }
function openFile(action: ActionContracts.OpenSampleNotebook, explorer: ViewModels.Explorer) { function openFile(action: ActionContracts.OpenSampleNotebook, explorer: ViewModels.Explorer) {
let path: string; explorer.handleOpenFileAction(decodeURIComponent(action.path));
if (action.hasOwnProperty("file")) {
// This is deprecated
const downloadUrl: string = (action as any).file.download_url;
path = downloadUrl.replace(
"raw.githubusercontent.com/Azure-Samples/cosmos-notebooks",
"github.com/Azure-Samples/cosmos-notebooks/blob"
); // convert raw download url to something which GitHubContentProvider understands
} else {
path = action.path;
}
explorer.handleOpenFileAction(path);
} }
function generateQueryText(action: ActionContracts.OpenQueryTab, partitionKeyProperty: string): string { function generateQueryText(action: ActionContracts.OpenQueryTab, partitionKeyProperty: string): string {

3
src/Explorer/Panes/ClusterLibraryPane.ts
View File

@ -1,3 +1,4 @@
import _ from "underscore";
import * as ko from "knockout"; import * as ko from "knockout";
import * as Constants from "../../Common/Constants"; import * as Constants from "../../Common/Constants";
import * as ViewModels from "../../Contracts/ViewModels"; import * as ViewModels from "../../Contracts/ViewModels";
@ -81,7 +82,7 @@ export class ClusterLibraryPane extends ContextualPaneBase {
private _onInstalledChanged = (libraryName: string, installed: boolean): void => { private _onInstalledChanged = (libraryName: string, installed: boolean): void => {
const items = this._clusterLibraryProps().libraryItems; const items = this._clusterLibraryProps().libraryItems;
const library = items.find(item => item.name === libraryName); const library = _.find(items, item => item.name === libraryName);
library.installed = installed; library.installed = installed;
this._clusterLibraryProps.valueHasMutated(); this._clusterLibraryProps.valueHasMutated();
}; };

39
src/Explorer/Panes/GitHubReposPane.ts
View File

@ -1,19 +1,20 @@
import _ from "underscore";
import { Areas, HttpStatusCodes } from "../../Common/Constants"; import { Areas, HttpStatusCodes } from "../../Common/Constants";
import { Logger } from "../../Common/Logger"; import { Logger } from "../../Common/Logger";
import * as ViewModels from "../../Contracts/ViewModels"; import * as ViewModels from "../../Contracts/ViewModels";
import { GitHubClient, IGitHubRepo } from "../../GitHub/GitHubClient"; import { GitHubClient, IGitHubPageInfo, IGitHubRepo } from "../../GitHub/GitHubClient";
import { IPinnedRepo, JunoClient } from "../../Juno/JunoClient"; import { IPinnedRepo, JunoClient } from "../../Juno/JunoClient";
import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants"; import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
import TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
import { GitHubUtils } from "../../Utils/GitHubUtils"; import { GitHubUtils } from "../../Utils/GitHubUtils";
import { JunoUtils } from "../../Utils/JunoUtils";
import { NotificationConsoleUtils } from "../../Utils/NotificationConsoleUtils"; import { NotificationConsoleUtils } from "../../Utils/NotificationConsoleUtils";
import { AuthorizeAccessComponent } from "../Controls/GitHub/AuthorizeAccessComponent"; import { AuthorizeAccessComponent } from "../Controls/GitHub/AuthorizeAccessComponent";
import { GitHubReposComponentProps, RepoListItem, GitHubReposComponent } from "../Controls/GitHub/GitHubReposComponent"; import { GitHubReposComponent, GitHubReposComponentProps, RepoListItem } from "../Controls/GitHub/GitHubReposComponent";
import { GitHubReposComponentAdapter } from "../Controls/GitHub/GitHubReposComponentAdapter"; import { GitHubReposComponentAdapter } from "../Controls/GitHub/GitHubReposComponentAdapter";
import { BranchesProps, PinnedReposProps, UnpinnedReposProps } from "../Controls/GitHub/ReposListComponent"; import { BranchesProps, PinnedReposProps, UnpinnedReposProps } from "../Controls/GitHub/ReposListComponent";
import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent"; import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent";
import { ContextualPaneBase } from "./ContextualPaneBase"; import { ContextualPaneBase } from "./ContextualPaneBase";
import { JunoUtils } from "../../Utils/JunoUtils";
export class GitHubReposPane extends ContextualPaneBase { export class GitHubReposPane extends ContextualPaneBase {
private static readonly PageSize = 30; private static readonly PageSize = 30;
@ -29,6 +30,7 @@ export class GitHubReposPane extends ContextualPaneBase {
private gitHubReposAdapter: GitHubReposComponentAdapter; private gitHubReposAdapter: GitHubReposComponentAdapter;
private allGitHubRepos: IGitHubRepo[]; private allGitHubRepos: IGitHubRepo[];
private allGitHubReposLastPageInfo?: IGitHubPageInfo;
private pinnedReposUpdated: boolean; private pinnedReposUpdated: boolean;
constructor(options: ViewModels.GitHubReposPaneOptions) { constructor(options: ViewModels.GitHubReposPaneOptions) {
@ -73,6 +75,7 @@ export class GitHubReposPane extends ContextualPaneBase {
this.gitHubReposAdapter = new GitHubReposComponentAdapter(this.gitHubReposProps); this.gitHubReposAdapter = new GitHubReposComponentAdapter(this.gitHubReposProps);
this.allGitHubRepos = []; this.allGitHubRepos = [];
this.allGitHubReposLastPageInfo = undefined;
this.pinnedReposUpdated = false; this.pinnedReposUpdated = false;
} }
@ -115,6 +118,7 @@ export class GitHubReposPane extends ContextualPaneBase {
// Reset cached repos // Reset cached repos
this.allGitHubRepos = []; this.allGitHubRepos = [];
this.allGitHubReposLastPageInfo = undefined;
// Reset flags // Reset flags
this.pinnedReposUpdated = false; this.pinnedReposUpdated = false;
@ -164,29 +168,28 @@ export class GitHubReposPane extends ContextualPaneBase {
const unpinnedGitHubRepos = this.allGitHubRepos.filter( const unpinnedGitHubRepos = this.allGitHubRepos.filter(
gitHubRepo => gitHubRepo =>
this.pinnedReposProps.repos.findIndex( this.pinnedReposProps.repos.findIndex(
pinnedRepo => pinnedRepo.key === GitHubUtils.toRepoFullName(gitHubRepo.owner.login, gitHubRepo.name) pinnedRepo => pinnedRepo.key === GitHubUtils.toRepoFullName(gitHubRepo.owner, gitHubRepo.name)
) === -1 ) === -1
); );
return unpinnedGitHubRepos.map(gitHubRepo => ({ return unpinnedGitHubRepos.map(gitHubRepo => ({
key: GitHubUtils.toRepoFullName(gitHubRepo.owner.login, gitHubRepo.name), key: GitHubUtils.toRepoFullName(gitHubRepo.owner, gitHubRepo.name),
repo: gitHubRepo, repo: gitHubRepo,
branches: [] branches: []
})); }));
} }
private async loadMoreBranches(repo: IGitHubRepo): Promise<void> { private async loadMoreBranches(repo: IGitHubRepo): Promise<void> {
const branchesProps = this.branchesProps[GitHubUtils.toRepoFullName(repo.owner.login, repo.name)]; const branchesProps = this.branchesProps[GitHubUtils.toRepoFullName(repo.owner, repo.name)];
branchesProps.hasMore = true; branchesProps.hasMore = true;
branchesProps.isLoading = true; branchesProps.isLoading = true;
this.triggerRender(); this.triggerRender();
const nextPage = Math.floor(branchesProps.branches.length / GitHubReposPane.PageSize) + 1;
try { try {
const response = await this.gitHubClient.getBranchesAsync( const response = await this.gitHubClient.getBranchesAsync(
repo.owner.login, repo.owner,
repo.name, repo.name,
nextPage, GitHubReposPane.PageSize,
GitHubReposPane.PageSize branchesProps.lastPageInfo?.endCursor
); );
if (response.status !== HttpStatusCodes.OK) { if (response.status !== HttpStatusCodes.OK) {
throw new Error(`Received HTTP ${response.status} when fetching branches`); throw new Error(`Received HTTP ${response.status} when fetching branches`);
@ -194,6 +197,7 @@ export class GitHubReposPane extends ContextualPaneBase {
if (response.data) { if (response.data) {
branchesProps.branches = branchesProps.branches.concat(response.data); branchesProps.branches = branchesProps.branches.concat(response.data);
branchesProps.lastPageInfo = response.pageInfo;
} }
} catch (error) { } catch (error) {
const message = `Failed to fetch branches: ${error}`; const message = `Failed to fetch branches: ${error}`;
@ -202,7 +206,7 @@ export class GitHubReposPane extends ContextualPaneBase {
} }
branchesProps.isLoading = false; branchesProps.isLoading = false;
branchesProps.hasMore = branchesProps.branches.length === GitHubReposPane.PageSize * nextPage; branchesProps.hasMore = branchesProps.lastPageInfo?.hasNextPage;
this.triggerRender(); this.triggerRender();
} }
@ -211,15 +215,18 @@ export class GitHubReposPane extends ContextualPaneBase {
this.unpinnedReposProps.hasMore = true; this.unpinnedReposProps.hasMore = true;
this.triggerRender(); this.triggerRender();
const nextPage = Math.floor(this.allGitHubRepos.length / GitHubReposPane.PageSize) + 1;
try { try {
const response = await this.gitHubClient.getReposAsync(nextPage, GitHubReposPane.PageSize); const response = await this.gitHubClient.getReposAsync(
GitHubReposPane.PageSize,
this.allGitHubReposLastPageInfo?.endCursor
);
if (response.status !== HttpStatusCodes.OK) { if (response.status !== HttpStatusCodes.OK) {
throw new Error(`Received HTTP ${response.status} when fetching unpinned repos`); throw new Error(`Received HTTP ${response.status} when fetching unpinned repos`);
} }
if (response.data) { if (response.data) {
this.allGitHubRepos = this.allGitHubRepos.concat(response.data); this.allGitHubRepos = this.allGitHubRepos.concat(response.data);
this.allGitHubReposLastPageInfo = response.pageInfo;
this.unpinnedReposProps.repos = this.calculateUnpinnedRepos(); this.unpinnedReposProps.repos = this.calculateUnpinnedRepos();
} }
} catch (error) { } catch (error) {
@ -229,7 +236,7 @@ export class GitHubReposPane extends ContextualPaneBase {
} }
this.unpinnedReposProps.isLoading = false; this.unpinnedReposProps.isLoading = false;
this.unpinnedReposProps.hasMore = this.allGitHubRepos.length === GitHubReposPane.PageSize * nextPage; this.unpinnedReposProps.hasMore = this.allGitHubReposLastPageInfo?.hasNextPage;
this.triggerRender(); this.triggerRender();
} }
@ -253,7 +260,7 @@ export class GitHubReposPane extends ContextualPaneBase {
this.pinnedReposUpdated = true; this.pinnedReposUpdated = true;
const initialReposLength = this.pinnedReposProps.repos.length; const initialReposLength = this.pinnedReposProps.repos.length;
const existingRepo = this.pinnedReposProps.repos.find(repo => repo.key === item.key); const existingRepo = _.find(this.pinnedReposProps.repos, repo => repo.key === item.key);
if (existingRepo) { if (existingRepo) {
existingRepo.branches = item.branches; existingRepo.branches = item.branches;
} else { } else {
@ -318,6 +325,7 @@ export class GitHubReposPane extends ContextualPaneBase {
if (!this.branchesProps[item.key]) { if (!this.branchesProps[item.key]) {
this.branchesProps[item.key] = { this.branchesProps[item.key] = {
branches: [], branches: [],
lastPageInfo: undefined,
hasMore: true, hasMore: true,
isLoading: true, isLoading: true,
loadMore: (): Promise<void> => this.loadMoreBranches(item.repo) loadMore: (): Promise<void> => this.loadMoreBranches(item.repo)
@ -329,6 +337,7 @@ export class GitHubReposPane extends ContextualPaneBase {
private async refreshUnpinnedRepoListItems(): Promise<void> { private async refreshUnpinnedRepoListItems(): Promise<void> {
this.allGitHubRepos = []; this.allGitHubRepos = [];
this.allGitHubReposLastPageInfo = undefined;
this.unpinnedReposProps.repos = []; this.unpinnedReposProps.repos = [];
this.loadMoreUnpinnedRepos(); this.loadMoreUnpinnedRepos();
} }

20
src/Explorer/Tree/ResourceTreeAdapter.tsx
View File

@ -14,7 +14,6 @@ import CollectionIcon from "../../../images/tree-collection.svg";
import DeleteIcon from "../../../images/delete.svg"; import DeleteIcon from "../../../images/delete.svg";
import NotebookIcon from "../../../images/notebook/Notebook-resource.svg"; import NotebookIcon from "../../../images/notebook/Notebook-resource.svg";
import RefreshIcon from "../../../images/refresh-cosmos.svg"; import RefreshIcon from "../../../images/refresh-cosmos.svg";
import { IGitHubRepo, IGitHubBranch } from "../../GitHub/GitHubClient";
import NewNotebookIcon from "../../../images/notebook/Notebook-new.svg"; import NewNotebookIcon from "../../../images/notebook/Notebook-new.svg";
import FileIcon from "../../../images/notebook/file-cosmos.svg"; import FileIcon from "../../../images/notebook/file-cosmos.svg";
import { ArrayHashMap } from "../../Common/ArrayHashMap"; import { ArrayHashMap } from "../../Common/ArrayHashMap";
@ -26,21 +25,11 @@ import TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants"; import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
import { Areas } from "../../Common/Constants"; import { Areas } from "../../Common/Constants";
import { GitHubUtils } from "../../Utils/GitHubUtils"; import { GitHubUtils } from "../../Utils/GitHubUtils";
import { SamplesRepo, SamplesBranch } from "../Notebook/NotebookSamples";
export class ResourceTreeAdapter implements ReactAdapter { export class ResourceTreeAdapter implements ReactAdapter {
private static readonly DataTitle = "DATA"; private static readonly DataTitle = "DATA";
private static readonly NotebooksTitle = "NOTEBOOKS"; private static readonly NotebooksTitle = "NOTEBOOKS";
private static readonly SamplesRepo: IGitHubRepo = {
name: "cosmos-notebooks",
owner: {
login: "Azure-Samples"
},
private: false
};
private static readonly SamplesBranch: IGitHubBranch = {
name: "master"
};
private static readonly PseudoDirPath = "PsuedoDir"; private static readonly PseudoDirPath = "PsuedoDir";
public parameters: ko.Observable<number>; public parameters: ko.Observable<number>;
@ -103,12 +92,7 @@ export class ResourceTreeAdapter implements ReactAdapter {
this.sampleNotebooksContentRoot = { this.sampleNotebooksContentRoot = {
name: "Sample Notebooks (View Only)", name: "Sample Notebooks (View Only)",
path: GitHubUtils.toContentUri( path: GitHubUtils.toContentUri(SamplesRepo.owner, SamplesRepo.name, SamplesBranch.name, ""),
ResourceTreeAdapter.SamplesRepo.owner.login,
ResourceTreeAdapter.SamplesRepo.name,
ResourceTreeAdapter.SamplesBranch.name,
""
),
type: NotebookContentItemType.Directory type: NotebookContentItemType.Directory
}; };
refreshTasks.push( refreshTasks.push(

142
src/GitHub/GitHubClient.test.ts
View File

@ -1,92 +1,110 @@
import ko from "knockout";
import { HttpStatusCodes } from "../Common/Constants"; import { HttpStatusCodes } from "../Common/Constants";
import { GitHubClient, IGitHubBranch, IGitHubRepo } from "./GitHubClient"; import { GitHubClient, IGitHubFile } from "./GitHubClient";
import { SamplesRepo, SamplesBranch, SamplesContentsQueryResponse } from "../Explorer/Notebook/NotebookSamples";
const invalidTokenCallback = jest.fn(); const invalidTokenCallback = jest.fn();
// Use a dummy token to get around API rate limit (same as AZURESAMPLESCOSMOSDBPAT in webpack.config.js) // Use a dummy token to get around API rate limit (something which doesn't affect the API quota for AZURESAMPLESCOSMOSDBPAT in Config.ts)
const gitHubClient = new GitHubClient("99e38770e29b4a61d7c49f188780504efd35cc86", invalidTokenCallback); const gitHubClient = new GitHubClient("cd1906b9534362fab6ce45d6db6c76b59e55bc50", invalidTokenCallback);
const samplesRepo: IGitHubRepo = {
name: "cosmos-notebooks",
owner: {
login: "Azure-Samples"
},
private: false
};
const samplesBranch: IGitHubBranch = {
name: "master"
};
const sampleFilePath = ".gitignore";
const sampleDirPath = ".github";
describe.skip("GitHubClient", () => { const validateGitHubFile = (file: IGitHubFile) => {
expect(file.branch).toEqual(SamplesBranch);
expect(file.commit).toBeDefined();
expect(file.name).toBeDefined();
expect(file.path).toBeDefined();
expect(file.repo).toEqual(SamplesRepo);
expect(file.type).toBeDefined();
switch (file.type) {
case "blob":
expect(file.sha).toBeDefined();
expect(file.size).toBeDefined();
break;
case "tree":
expect(file.sha).toBeUndefined();
expect(file.size).toBeUndefined();
break;
default:
throw new Error(`Unsupported github file type: ${file.type}`);
}
};
describe("GitHubClient", () => {
it("getRepoAsync returns valid repo", async () => { it("getRepoAsync returns valid repo", async () => {
const response = await gitHubClient.getRepoAsync(samplesRepo.owner.login, samplesRepo.name); const response = await gitHubClient.getRepoAsync(SamplesRepo.owner, SamplesRepo.name);
expect(response.status).toBe(HttpStatusCodes.OK); expect(response).toEqual({
expect(response.data.name).toBe(samplesRepo.name); status: HttpStatusCodes.OK,
expect(response.data.owner.login).toBe(samplesRepo.owner.login); data: SamplesRepo
});
}); });
it("getReposAsync returns repos for authenticated user", async () => { it("getReposAsync returns repos for authenticated user", async () => {
const response = await gitHubClient.getReposAsync(1, 1); const response = await gitHubClient.getReposAsync(1);
expect(response.status).toBe(HttpStatusCodes.OK); expect(response.status).toBe(HttpStatusCodes.OK);
expect(response.data).toBeDefined();
expect(response.data.length).toBe(1); expect(response.data.length).toBe(1);
expect(response.pageInfo).toBeDefined();
}); });
it("getBranchesAsync returns branches for a repo", async () => { it("getBranchesAsync returns branches for a repo", async () => {
const response = await gitHubClient.getBranchesAsync(samplesRepo.owner.login, samplesRepo.name, 1, 1); const response = await gitHubClient.getBranchesAsync(SamplesRepo.owner, SamplesRepo.name, 1);
expect(response.status).toBe(HttpStatusCodes.OK); expect(response.status).toBe(HttpStatusCodes.OK);
expect(response.data.length).toBe(1); expect(response.data).toEqual([SamplesBranch]);
expect(response.pageInfo).toBeDefined();
}); });
it("getCommitsAsync returns commits for a file", async () => { it("getContentsAsync returns files in the repo", async () => {
const response = await gitHubClient.getCommitsAsync( const response = await gitHubClient.getContentsAsync(SamplesRepo.owner, SamplesRepo.name, SamplesBranch.name);
samplesRepo.owner.login,
samplesRepo.name,
samplesBranch.name,
sampleFilePath,
1,
1
);
expect(response.status).toBe(HttpStatusCodes.OK); expect(response.status).toBe(HttpStatusCodes.OK);
expect(response.data.length).toBe(1); expect(response.data).toBeDefined();
const data = response.data as IGitHubFile[];
expect(data.length).toBeGreaterThan(0);
data.forEach(content => validateGitHubFile(content));
}); });
it("getDirContentsAsync returns files in the repo", async () => { it("getContentsAsync returns files in a dir", async () => {
const response = await gitHubClient.getDirContentsAsync( const samplesDir = SamplesContentsQueryResponse.repository.object.entries.find(file => file.type === "tree");
samplesRepo.owner.login, const response = await gitHubClient.getContentsAsync(
samplesRepo.name, SamplesRepo.owner,
samplesBranch.name, SamplesRepo.name,
"" SamplesBranch.name,
samplesDir.name
); );
expect(response.status).toBe(HttpStatusCodes.OK); expect(response.status).toBe(HttpStatusCodes.OK);
expect(response.data.length).toBeGreaterThan(0); expect(response.data).toBeDefined();
expect(response.data[0].repo).toEqual(samplesRepo);
expect(response.data[0].branch).toEqual(samplesBranch); const data = response.data as IGitHubFile[];
expect(data.length).toBeGreaterThan(0);
data.forEach(content => validateGitHubFile(content));
}); });
it("getDirContentsAsync returns files in a dir", async () => { it("getContentsAsync returns a file", async () => {
const response = await gitHubClient.getDirContentsAsync( const samplesFile = SamplesContentsQueryResponse.repository.object.entries.find(file => file.type === "blob");
samplesRepo.owner.login, const response = await gitHubClient.getContentsAsync(
samplesRepo.name, SamplesRepo.owner,
samplesBranch.name, SamplesRepo.name,
sampleDirPath SamplesBranch.name,
samplesFile.name
); );
expect(response.status).toBe(HttpStatusCodes.OK); expect(response.status).toBe(HttpStatusCodes.OK);
expect(response.data.length).toBeGreaterThan(0); expect(response.data).toBeDefined();
expect(response.data[0].repo).toEqual(samplesRepo);
expect(response.data[0].branch).toEqual(samplesBranch); const file = response.data as IGitHubFile;
expect(file.type).toBe("blob");
validateGitHubFile(file);
expect(file.content).toBeUndefined();
}); });
it("getFileContentsAsync returns a file", async () => { it("getBlobAsync returns file content", async () => {
const response = await gitHubClient.getFileContentsAsync( const samplesFile = SamplesContentsQueryResponse.repository.object.entries.find(file => file.type === "blob");
samplesRepo.owner.login, const response = await gitHubClient.getBlobAsync(SamplesRepo.owner, SamplesRepo.name, samplesFile.object.oid);
samplesRepo.name,
samplesBranch.name,
sampleFilePath
);
expect(response.status).toBe(HttpStatusCodes.OK); expect(response.status).toBe(HttpStatusCodes.OK);
expect(response.data.path).toBe(sampleFilePath); expect(response.data).toBeDefined();
expect(response.data.repo).toEqual(samplesRepo); expect(typeof response.data).toBe("string");
expect(response.data.branch).toEqual(samplesBranch);
}); });
}); });

657
src/GitHub/GitHubClient.ts
View File

@ -1,163 +1,228 @@
import { Octokit } from "@octokit/rest"; import { Octokit } from "@octokit/rest";
import { RequestHeaders } from "@octokit/types";
import { HttpStatusCodes } from "../Common/Constants"; import { HttpStatusCodes } from "../Common/Constants";
import { Logger } from "../Common/Logger";
import UrlUtility from "../Common/UrlUtility";
import { isSamplesCall, SamplesContentsQueryResponse } from "../Explorer/Notebook/NotebookSamples";
import { NotebookUtil } from "../Explorer/Notebook/NotebookUtil";
export interface IGitHubPageInfo {
endCursor: string;
hasNextPage: boolean;
}
export interface IGitHubResponse<T> { export interface IGitHubResponse<T> {
status: number; status: number;
data: T; data: T;
pageInfo?: IGitHubPageInfo;
} }
export interface IGitHubRepo { export interface IGitHubRepo {
// API properties
name: string; name: string;
owner: { owner: string;
login: string;
};
private: boolean; private: boolean;
// Custom properties
children?: IGitHubFile[]; children?: IGitHubFile[];
} }
export interface IGitHubFile { export interface IGitHubFile {
// API properties type: "blob" | "tree";
type: "file" | "dir" | "symlink" | "submodule"; size?: number;
encoding?: string;
size: number;
name: string; name: string;
path: string; path: string;
content?: string; content?: string;
sha: string; sha?: string;
// Custom properties
children?: IGitHubFile[]; children?: IGitHubFile[];
repo?: IGitHubRepo; repo: IGitHubRepo;
branch?: IGitHubBranch; branch: IGitHubBranch;
commit: IGitHubCommit;
} }
export interface IGitHubCommit { export interface IGitHubCommit {
// API properties
sha: string; sha: string;
message: string; message: string;
committer: { commitDate: string;
date: string;
};
} }
export interface IGitHubBranch { export interface IGitHubBranch {
// API properties
name: string; name: string;
} }
export interface IGitHubUser { // graphql schema
// API properties interface Collection<T> {
login: string; pageInfo?: PageInfo;
nodes: T[];
}
interface Repository {
isPrivate: boolean;
name: string;
owner: {
login: string;
};
}
interface Ref {
name: string; name: string;
} }
interface History {
history: Collection<Commit>;
}
interface Commit {
committer: {
date: string;
};
message: string;
oid: string;
}
interface Tree extends Blob {
entries: TreeEntry[];
}
interface TreeEntry {
name: string;
type: string;
object: Blob;
}
interface Blob {
byteSize?: number;
oid?: string;
}
interface PageInfo {
endCursor: string;
hasNextPage: boolean;
}
// graphql queries and types
const repositoryQuery = `query($owner: String!, $repo: String!) {
repository(owner: $owner, name: $repo) {
owner {
login
}
name
isPrivate
}
}`;
type RepositoryQueryParams = {
owner: string;
repo: string;
};
type RepositoryQueryResponse = {
repository: Repository;
};
const repositoriesQuery = `query($pageSize: Int!, $endCursor: String) {
viewer {
repositories(first: $pageSize, after: $endCursor) {
pageInfo {
endCursor,
hasNextPage
}
nodes {
owner {
login
}
name
isPrivate
}
}
}
}`;
type RepositoriesQueryParams = {
pageSize: number;
endCursor?: string;
};
type RepositoriesQueryResponse = {
viewer: {
repositories: Collection<Repository>;
};
};
const branchesQuery = `query($owner: String!, $repo: String!, $refPrefix: String!, $pageSize: Int!, $endCursor: String) {
repository(owner: $owner, name: $repo) {
refs(refPrefix: $refPrefix, first: $pageSize, after: $endCursor) {
pageInfo {
endCursor,
hasNextPage
}
nodes {
name
}
}
}
}`;
type BranchesQueryParams = {
owner: string;
repo: string;
refPrefix: string;
pageSize: number;
endCursor?: string;
};
type BranchesQueryResponse = {
repository: {
refs: Collection<Ref>;
};
};
const contentsQuery = `query($owner: String!, $repo: String!, $ref: String!, $path: String, $objectExpression: String!) {
repository(owner: $owner, name: $repo) {
owner {
login
}
name
isPrivate
ref(qualifiedName: $ref) {
name
target {
... on Commit {
history(first: 1, path: $path) {
nodes {
oid
message
committer {
date
}
}
}
}
}
}
object(expression: $objectExpression) {
... on Blob {
oid
byteSize
}
... on Tree {
entries {
name
type
object {
... on Blob {
oid
byteSize
}
}
}
}
}
}
}`;
type ContentsQueryParams = {
owner: string;
repo: string;
ref: string;
path?: string;
objectExpression: string;
};
type ContentsQueryResponse = {
repository: Repository & { ref: Ref & { target: History } } & { object: Tree };
};
export class GitHubClient { export class GitHubClient {
private static readonly gitHubApiEndpoint = "https://api.github.com"; private static readonly SelfErrorCode = 599;
private static readonly samplesRepo: IGitHubRepo = {
name: "cosmos-notebooks",
private: false,
owner: {
login: "Azure-Samples"
}
};
private static readonly samplesBranch: IGitHubBranch = {
name: "master"
};
private static readonly samplesTopCommit: IGitHubCommit = {
sha: "41b964f442b638097a75a3f3b6a6451db05a12bf",
committer: {
date: "2020-05-19T05:03:30Z"
},
message: "Fixing formatting"
};
private static readonly samplesFiles: IGitHubFile[] = [
{
name: ".github",
path: ".github",
sha: "5e6794a8177a0c07a8719f6e1d7b41cce6f92e1e",
size: 0,
type: "dir"
},
{
name: ".gitignore",
path: ".gitignore",
sha: "3e759b75bf455ac809d0987d369aab89137b5689",
size: 5582,
type: "file"
},
{
name: "1. GettingStarted.ipynb",
path: "1. GettingStarted.ipynb",
sha: "0732ff5366e4aefdc4c378c61cbd968664f0acec",
size: 3933,
type: "file"
},
{
name: "2. Visualization.ipynb",
path: "2. Visualization.ipynb",
sha: "f480134ac4adf2f50ce5fe66836c6966749d3ca1",
size: 814261,
type: "file"
},
{
name: "3. RequestUnits.ipynb",
path: "3. RequestUnits.ipynb",
sha: "252b79a4adc81e9f2ffde453231b695d75e270e8",
size: 9490,
type: "file"
},
{
name: "4. Indexing.ipynb",
path: "4. Indexing.ipynb",
sha: "e10dd67bd1c55c345226769e4f80e43659ef9cd5",
size: 10394,
type: "file"
},
{
name: "5. StoredProcedures.ipynb",
path: "5. StoredProcedures.ipynb",
sha: "949941949920de4d2d111149e2182e9657cc8134",
size: 11818,
type: "file"
},
{
name: "6. GlobalDistribution.ipynb",
path: "6. GlobalDistribution.ipynb",
sha: "b91c31dacacbc9e35750d9054063dda4a5309f3b",
size: 11375,
type: "file"
},
{
name: "7. IoTAnomalyDetection.ipynb",
path: "7. IoTAnomalyDetection.ipynb",
sha: "82057ae52a67721a5966e2361317f5dfbd0ee595",
size: 377939,
type: "file"
},
{
name: "All_API_quickstarts",
path: "All_API_quickstarts",
sha: "07054293e6c8fc00771fccd0cde207f5c8053978",
size: 0,
type: "dir"
},
{
name: "CSharp_quickstarts",
path: "CSharp_quickstarts",
sha: "10e7f5704e6b56a40cac74bc39f15b7708954f52",
size: 0,
type: "dir"
}
];
private ocktokit: Octokit; private ocktokit: Octokit;
constructor(token: string, private errorCallback: (error: any) => void) { constructor(token: string, private errorCallback: (error: any) => void) {
@ -169,167 +234,136 @@ export class GitHubClient {
} }
public async getRepoAsync(owner: string, repo: string): Promise<IGitHubResponse<IGitHubRepo>> { public async getRepoAsync(owner: string, repo: string): Promise<IGitHubResponse<IGitHubRepo>> {
if (GitHubClient.isSamplesCall(owner, repo)) { try {
const response = (await this.ocktokit.graphql(repositoryQuery, {
owner,
repo
} as RepositoryQueryParams)) as RepositoryQueryResponse;
return { return {
status: HttpStatusCodes.OK, status: HttpStatusCodes.OK,
data: GitHubClient.samplesRepo data: GitHubClient.toGitHubRepo(response.repository)
};
} catch (error) {
GitHubClient.log(Logger.logError, `GitHubClient.getRepoAsync failed: ${error}`);
return {
status: GitHubClient.SelfErrorCode,
data: undefined
}; };
} }
const response = await this.ocktokit.repos.get({
owner,
repo,
headers: GitHubClient.getDisableCacheHeaders()
});
let data: IGitHubRepo;
if (response.data) {
data = GitHubClient.toGitHubRepo(response.data);
}
return { status: response.status, data };
} }
public async getReposAsync(page: number, perPage: number): Promise<IGitHubResponse<IGitHubRepo[]>> { public async getReposAsync(pageSize: number, endCursor?: string): Promise<IGitHubResponse<IGitHubRepo[]>> {
const response = await this.ocktokit.repos.listForAuthenticatedUser({ try {
page, const response = (await this.ocktokit.graphql(repositoriesQuery, {
per_page: perPage, pageSize,
headers: GitHubClient.getDisableCacheHeaders() endCursor
}); } as RepositoriesQueryParams)) as RepositoriesQueryResponse;
let data: IGitHubRepo[]; return {
if (response.data) { status: HttpStatusCodes.OK,
data = []; data: response.viewer.repositories.nodes.map(repo => GitHubClient.toGitHubRepo(repo)),
response.data?.forEach((element: any) => data.push(GitHubClient.toGitHubRepo(element))); pageInfo: GitHubClient.toGitHubPageInfo(response.viewer.repositories.pageInfo)
};
} catch (error) {
GitHubClient.log(Logger.logError, `GitHubClient.getReposAsync failed: ${error}`);
return {
status: GitHubClient.SelfErrorCode,
data: undefined
};
} }
return { status: response.status, data };
} }
public async getBranchesAsync( public async getBranchesAsync(
owner: string, owner: string,
repo: string, repo: string,
page: number, pageSize: number,
perPage: number endCursor?: string
): Promise<IGitHubResponse<IGitHubBranch[]>> { ): Promise<IGitHubResponse<IGitHubBranch[]>> {
const response = await this.ocktokit.repos.listBranches({ try {
owner, const response = (await this.ocktokit.graphql(branchesQuery, {
repo, owner,
page, repo,
per_page: perPage, refPrefix: "refs/heads/",
headers: GitHubClient.getDisableCacheHeaders() pageSize,
}); endCursor
} as BranchesQueryParams)) as BranchesQueryResponse;
let data: IGitHubBranch[];
if (response.data) {
data = [];
response.data?.forEach(element => data.push(GitHubClient.toGitHubBranch(element)));
}
return { status: response.status, data };
}
public async getCommitsAsync(
owner: string,
repo: string,
branch: string,
path: string,
page: number,
perPage: number
): Promise<IGitHubResponse<IGitHubCommit[]>> {
if (GitHubClient.isSamplesCall(owner, repo, branch) && path === "" && page === 1 && perPage === 1) {
return { return {
status: HttpStatusCodes.OK, status: HttpStatusCodes.OK,
data: [GitHubClient.samplesTopCommit] data: response.repository.refs.nodes.map(ref => GitHubClient.toGitHubBranch(ref)),
pageInfo: GitHubClient.toGitHubPageInfo(response.repository.refs.pageInfo)
};
} catch (error) {
GitHubClient.log(Logger.logError, `GitHubClient.getBranchesAsync failed: ${error}`);
return {
status: GitHubClient.SelfErrorCode,
data: undefined
}; };
} }
const response = await this.ocktokit.repos.listCommits({
owner,
repo,
sha: branch,
path,
page,
per_page: perPage,
headers: GitHubClient.getDisableCacheHeaders()
});
let data: IGitHubCommit[];
if (response.data) {
data = [];
response.data?.forEach(element =>
data.push(GitHubClient.toGitHubCommit({ ...element.commit, sha: element.sha }))
);
}
return { status: response.status, data };
}
public async getDirContentsAsync(
owner: string,
repo: string,
branch: string,
path: string
): Promise<IGitHubResponse<IGitHubFile[]>> {
return (await this.getContentsAsync(owner, repo, branch, path)) as IGitHubResponse<IGitHubFile[]>;
}
public async getFileContentsAsync(
owner: string,
repo: string,
branch: string,
path: string
): Promise<IGitHubResponse<IGitHubFile>> {
return (await this.getContentsAsync(owner, repo, branch, path)) as IGitHubResponse<IGitHubFile>;
} }
public async getContentsAsync( public async getContentsAsync(
owner: string, owner: string,
repo: string, repo: string,
branch: string, branch: string,
path: string path?: string
): Promise<IGitHubResponse<IGitHubFile | IGitHubFile[]>> { ): Promise<IGitHubResponse<IGitHubFile | IGitHubFile[]>> {
if (GitHubClient.isSamplesCall(owner, repo, branch) && path === "") { try {
let response: ContentsQueryResponse;
if (isSamplesCall(owner, repo, branch) && !path) {
response = SamplesContentsQueryResponse;
} else {
response = (await this.ocktokit.graphql(contentsQuery, {
owner,
repo,
ref: `refs/heads/${branch}`,
path: path || undefined,
objectExpression: `refs/heads/${branch}:${path || ""}`
} as ContentsQueryParams)) as ContentsQueryResponse;
}
let data: IGitHubFile | IGitHubFile[];
const entries = response.repository.object.entries;
const gitHubRepo = GitHubClient.toGitHubRepo(response.repository);
const gitHubBranch = GitHubClient.toGitHubBranch(response.repository.ref);
const gitHubCommit = GitHubClient.toGitHubCommit(response.repository.ref.target.history.nodes[0]);
if (Array.isArray(entries)) {
data = entries.map(entry =>
GitHubClient.toGitHubFile(
entry,
(path && UrlUtility.createUri(path, entry.name)) || entry.name,
gitHubRepo,
gitHubBranch,
gitHubCommit
)
);
} else {
data = GitHubClient.toGitHubFile(
{
name: NotebookUtil.getName(path),
type: "blob",
object: response.repository.object
},
path,
gitHubRepo,
gitHubBranch,
gitHubCommit
);
}
return { return {
status: HttpStatusCodes.OK, status: HttpStatusCodes.OK,
data: GitHubClient.samplesFiles.map(file => data
GitHubClient.toGitHubFile(file, GitHubClient.samplesRepo, GitHubClient.samplesBranch) };
) } catch (error) {
GitHubClient.log(Logger.logError, `GitHubClient.getContentsAsync failed: ${error}`);
return {
status: GitHubClient.SelfErrorCode,
data: undefined
}; };
} }
const response = await this.ocktokit.repos.getContents({
owner,
repo,
path,
ref: branch,
headers: GitHubClient.getDisableCacheHeaders()
});
let data: IGitHubFile | IGitHubFile[];
if (response.data) {
const repoResponse = await this.getRepoAsync(owner, repo);
if (repoResponse.data) {
const fileRepo: IGitHubRepo = GitHubClient.toGitHubRepo(repoResponse.data);
const fileBranch: IGitHubBranch = { name: branch };
if (Array.isArray(response.data)) {
const contents: IGitHubFile[] = [];
response.data.forEach((element: any) =>
contents.push(GitHubClient.toGitHubFile(element, fileRepo, fileBranch))
);
data = contents;
} else {
data = GitHubClient.toGitHubFile(
{ ...response.data, type: response.data.type as "file" | "dir" | "symlink" | "submodule" },
fileRepo,
fileBranch
);
}
}
}
return { status: response.status, data };
} }
public async createOrUpdateFileAsync( public async createOrUpdateFileAsync(
@ -372,7 +406,9 @@ export class GitHubClient {
owner, owner,
repo, repo,
ref, ref,
headers: GitHubClient.getDisableCacheHeaders() headers: {
"If-None-Match": "" // disable 60s cache
}
}); });
const currentTree = await this.ocktokit.git.getTree({ const currentTree = await this.ocktokit.git.getTree({
@ -380,7 +416,9 @@ export class GitHubClient {
repo, repo,
tree_sha: currentRef.data.object.sha, tree_sha: currentRef.data.object.sha,
recursive: "1", recursive: "1",
headers: GitHubClient.getDisableCacheHeaders() headers: {
"If-None-Match": "" // disable 60s cache
}
}); });
// API infers tree from paths so we need to filter them out // API infers tree from paths so we need to filter them out
@ -425,7 +463,7 @@ export class GitHubClient {
public async deleteFileAsync(file: IGitHubFile, message: string): Promise<IGitHubResponse<IGitHubCommit>> { public async deleteFileAsync(file: IGitHubFile, message: string): Promise<IGitHubResponse<IGitHubCommit>> {
const response = await this.ocktokit.repos.deleteFile({ const response = await this.ocktokit.repos.deleteFile({
owner: file.repo.owner.login, owner: file.repo.owner,
repo: file.repo.name, repo: file.repo.name,
path: file.path, path: file.path,
message, message,
@ -441,10 +479,31 @@ export class GitHubClient {
return { status: response.status, data }; return { status: response.status, data };
} }
private initOctokit(token: string) { public async getBlobAsync(owner: string, repo: string, sha: string): Promise<IGitHubResponse<string>> {
const response = await this.ocktokit.git.getBlob({
owner,
repo,
file_sha: sha,
mediaType: {
format: "raw"
},
headers: {
"If-None-Match": "" // disable 60s cache
}
});
return { status: response.status, data: <string>(<unknown>response.data) };
}
private async initOctokit(token: string) {
this.ocktokit = new Octokit({ this.ocktokit = new Octokit({
auth: token, auth: token,
baseUrl: GitHubClient.gitHubApiEndpoint log: {
debug: () => {},
info: (message?: any) => GitHubClient.log(Logger.logInfo, message),
warn: (message?: any) => GitHubClient.log(Logger.logWarning, message),
error: (message?: any) => GitHubClient.log(Logger.logError, message)
}
}); });
this.ocktokit.hook.error("request", error => { this.ocktokit.hook.error("request", error => {
@ -453,53 +512,69 @@ export class GitHubClient {
}); });
} }
private static getDisableCacheHeaders(): RequestHeaders { private static log(logger: (message: string, area: string) => void, message?: any) {
if (message) {
message = typeof message === "string" ? message : JSON.stringify(message);
logger(message, "GitHubClient.Octokit");
}
}
private static toGitHubRepo(object: Repository): IGitHubRepo {
return { return {
"If-None-Match": "" owner: object.owner.login,
name: object.name,
private: object.isPrivate
}; };
} }
private static toGitHubRepo(element: IGitHubRepo): IGitHubRepo { private static toGitHubBranch(object: Ref): IGitHubBranch {
return { return {
name: element.name, name: object.name
owner: {
login: element.owner.login
},
private: element.private
}; };
} }
private static toGitHubBranch(element: IGitHubBranch): IGitHubBranch { private static toGitHubCommit(object: {
message: string;
committer: {
date: string;
};
sha?: string;
oid?: string;
}): IGitHubCommit {
return { return {
name: element.name sha: object.sha || object.oid,
message: object.message,
commitDate: object.committer.date
}; };
} }
private static toGitHubCommit(element: IGitHubCommit): IGitHubCommit { private static toGitHubPageInfo(object: PageInfo): IGitHubPageInfo {
return { return {
sha: element.sha, endCursor: object.endCursor,
message: element.message, hasNextPage: object.hasNextPage
committer: {
date: element.committer.date
}
}; };
} }
private static toGitHubFile(element: IGitHubFile, repo: IGitHubRepo, branch: IGitHubBranch): IGitHubFile { private static toGitHubFile(
entry: TreeEntry,
path: string,
repo: IGitHubRepo,
branch: IGitHubBranch,
commit: IGitHubCommit
): IGitHubFile {
if (entry.type !== "blob" && entry.type !== "tree") {
throw new Error(`Unsupported file type: ${entry.type}`);
}
return { return {
type: element.type, type: entry.type,
encoding: element.encoding, name: entry.name,
size: element.size, path,
name: element.name,
path: element.path,
content: element.content,
sha: element.sha,
repo, repo,
branch branch,
commit,
size: entry.object?.byteSize,
sha: entry.object?.oid
}; };
} }
private static isSamplesCall(owner: string, repo: string, branch?: string): boolean {
return owner === "Azure-Samples" && repo === "cosmos-notebooks" && (!branch || branch === "master");
}
} }

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

@ -10,27 +10,30 @@ const gitHubContentProvider = new GitHubContentProvider({
gitHubClient, gitHubClient,
promptForCommitMsg: () => Promise.resolve("commit msg") promptForCommitMsg: () => Promise.resolve("commit msg")
}); });
const gitHubCommit: IGitHubCommit = {
sha: "sha",
message: "message",
commitDate: "date"
};
const sampleFile: IGitHubFile = { const sampleFile: IGitHubFile = {
type: "file", type: "blob",
encoding: "encoding",
size: 0, size: 0,
name: "name.ipynb", name: "name.ipynb",
path: "dir/name.ipynb", path: "dir/name.ipynb",
content: btoa(fixture), content: fixture,
sha: "sha", sha: "sha",
repo: { repo: {
owner: { owner: "owner",
login: "login"
},
name: "repo", name: "repo",
private: false private: false
}, },
branch: { branch: {
name: "branch" name: "branch"
} },
commit: gitHubCommit
}; };
const sampleGitHubUri = GitHubUtils.toContentUri( const sampleGitHubUri = GitHubUtils.toContentUri(
sampleFile.repo.owner.login, sampleFile.repo.owner,
sampleFile.repo.name, sampleFile.repo.name,
sampleFile.branch.name, sampleFile.branch.name,
sampleFile.path sampleFile.path
@ -43,16 +46,9 @@ const sampleNotebookModel: IContent<"notebook"> = {
created: "", created: "",
last_modified: "date", last_modified: "date",
mimetype: "application/x-ipynb+json", mimetype: "application/x-ipynb+json",
content: sampleFile.content ? JSON.parse(atob(sampleFile.content)) : null, content: sampleFile.content ? JSON.parse(sampleFile.content) : null,
format: "json" format: "json"
}; };
const gitHubCommit: IGitHubCommit = {
sha: "sha",
message: "message",
committer: {
date: "date"
}
};
describe("GitHubContentProvider remove", () => { describe("GitHubContentProvider remove", () => {
it("errors on invalid path", async () => { it("errors on invalid path", async () => {
@ -125,9 +121,6 @@ describe("GitHubContentProvider get", () => {
spyOn(GitHubClient.prototype, "getContentsAsync").and.returnValue( spyOn(GitHubClient.prototype, "getContentsAsync").and.returnValue(
Promise.resolve({ status: HttpStatusCodes.OK, data: sampleFile }) Promise.resolve({ status: HttpStatusCodes.OK, data: sampleFile })
); );
spyOn(GitHubClient.prototype, "getCommitsAsync").and.returnValue(
Promise.resolve({ status: HttpStatusCodes.OK, data: [gitHubCommit] })
);
const response = await gitHubContentProvider.get(null, sampleGitHubUri, {}).toPromise(); const response = await gitHubContentProvider.get(null, sampleGitHubUri, {}).toPromise();
expect(response).toBeDefined(); expect(response).toBeDefined();
@ -176,9 +169,6 @@ describe("GitHubContentProvider update", () => {
spyOn(GitHubClient.prototype, "renameFileAsync").and.returnValue( spyOn(GitHubClient.prototype, "renameFileAsync").and.returnValue(
Promise.resolve({ status: HttpStatusCodes.OK, data: gitHubCommit }) Promise.resolve({ status: HttpStatusCodes.OK, data: gitHubCommit })
); );
spyOn(GitHubClient.prototype, "getCommitsAsync").and.returnValue(
Promise.resolve({ status: HttpStatusCodes.OK, data: [gitHubCommit] })
);
const response = await gitHubContentProvider.update(null, sampleGitHubUri, sampleNotebookModel).toPromise(); const response = await gitHubContentProvider.update(null, sampleGitHubUri, sampleNotebookModel).toPromise();
expect(response).toBeDefined(); expect(response).toBeDefined();
@ -215,18 +205,14 @@ describe("GitHubContentProvider create", () => {
spyOn(GitHubClient.prototype, "createOrUpdateFileAsync").and.returnValue( spyOn(GitHubClient.prototype, "createOrUpdateFileAsync").and.returnValue(
Promise.resolve({ status: HttpStatusCodes.Created, data: gitHubCommit }) Promise.resolve({ status: HttpStatusCodes.Created, data: gitHubCommit })
); );
spyOn(GitHubClient.prototype, "getContentsAsync").and.returnValue(
Promise.resolve({ status: HttpStatusCodes.OK, data: sampleFile })
);
const response = await gitHubContentProvider.create(null, sampleGitHubUri, sampleNotebookModel).toPromise(); const response = await gitHubContentProvider.create(null, sampleGitHubUri, sampleNotebookModel).toPromise();
expect(response).toBeDefined(); expect(response).toBeDefined();
expect(response.status).toBe(HttpStatusCodes.Created); expect(response.status).toBe(HttpStatusCodes.Created);
expect(gitHubClient.createOrUpdateFileAsync).toBeCalled(); expect(gitHubClient.createOrUpdateFileAsync).toBeCalled();
expect(gitHubClient.getContentsAsync).toBeCalled();
expect(response.response.type).toEqual(sampleNotebookModel.type); expect(response.response.type).toEqual(sampleNotebookModel.type);
expect(response.response.name).toEqual(sampleNotebookModel.name); expect(response.response.name).toBeDefined();
expect(response.response.path).toEqual(sampleNotebookModel.path); expect(response.response.path).toBeDefined();
expect(response.response.content).toBeUndefined(); expect(response.response.content).toBeUndefined();
}); });
}); });

117
src/GitHub/GitHubContentProvider.ts
View File

@ -5,7 +5,7 @@ import { AjaxResponse } from "rxjs/ajax";
import { HttpStatusCodes } from "../Common/Constants"; import { HttpStatusCodes } from "../Common/Constants";
import { Logger } from "../Common/Logger"; import { Logger } from "../Common/Logger";
import { NotebookUtil } from "../Explorer/Notebook/NotebookUtil"; import { NotebookUtil } from "../Explorer/Notebook/NotebookUtil";
import { GitHubClient, IGitHubFile, IGitHubResponse, IGitHubCommit } from "./GitHubClient"; import { GitHubClient, IGitHubFile, IGitHubResponse, IGitHubCommit, IGitHubBranch } from "./GitHubClient";
import { GitHubUtils } from "../Utils/GitHubUtils"; import { GitHubUtils } from "../Utils/GitHubUtils";
import UrlUtility from "../Common/UrlUtility"; import UrlUtility from "../Common/UrlUtility";
@ -54,23 +54,14 @@ export class GitHubContentProvider implements IContentProvider {
throw new GitHubContentProviderError("Failed to get content", content.status); throw new GitHubContentProviderError("Failed to get content", content.status);
} }
const contentInfo = GitHubUtils.fromContentUri(uri); if (!Array.isArray(content.data) && !content.data.content && params.content !== 0) {
const commitResponse = await this.params.gitHubClient.getCommitsAsync( const file = content.data;
contentInfo.owner, file.content = (
contentInfo.repo, await this.params.gitHubClient.getBlobAsync(file.repo.owner, file.repo.name, file.sha)
contentInfo.branch, ).data;
contentInfo.path,
1,
1
);
if (commitResponse.status !== HttpStatusCodes.OK) {
throw new GitHubContentProviderError("Failed to get commit", commitResponse.status);
} }
return this.createSuccessAjaxResponse( return this.createSuccessAjaxResponse(HttpStatusCodes.OK, this.createContentModel(uri, content.data, params));
HttpStatusCodes.OK,
this.createContentModel(uri, content.data, commitResponse.data[0], params)
);
} catch (error) { } catch (error) {
Logger.logError(error, "GitHubContentProvider/get", error.errno); Logger.logError(error, "GitHubContentProvider/get", error.errno);
return this.createErrorAjaxResponse(error); return this.createErrorAjaxResponse(error);
@ -90,26 +81,26 @@ export class GitHubContentProvider implements IContentProvider {
const gitHubFile = content.data as IGitHubFile; const gitHubFile = content.data as IGitHubFile;
const commitMsg = await this.validateContentAndGetCommitMsg(content, "Rename", "Rename"); const commitMsg = await this.validateContentAndGetCommitMsg(content, "Rename", "Rename");
const newUri = model.path; const newUri = model.path;
const newPath = GitHubUtils.fromContentUri(newUri).path;
const response = await this.params.gitHubClient.renameFileAsync( const response = await this.params.gitHubClient.renameFileAsync(
gitHubFile.repo.owner.login, gitHubFile.repo.owner,
gitHubFile.repo.name, gitHubFile.repo.name,
gitHubFile.branch.name, gitHubFile.branch.name,
commitMsg, commitMsg,
gitHubFile.path, gitHubFile.path,
GitHubUtils.fromContentUri(newUri).path newPath
); );
if (response.status !== HttpStatusCodes.OK) { if (response.status !== HttpStatusCodes.OK) {
throw new GitHubContentProviderError("Failed to rename", response.status); throw new GitHubContentProviderError("Failed to rename", response.status);
} }
const updatedContentResponse = await this.getContent(model.path); gitHubFile.commit = response.data;
if (updatedContentResponse.status !== HttpStatusCodes.OK) { gitHubFile.path = newPath;
throw new GitHubContentProviderError("Failed to get content after renaming", updatedContentResponse.status); gitHubFile.name = NotebookUtil.getName(gitHubFile.path);
}
return this.createSuccessAjaxResponse( return this.createSuccessAjaxResponse(
HttpStatusCodes.OK, HttpStatusCodes.OK,
this.createContentModel(newUri, updatedContentResponse.data, response.data, { content: 0 }) this.createContentModel(newUri, gitHubFile, { content: 0 })
); );
} catch (error) { } catch (error) {
Logger.logError(error, "GitHubContentProvider/update", error.errno); Logger.logError(error, "GitHubContentProvider/update", error.errno);
@ -169,14 +160,24 @@ export class GitHubContentProvider implements IContentProvider {
} }
const newUri = GitHubUtils.toContentUri(contentInfo.owner, contentInfo.repo, contentInfo.branch, path); const newUri = GitHubUtils.toContentUri(contentInfo.owner, contentInfo.repo, contentInfo.branch, path);
const newContentResponse = await this.getContent(newUri); const newGitHubFile: IGitHubFile = {
if (newContentResponse.status !== HttpStatusCodes.OK) { type: "blob",
throw new GitHubContentProviderError("Failed to get content after creating", newContentResponse.status); name: NotebookUtil.getName(newUri),
} path,
repo: {
owner: contentInfo.owner,
name: contentInfo.repo,
private: undefined
},
branch: {
name: contentInfo.branch
},
commit: response.data
};
return this.createSuccessAjaxResponse( return this.createSuccessAjaxResponse(
HttpStatusCodes.Created, HttpStatusCodes.Created,
this.createContentModel(newUri, newContentResponse.data, response.data, { content: 0 }) this.createContentModel(newUri, newGitHubFile, { content: 0 })
); );
} catch (error) { } catch (error) {
Logger.logError(error, "GitHubContentProvider/create", error.errno); Logger.logError(error, "GitHubContentProvider/create", error.errno);
@ -209,7 +210,7 @@ export class GitHubContentProvider implements IContentProvider {
const gitHubFile = content.data as IGitHubFile; const gitHubFile = content.data as IGitHubFile;
const response = await this.params.gitHubClient.createOrUpdateFileAsync( const response = await this.params.gitHubClient.createOrUpdateFileAsync(
gitHubFile.repo.owner.login, gitHubFile.repo.owner,
gitHubFile.repo.name, gitHubFile.repo.name,
gitHubFile.branch.name, gitHubFile.branch.name,
gitHubFile.path, gitHubFile.path,
@ -221,14 +222,11 @@ export class GitHubContentProvider implements IContentProvider {
throw new GitHubContentProviderError("Failed to update", response.status); throw new GitHubContentProviderError("Failed to update", response.status);
} }
const savedContentResponse = await this.getContent(uri); gitHubFile.commit = response.data;
if (savedContentResponse.status !== HttpStatusCodes.OK) {
throw new GitHubContentProviderError("Failed to get content after updating", savedContentResponse.status);
}
return this.createSuccessAjaxResponse( return this.createSuccessAjaxResponse(
HttpStatusCodes.OK, HttpStatusCodes.OK,
this.createContentModel(uri, savedContentResponse.data, response.data, { content: 0 }) this.createContentModel(uri, gitHubFile, { content: 0 })
); );
} catch (error) { } catch (error) {
Logger.logError(error, "GitHubContentProvider/update", error.errno); Logger.logError(error, "GitHubContentProvider/update", error.errno);
@ -283,7 +281,7 @@ export class GitHubContentProvider implements IContentProvider {
return commitMsg; return commitMsg;
} }
private getContent(uri: string): Promise<IGitHubResponse<IGitHubFile | IGitHubFile[]>> { private async getContent(uri: string): Promise<IGitHubResponse<IGitHubFile | IGitHubFile[]>> {
const contentInfo = GitHubUtils.fromContentUri(uri); const contentInfo = GitHubUtils.fromContentUri(uri);
if (contentInfo) { if (contentInfo) {
const { owner, repo, branch, path } = contentInfo; const { owner, repo, branch, path } = contentInfo;
@ -296,43 +294,37 @@ export class GitHubContentProvider implements IContentProvider {
private createContentModel( private createContentModel(
uri: string, uri: string,
content: IGitHubFile | IGitHubFile[], content: IGitHubFile | IGitHubFile[],
commit: IGitHubCommit,
params: Partial<IGetParams> params: Partial<IGetParams>
): IContent<FileType> { ): IContent<FileType> {
if (Array.isArray(content)) { if (Array.isArray(content)) {
return this.createDirectoryModel(uri, content, commit); return this.createDirectoryModel(uri, content);
} }
if (content.type !== "file") { if (content.type === "tree") {
return this.createDirectoryModel(uri, undefined, commit); return this.createDirectoryModel(uri, undefined);
} }
if (NotebookUtil.isNotebookFile(uri)) { if (NotebookUtil.isNotebookFile(uri)) {
return this.createNotebookModel(content, commit, params); return this.createNotebookModel(content, params);
} }
return this.createFileModel(content, commit, params); return this.createFileModel(content, params);
} }
private createDirectoryModel( private createDirectoryModel(uri: string, gitHubFiles: IGitHubFile[] | undefined): IContent<"directory"> {
uri: string,
gitHubFiles: IGitHubFile[] | undefined,
commit: IGitHubCommit
): IContent<"directory"> {
return { return {
name: GitHubUtils.fromContentUri(uri).path, name: NotebookUtil.getName(uri),
path: uri, path: uri,
type: "directory", type: "directory",
writable: true, // TODO: tamitta: we don't know this info here writable: true, // TODO: tamitta: we don't know this info here
created: "", // TODO: tamitta: we don't know this info here created: "", // TODO: tamitta: we don't know this info here
last_modified: commit.committer.date, last_modified: "", // TODO: tamitta: we don't know this info here
mimetype: undefined, mimetype: undefined,
content: gitHubFiles?.map( content: gitHubFiles?.map(
(file: IGitHubFile) => (file: IGitHubFile) =>
this.createContentModel( this.createContentModel(
GitHubUtils.toContentUri(file.repo.owner.login, file.repo.name, file.branch.name, file.path), GitHubUtils.toContentUri(file.repo.owner, file.repo.name, file.branch.name, file.path),
file, file,
commit,
{ {
content: 0 content: 0
} }
@ -342,17 +334,12 @@ export class GitHubContentProvider implements IContentProvider {
}; };
} }
private createNotebookModel( private createNotebookModel(gitHubFile: IGitHubFile, params: Partial<IGetParams>): IContent<"notebook"> {
gitHubFile: IGitHubFile, const content: Notebook = gitHubFile.content && params.content !== 0 ? JSON.parse(gitHubFile.content) : undefined;
commit: IGitHubCommit,
params: Partial<IGetParams>
): IContent<"notebook"> {
const content: Notebook =
gitHubFile.content && params.content !== 0 ? JSON.parse(atob(gitHubFile.content)) : undefined;
return { return {
name: gitHubFile.name, name: gitHubFile.name,
path: GitHubUtils.toContentUri( path: GitHubUtils.toContentUri(
gitHubFile.repo.owner.login, gitHubFile.repo.owner,
gitHubFile.repo.name, gitHubFile.repo.name,
gitHubFile.branch.name, gitHubFile.branch.name,
gitHubFile.path gitHubFile.path
@ -360,23 +347,19 @@ export class GitHubContentProvider implements IContentProvider {
type: "notebook", type: "notebook",
writable: true, // TODO: tamitta: we don't know this info here writable: true, // TODO: tamitta: we don't know this info here
created: "", // TODO: tamitta: we don't know this info here created: "", // TODO: tamitta: we don't know this info here
last_modified: commit.committer.date, last_modified: gitHubFile.commit.commitDate,
mimetype: content ? "application/x-ipynb+json" : undefined, mimetype: content ? "application/x-ipynb+json" : undefined,
content, content,
format: content ? "json" : undefined format: content ? "json" : undefined
}; };
} }
private createFileModel( private createFileModel(gitHubFile: IGitHubFile, params: Partial<IGetParams>): IContent<"file"> {
gitHubFile: IGitHubFile, const content: string = gitHubFile.content && params.content !== 0 ? gitHubFile.content : undefined;
commit: IGitHubCommit,
params: Partial<IGetParams>
): IContent<"file"> {
const content: string = gitHubFile.content && params.content !== 0 ? atob(gitHubFile.content) : undefined;
return { return {
name: gitHubFile.name, name: gitHubFile.name,
path: GitHubUtils.toContentUri( path: GitHubUtils.toContentUri(
gitHubFile.repo.owner.login, gitHubFile.repo.owner,
gitHubFile.repo.name, gitHubFile.repo.name,
gitHubFile.branch.name, gitHubFile.branch.name,
gitHubFile.path gitHubFile.path
@ -384,7 +367,7 @@ export class GitHubContentProvider implements IContentProvider {
type: "file", type: "file",
writable: true, // TODO: tamitta: we don't know this info here writable: true, // TODO: tamitta: we don't know this info here
created: "", // TODO: tamitta: we don't know this info here created: "", // TODO: tamitta: we don't know this info here
last_modified: commit.committer.date, last_modified: gitHubFile.commit.commitDate,
mimetype: content ? "text/plain" : undefined, mimetype: content ? "text/plain" : undefined,
content, content,
format: content ? "text" : undefined format: content ? "text" : undefined

6
src/HostedExplorer.ts
View File

@ -713,7 +713,7 @@ class HostedExplorer {
? storedDefaultTenantId.substring(DefaultDirectoryDropdownComponent.lastVisitedKey.length) ? storedDefaultTenantId.substring(DefaultDirectoryDropdownComponent.lastVisitedKey.length)
: storedDefaultTenantId; : storedDefaultTenantId;
let defaultTenant: Tenant = tenants.find(t => t.tenantId === storedDefaultTenantId); let defaultTenant: Tenant = _.find(tenants, t => t.tenantId === storedDefaultTenantId);
if (!defaultTenant) { if (!defaultTenant) {
defaultTenant = tenants[0]; defaultTenant = tenants[0];
LocalStorageUtility.setEntryString( LocalStorageUtility.setEntryString(
@ -830,7 +830,7 @@ class HostedExplorer {
const storedAccountId = LocalStorageUtility.getEntryString(StorageKey.DatabaseAccountId); const storedAccountId = LocalStorageUtility.getEntryString(StorageKey.DatabaseAccountId);
const storedSubId = storedAccountId && storedAccountId.split("subscriptions/")[1].split("/")[0]; const storedSubId = storedAccountId && storedAccountId.split("subscriptions/")[1].split("/")[0];
let defaultSub = subscriptions.find(s => s.subscriptionId === storedSubId); let defaultSub = _.find(subscriptions, s => s.subscriptionId === storedSubId);
if (!defaultSub) { if (!defaultSub) {
defaultSub = subscriptions[0]; defaultSub = subscriptions[0];
} }
@ -932,7 +932,7 @@ class HostedExplorer {
} }
let storedDefaultAccountId = LocalStorageUtility.getEntryString(StorageKey.DatabaseAccountId); let storedDefaultAccountId = LocalStorageUtility.getEntryString(StorageKey.DatabaseAccountId);
let defaultAccount = accounts.find(a => a.id === storedDefaultAccountId); let defaultAccount = _.find(accounts, a => a.id === storedDefaultAccountId);
if (!defaultAccount) { if (!defaultAccount) {
defaultAccount = accounts[0]; defaultAccount = accounts[0];

18
src/Utils/GitHubUtils.ts
View File

@ -7,6 +7,10 @@ export class GitHubUtils {
// Custom scheme for github content // Custom scheme for github content
private static readonly ContentUriPattern = /github:\/\/([^/]*)\/([^/]*)\/([^?]*)\?ref=(.*)/; private static readonly ContentUriPattern = /github:\/\/([^/]*)\/([^/]*)\/([^?]*)\?ref=(.*)/;
// https://github.com/<owner>/<repo>/blob/<branch>/<path>
// We need to support this until we move to newer scheme for quickstarts
private static readonly LegacyContentUriPattern = /https:\/\/github.com\/([^/]*)\/([^/]*)\/blob\/([^/]*)\/([^?]*)/;
public static toRepoFullName(owner: string, repo: string): string { public static toRepoFullName(owner: string, repo: string): string {
return `${owner}/${repo}`; return `${owner}/${repo}`;
} }
@ -27,7 +31,7 @@ export class GitHubUtils {
public static fromContentUri( public static fromContentUri(
contentUri: string contentUri: string
): undefined | { owner: string; repo: string; branch: string; path: string } { ): undefined | { owner: string; repo: string; branch: string; path: string } {
const matches = contentUri.match(GitHubUtils.ContentUriPattern); let matches = contentUri.match(GitHubUtils.ContentUriPattern);
if (matches && matches.length > 4) { if (matches && matches.length > 4) {
return { return {
owner: matches[1], owner: matches[1],
@ -37,6 +41,18 @@ export class GitHubUtils {
}; };
} }
matches = contentUri.match(GitHubUtils.LegacyContentUriPattern);
if (matches && matches.length > 4) {
console.log(`Using legacy github content uri scheme ${contentUri}`);
return {
owner: matches[1],
repo: matches[2],
branch: matches[3],
path: matches[4]
};
}
return undefined; return undefined;
} }

6
src/Utils/JunoUtils.ts
View File

@ -54,7 +54,7 @@ export class JunoUtils {
public static toPinnedRepo(item: RepoListItem): IPinnedRepo { public static toPinnedRepo(item: RepoListItem): IPinnedRepo {
return { return {
owner: item.repo.owner.login, owner: item.repo.owner,
name: item.repo.name, name: item.repo.name,
private: item.repo.private, private: item.repo.private,
branches: item.branches.map(element => ({ name: element.name })) branches: item.branches.map(element => ({ name: element.name }))
@ -63,9 +63,7 @@ export class JunoUtils {
public static toGitHubRepo(pinnedRepo: IPinnedRepo): IGitHubRepo { public static toGitHubRepo(pinnedRepo: IPinnedRepo): IGitHubRepo {
return { return {
owner: { owner: pinnedRepo.owner,
login: pinnedRepo.owner
},
name: pinnedRepo.name, name: pinnedRepo.name,
private: pinnedRepo.private private: pinnedRepo.private
}; };