@@ -64,17 +64,16 @@ const mod = /Mac|iPod|iPhone|iPad/.test(navigator.platform) ? 'Meta' : 'Ctrl';
const getShortcut = (method) => {
let result = '';
Object.entries(store.getters['data/computedSettings'].shortcuts).some(([keys, shortcut]) => {
- if (`${shortcut.method || shortcut}` !== method) {
- return false;
+ if (`${shortcut.method || shortcut}` === method) {
+ result = keys.split('+').map(key => key.toLowerCase()).map((key) => {
+ if (key === 'mod') {
+ return mod;
+ }
+ // Capitalize
+ return key && `${key[0].toUpperCase()}${key.slice(1)}`;
+ }).join('+');
}
- result = keys.split('+').map(key => key.toLowerCase()).map((key) => {
- if (key === 'mod') {
- return mod;
- }
- // Capitalize
- return key && `${key[0].toUpperCase()}${key.slice(1)}`;
- }).join('+');
- return true;
+ return result;
});
return result && ` – ${result}`;
};
diff --git a/src/components/ProviderName.vue b/src/components/ProviderName.vue
deleted file mode 100644
index 79e7c2d1..00000000
--- a/src/components/ProviderName.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-
- {{name}}
-
-
-
diff --git a/src/components/common/globals.js b/src/components/common/globals.js
new file mode 100644
index 00000000..0ede56ad
--- /dev/null
+++ b/src/components/common/globals.js
@@ -0,0 +1,46 @@
+import Vue from 'vue';
+import timeSvc from '../../services/timeSvc';
+import store from '../../store';
+
+// Global directives
+Vue.directive('focus', {
+ inserted(el) {
+ el.focus();
+ const { value } = el;
+ if (value && el.setSelectionRange) {
+ el.setSelectionRange(0, value.length);
+ }
+ },
+});
+
+const setVisible = (el, value) => {
+ el.style.display = value ? '' : 'none';
+ if (value) {
+ el.removeAttribute('aria-hidden');
+ } else {
+ el.setAttribute('aria-hidden', 'true');
+ }
+};
+Vue.directive('show', {
+ bind(el, { value }) {
+ setVisible(el, value);
+ },
+ update(el, { value, oldValue }) {
+ if (value !== oldValue) {
+ setVisible(el, value);
+ }
+ },
+});
+
+Vue.directive('title', {
+ bind(el, { value }) {
+ el.title = value;
+ el.setAttribute('aria-label', value);
+ },
+});
+
+// Global filters
+Vue.filter('formatTime', time =>
+ // Access the minute counter for reactive refresh
+ timeSvc.format(time, store.state.minuteCounter));
+
diff --git a/src/components/gutters/Comment.vue b/src/components/gutters/Comment.vue
index b3e063ea..1651ac10 100644
--- a/src/components/gutters/Comment.vue
+++ b/src/components/gutters/Comment.vue
@@ -49,7 +49,7 @@ export default {
]),
async removeComment() {
try {
- await this.$store.dispatch('modal/commentDeletion');
+ await this.$store.dispatch('modal/open', 'commentDeletion');
this.$store.dispatch('discussion/cleanCurrentFile', { filterComment: this.comment });
} catch (e) {
// Cancel
diff --git a/src/components/gutters/CurrentDiscussion.vue b/src/components/gutters/CurrentDiscussion.vue
index f14b68be..d2c0b783 100644
--- a/src/components/gutters/CurrentDiscussion.vue
+++ b/src/components/gutters/CurrentDiscussion.vue
@@ -95,7 +95,7 @@ export default {
},
async removeDiscussion() {
try {
- await this.$store.dispatch('modal/discussionDeletion');
+ await this.$store.dispatch('modal/open', 'discussionDeletion');
this.$store.dispatch('discussion/cleanCurrentFile', {
filterDiscussion: this.currentDiscussion,
});
diff --git a/src/components/menus/MoreMenu.vue b/src/components/menus/MoreMenu.vue
index 38735eb1..21f4ff2f 100644
--- a/src/components/menus/MoreMenu.vue
+++ b/src/components/menus/MoreMenu.vue
@@ -96,7 +96,7 @@ export default {
},
async reset() {
try {
- await this.$store.dispatch('modal/reset');
+ await this.$store.dispatch('modal/open', 'reset');
window.location.href = '#reset=true';
window.location.reload();
} catch (e) {
diff --git a/src/components/modals/PandocExportModal.vue b/src/components/modals/PandocExportModal.vue
index 7c787c36..cf59d2cc 100644
--- a/src/components/modals/PandocExportModal.vue
+++ b/src/components/modals/PandocExportModal.vue
@@ -68,7 +68,7 @@ export default modalTemplate({
FileSaver.saveAs(body, `${currentFile.name}.${selectedFormat}`);
} catch (err) {
if (err.status === 401) {
- this.$store.dispatch('modal/sponsorOnly');
+ this.$store.dispatch('modal/open', 'sponsorOnly');
} else {
console.error(err); // eslint-disable-line no-console
this.$store.dispatch('notification/error', err);
diff --git a/src/components/modals/PdfExportModal.vue b/src/components/modals/PdfExportModal.vue
index 619373c4..2980d86d 100644
--- a/src/components/modals/PdfExportModal.vue
+++ b/src/components/modals/PdfExportModal.vue
@@ -65,7 +65,7 @@ export default modalTemplate({
FileSaver.saveAs(body, `${currentFile.name}.pdf`);
} catch (err) {
if (err.status === 401) {
- this.$store.dispatch('modal/sponsorOnly');
+ this.$store.dispatch('modal/open', 'sponsorOnly');
} else {
console.error(err); // eslint-disable-line no-console
this.$store.dispatch('notification/error', err);
diff --git a/src/components/modals/WorkspaceManagementModal.vue b/src/components/modals/WorkspaceManagementModal.vue
index 626777d3..69f07c36 100644
--- a/src/components/modals/WorkspaceManagementModal.vue
+++ b/src/components/modals/WorkspaceManagementModal.vue
@@ -77,7 +77,7 @@ export default {
},
async remove(id) {
try {
- await this.$store.dispatch('modal/removeWorkspace');
+ await this.$store.dispatch('modal/open', 'removeWorkspace');
localDbSvc.removeWorkspace(id);
} catch (e) {
// Cancel
diff --git a/src/components/modals/common/ModalInner.vue b/src/components/modals/common/ModalInner.vue
index 14516990..cc43d310 100644
--- a/src/components/modals/common/ModalInner.vue
+++ b/src/components/modals/common/ModalInner.vue
@@ -33,7 +33,7 @@ export default {
try {
if (!this.$store.getters['workspace/sponsorToken']) {
// User has to sign in
- await this.$store.dispatch('modal/signInForSponsorship');
+ await this.$store.dispatch('modal/open', 'signInForSponsorship');
await googleHelper.signin();
syncSvc.requestSync();
}
diff --git a/src/data/faq.md b/src/data/faq.md
index ad6add70..d27614dd 100644
--- a/src/data/faq.md
+++ b/src/data/faq.md
@@ -1,12 +1,12 @@
**Where is my data stored?**
-If your workspace is not synced, your files are only stored inside your browser (using the [IndexedDB API](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API)) and are not stored anywhere else.
+If your workspace is not synced, your files are only stored inside your browser using the [IndexedDB API](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) and are not stored anywhere else.
We recommend syncing your workspace to make sure files won't be lost in case your browser data is cleared.
**Where is my data stored once I sync my workspace?**
-If you sign in with Google, your main workspace will be stored in Google Drive (in your [app data folder](https://developers.google.com/drive/v3/web/appdata)).
+If you sign in with Google, your main workspace will be stored in Google Drive, in your [app data folder](https://developers.google.com/drive/v3/web/appdata).
If you open a Google Drive workspace, the files in the workspace will be stored inside a Google Drive folder which you can share with other users.
diff --git a/src/data/pagedownButtons.js b/src/data/pagedownButtons.js
index 367827b4..cf5dc89e 100644
--- a/src/data/pagedownButtons.js
+++ b/src/data/pagedownButtons.js
@@ -1,4 +1,5 @@
-export default [{}, {
+export default [{
+}, {
method: 'bold',
title: 'Bold',
icon: 'format-bold',
@@ -14,7 +15,8 @@ export default [{}, {
method: 'strikethrough',
title: 'Strikethrough',
icon: 'format-strikethrough',
-}, {}, {
+}, {
+}, {
method: 'ulist',
title: 'Unordered list',
icon: 'format-list-bulleted',
@@ -26,7 +28,8 @@ export default [{}, {
method: 'clist',
title: 'Check list',
icon: 'format-list-checks',
-}, {}, {
+}, {
+}, {
method: 'quote',
title: 'Blockquote',
icon: 'format-quote-close',
diff --git a/src/data/simpleModals.js b/src/data/simpleModals.js
new file mode 100644
index 00000000..aa1dfb9c
--- /dev/null
+++ b/src/data/simpleModals.js
@@ -0,0 +1,97 @@
+const simpleModal = (contentHtml, rejectText, resolveText) => ({
+ contentHtml: typeof contentHtml === 'function' ? contentHtml : () => contentHtml,
+ rejectText,
+ resolveText,
+});
+
+/* eslint sort-keys: "error" */
+export default {
+ commentDeletion: simpleModal(
+ '
You are about to delete a comment. Are you sure?
',
+ 'No',
+ 'Yes, delete',
+ ),
+ discussionDeletion: simpleModal(
+ '
You are about to delete a discussion. Are you sure?
',
+ 'No',
+ 'Yes, delete',
+ ),
+ fileRestoration: simpleModal(
+ '
You are about to revert some changes. Are you sure?
',
+ 'No',
+ 'Yes, revert',
+ ),
+ folderDeletion: simpleModal(
+ config => `
You are about to delete the folder ${config.item.name}. Its files will be moved to Trash. Are you sure?
`,
+ 'No',
+ 'Yes, delete',
+ ),
+ pathConflict: simpleModal(
+ config => `
${config.item.name} already exists. Do you want to add a suffix?
`,
+ 'No',
+ 'Yes, add suffix',
+ ),
+ paymentSuccess: simpleModal(
+ '
Thank you for your payment! Your sponsorship will be active in a minute.
',
+ 'Ok',
+ ),
+ providerRedirection: simpleModal(
+ config => `
You are about to navigate to the ${config.name} authorization page.
`,
+ 'Cancel',
+ 'Ok, go on',
+ ),
+ removeWorkspace: simpleModal(
+ '
You are about to remove a workspace locally. Are you sure?
',
+ 'No',
+ 'Yes, remove',
+ ),
+ reset: simpleModal(
+ '
This will clean all your workspaces locally. Are you sure?
',
+ 'No',
+ 'Yes, clean',
+ ),
+ signInForComment: simpleModal(
+ `
You have to sign in with Google to start commenting.
+
Note: This will sync your main workspace.
`,
+ 'Cancel',
+ 'Ok, sign in',
+ ),
+ signInForSponsorship: simpleModal(
+ `
You have to sign in with Google to sponsor.
+
Note: This will sync your main workspace.
`,
+ 'Cancel',
+ 'Ok, sign in',
+ ),
+ sponsorOnly: simpleModal(
+ '
This feature is restricted to sponsors as it relies on server resources.
',
+ 'Ok, I understand',
+ ),
+ stripName: simpleModal(
+ config => `
${config.item.name} contains illegal characters. Do you want to strip them?
`,
+ 'No',
+ 'Yes, strip',
+ ),
+ tempFileDeletion: simpleModal(
+ config => `
You are about to permanently delete the temporary file ${config.item.name}. Are you sure?
`,
+ 'No',
+ 'Yes, delete',
+ ),
+ tempFolderDeletion: simpleModal(
+ '
You are about to permanently delete all the temporary files. Are you sure?
',
+ 'No',
+ 'Yes, delete all',
+ ),
+ trashDeletion: simpleModal(
+ '
Files in the trash are automatically deleted after 7 days of inactivity.
',
+ 'Ok',
+ ),
+ unauthorizedName: simpleModal(
+ config => `
${config.item.name} is an unauthorized name.
`,
+ 'Ok',
+ ),
+ workspaceGoogleRedirection: simpleModal(
+ '
StackEdit needs full Google Drive access to open this workspace.
',
+ 'Cancel',
+ 'Ok, grant',
+ ),
+};
diff --git a/src/index.js b/src/index.js
index 418a5d0c..8b9c79cb 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,9 +2,9 @@ import Vue from 'vue';
import 'babel-polyfill';
import 'indexeddbshim/dist/indexeddbshim';
import * as OfflinePluginRuntime from 'offline-plugin/runtime';
-import './extensions/';
+import './extensions';
import './services/optional';
-import './icons/';
+import './icons';
import App from './components/App';
import store from './store';
import localDbSvc from './services/localDbSvc';
diff --git a/src/libs/clunderscore.js b/src/libs/clunderscore.js
index 0271f6b3..de2f2390 100644
--- a/src/libs/clunderscore.js
+++ b/src/libs/clunderscore.js
@@ -140,7 +140,8 @@ objectProperties.cl_extend = function (obj) {
function build(properties) {
return objectProperties.cl_reduce.call(properties, function (memo, value, key) {
memo[key] = {
- value: value
+ value: value,
+ configurable: true
}
return memo
}, {})
diff --git a/src/services/explorerSvc.js b/src/services/explorerSvc.js
index eb143d99..6827cca8 100644
--- a/src/services/explorerSvc.js
+++ b/src/services/explorerSvc.js
@@ -20,9 +20,10 @@ export default {
if (selectedNode.isNil) {
return;
}
+
if (selectedNode.isTrash || selectedNode.item.parentId === 'trash') {
try {
- await store.dispatch('modal/trashDeletion');
+ await store.dispatch('modal/open', 'trashDeletion');
} catch (e) {
// Cancel
}
@@ -33,13 +34,19 @@ export default {
let moveToTrash = true;
try {
if (selectedNode.isTemp) {
- await store.dispatch('modal/tempFolderDeletion', selectedNode.item);
+ await store.dispatch('modal/open', 'tempFolderDeletion');
moveToTrash = false;
} else if (selectedNode.item.parentId === 'temp') {
- await store.dispatch('modal/tempFileDeletion', selectedNode.item);
+ await store.dispatch('modal/open', {
+ type: 'tempFileDeletion',
+ item: selectedNode.item,
+ });
moveToTrash = false;
} else if (selectedNode.isFolder) {
- await store.dispatch('modal/folderDeletion', selectedNode.item);
+ await store.dispatch('modal/open', {
+ type: 'folderDeletion',
+ item: selectedNode.item,
+ });
}
} catch (e) {
return; // cancel
diff --git a/src/services/fileSvc.js b/src/services/fileSvc.js
index 69830fbe..3194b796 100644
--- a/src/services/fileSvc.js
+++ b/src/services/fileSvc.js
@@ -16,7 +16,7 @@ export default {
comments,
} = {}, background = false) {
const id = utils.uid();
- const file = {
+ const item = {
id,
name: utils.sanitizeName(name),
parentId: parentId || null,
@@ -34,23 +34,29 @@ export default {
// Show warning dialogs
if (!background) {
// If name is being stripped
- if (file.name !== utils.defaultName && file.name !== name) {
- await store.dispatch('modal/stripName', name);
+ if (item.name !== utils.defaultName && item.name !== name) {
+ await store.dispatch('modal/open', {
+ type: 'stripName',
+ item,
+ });
}
// Check if there is already a file with that path
if (workspaceUniquePaths) {
- const parentPath = store.getters.itemPaths[file.parentId] || '';
- const path = parentPath + file.name;
+ const parentPath = store.getters.itemPaths[item.parentId] || '';
+ const path = parentPath + item.name;
if (store.getters.pathItems[path]) {
- await store.dispatch('modal/pathConflict', name);
+ await store.dispatch('modal/open', {
+ type: 'pathConflict',
+ item,
+ });
}
}
}
// Save file and content in the store
store.commit('content/setItem', content);
- store.commit('file/setItem', file);
+ store.commit('file/setItem', item);
if (workspaceUniquePaths) {
this.makePathUnique(id);
}
@@ -67,14 +73,20 @@ export default {
const sanitizedName = utils.sanitizeName(item.name);
if (item.type === 'folder' && forbiddenFolderNameMatcher.exec(sanitizedName)) {
- await store.dispatch('modal/unauthorizedName', item.name);
+ await store.dispatch('modal/open', {
+ type: 'unauthorizedName',
+ item,
+ });
throw new Error('Unauthorized name.');
}
// Show warning dialogs
// If name has been stripped
if (sanitizedName !== utils.defaultName && sanitizedName !== item.name) {
- await store.dispatch('modal/stripName', item.name);
+ await store.dispatch('modal/open', {
+ type: 'stripName',
+ item,
+ });
}
// Check if there is a path conflict
if (store.getters['workspace/hasUniquePaths']) {
@@ -82,7 +94,10 @@ export default {
const path = parentPath + sanitizedName;
const pathItems = store.getters.pathItems[path] || [];
if (pathItems.some(itemWithSamePath => itemWithSamePath.id !== id)) {
- await store.dispatch('modal/pathConflict', item.name);
+ await store.dispatch('modal/open', {
+ type: 'pathConflict',
+ item,
+ });
}
}
diff --git a/src/services/localDbSvc.js b/src/services/localDbSvc.js
index cdb8f194..0e9123cd 100644
--- a/src/services/localDbSvc.js
+++ b/src/services/localDbSvc.js
@@ -399,7 +399,7 @@ const localDbSvc = {
// Enable sponsorship
if (utils.queryParams.paymentSuccess) {
window.location.hash = ''; // PaymentSuccess param is always on its own
- store.dispatch('modal/paymentSuccess')
+ store.dispatch('modal/open', 'paymentSuccess')
.catch(() => { /* Cancel */ });
const sponsorToken = store.getters['workspace/sponsorToken'];
// Force check sponsorship after a few seconds
diff --git a/src/services/networkSvc.js b/src/services/networkSvc.js
index 394dc684..8bbb2358 100644
--- a/src/services/networkSvc.js
+++ b/src/services/networkSvc.js
@@ -215,13 +215,24 @@ export default {
const attempt = async () => {
try {
- await new Promise((resolve, reject) => {
+ return await new Promise((resolve, reject) => {
if (offlineCheck) {
store.commit('updateLastOfflineCheck');
}
+
const xhr = new window.XMLHttpRequest();
xhr.withCredentials = config.withCredentials || false;
- let timeoutId;
+
+ const timeoutId = setTimeout(() => {
+ xhr.abort();
+ if (offlineCheck) {
+ isConnectionDown = true;
+ store.commit('setOffline', true);
+ reject(new Error('You are offline.'));
+ } else {
+ reject(new Error('Network request timeout.'));
+ }
+ }, config.timeout);
xhr.onload = () => {
if (offlineCheck) {
@@ -242,9 +253,9 @@ export default {
}
if (result.status >= 200 && result.status < 300) {
resolve(result);
- return;
+ } else {
+ reject(result);
}
- reject(result);
};
xhr.onerror = () => {
@@ -258,21 +269,13 @@ export default {
}
};
- timeoutId = setTimeout(() => {
- xhr.abort();
- if (offlineCheck) {
- isConnectionDown = true;
- store.commit('setOffline', true);
- reject(new Error('You are offline.'));
- } else {
- reject(new Error('Network request timeout.'));
- }
- }, config.timeout);
-
const url = utils.addQueryParams(config.url, config.params);
xhr.open(config.method || 'GET', url);
- Object.entries(config.headers).forEach(([key, value]) =>
- value && xhr.setRequestHeader(key, `${value}`));
+ Object.entries(config.headers).forEach(([key, value]) => {
+ if (value) {
+ xhr.setRequestHeader(key, `${value}`);
+ }
+ });
if (config.blob) {
xhr.responseType = 'blob';
}
@@ -286,7 +289,7 @@ export default {
// Exponential backoff
retryAfter *= 2;
});
- attempt();
+ return attempt();
}
throw err;
}
diff --git a/src/services/providers/couchdbWorkspaceProvider.js b/src/services/providers/couchdbWorkspaceProvider.js
index 20c3400b..99e1ebcf 100644
--- a/src/services/providers/couchdbWorkspaceProvider.js
+++ b/src/services/providers/couchdbWorkspaceProvider.js
@@ -91,7 +91,7 @@ export default new Provider({
syncLastSeq,
});
},
- async saveSimpleItem(item, syncData) {
+ async saveWorkspaceItem(item, syncData) {
const syncToken = store.getters['workspace/syncToken'];
const { id, rev } = couchdbHelper.uploadDocument({
token: syncToken,
@@ -108,78 +108,85 @@ export default new Provider({
rev,
};
},
- removeItem(syncData) {
+ removeWorkspaceItem(syncData) {
const syncToken = store.getters['workspace/syncToken'];
return couchdbHelper.removeDocument(syncToken, syncData.id, syncData.rev);
},
- downloadContent(token, syncLocation) {
- return this.downloadData(`${syncLocation.fileId}/content`);
- },
- async downloadData(dataId) {
- const syncData = store.getters['data/syncDataByItemId'][dataId];
- if (!syncData) {
- return Promise.resolve();
- }
- const syncToken = store.getters['workspace/syncToken'];
- const body = await couchdbHelper.retrieveDocumentWithAttachments(syncToken, syncData.id);
- let item;
- if (body.item.type === 'content') {
- item = Provider.parseContent(body.attachments.data, body.item.id);
- } else {
- item = utils.addItemHash(JSON.parse(body.attachments.data));
- }
+ async downloadWorkspaceContent(token, syncData) {
+ const body = await couchdbHelper.retrieveDocumentWithAttachments(token, syncData.id);
const rev = body._rev; // eslint-disable-line no-underscore-dangle
- if (item.hash !== syncData.hash || rev !== syncData.rev) {
- store.dispatch('data/patchSyncData', {
- [syncData.id]: {
- ...syncData,
- hash: item.hash,
- rev,
- },
- });
- }
- return item;
+ const item = Provider.parseContent(body.attachments.data, body.item.id);
+ return {
+ item,
+ syncData: {
+ ...syncData,
+ hash: item.hash,
+ rev,
+ },
+ };
},
- async uploadContent(token, content, syncLocation) {
- await this.uploadData(content);
- return syncLocation;
- },
- async uploadData(item) {
- const syncData = store.getters['data/syncDataByItemId'][item.id];
- if (!syncData || syncData.hash !== item.hash) {
- let data;
- let dataType;
- if (item.type === 'content') {
- data = Provider.serializeContent(item);
- dataType = 'text/plain';
- } else {
- data = JSON.stringify(item);
- dataType = 'application/json';
- }
- const syncToken = store.getters['workspace/syncToken'];
- const res = await couchdbHelper.uploadDocument({
- token: syncToken,
- item: {
- id: item.id,
- type: item.type,
- hash: item.hash,
- },
- data,
- dataType,
- documentId: syncData && syncData.id,
- rev: syncData && syncData.rev,
- });
- store.dispatch('data/patchSyncData', {
- [res.id]: {
- // Build sync data
- id: res.id,
- itemId: item.id,
- type: item.type,
- hash: item.hash,
- rev: res.rev,
- },
- });
+ async downloadWorkspaceData(token, dataId, syncData) {
+ if (!syncData) {
+ return {};
}
+
+ const body = await couchdbHelper.retrieveDocumentWithAttachments(token, syncData.id);
+ const item = utils.addItemHash(JSON.parse(body.attachments.data));
+ const rev = body._rev; // eslint-disable-line no-underscore-dangle
+ return {
+ item,
+ syncData: {
+ ...syncData,
+ hash: item.hash,
+ rev,
+ },
+ };
+ },
+ async uploadWorkspaceContent(token, item, syncData) {
+ const res = await couchdbHelper.uploadDocument({
+ token,
+ item: {
+ id: item.id,
+ type: item.type,
+ hash: item.hash,
+ },
+ data: Provider.serializeContent(item),
+ dataType: 'text/plain',
+ documentId: syncData && syncData.id,
+ rev: syncData && syncData.rev,
+ });
+
+ // Return new sync data
+ return {
+ id: res.id,
+ itemId: item.id,
+ type: item.type,
+ hash: item.hash,
+ rev: res.rev,
+ };
+ },
+ async uploadWorkspaceData(token, item, syncData) {
+ const res = await couchdbHelper.uploadDocument({
+ token,
+ item: {
+ id: item.id,
+ type: item.type,
+ hash: item.hash,
+ },
+ data: JSON.stringify(item),
+ dataType: 'application/json',
+ documentId: syncData && syncData.id,
+ rev: syncData && syncData.rev,
+ });
+
+ // Return new sync data
+ return {
+ id: res.id,
+ itemId: item.id,
+ type: item.type,
+ hash: item.hash,
+ rev: res.rev,
+ };
},
async listRevisions(token, fileId) {
const syncData = Provider.getContentSyncData(fileId);
diff --git a/src/services/providers/githubWorkspaceProvider.js b/src/services/providers/githubWorkspaceProvider.js
index b57ed3c1..375acffb 100644
--- a/src/services/providers/githubWorkspaceProvider.js
+++ b/src/services/providers/githubWorkspaceProvider.js
@@ -28,6 +28,7 @@ const endsWith = (str, suffix) => str.slice(-suffix.length) === suffix;
export default new Provider({
id: 'githubWorkspace',
+ isGit: true,
getToken() {
return store.getters['workspace/syncToken'];
},
@@ -110,29 +111,31 @@ export default new Provider({
const path = blobEntry.path.slice(workspacePath.length);
// Collect blob sha
treeShaMap[path] = blobEntry.sha;
- // Collect parents path
- let parentPath = '';
- path.split('/').slice(0, -1).forEach((folderName) => {
- const folderPath = `${parentPath}${folderName}/`;
- treeFolderMap[folderPath] = parentPath;
- parentPath = folderPath;
- });
- // Collect file path
if (path.indexOf('.stackedit-data/') === 0) {
treeDataMap[path] = true;
- } else if (endsWith(path, '.md')) {
- treeFileMap[path] = parentPath;
- } else if (endsWith(path, '.sync')) {
- treeSyncLocationMap[path] = true;
- } else if (endsWith(path, '.publish')) {
- treePublishLocationMap[path] = true;
+ } else {
+ // Collect parents path
+ let parentPath = '';
+ path.split('/').slice(0, -1).forEach((folderName) => {
+ const folderPath = `${parentPath}${folderName}/`;
+ treeFolderMap[folderPath] = parentPath;
+ parentPath = folderPath;
+ });
+ // Collect file path
+ if (endsWith(path, '.md')) {
+ treeFileMap[path] = parentPath;
+ } else if (endsWith(path, '.sync')) {
+ treeSyncLocationMap[path] = true;
+ } else if (endsWith(path, '.publish')) {
+ treePublishLocationMap[path] = true;
+ }
}
});
// Collect changes
const changes = [];
const pathIds = {};
- const syncDataToIgnore = Object.create(null);
+ const syncDataToKeep = Object.create(null);
const getId = (path) => {
const syncData = syncDataByPath[path];
const id = syncData ? syncData.itemId : utils.uid();
@@ -185,7 +188,7 @@ export default new Provider({
// Content creations/updates
const contentSyncData = syncDataByItemId[`${id}/content`];
if (contentSyncData) {
- syncDataToIgnore[contentSyncData.id] = true;
+ syncDataToKeep[contentSyncData.id] = true;
}
if (!contentSyncData || contentSyncData.sha !== treeShaMap[path]) {
// Use `/` as a prefix to get a unique syncData id
@@ -211,11 +214,12 @@ export default new Provider({
// Data creations/updates
Object.keys(treeDataMap).forEach((path) => {
try {
- const [, id] = path.match(/^\.stackedit-data\/([\s\S]+)\.json$/);
+ // Only template data are stored
+ const [, id] = path.match(/^\.stackedit-data\/(templates)\.json$/) || [];
pathIds[path] = id;
const syncData = syncDataByItemId[id];
if (syncData) {
- syncDataToIgnore[syncData.id] = true;
+ syncDataToKeep[syncData.id] = true;
}
if (!syncData || syncData.sha !== treeShaMap[path]) {
changes.push({
@@ -281,40 +285,28 @@ export default new Provider({
// Deletions
Object.keys(syncDataByPath).forEach((path) => {
- if (!pathIds[path] && !syncDataToIgnore[path]) {
+ if (!pathIds[path] && !syncDataToKeep[path]) {
changes.push({ syncDataId: path });
}
});
return changes;
},
- async saveSimpleItem(item) {
- const path = store.getters.itemPaths[item.fileId || item.id];
- const syncToken = store.getters['workspace/syncToken'];
+ async saveWorkspaceItem(item) {
const syncData = {
+ id: store.getters.itemGitPaths[item.id],
itemId: item.id,
type: item.type,
hash: item.hash,
};
- if (item.type === 'file') {
- syncData.id = `${path}.md`;
- return syncData;
- }
- if (item.type === 'folder') {
- syncData.id = path;
+ // Files and folders are not in git, only contents
+ if (item.type === 'file' || item.type === 'folder') {
return syncData;
}
// locations are stored as paths, so we upload an empty file
- const data = utils.encodeBase64(utils.serializeObject({
- ...item,
- id: undefined,
- type: undefined,
- fileId: undefined,
- }), true);
- const extension = item.type === 'syncLocation' ? 'sync' : 'publish';
- syncData.id = `${path}.${data}.${extension}`;
+ const syncToken = store.getters['workspace/syncToken'];
await githubHelper.uploadFile({
...getWorkspaceWithOwner(),
token: syncToken,
@@ -324,9 +316,8 @@ export default new Provider({
});
return syncData;
},
- async removeItem(syncData) {
- // Ignore content deletion
- if (syncData.type !== 'content') {
+ async removeWorkspaceItem(syncData) {
+ if (treeShaMap[syncData.id]) {
const syncToken = store.getters['workspace/syncToken'];
await githubHelper.removeFile({
...getWorkspaceWithOwner(),
@@ -336,102 +327,91 @@ export default new Provider({
});
}
},
- async downloadContent(token, syncLocation) {
- const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId];
- const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
- if (!syncData || !contentSyncData) {
- return null;
+ async downloadWorkspaceContent(token, contentSyncData) {
+ const [fileId] = contentSyncData.itemId.split('/');
+ const path = store.getters.itemGitPaths[fileId];
+ const syncData = store.getters['data/syncData'][path];
+ if (!syncData) {
+ return {};
}
const { sha, content } = await githubHelper.downloadFile({
...getWorkspaceWithOwner(),
token,
path: getAbsolutePath(syncData),
});
- const item = Provider.parseContent(content, `${syncLocation.fileId}/content`);
- if (item.hash !== contentSyncData.hash) {
- store.dispatch('data/patchSyncData', {
- [contentSyncData.id]: {
- ...contentSyncData,
- hash: item.hash,
- sha,
- },
- });
- }
- return item;
+ treeShaMap[path] = sha;
+ const item = Provider.parseContent(content, `${fileId}/content`);
+ return {
+ item,
+ syncData: {
+ ...contentSyncData,
+ hash: item.hash,
+ sha,
+ },
+ };
},
- async downloadData(dataId) {
- const syncData = store.getters['data/syncDataByItemId'][dataId];
+ async downloadWorkspaceData(token, dataId, syncData) {
if (!syncData) {
- return null;
+ return {};
}
- const syncToken = store.getters['workspace/syncToken'];
+
const { sha, content } = await githubHelper.downloadFile({
...getWorkspaceWithOwner(),
- token: syncToken,
+ token,
path: getAbsolutePath(syncData),
});
+ treeShaMap[syncData.id] = sha;
const item = JSON.parse(content);
- if (item.hash !== syncData.hash) {
- store.dispatch('data/patchSyncData', {
- [syncData.id]: {
- ...syncData,
- hash: item.hash,
- sha,
- },
- });
- }
- return item;
- },
- async uploadContent(token, content, syncLocation) {
- const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
- if (!contentSyncData || contentSyncData.hash !== content.hash) {
- const path = `${store.getters.itemPaths[syncLocation.fileId]}.md`;
- const absolutePath = `${store.getters['workspace/currentWorkspace'].path || ''}${path}`;
- const id = `/${path}`;
- const res = await githubHelper.uploadFile({
- ...getWorkspaceWithOwner(),
- token,
- path: absolutePath,
- content: Provider.serializeContent(content),
- sha: treeShaMap[id],
- });
- store.dispatch('data/patchSyncData', {
- [id]: {
- // Build sync data
- id,
- itemId: content.id,
- type: content.type,
- hash: content.hash,
- sha: res.content.sha,
- },
- });
- }
- return syncLocation;
- },
- async uploadData(item) {
- const oldSyncData = store.getters['data/syncDataByItemId'][item.id];
- if (!oldSyncData || oldSyncData.hash !== item.hash) {
- const syncData = {
- id: `.stackedit-data/${item.id}.json`,
- itemId: item.id,
- type: item.type,
+ return {
+ item,
+ syncData: {
+ ...syncData,
hash: item.hash,
- };
- const syncToken = store.getters['workspace/syncToken'];
- const res = await githubHelper.uploadFile({
- ...getWorkspaceWithOwner(),
- token: syncToken,
- path: getAbsolutePath(syncData),
- content: JSON.stringify(item),
- sha: oldSyncData && oldSyncData.sha,
- });
- store.dispatch('data/patchSyncData', {
- [syncData.id]: {
- ...syncData,
- sha: res.content.sha,
- },
- });
- }
+ sha,
+ },
+ };
+ },
+ async uploadWorkspaceContent(token, item) {
+ const [fileId] = item.id.split('/');
+ const path = store.getters.itemGitPaths[fileId];
+ const absolutePath = `${store.getters['workspace/currentWorkspace'].path || ''}${path}`;
+ const res = await githubHelper.uploadFile({
+ ...getWorkspaceWithOwner(),
+ token,
+ path: absolutePath,
+ content: Provider.serializeContent(item),
+ sha: treeShaMap[path],
+ });
+
+ // Return new sync data
+ return {
+ id: store.getters.itemGitPaths[item.id],
+ itemId: item.id,
+ type: item.type,
+ hash: item.hash,
+ sha: res.content.sha,
+ };
+ },
+ async uploadWorkspaceData(token, item) {
+ const path = store.getters.itemGitPaths[item.id];
+ const syncData = {
+ id: path,
+ itemId: item.id,
+ type: item.type,
+ hash: item.hash,
+ };
+ const res = await githubHelper.uploadFile({
+ ...getWorkspaceWithOwner(),
+ token,
+ path: getAbsolutePath(syncData),
+ content: JSON.stringify(item),
+ sha: treeShaMap[path],
+ });
+
+ return {
+ ...syncData,
+ sha: res.content.sha,
+ };
},
onSyncEnd() {
// Clean up
diff --git a/src/services/providers/googleDriveAppDataProvider.js b/src/services/providers/googleDriveAppDataProvider.js
index d83a63b0..1f990c49 100644
--- a/src/services/providers/googleDriveAppDataProvider.js
+++ b/src/services/providers/googleDriveAppDataProvider.js
@@ -48,7 +48,7 @@ export default new Provider({
syncStartPageToken,
});
},
- async saveSimpleItem(item, syncData, ifNotTooLate) {
+ async saveWorkspaceItem(item, syncData, ifNotTooLate) {
const syncToken = store.getters['workspace/syncToken'];
const file = await googleHelper.uploadAppDataFile({
token: syncToken,
@@ -64,60 +64,77 @@ export default new Provider({
hash: item.hash,
};
},
- removeItem(syncData, ifNotTooLate) {
+ removeWorkspaceItem(syncData, ifNotTooLate) {
const syncToken = store.getters['workspace/syncToken'];
return googleHelper.removeAppDataFile(syncToken, syncData.id, ifNotTooLate);
},
- downloadContent(token, syncLocation) {
- return this.downloadData(`${syncLocation.fileId}/content`);
- },
- async downloadData(dataId) {
- const syncData = store.getters['data/syncDataByItemId'][dataId];
- if (!syncData) {
- return null;
- }
- const syncToken = store.getters['workspace/syncToken'];
- const data = await googleHelper.downloadAppDataFile(syncToken, syncData.id);
+ async downloadWorkspaceContent(token, syncData) {
+ const data = await googleHelper.downloadAppDataFile(token, syncData.id);
const item = utils.addItemHash(JSON.parse(data));
- if (item.hash !== syncData.hash) {
- store.dispatch('data/patchSyncData', {
- [syncData.id]: {
- ...syncData,
- hash: item.hash,
- },
- });
- }
- return item;
+ return {
+ item,
+ syncData: {
+ ...syncData,
+ hash: item.hash,
+ },
+ };
},
- async uploadContent(token, content, syncLocation, ifNotTooLate) {
- await this.uploadData(content, ifNotTooLate);
- return syncLocation;
- },
- async uploadData(item, ifNotTooLate) {
- const syncData = store.getters['data/syncDataByItemId'][item.id];
- if (!syncData || syncData.hash !== item.hash) {
- const syncToken = store.getters['workspace/syncToken'];
- const file = await googleHelper.uploadAppDataFile({
- token: syncToken,
- name: JSON.stringify({
- id: item.id,
- type: item.type,
- hash: item.hash,
- }),
- media: JSON.stringify(item),
- fileId: syncData && syncData.id,
- ifNotTooLate,
- });
- store.dispatch('data/patchSyncData', {
- [file.id]: {
- // Build sync data
- id: file.id,
- itemId: item.id,
- type: item.type,
- hash: item.hash,
- },
- });
+ async downloadWorkspaceData(token, dataId, syncData) {
+ if (!syncData) {
+ return {};
}
+
+ const data = await googleHelper.downloadAppDataFile(token, syncData.id);
+ const item = utils.addItemHash(JSON.parse(data));
+ return {
+ item,
+ syncData: {
+ ...syncData,
+ hash: item.hash,
+ },
+ };
+ },
+ async uploadWorkspaceContent(token, item, syncData, ifNotTooLate) {
+ const file = await googleHelper.uploadAppDataFile({
+ token,
+ name: JSON.stringify({
+ id: item.id,
+ type: item.type,
+ hash: item.hash,
+ }),
+ media: JSON.stringify(item),
+ fileId: syncData && syncData.id,
+ ifNotTooLate,
+ });
+
+ // Return new sync data
+ return {
+ id: file.id,
+ itemId: item.id,
+ type: item.type,
+ hash: item.hash,
+ };
+ },
+ async uploadWorkspaceData(token, item, syncData, ifNotTooLate) {
+ const file = await googleHelper.uploadAppDataFile({
+ token,
+ name: JSON.stringify({
+ id: item.id,
+ type: item.type,
+ hash: item.hash,
+ }),
+ media: JSON.stringify(item),
+ fileId: syncData && syncData.id,
+ ifNotTooLate,
+ });
+
+ // Return new sync data
+ return {
+ id: file.id,
+ itemId: item.id,
+ type: item.type,
+ hash: item.hash,
+ };
},
async listRevisions(token, fileId) {
const syncData = Provider.getContentSyncData(fileId);
diff --git a/src/services/providers/googleDriveWorkspaceProvider.js b/src/services/providers/googleDriveWorkspaceProvider.js
index 37552336..ee1f4f91 100644
--- a/src/services/providers/googleDriveWorkspaceProvider.js
+++ b/src/services/providers/googleDriveWorkspaceProvider.js
@@ -89,7 +89,7 @@ export default new Provider({
let token = store.getters['data/googleTokens'][sub];
// If no token has been found, popup an authorize window and get one
if (!token || !token.isDrive || !token.driveFullAccess) {
- await store.dispatch('modal/workspaceGoogleRedirection');
+ await store.dispatch('modal/open', 'workspaceGoogleRedirection');
token = await googleHelper.addDriveAccount(true, utils.queryParams.sub);
}
@@ -312,7 +312,7 @@ export default new Provider({
syncStartPageToken,
});
},
- async saveSimpleItem(item, syncData, ifNotTooLate) {
+ async saveWorkspaceItem(item, syncData, ifNotTooLate) {
const workspace = store.getters['workspace/currentWorkspace'];
const syncToken = store.getters['workspace/syncToken'];
let file;
@@ -363,133 +363,88 @@ export default new Provider({
hash: item.hash,
};
},
- async removeItem(syncData, ifNotTooLate) {
+ async removeWorkspaceItem(syncData, ifNotTooLate) {
// Ignore content deletion
if (syncData.type !== 'content') {
const syncToken = store.getters['workspace/syncToken'];
await googleHelper.removeFile(syncToken, syncData.id, ifNotTooLate);
}
},
- async downloadContent(token, syncLocation) {
- const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId];
- const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
- if (!syncData || !contentSyncData) {
- return null;
+ async downloadWorkspaceContent(token, contentSyncData) {
+ const [fileId] = contentSyncData.itemId.split('/');
+ const syncData = store.getters['data/syncDataByItemId'][fileId];
+ if (!syncData) {
+ return {};
}
const content = await googleHelper.downloadFile(token, syncData.id);
- const item = Provider.parseContent(content, `${syncLocation.fileId}/content`);
- if (item.hash !== contentSyncData.hash) {
- store.dispatch('data/patchSyncData', {
- [contentSyncData.id]: {
- ...contentSyncData,
- hash: item.hash,
- },
- });
- }
+ const item = Provider.parseContent(content, contentSyncData.itemId);
// Open the file requested by action if it wasn't synced yet
if (fileIdToOpen && fileIdToOpen === syncData.id) {
fileIdToOpen = null;
// Open the file once downloaded content has been stored
setTimeout(() => {
- store.commit('file/setCurrentId', syncData.itemId);
+ store.commit('file/setCurrentId', fileId);
}, 10);
}
- return item;
+
+ return {
+ item,
+ syncData: {
+ ...contentSyncData,
+ hash: item.hash,
+ },
+ };
},
- async downloadData(dataId) {
- const syncData = store.getters['data/syncDataByItemId'][dataId];
+ async downloadWorkspaceData(token, dataId, syncData) {
if (!syncData) {
- return null;
+ return {};
}
- const syncToken = store.getters['workspace/syncToken'];
- const content = await googleHelper.downloadFile(syncToken, syncData.id);
+
+ const content = await googleHelper.downloadFile(token, syncData.id);
const item = JSON.parse(content);
- if (item.hash !== syncData.hash) {
- store.dispatch('data/patchSyncData', {
- [syncData.id]: {
- ...syncData,
- hash: item.hash,
- },
- });
- }
- return item;
+ return {
+ item,
+ syncData: {
+ ...syncData,
+ hash: item.hash,
+ },
+ };
},
- async uploadContent(token, content, syncLocation, ifNotTooLate) {
- const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`];
- if (!contentSyncData || contentSyncData.hash !== content.hash) {
- const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId];
- let file;
- if (syncData) {
- // Only update file media
- file = await googleHelper.uploadFile({
- token,
- media: Provider.serializeContent(content),
- fileId: syncData.id,
- ifNotTooLate,
- });
- } else {
- // Create file with media
- const workspace = store.getters['workspace/currentWorkspace'];
- // Use deepCopy to freeze objects
- const item = utils.deepCopy(store.state.file.itemMap[syncLocation.fileId]);
- const parentSyncData = store.getters['data/syncDataByItemId'][item.parentId];
- file = await googleHelper.uploadFile({
- token,
- name: item.name,
- parents: [parentSyncData ? parentSyncData.id : workspace.folderId],
- appProperties: {
- id: item.id,
- folderId: workspace.folderId,
- },
- media: Provider.serializeContent(content),
- ifNotTooLate,
- });
- store.dispatch('data/patchSyncData', {
- [file.id]: {
- id: file.id,
- itemId: item.id,
- type: item.type,
- hash: item.hash,
- },
- });
- }
- store.dispatch('data/patchSyncData', {
- [`${file.id}/content`]: {
- // Build sync data
- id: `${file.id}/content`,
- itemId: content.id,
- type: content.type,
- hash: content.hash,
- },
- });
- }
- return syncLocation;
- },
- async uploadData(item, ifNotTooLate) {
- const syncData = store.getters['data/syncDataByItemId'][item.id];
- if (!syncData || syncData.hash !== item.hash) {
- const workspace = store.getters['workspace/currentWorkspace'];
- const syncToken = store.getters['workspace/syncToken'];
- const file = await googleHelper.uploadFile({
- token: syncToken,
- name: JSON.stringify({
- id: item.id,
- type: item.type,
- hash: item.hash,
- }),
- parents: [workspace.dataFolderId],
- appProperties: {
- folderId: workspace.folderId,
- },
- media: JSON.stringify(item),
- fileId: syncData && syncData.id,
- oldParents: syncData && syncData.parentIds,
+ async uploadWorkspaceContent(token, content, contentSyncData, ifNotTooLate) {
+ const [fileId] = content.id.split('/');
+ const syncData = store.getters['data/syncDataByItemId'][fileId];
+ let file;
+
+ if (syncData) {
+ // Only update file media
+ file = await googleHelper.uploadFile({
+ token,
+ media: Provider.serializeContent(content),
+ fileId: syncData.id,
ifNotTooLate,
});
+ } else {
+ // Create file with media
+ const workspace = store.getters['workspace/currentWorkspace'];
+ // Use deepCopy to freeze objects
+ const item = utils.deepCopy(store.state.file.itemMap[fileId]);
+ const parentSyncData = store.getters['data/syncDataByItemId'][item.parentId];
+ file = await googleHelper.uploadFile({
+ token,
+ name: item.name,
+ parents: [parentSyncData ? parentSyncData.id : workspace.folderId],
+ appProperties: {
+ id: item.id,
+ folderId: workspace.folderId,
+ },
+ media: Provider.serializeContent(content),
+ ifNotTooLate,
+ });
+
+ // Create file syncData
store.dispatch('data/patchSyncData', {
[file.id]: {
- // Build sync data
id: file.id,
itemId: item.id,
type: item.type,
@@ -497,6 +452,41 @@ export default new Provider({
},
});
}
+
+ // Return new sync data
+ return {
+ id: `${file.id}/content`,
+ itemId: content.id,
+ type: content.type,
+ hash: content.hash,
+ };
+ },
+ async uploadWorkspaceData(token, item, syncData, ifNotTooLate) {
+ const workspace = store.getters['workspace/currentWorkspace'];
+ const file = await googleHelper.uploadFile({
+ token,
+ name: JSON.stringify({
+ id: item.id,
+ type: item.type,
+ hash: item.hash,
+ }),
+ parents: [workspace.dataFolderId],
+ appProperties: {
+ folderId: workspace.folderId,
+ },
+ media: JSON.stringify(item),
+ fileId: syncData && syncData.id,
+ oldParents: syncData && syncData.parentIds,
+ ifNotTooLate,
+ });
+
+ // Return new sync data
+ return {
+ id: file.id,
+ itemId: item.id,
+ type: item.type,
+ hash: item.hash,
+ };
},
async listRevisions(token, fileId) {
const syncData = Provider.getContentSyncData(fileId);
diff --git a/src/services/providers/helpers/githubHelper.js b/src/services/providers/helpers/githubHelper.js
index 7668e9d3..41ac1e32 100644
--- a/src/services/providers/helpers/githubHelper.js
+++ b/src/services/providers/helpers/githubHelper.js
@@ -113,12 +113,12 @@ export default {
repo,
branch,
}) {
- const { commit } = (await repoRequest(token, owner, repo, {
+ const { commit } = await repoRequest(token, owner, repo, {
url: `commits/${encodeURIComponent(branch)}`,
- })).body;
- const { tree, truncated } = (await repoRequest(token, owner, repo, {
+ });
+ const { tree, truncated } = await repoRequest(token, owner, repo, {
url: `git/trees/${encodeURIComponent(commit.tree.sha)}?recursive=1`,
- })).body;
+ });
if (truncated) {
throw new Error('Git tree too big. Please remove some files in the repository.');
}
@@ -198,13 +198,13 @@ export default {
branch,
path,
}) {
- const body = await repoRequest(token, owner, repo, {
+ const { sha, content } = await repoRequest(token, owner, repo, {
url: `contents/${encodeURIComponent(path)}`,
params: { ref: branch },
});
return {
- sha: body.sha,
- content: utils.decodeBase64(body.content),
+ sha,
+ content: utils.decodeBase64(content),
};
},
diff --git a/src/services/providers/helpers/googleHelper.js b/src/services/providers/helpers/googleHelper.js
index 9a19ab6f..2fbaa337 100644
--- a/src/services/providers/helpers/googleHelper.js
+++ b/src/services/providers/helpers/googleHelper.js
@@ -190,7 +190,10 @@ export default {
if (store.state.offline) {
throw err;
}
- await store.dispatch('modal/providerRedirection', { providerName: 'Google' });
+ await store.dispatch('modal/open', {
+ type: 'providerRedirection',
+ name: 'Google',
+ });
return this.startOauth2(mergedScopes, sub);
}
},
@@ -231,7 +234,7 @@ export default {
mediaType = null,
fileId = null,
oldParents = null,
- ifNotTooLate = cb => res => cb(res),
+ ifNotTooLate = cb => cb(),
}) {
// Refreshing a token can take a while if an oauth window pops up, make sure it's not too late
return ifNotTooLate(() => {
@@ -374,7 +377,7 @@ export default {
/**
* https://developers.google.com/drive/v3/reference/files/delete
*/
- async $removeFile(refreshedToken, id, ifNotTooLate = cb => res => cb(res)) {
+ async $removeFile(refreshedToken, id, ifNotTooLate = cb => cb()) {
// Refreshing a token can take a while if an oauth window pops up, so check if it's too late
return ifNotTooLate(() => this.$request(refreshedToken, {
method: 'DELETE',
@@ -388,7 +391,7 @@ export default {
const refreshedToken = await this.refreshToken(token, getDriveScopes(token));
return this.$removeFile(refreshedToken, id, ifNotTooLate);
},
- async removeAppDataFile(token, id, ifNotTooLate = cb => res => cb(res)) {
+ async removeAppDataFile(token, id, ifNotTooLate = cb => cb()) {
const refreshedToken = await this.refreshToken(token, driveAppDataScopes);
return this.$removeFile(refreshedToken, id, ifNotTooLate);
},
@@ -599,7 +602,7 @@ export default {
}
const refreshedToken = await this.refreshToken(token, scopes);
const { google } = window;
- return Promise((resolve) => {
+ return new Promise((resolve) => {
let picker;
const pickerBuilder = new google.picker.PickerBuilder()
.setOAuthToken(refreshedToken.accessToken)
diff --git a/src/services/providers/helpers/wordpressHelper.js b/src/services/providers/helpers/wordpressHelper.js
index ad4c9a78..69cbd143 100644
--- a/src/services/providers/helpers/wordpressHelper.js
+++ b/src/services/providers/helpers/wordpressHelper.js
@@ -57,7 +57,10 @@ export default {
}
// Existing token is going to expire.
// Try to get a new token in background
- await store.dispatch('modal/providerRedirection', { providerName: 'WordPress' });
+ await store.dispatch('modal/open', {
+ type: 'providerRedirection',
+ name: 'WordPress',
+ });
return this.startOauth2(sub);
},
addAccount(fullAccess = false) {
diff --git a/src/services/publishSvc.js b/src/services/publishSvc.js
index bbcbb1aa..8557135f 100644
--- a/src/services/publishSvc.js
+++ b/src/services/publishSvc.js
@@ -103,24 +103,22 @@ const requestPublish = () => {
return;
}
- store.dispatch('queue/enqueuePublishRequest', () => new Promise((resolve, reject) => {
+ store.dispatch('queue/enqueuePublishRequest', async () => {
let intervalId;
- const attempt = () => {
+ const attempt = async () => {
// Only start publishing when these conditions are met
if (networkSvc.isUserActive()) {
clearInterval(intervalId);
if (!hasCurrentFilePublishLocations()) {
// Cancel sync
- reject(new Error('Publish not possible.'));
- return;
+ throw new Error('Publish not possible.');
}
- publishFile(store.getters['file/current'].id)
- .then(resolve, reject);
+ await publishFile(store.getters['file/current'].id);
}
};
intervalId = utils.setInterval(() => attempt(), 1000);
- attempt();
- }));
+ return attempt();
+ });
};
const createPublishLocation = (publishLocation) => {
diff --git a/src/services/syncSvc.js b/src/services/syncSvc.js
index 709cc266..84d98eeb 100644
--- a/src/services/syncSvc.js
+++ b/src/services/syncSvc.js
@@ -206,24 +206,30 @@ const createSyncLocation = (syncLocation) => {
);
};
-// Prevent from sending new data too long after old data has been fetched
+/**
+ * Prevent from sending new data too long after old data has been fetched.
+ */
const tooLateChecker = (timeout) => {
const tooLateAfter = Date.now() + timeout;
- return cb => (res) => {
+ return (cb) => {
if (tooLateAfter < Date.now()) {
throw new Error('TOO_LATE');
}
- return cb(res);
+ return cb();
};
};
+/**
+ * Return true if file is in the temp folder or it's a welcome file.
+ */
const isTempFile = (fileId) => {
- if (store.getters['data/syncDataByItemId'][`${fileId}/content`]) {
+ const contentId = `${fileId}/content`;
+ if (store.getters['data/syncDataByItemId'][contentId]) {
// If file has already been synced, it's not a temp file
return false;
}
const file = store.state.file.itemMap[fileId];
- const content = store.state.content.itemMap[`${fileId}/content`];
+ const content = store.state.content.itemMap[contentId];
if (!file || !content) {
return false;
}
@@ -254,15 +260,17 @@ class SyncContext {
* Sync one file with all its locations.
*/
const syncFile = async (fileId, syncContext = new SyncContext()) => {
- syncContext.attempted[`${fileId}/content`] = true;
+ const contentId = `${fileId}/content`;
+ syncContext.attempted[contentId] = true;
await localDbSvc.loadSyncedContent(fileId);
try {
- await localDbSvc.loadItem(`${fileId}/content`);
+ await localDbSvc.loadItem(contentId);
} catch (e) {
// Item may not exist if content has not been downloaded yet
}
- const getContent = () => store.state.content.itemMap[`${fileId}/content`];
+
+ const getContent = () => store.state.content.itemMap[contentId];
const getSyncedContent = () => upgradeSyncedContent(store.state.syncedContent.itemMap[`${fileId}/syncedContent`]);
const getSyncHistoryItem = syncLocationId => getSyncedContent().syncHistory[syncLocationId];
@@ -288,28 +296,88 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
return;
}
+ const downloadContent = async () => {
+ // On simple provider, call simply downloadContent
+ if (syncLocation.id !== 'main') {
+ return provider.downloadContent(token, syncLocation);
+ }
+
+ // On workspace provider, call downloadWorkspaceContent
+ const oldSyncData = provider.isGit
+ ? store.getters['data/syncData'][store.getters.itemGitPaths[contentId]]
+ : store.getters['data/syncDataByItemId'][contentId];
+ if (!oldSyncData) {
+ return null;
+ }
+ const { item, syncData } = await provider.downloadWorkspaceContent(token, oldSyncData);
+ if (!item) {
+ return null;
+ }
+
+ // Update sync data if changed
+ if (syncData
+ && utils.serializeObject(oldSyncData) !== utils.serializeObject(syncData)
+ ) {
+ store.dispatch('data/patchSyncData', {
+ [syncData.id]: syncData,
+ });
+ }
+ return item;
+ };
+
+ const uploadContent = async (item, ifNotTooLate) => {
+ // On simple provider, call simply uploadContent
+ if (syncLocation.id !== 'main') {
+ return provider.uploadContent(token, item, syncLocation, ifNotTooLate);
+ }
+
+ // On workspace provider, call uploadWorkspaceContent
+ const oldSyncData = provider.isGit
+ ? store.getters['data/syncData'][store.getters.itemGitPaths[contentId]]
+ : store.getters['data/syncDataByItemId'][contentId];
+ if (oldSyncData && oldSyncData.hash === item.hash) {
+ return syncLocation;
+ }
+
+ const syncData = await provider.uploadWorkspaceContent(
+ token,
+ item,
+ oldSyncData,
+ ifNotTooLate,
+ );
+
+ // Update sync data if changed
+ if (syncData
+ && utils.serializeObject(oldSyncData) !== utils.serializeObject(syncData)
+ ) {
+ store.dispatch('data/patchSyncData', {
+ [syncData.id]: syncData,
+ });
+ }
+
+ // Return syncLocation
+ return syncLocation;
+ };
+
const doSyncLocation = async () => {
- const serverContent = await provider.downloadContent(token, syncLocation);
+ const serverContent = await downloadContent(token, syncLocation);
const syncedContent = getSyncedContent();
const syncHistoryItem = getSyncHistoryItem(syncLocation.id);
- let mergedContent = (() => {
- const clientContent = utils.deepCopy(getContent());
- if (!clientContent) {
- return utils.deepCopy(serverContent || null);
- }
- if (!serverContent) {
- // Sync location has not been created yet
- return clientContent;
- }
- if (serverContent.hash === clientContent.hash) {
- // Server and client contents are synced
- return clientContent;
- }
- if (syncedContent.historyData[serverContent.hash]) {
- // Server content has not changed or has already been merged
- return clientContent;
- }
- // Perform a merge with last merged content if any, or a simple fusion otherwise
+
+ // Merge content
+ let mergedContent;
+ const clientContent = utils.deepCopy(getContent());
+ if (!clientContent) {
+ mergedContent = utils.deepCopy(serverContent || null);
+ } else if (!serverContent // If sync location has not been created yet
+ // Or server and client contents are synced
+ || serverContent.hash === clientContent.hash
+ // Or server content has not changed or has already been merged
+ || syncedContent.historyData[serverContent.hash]
+ ) {
+ mergedContent = clientContent;
+ } else {
+ // Perform a merge with last merged content if any, or perform a simple fusion otherwise
let lastMergedContent = utils.someResult(
serverContent.history,
hash => syncedContent.historyData[hash],
@@ -317,16 +385,15 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
if (!lastMergedContent && syncHistoryItem) {
lastMergedContent = syncedContent.historyData[syncHistoryItem[LAST_MERGED]];
}
- return diffUtils.mergeContent(serverContent, clientContent, lastMergedContent);
- })();
-
+ mergedContent = diffUtils.mergeContent(serverContent, clientContent, lastMergedContent);
+ }
if (!mergedContent) {
return;
}
// Update or set content in store
store.commit('content/setItem', {
- id: `${fileId}/content`,
+ id: contentId,
text: utils.sanitizeText(mergedContent.text),
properties: utils.sanitizeText(mergedContent.properties),
discussions: mergedContent.discussions,
@@ -356,8 +423,7 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
}
}
- // Store last sent if it's in the server history,
- // and merged content which will be sent if different
+ // Update synced content
const newSyncedContent = utils.deepCopy(syncedContent);
const newSyncHistoryItem = newSyncedContent.syncHistory[syncLocation.id] || [];
newSyncedContent.syncHistory[syncLocation.id] = newSyncHistoryItem;
@@ -384,10 +450,14 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => {
}
// Upload merged content
- const syncLocationToStore = await provider.uploadContent(token, {
+ const item = {
...mergedContent,
history: mergedContentHistory.slice(0, maxContentHistory),
- }, syncLocation, tooLateChecker(restartContentSyncAfter));
+ };
+ const syncLocationToStore = await uploadContent(
+ item,
+ tooLateChecker(restartContentSyncAfter),
+ );
// Replace sync location if modified
if (utils.serializeObject(syncLocation) !==
@@ -437,14 +507,30 @@ const syncDataItem = async (dataId) => {
const getItem = () => store.state.data.itemMap[dataId]
|| store.state.data.lsItemMap[dataId];
- const item = getItem();
- const syncData = store.getters['data/syncDataByItemId'][dataId];
+ const oldItem = getItem();
+ const oldSyncData = store.getters['data/syncDataByItemId'][dataId];
// Sync if item hash and syncData hash are out of sync
- if (syncData && item && item.hash === syncData.hash) {
+ if (oldSyncData && oldItem && oldItem.hash === oldSyncData.hash) {
return;
}
- const serverItem = await workspaceProvider.downloadData(dataId);
+ const token = workspaceProvider.getToken();
+ const { item, syncData } = await workspaceProvider.downloadWorkspaceData(
+ token,
+ dataId,
+ oldSyncData,
+ );
+
+ // Update sync data if changed
+ if (syncData
+ && utils.serializeObject(oldSyncData) !== utils.serializeObject(syncData)
+ ) {
+ store.dispatch('data/patchSyncData', {
+ [syncData.id]: syncData,
+ });
+ }
+
+ const serverItem = item;
const dataSyncData = store.getters['data/dataSyncData'][dataId];
let mergedItem = (() => {
const clientItem = utils.deepCopy(getItem());
@@ -487,7 +573,25 @@ const syncDataItem = async (dataId) => {
if (serverItem && serverItem.hash === mergedItem.hash) {
return;
}
- await workspaceProvider.uploadData(mergedItem, tooLateChecker(restartContentSyncAfter));
+
+ // Upload merged data item
+ const newSyncData = await workspaceProvider.uploadWorkspaceData(
+ token,
+ mergedItem,
+ syncData,
+ tooLateChecker(restartContentSyncAfter),
+ );
+
+ // Update sync data if changed
+ if (newSyncData
+ && utils.serializeObject(syncData) !== utils.serializeObject(newSyncData)
+ ) {
+ store.dispatch('data/patchSyncData', {
+ [newSyncData.id]: newSyncData,
+ });
+ }
+
+ // Update data sync data
store.dispatch('data/patchDataSyncData', {
[dataId]: utils.deepCopy(store.getters['data/syncDataByItemId'][dataId]),
});
@@ -523,7 +627,7 @@ const syncWorkspace = async () => {
const ifNotTooLate = tooLateChecker(restartSyncAfter);
// Called until no item to save
- const saveNextItem = ifNotTooLate(async () => {
+ const saveNextItem = () => ifNotTooLate(async () => {
const storeItemMap = {
...store.state.file.itemMap,
...store.state.folder.itemMap,
@@ -531,16 +635,25 @@ const syncWorkspace = async () => {
...store.state.publishLocation.itemMap,
// Deal with contents and data later
};
- const syncDataByItemId = store.getters['data/syncDataByItemId'];
+
+ let getSyncData;
+ if (workspaceProvider.isGit) {
+ const syncData = store.getters['data/syncData'];
+ getSyncData = id => syncData[store.getters.itemGitPaths[id]];
+ } else {
+ const syncDataByItemId = store.getters['data/syncDataByItemId'];
+ getSyncData = id => syncDataByItemId[id];
+ }
+
const [changedItem, syncDataToUpdate] = utils.someResult(
Object.entries(storeItemMap),
([id, item]) => {
- const existingSyncData = syncDataByItemId[id];
+ const existingSyncData = getSyncData(id);
if ((!existingSyncData || existingSyncData.hash !== item.hash)
// Add file/folder if parent has been added
- && (!storeItemMap[item.parentId] || syncDataByItemId[item.parentId])
+ && (!storeItemMap[item.parentId] || getSyncData(item.parentId))
// Add file if content has been added
- && (item.type !== 'file' || syncDataByItemId[`${id}/content`])
+ && (item.type !== 'file' || getSyncData(`${id}/content`))
) {
return [item, existingSyncData];
}
@@ -550,7 +663,7 @@ const syncWorkspace = async () => {
if (changedItem) {
const resultSyncData = await workspaceProvider
- .saveSimpleItem(
+ .saveWorkspaceItem(
// Use deepCopy to freeze objects
utils.deepCopy(changedItem),
utils.deepCopy(syncDataToUpdate),
@@ -565,29 +678,39 @@ const syncWorkspace = async () => {
await saveNextItem();
// Called until no item to remove
- const removeNextItem = ifNotTooLate(async () => {
- const storeItemMap = {
- ...store.state.file.itemMap,
- ...store.state.folder.itemMap,
- ...store.state.syncLocation.itemMap,
- ...store.state.publishLocation.itemMap,
- ...store.state.content.itemMap,
- };
+ const removeNextItem = () => ifNotTooLate(async () => {
+ let getItem;
+ let getFileItem;
+ if (workspaceProvider.isGit) {
+ const { gitPathItems } = store.getters;
+ getItem = syncData => gitPathItems[syncData.id];
+ getFileItem = syncData => gitPathItems[syncData.id.slice(1)]; // Remove leading /
+ } else {
+ const { allItemMap } = store.getters;
+ getItem = syncData => allItemMap[syncData.itemId];
+ getFileItem = syncData => allItemMap[syncData.itemId.split('/')[0]];
+ }
+
const syncData = store.getters['data/syncData'];
const syncDataToRemove = utils.deepCopy(utils.someResult(
Object.values(syncData),
- existingSyncData => !storeItemMap[existingSyncData.itemId]
- // We don't want to delete data items, especially on first sync
- && existingSyncData.type !== 'data'
- // Remove content only if file has been removed
- && (existingSyncData.type !== 'content'
- || !storeItemMap[existingSyncData.itemId.split('/')[0]])
- && existingSyncData,
+ (existingSyncData) => {
+ if (!getItem(existingSyncData)
+ // We don't want to delete data items, especially on first sync
+ && existingSyncData.type !== 'data'
+ // Remove content only if file has been removed
+ && (existingSyncData.type !== 'content'
+ || !getFileItem(existingSyncData))
+ ) {
+ return existingSyncData;
+ }
+ return null;
+ },
));
if (syncDataToRemove) {
// Use deepCopy to freeze objects
- await workspaceProvider.removeItem(syncDataToRemove, ifNotTooLate);
+ await workspaceProvider.removeWorkspaceItem(syncDataToRemove, ifNotTooLate);
const syncDataCopy = { ...store.getters['data/syncData'] };
delete syncDataCopy[syncDataToRemove.id];
store.dispatch('data/setSyncData', syncDataCopy);
@@ -608,11 +731,22 @@ const syncWorkspace = async () => {
...Object.keys(localDbSvc.hashMap.content),
...store.getters['file/items'].map(file => `${file.id}/content`),
])];
+ const contentMap = store.state.content.itemMap;
+ const syncDataById = store.getters['data/syncData'];
+ let getSyncData;
+ if (workspaceProvider.isGit) {
+ const { itemGitPaths } = store.getters;
+ getSyncData = contentId => syncDataById[itemGitPaths[contentId]];
+ } else {
+ const syncDataByItemId = store.getters['data/syncDataByItemId'];
+ getSyncData = contentId => syncDataByItemId[contentId];
+ }
+
return utils.someResult(contentIds, (contentId) => {
// Get content hash from itemMap or from localDbSvc if not loaded
- const loadedContent = store.state.content.itemMap[contentId];
+ const loadedContent = contentMap[contentId];
const hash = loadedContent ? loadedContent.hash : localDbSvc.hashMap.content[contentId];
- const syncData = store.getters['data/syncDataByItemId'][contentId];
+ const syncData = getSyncData(contentId);
if (
// Sync if content syncing was not attempted yet
!syncContext.attempted[contentId] &&
@@ -721,7 +855,7 @@ const requestSync = () => {
};
intervalId = utils.setInterval(() => attempt(), 1000);
- attempt();
+ return attempt();
});
};
diff --git a/src/services/utils.js b/src/services/utils.js
index 6430c0e4..46c08e99 100644
--- a/src/services/utils.js
+++ b/src/services/utils.js
@@ -23,7 +23,6 @@ const parseQueryParams = (params) => {
return result;
};
-
// For utils.computeProperties()
const deepOverride = (obj, opt) => {
if (obj === undefined) {
@@ -172,10 +171,12 @@ export default {
return Math.abs(this.hash(this.serializeObject(params))).toString(36);
},
encodeBase64(str, urlSafe = false) {
- const result = btoa(encodeURIComponent(str).replace(
+ const uriEncodedStr = encodeURIComponent(str);
+ const utf8Str = uriEncodedStr.replace(
/%([0-9A-F]{2})/g,
(match, p1) => String.fromCharCode(`0x${p1}`),
- ));
+ );
+ const result = btoa(utf8Str);
if (!urlSafe) {
return result;
}
@@ -187,10 +188,12 @@ export default {
decodeBase64(str) {
// In case of URL safe base64
const sanitizedStr = str.replace(/_/g, '/').replace(/-/g, '+');
- return decodeURIComponent(atob(sanitizedStr)
+ const utf8Str = atob(sanitizedStr);
+ const uriEncodedStr = utf8Str
.split('')
.map(c => `%${`00${c.charCodeAt(0).toString(16)}`.slice(-2)}`)
- .join(''));
+ .join('');
+ return decodeURIComponent(uriEncodedStr);
},
computeProperties(yamlProperties) {
let properties = {};
diff --git a/src/store/content.js b/src/store/content.js
index 57f901a8..89421b2b 100644
--- a/src/store/content.js
+++ b/src/store/content.js
@@ -82,7 +82,7 @@ module.actions = {
}) {
const { revisionContent } = state;
if (revisionContent) {
- await dispatch('modal/fileRestoration', null, { root: true });
+ await dispatch('modal/open', 'fileRestoration', { root: true });
// Close revision
commit('setRevisionContent');
const currentContent = utils.deepCopy(getters.current);
diff --git a/src/store/contextMenu.js b/src/store/contextMenu.js
index ce1fbe7a..6b4180e4 100644
--- a/src/store/contextMenu.js
+++ b/src/store/contextMenu.js
@@ -26,21 +26,23 @@ export default {
setTimeout(() => {
// Take the size of the context menu and place it
const elt = document.querySelector('.context-menu__inner');
- const height = elt.offsetHeight;
- if (coordinates.top + height > rootState.layout.bodyHeight) {
- coordinates.top -= height;
+ if (elt) {
+ const height = elt.offsetHeight;
+ if (coordinates.top + height > rootState.layout.bodyHeight) {
+ coordinates.top -= height;
+ }
+ if (coordinates.top < 0) {
+ coordinates.top = 0;
+ }
+ const width = elt.offsetWidth;
+ if (coordinates.left + width > rootState.layout.bodyWidth) {
+ coordinates.left -= width;
+ }
+ if (coordinates.left < 0) {
+ coordinates.left = 0;
+ }
+ commit('setCoordinates', coordinates);
}
- if (coordinates.top < 0) {
- coordinates.top = 0;
- }
- const width = elt.offsetWidth;
- if (coordinates.left + width > rootState.layout.bodyWidth) {
- coordinates.left -= width;
- }
- if (coordinates.left < 0) {
- coordinates.left = 0;
- }
- commit('setCoordinates', coordinates);
}, 1);
return new Promise(resolve => commit('setResolve', resolve));
diff --git a/src/store/discussion.js b/src/store/discussion.js
index 1c1d1ab5..2171c148 100644
--- a/src/store/discussion.js
+++ b/src/store/discussion.js
@@ -135,7 +135,7 @@ export default {
const loginToken = rootGetters['workspace/loginToken'];
if (!loginToken) {
try {
- await dispatch('modal/signInForComment', null, { root: true });
+ await dispatch('modal/open', 'signInForComment', { root: true });
await googleHelper.signin();
syncSvc.requestSync();
await dispatch('createNewDiscussion', selection);
diff --git a/src/store/explorer.js b/src/store/explorer.js
index c1ca2152..f9fdfc29 100644
--- a/src/store/explorer.js
+++ b/src/store/explorer.js
@@ -18,11 +18,10 @@ const collator = new Intl.Collator(undefined, { sensitivity: 'base' });
const compare = (node1, node2) => collator.compare(node1.item.name, node2.item.name);
class Node {
- constructor(item, locations = [], isFolder = false, isRoot = false) {
+ constructor(item, locations = [], isFolder = false) {
this.item = item;
this.locations = locations;
this.isFolder = isFolder;
- this.isRoot = isRoot;
if (isFolder) {
this.folders = [];
this.files = [];
@@ -84,7 +83,8 @@ export default {
},
getters: {
nodeStructure: (state, getters, rootState, rootGetters) => {
- const rootNode = new Node(emptyFolder(), [], true, true);
+ const rootNode = new Node(emptyFolder(), [], true);
+ rootNode.isRoot = true;
// Create Trash node
const trashFolderNode = new Node(emptyFolder(), [], true);
diff --git a/src/store/index.js b/src/store/index.js
index f811c287..bdc0d071 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -119,6 +119,41 @@ const store = new Vuex.Store({
});
return result;
},
+ itemGitPaths: (state, { allItemMap, itemPaths }) => {
+ const result = {};
+ Object.entries(allItemMap).forEach(([id, item]) => {
+ if (item.type === 'data') {
+ result[id] = `.stackedit-data/${id}.json`;
+ } else if (item.type === 'file') {
+ result[id] = `${itemPaths[id]}.md`;
+ } else if (item.type === 'content') {
+ const [fileId] = id.split('/');
+ result[id] = `/${itemPaths[fileId]}.md`;
+ } else if (item.type === 'folder') {
+ result[id] = itemPaths[id];
+ } else if (item.type === 'syncLocation' || item.type === 'publishLocation') {
+ // locations are stored as paths
+ const encodedItem = utils.encodeBase64(utils.serializeObject({
+ ...item,
+ id: undefined,
+ type: undefined,
+ fileId: undefined,
+ }), true);
+ const extension = item.type === 'syncLocation' ? 'sync' : 'publish';
+ result[id] = `${itemPaths[item.fileId]}.${encodedItem}.${extension}`;
+ }
+ });
+ return result;
+ },
+ gitPathItems: (state, { allItemMap, itemGitPaths }) => {
+ const result = {};
+ Object.entries(itemGitPaths).forEach(([id, path]) => {
+ const items = result[path] || [];
+ items.push(allItemMap[id]);
+ result[path] = items;
+ });
+ return result;
+ },
isSponsor: ({ light, monetizeSponsor }, getters) => {
const sponsorToken = getters['workspace/sponsorToken'];
return light || monetizeSponsor || (sponsorToken && sponsorToken.isSponsor);
diff --git a/src/store/modal.js b/src/store/modal.js
index 5ec3ba32..632717d0 100644
--- a/src/store/modal.js
+++ b/src/store/modal.js
@@ -36,100 +36,5 @@ export default {
commit('setHidden', false);
}
},
- folderDeletion: ({ dispatch }, item) => dispatch('open', {
- content: `
You are about to delete the folder ${item.name}. Its files will be moved to Trash. Are you sure?
`,
- resolveText: 'Yes, delete',
- rejectText: 'No',
- }),
- tempFileDeletion: ({ dispatch }, item) => dispatch('open', {
- content: `
You are about to permanently delete the temporary file ${item.name}. Are you sure?
`,
- resolveText: 'Yes, delete',
- rejectText: 'No',
- }),
- tempFolderDeletion: ({ dispatch }) => dispatch('open', {
- content: '
You are about to permanently delete all the temporary files. Are you sure?
',
- resolveText: 'Yes, delete all',
- rejectText: 'No',
- }),
- discussionDeletion: ({ dispatch }) => dispatch('open', {
- content: '
You are about to delete a discussion. Are you sure?
',
- resolveText: 'Yes, delete',
- rejectText: 'No',
- }),
- commentDeletion: ({ dispatch }) => dispatch('open', {
- content: '
You are about to delete a comment. Are you sure?
',
- resolveText: 'Yes, delete',
- rejectText: 'No',
- }),
- trashDeletion: ({ dispatch }) => dispatch('open', {
- content: '
Files in the trash are automatically deleted after 7 days of inactivity.
',
- rejectText: 'Ok',
- }),
- fileRestoration: ({ dispatch }) => dispatch('open', {
- content: '
You are about to revert some changes. Are you sure?
',
- resolveText: 'Yes, revert',
- rejectText: 'No',
- }),
- unauthorizedName: ({ dispatch }, name) => dispatch('open', {
- content: `
${name} is not an authorized name.
`,
- rejectText: 'Ok',
- }),
- stripName: ({ dispatch }, name) => dispatch('open', {
- content: `
${name} contains illegal characters. Do you want to strip them?
`,
- resolveText: 'Yes, strip',
- rejectText: 'No',
- }),
- pathConflict: ({ dispatch }, name) => dispatch('open', {
- content: `
${name} already exists. Do you want to add a suffix?
`,
- resolveText: 'Yes, add suffix',
- rejectText: 'No',
- }),
- removeWorkspace: ({ dispatch }) => dispatch('open', {
- content: '
You are about to remove a workspace locally. Are you sure?
',
- resolveText: 'Yes, remove',
- rejectText: 'No',
- }),
- reset: ({ dispatch }) => dispatch('open', {
- content: '
This will clean all your workspaces locally. Are you sure?
',
- resolveText: 'Yes, clean',
- rejectText: 'No',
- }),
- providerRedirection: ({ dispatch }, { providerName }) => dispatch('open', {
- content: `
You are about to navigate to the ${providerName} authorization page.
`,
- resolveText: 'Ok, go on',
- rejectText: 'Cancel',
- }),
- workspaceGoogleRedirection: ({ dispatch }) => dispatch('open', {
- content: '
StackEdit needs full Google Drive access to open this workspace.
',
- resolveText: 'Ok, grant',
- rejectText: 'Cancel',
- }),
- signInForSponsorship: ({ dispatch }) => dispatch('open', {
- type: 'signInForSponsorship',
- content: `
You have to sign in with Google to sponsor.
-
Note: This will sync your main workspace.
`,
- resolveText: 'Ok, sign in',
- rejectText: 'Cancel',
- }),
- signInForComment: ({ dispatch }) => dispatch('open', {
- content: `
You have to sign in with Google to start commenting.
-
Note: This will sync your main workspace.
`,
- resolveText: 'Ok, sign in',
- rejectText: 'Cancel',
- }),
- signInForHistory: ({ dispatch }) => dispatch('open', {
- content: `
You have to sign in with Google to enable revision history.
-
Note: This will sync your main workspace.
`,
- resolveText: 'Ok, sign in',
- rejectText: 'Cancel',
- }),
- sponsorOnly: ({ dispatch }) => dispatch('open', {
- content: '
This feature is restricted to sponsors as it relies on server resources.
',
- rejectText: 'Ok, I understand',
- }),
- paymentSuccess: ({ dispatch }) => dispatch('open', {
- content: '
Thank you for your payment! Your sponsorship will be active in a minute.
',
- rejectText: 'Ok',
- }),
},
};
diff --git a/src/store/notification.js b/src/store/notification.js
index e2fa1537..b69e3999 100644
--- a/src/store/notification.js
+++ b/src/store/notification.js
@@ -1,4 +1,4 @@
-const itemTimeout = 5000;
+const defaultTimeout = 5000;
export default {
namespaced: true,
@@ -14,8 +14,10 @@ export default {
showItem({ state, commit }, item) {
if (state.items.every(other => other.type !== item.type || other.content !== item.content)) {
commit('setItems', [...state.items, item]);
- setTimeout(() =>
- commit('setItems', state.items.filter(otherItem => otherItem !== item)), itemTimeout);
+ setTimeout(
+ () => commit('setItems', state.items.filter(otherItem => otherItem !== item)),
+ item.timeout || defaultTimeout,
+ );
}
},
info({ dispatch }, info) {
@@ -25,9 +27,7 @@ export default {
});
},
error({ dispatch, rootState }, error) {
- const item = {
- type: 'error',
- };
+ const item = { type: 'error' };
if (error) {
if (error.message) {
item.content = error.message;
diff --git a/static/landing/index.html b/static/landing/index.html
index 6b0fa372..8eda4c35 100644
--- a/static/landing/index.html
+++ b/static/landing/index.html
@@ -15,6 +15,10 @@