Skip to content
Snippets Groups Projects
Commit 166c3ea2 authored by Denys Mishunov's avatar Denys Mishunov
Browse files

Stores 'binary' and 'rawPath' attr after upload

- When uploading a file, we need to flag binary files correspondingly
so that it gets propagated all the way to RepoEditor as it decides on
whether to show editor for this or that file or not (shouldHideEditor())

- rawPath needs to be propagate all the way to ContentViewer as well so
that uploaded images could be rendered as a base64 image right away
instead of raw base64 string
parent c8c8dd11
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -57,6 +57,8 @@ export default {
type: 'blob',
content: result,
base64: !isText,
binary: !isText,
rawPath: !isText ? target.result : '',
});
},
readFile(file) {
Loading
Loading
Loading
Loading
@@ -22,6 +22,8 @@ export const decorateFiles = ({
tempFile = false,
content = '',
base64 = false,
binary = false,
rawPath = '',
}) => {
const treeList = [];
const entries = {};
Loading
Loading
@@ -90,6 +92,8 @@ export const decorateFiles = ({
changed: tempFile,
content,
base64,
binary,
rawPath,
previewMode: viewerInformationForPath(name),
parentPath,
});
Loading
Loading
Loading
Loading
@@ -53,7 +53,7 @@ export const setResizingStatus = ({ commit }, resizing) => {
 
export const createTempEntry = (
{ state, commit, dispatch },
{ name, type, content = '', base64 = false },
{ name, type, content = '', base64 = false, binary = false, rawPath = '' },
) =>
new Promise(resolve => {
const fullName = name.slice(-1) !== '/' && type === 'tree' ? `${name}/` : name;
Loading
Loading
@@ -79,8 +79,10 @@ export const createTempEntry = (
branchId: state.currentBranchId,
type,
tempFile: true,
base64,
content,
base64,
binary,
rawPath,
});
const { file, parentPath } = data;
 
Loading
Loading
Loading
Loading
@@ -69,6 +69,8 @@ export const decorateData = entity => {
changed = false,
parentTreeUrl = '',
base64 = false,
binary = false,
rawPath = '',
previewMode,
file_lock,
html,
Loading
Loading
@@ -92,6 +94,8 @@ export const decorateData = entity => {
renderError,
content,
base64,
binary,
rawPath,
previewMode,
file_lock,
html,
Loading
Loading
Loading
Loading
@@ -78,6 +78,8 @@ describe('new dropdown upload', () => {
type: 'blob',
content: 'plain text',
base64: false,
binary: false,
rawPath: '',
});
});
 
Loading
Loading
@@ -89,6 +91,8 @@ describe('new dropdown upload', () => {
type: 'blob',
content: binaryTarget.result.split('base64,')[1],
base64: true,
binary: true,
rawPath: binaryTarget.result,
});
});
});
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment