resolve merge conflict

This commit is contained in:
hardiknai-techm
2021-05-04 13:03:01 +05:30
75 changed files with 6769 additions and 3886 deletions

View File

@@ -1,18 +1,17 @@
import React, { ChangeEvent, FunctionComponent, useState } from "react";
import { Upload } from "../../../Common/Upload/Upload";
import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../../Utils/NotificationConsoleUtils";
import Explorer from "../../Explorer";
import { NotebookContentItem } from "../../Notebook/NotebookContentItem";
import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
export interface UploadFilePanelProps {
explorer: Explorer;
expandConsole: () => void;
closePanel: () => void;
uploadFile: (name: string, content: string) => Promise<NotebookContentItem>;
}
export const UploadFilePane: FunctionComponent<UploadFilePanelProps> = ({
explorer: container,
expandConsole,
closePanel,
uploadFile,
}: UploadFilePanelProps) => {
@@ -90,7 +89,7 @@ export const UploadFilePane: FunctionComponent<UploadFilePanelProps> = ({
};
const genericPaneProps: RightPaneFormProps = {
container: container,
expandConsole,
formError: formErrors,
formErrorDetail: formErrorsDetails,
id: "uploadFilePane",