filecoin-project/slate
1
1
Fork 0
mirror of https://github.com/filecoin-project/slate.git synced 2024-11-22 21:45:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

patches

Browse Source
This commit is contained in:
jimmylee 2021-02-09 01:56:24 -08:00
parent f4cef78420
commit df92fdacd9
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/browser-websockets.js
View File

@ -8,7 +8,7 @@ let savedResource = null;
let savedViewer = null;
let savedOnUpdate = null;
export const init = ({ resource = "", viewer, onUpdate, onNewActiveUser }) => {
export const init = ({ resource = "", viewer, onUpdate, onNewActiveUser = () => {} }) => {
savedResource = resource;
savedViewer = viewer;
savedOnUpdate = onUpdate;
@ -79,7 +79,7 @@ export const init = ({ resource = "", viewer, onUpdate, onNewActiveUser }) => {
onUpdate(data);
}
if (type === "UPDATE_USERS_ONLINE") {
if (type === "UPDATE_USERS_ONLINE" && typeof onNewActiveUser === "function") {
onNewActiveUser(data);
}
});

32
common/user-behaviors.js
View File

@ -11,6 +11,7 @@ import * as Events from "~/common/custom-events";
import Cookies from "universal-cookie";
import JSZip from "jszip";
import { v4 as uuid } from "uuid";
import { saveAs } from "file-saver";
//NOTE(martina): this file is for utility *API-calling* functions
@ -111,16 +112,29 @@ export const formatDroppedFiles = async ({ dataTransfer }) => {
let fileLoading = {};
if (dataTransfer.items && dataTransfer.items.length) {
for (var i = 0; i < dataTransfer.items.length; i++) {
const it = dataTransfer.items[i];
var file = null;
if (it.kind === "file") {
file = it.getAsFile();
} else if (it.kind == "string" && it.type == "text/uri-list") {
let asString = new Promise((resolve, reject) => it.getAsString((d) => resolve(d))); // kill me
const resp = await fetch(await asString);
const blob = resp.blob(); // is there an easier way to chain all this await?
const data = dataTransfer.items[i];
file = new File(blob, "dragged link"); // theres probably some way to get a real file name for this, but i dont think we care?
let file = null;
if (data.kind === "file") {
file = data.getAsFile();
} else if (data.kind == "string" && data.type == "text/uri-list") {
try {
const dataAsString = new Promise((resolve, reject) =>
data.getAsString((d) => resolve(d))
);
const resp = await fetch(await dataAsString);
const blob = resp.blob();
file = new File(blob, `data-${uuid()}`);
file.name = `data-${uuid()}`;
console.log(file);
} catch (e) {
Events.dispatchMessage({
message: "File type not supported. Please try a different file",
});
return { error: true };
}
}
files.push(file);

7
components/core/Application.js
View File

@ -252,10 +252,14 @@ export default class ApplicationPage extends React.Component {
_handleDrop = async (e) => {
e.preventDefault();
this.setState({ sidebar: null });
const { fileLoading, files, numFailed } = UserBehaviors.formatDroppedFiles({
const { fileLoading, files, numFailed, error } = await UserBehaviors.formatDroppedFiles({
dataTransfer: e.dataTransfer,
});
if (error) {
return null;
}
let page;
if (typeof window !== "undefined") {
page = window?.history?.state;
@ -272,6 +276,7 @@ export default class ApplicationPage extends React.Component {
) {
slate = this.state.data;
}
this._handleRegisterFileLoading({ fileLoading });
this._handleUpload({ files, slate, keys: Object.keys(fileLoading), numFailed });
};