diff --git a/src/ts/component/block/index.tsx b/src/ts/component/block/index.tsx
index d1af784cd2..de4f7159b1 100644
--- a/src/ts/component/block/index.tsx
+++ b/src/ts/component/block/index.tsx
@@ -223,7 +223,7 @@ const Block = observer(class Block extends React.Component {
};
case I.BlockType.Chat: {
- canDrop = canSelect = !U.Object.isChatLayout(root.layout);
+ canDrop = canSelect = false;
blockComponent = (
{
if (block.isText() && !block.isTextCode() && pressed.match('shift')) {
pd = false;
};
- if (block.isTextCallout()) {
+ if (block.isTextCallout() || block.isTextQuote()) {
pd = true;
};
diff --git a/src/ts/component/editor/page.tsx b/src/ts/component/editor/page.tsx
index 293ac46b9d..e0a315bb3c 100644
--- a/src/ts/component/editor/page.tsx
+++ b/src/ts/component/editor/page.tsx
@@ -1389,7 +1389,7 @@ const EditorPage = observer(class EditorPage extends React.Component {
+const FooterMainEdit = observer(class FooterMainEdit extends React.Component {
render () {
const { onHelp } = this.props;
+ const { show } = S.Progress;
+ const current = S.Progress.getCurrent();
+ const total = S.Progress.getTotal();
+ const percent = Math.round((current / total) * 100);
return (
-
);
diff --git a/src/ts/component/page/main/chat.tsx b/src/ts/component/page/main/chat.tsx
index dfa0dec684..c0f083cc0b 100644
--- a/src/ts/component/page/main/chat.tsx
+++ b/src/ts/component/page/main/chat.tsx
@@ -22,7 +22,6 @@ const PageMainChat = observer(class PageMainChat extends React.Component
- {check.withCover ?
+ this.node = node}>
this.refHeader = ref}
- rootId={rootId}
+ rootId={object.chatId}
/>
{
switch (layout) {
default:
+ case I.ObjectLayout.Chat:
case I.ObjectLayout.Page: {
if (iconImage) {
cn.push('withImage');
};
- if (iconEmoji || iconImage || iconClass) {
- icon = {
break;
};
- const src = require(`img/icon/relation/${Relation.typeName(relationFormat)}.svg`).default;
-
icn = icn.concat([ 'iconCommon', 'c' + iconSize ]);
- icon = 
;
+ icon = }.svg`})
;
break;
};
@@ -268,7 +261,7 @@ const IconObject = observer(class IconObject extends React.Component {
icon = 
;
} else {
icn = icn.concat([ 'iconFile', 'c' + iconSize ]);
- icon = })
;
+ icon = })
;
};
break;
};
@@ -278,7 +271,7 @@ const IconObject = observer(class IconObject extends React.Component {
case I.ObjectLayout.Pdf:
case I.ObjectLayout.File: {
icn = icn.concat([ 'iconFile', 'c' + iconSize ]);
- icon = ;
+ icon = ;
break;
};
@@ -507,7 +500,7 @@ const IconObject = observer(class IconObject extends React.Component {
};
defaultIcon (type: string) {
- return require(`img/icon/default/${type}.svg`).default;
+ return require(`img/icon/default/${type}.svg`);
};
});
diff --git a/src/ts/component/util/marker.tsx b/src/ts/component/util/marker.tsx
index c41882a673..c75fe69b19 100644
--- a/src/ts/component/util/marker.tsx
+++ b/src/ts/component/util/marker.tsx
@@ -15,28 +15,28 @@ interface Props {
const Icons = {
checkbox: {
- 0: require('img/icon/marker/checkbox0.svg').default,
- 1: require('img/icon/marker/checkbox1.svg').default,
- 2: require('img/icon/marker/checkbox2.svg').default,
+ 0: require('img/icon/marker/checkbox0.svg'),
+ 1: require('img/icon/marker/checkbox1.svg'),
+ 2: require('img/icon/marker/checkbox2.svg'),
},
task: {
- 0: require('img/icon/object/checkbox0.svg').default,
- 1: require('img/icon/object/checkbox1.svg').default,
- 2: require('img/icon/object/checkbox2.svg').default,
+ 0: require('img/icon/object/checkbox0.svg'),
+ 1: require('img/icon/object/checkbox1.svg'),
+ 2: require('img/icon/object/checkbox2.svg'),
},
};
const Theme = {
dark: {
checkbox: {
- 0: require('img/icon/marker/checkbox0.svg').default,
- 1: require('img/theme/dark/icon/marker/checkbox1.svg').default,
- 2: require('img/icon/marker/checkbox2.svg').default,
+ 0: require('img/icon/marker/checkbox0.svg'),
+ 1: require('img/theme/dark/icon/marker/checkbox1.svg'),
+ 2: require('img/icon/marker/checkbox2.svg'),
},
task: {
- 0: require('img/icon/object/checkbox0.svg').default,
- 1: require('img/theme/dark/icon/object/checkbox1.svg').default,
- 2: require('img/icon/object/checkbox2.svg').default,
+ 0: require('img/icon/object/checkbox0.svg'),
+ 1: require('img/theme/dark/icon/object/checkbox1.svg'),
+ 2: require('img/icon/object/checkbox2.svg'),
},
},
};
diff --git a/src/ts/component/util/media/audio.tsx b/src/ts/component/util/media/audio.tsx
index dc61276775..197275b2bb 100644
--- a/src/ts/component/util/media/audio.tsx
+++ b/src/ts/component/util/media/audio.tsx
@@ -34,7 +34,7 @@ class MediaAudio extends React.PureComponent {
playOnSeek = false;
current: PlaylistItem = { name: '', src: '' };
resizeObserver: ResizeObserver;
- fadeOutVolumeSlider = _.debounce(() => this.setState({ showVolumeSlider: false }), 500);
+ fadeOutVolumeSlider = _.debounce(() => this.setState({ showVolumeSlider: false }), 250);
startedPlaying = false;
@@ -93,9 +93,7 @@ class MediaAudio extends React.PureComponent {
- this.refControls = ref} key="editorControls" {...this.props} rootId={rootId} resize={this.resize} />
- this.refHead = ref}
- placeholder={translate('defaultNamePage')}
- rootId={rootId}
- readonly={readonly}
- />
-
- {children.map((block: I.Block, i: number) => (
- this.blockRefs[block.id] = ref}
- key={block.id}
- rootId={rootId}
- iconSize={20}
- block={block}
- className="noPlus"
- isSelectionDisabled={true}
- isContextMenuDisabled={true}
- readonly={readonly}
- />
- ))}
-
-
+
);
};
@@ -90,13 +72,13 @@ const PageMainChat = observer(class PageMainChat extends React.Component
- {
S.Auth.logout(true, false);
-
- analytics.event('LogOut');
},
});
};
diff --git a/src/ts/component/popup/page/settings/space/index.tsx b/src/ts/component/popup/page/settings/space/index.tsx
index 039e149e9a..ee543c7ecd 100644
--- a/src/ts/component/popup/page/settings/space/index.tsx
+++ b/src/ts/component/popup/page/settings/space/index.tsx
@@ -58,7 +58,7 @@ const PopupSettingsSpaceIndex = observer(class PopupSettingsSpaceIndex extends R
const hasLink = cid && key;
const isOwner = U.Space.isMyOwner();
const canWrite = U.Space.canMyParticipantWrite();
- const canDelete = !space.isPersonal && isOwner;
+ const canDelete = !space.isPersonal;
const isShareActive = U.Space.isShareActive();
let bytesUsed = 0;
@@ -446,9 +446,9 @@ const PopupSettingsSpaceIndex = observer(class PopupSettingsSpaceIndex extends R
const space = U.Space.getSpaceview();
if (space.isShared && !cid && !key) {
- C.SpaceInviteGetCurrent(S.Common.space, (message: any) => {
- if (!message.error.code) {
- this.setInvite(message.inviteCid, message.inviteKey);
+ U.Space.getInvite(S.Common.space, (cid: string, key: string) => {
+ if (cid && key) {
+ this.setInvite(cid, key);
};
});
};
@@ -471,7 +471,7 @@ const PopupSettingsSpaceIndex = observer(class PopupSettingsSpaceIndex extends R
data: {
filter: '',
filters: [
- { relationKey: 'recommendedLayout', condition: I.FilterCondition.In, value: U.Object.getPageLayouts().concat(I.ObjectLayout.Chat) },
+ { relationKey: 'recommendedLayout', condition: I.FilterCondition.In, value: U.Object.getPageLayouts() },
{ relationKey: 'uniqueKey', condition: I.FilterCondition.NotEqual, value: J.Constant.typeKey.template },
],
onClick: (item: any) => {
diff --git a/src/ts/component/popup/page/settings/space/share.tsx b/src/ts/component/popup/page/settings/space/share.tsx
index 8909d9be52..b576254ff4 100644
--- a/src/ts/component/popup/page/settings/space/share.tsx
+++ b/src/ts/component/popup/page/settings/space/share.tsx
@@ -271,9 +271,9 @@ const PopupSettingsSpaceShare = observer(class PopupSettingsSpaceShare extends R
const space = U.Space.getSpaceview();
if (space.isShared && !cid && !key) {
- C.SpaceInviteGetCurrent(S.Common.space, (message: any) => {
- if (!message.error.code) {
- this.setInvite(message.inviteCid, message.inviteKey);
+ U.Space.getInvite(S.Common.space, (cid: string, key: string) => {
+ if (cid && key) {
+ this.setInvite(cid, key);
};
});
};
@@ -332,6 +332,8 @@ const PopupSettingsSpaceShare = observer(class PopupSettingsSpaceShare extends R
onInitLink () {
const btn = this.refButton;
+ const space = U.Space.getSpaceview();
+
if (!btn || btn.state.isLoading) {
return;
};
@@ -348,9 +350,13 @@ const PopupSettingsSpaceShare = observer(class PopupSettingsSpaceShare extends R
btn.setLoading(false);
if (!this.setError(message.error)) {
- this.setInvite(message.inviteCid, message.inviteKey);
+ return;
+ };
- Preview.toastShow({ text: translate('toastInviteGenerate') });
+ this.setInvite(message.inviteCid, message.inviteKey);
+ Preview.toastShow({ text: translate('toastInviteGenerate') });
+
+ if (!space.isShared) {
analytics.event('ShareSpace');
};
});
diff --git a/src/ts/component/popup/page/usecase/item.tsx b/src/ts/component/popup/page/usecase/item.tsx
index 4dfe044047..7ded04c03f 100644
--- a/src/ts/component/popup/page/usecase/item.tsx
+++ b/src/ts/component/popup/page/usecase/item.tsx
@@ -136,6 +136,7 @@ class PopupUsecasePageItem extends React.Component {
};
onMenu () {
+ const { config } = S.Common;
const { getId, close } = this.props;
const object = this.getObject();
const route = this.getRoute();
@@ -159,12 +160,13 @@ class PopupUsecasePageItem extends React.Component {
noVirtualisation: true,
onSelect: (e: any, item: any) => {
const isNew = item.id == 'add';
+ const withChat = U.Common.isChatAllowed();
this.setState({ isLoading: true });
analytics.event('ClickGalleryInstallSpace', { type: isNew ? 'New' : 'Existing', route });
if (isNew) {
- C.WorkspaceCreate({ name: object.title, iconOption: U.Common.rand(1, J.Constant.count.icon) }, I.Usecase.None, (message: any) => {
+ C.WorkspaceCreate({ name: object.title, iconOption: U.Common.rand(1, J.Constant.count.icon) }, I.Usecase.None, withChat, (message: any) => {
if (!message.error.code) {
cb(message.objectId, true);
diff --git a/src/ts/component/popup/spaceCreate.tsx b/src/ts/component/popup/spaceCreate.tsx
index 2da624f939..961f3a2786 100644
--- a/src/ts/component/popup/spaceCreate.tsx
+++ b/src/ts/component/popup/spaceCreate.tsx
@@ -28,6 +28,7 @@ const PopupSpaceCreate = observer(class PopupSpaceCreate extends React.Component
this.onKeyDown = this.onKeyDown.bind(this);
this.onChange = this.onChange.bind(this);
+ this.onIcon = this.onIcon.bind(this);
};
render () {
@@ -52,6 +53,7 @@ const PopupSpaceCreate = observer(class PopupSpaceCreate extends React.Component
object={space}
canEdit={false}
menuParam={{ horizontal: I.MenuDirection.Center }}
+ onClick={this.onIcon}
/>
@@ -118,13 +120,14 @@ const PopupSpaceCreate = observer(class PopupSpaceCreate extends React.Component
this.setLoading(true);
+ const withChat = U.Common.isChatAllowed();
const details = {
name,
iconOption,
spaceDashboardId: I.HomePredefinedId.Last,
};
- C.WorkspaceCreate(details, I.Usecase.GetStarted, (message: any) => {
+ C.WorkspaceCreate(details, I.Usecase.GetStarted, withChat, (message: any) => {
this.setLoading(false);
if (message.error.code) {
@@ -169,6 +172,17 @@ const PopupSpaceCreate = observer(class PopupSpaceCreate extends React.Component
this.setState({ isLoading });
};
+ onIcon () {
+ let { iconOption } = this.state;
+
+ iconOption++;
+ if (iconOption > J.Constant.count.icon) {
+ iconOption = 1;
+ };
+
+ this.setState({ iconOption });
+ };
+
});
export default PopupSpaceCreate;
\ No newline at end of file
diff --git a/src/ts/component/sidebar/object.tsx b/src/ts/component/sidebar/object.tsx
index 586bd41c90..bbd19f5fed 100644
--- a/src/ts/component/sidebar/object.tsx
+++ b/src/ts/component/sidebar/object.tsx
@@ -484,6 +484,15 @@ const SidebarObject = observer(class SidebarObject extends React.Component<{}, S
subId: J.Constant.subId.allObject,
route: analytics.route.allObjects,
allowedLinkTo: true,
+ onSelect: id => {
+ switch (id) {
+ case 'archive': {
+ this.selected = [];
+ this.renderSelection();
+ break;
+ };
+ };
+ }
}
});
};
diff --git a/src/ts/component/sidebar/widget.tsx b/src/ts/component/sidebar/widget.tsx
index ffa780dc58..481ec34392 100644
--- a/src/ts/component/sidebar/widget.tsx
+++ b/src/ts/component/sidebar/widget.tsx
@@ -23,7 +23,7 @@ const SidebarWidget = observer(class SidebarWidget extends React.Component<{}, S
position: I.BlockPosition = null;
isDragging = false;
frame = 0;
- isSubcribed = false;
+ isSubcribed = '';
constructor (props) {
super(props);
@@ -231,7 +231,11 @@ const SidebarWidget = observer(class SidebarWidget extends React.Component<{}, S
);
};
- componentDidMount(): void {
+ componentDidMount (): void {
+ this.subscribeArchive();
+ };
+
+ componentDidUpdate (): void {
this.subscribeArchive();
};
@@ -531,21 +535,23 @@ const SidebarWidget = observer(class SidebarWidget extends React.Component<{}, S
};
subscribeArchive () {
- if (this.isSubcribed) {
+ const { space } = S.Common
+
+ if (this.isSubcribed == space) {
return;
};
- this.isSubcribed = true;
-
U.Data.searchSubscribe({
subId: SUB_ID,
- spaceId: S.Common.space,
+ spaceId: space,
withArchived: true,
filters: [
{ relationKey: 'isArchived', condition: I.FilterCondition.Equal, value: true },
],
limit: 1,
- }, () => {});
+ }, () => {
+ this.isSubcribed = space;
+ });
};
});
diff --git a/src/ts/component/util/iconObject.tsx b/src/ts/component/util/iconObject.tsx
index 37a0fae3d9..7f5fc0ba2e 100644
--- a/src/ts/component/util/iconObject.tsx
+++ b/src/ts/component/util/iconObject.tsx
@@ -93,18 +93,18 @@ const FontSize = {
};
const DefaultIcons = [ 'page', 'task', 'set', 'chat', 'bookmark', 'type' ];
-const Ghost = require('img/icon/ghost.svg').default;
+const Ghost = require('img/icon/ghost.svg');
const CheckboxTask = {
'': {
- 0: require('img/icon/object/checkbox0.svg').default,
- 1: require('img/icon/object/checkbox1.svg').default,
- 2: require('img/icon/object/checkbox2.svg').default,
+ 0: require('img/icon/object/checkbox0.svg'),
+ 1: require('img/icon/object/checkbox1.svg'),
+ 2: require('img/icon/object/checkbox2.svg'),
},
dark: {
- 0: require('img/icon/object/checkbox0.svg').default,
- 1: require('img/theme/dark/icon/object/checkbox1.svg').default,
- 2: require('img/icon/object/checkbox2.svg').default,
+ 0: require('img/icon/object/checkbox0.svg'),
+ 1: require('img/theme/dark/icon/object/checkbox1.svg'),
+ 2: require('img/icon/object/checkbox2.svg'),
},
};
@@ -162,28 +162,23 @@ const IconObject = observer(class IconObject extends React.Component
+
diff --git a/src/ts/component/page/main/type.tsx b/src/ts/component/page/main/type.tsx
index 883782a21d..75ff3b2dc8 100644
--- a/src/ts/component/page/main/type.tsx
+++ b/src/ts/component/page/main/type.tsx
@@ -68,7 +68,7 @@ const PageMainType = observer(class PageMainType extends React.Component
{content}
;
break;
};
@@ -268,7 +261,7 @@ const IconObject = observer(class IconObject extends React.Component
{this.state.timeMetric}
-
+
{
this.fadeOutVolumeSlider.cancel();
@@ -275,6 +273,7 @@ class MediaAudio extends React.PureComponent {
};
const t = this.startedPlaying ? this.getTime(el.currentTime) : this.getTime(el.duration);
+
this.setState({ timeMetric: `${U.Common.sprintf('%02d', t.m)}:${U.Common.sprintf('%02d', t.s)}`});
this.timeDragRef.setValue(el.currentTime / el.duration);
};
diff --git a/src/ts/component/util/progress.tsx b/src/ts/component/util/progress.tsx
index 03f222a16a..8fceecdaf4 100644
--- a/src/ts/component/util/progress.tsx
+++ b/src/ts/component/util/progress.tsx
@@ -1,8 +1,8 @@
import * as React from 'react';
-import { observer } from 'mobx-react';
import $ from 'jquery';
-import { Icon, Label } from 'Component';
-import { S, U, C, J, Storage, keyboard } from 'Lib';
+import { observer } from 'mobx-react';
+import { Icon, Label, Error } from 'Component';
+import { I, S, U, C, J, Storage, keyboard, translate } from 'Lib';
const Progress = observer(class Progress extends React.Component {
@@ -22,26 +22,49 @@ const Progress = observer(class Progress extends React.Component {
};
render () {
- const { progress } = S.Common;
- const { status, current, total, isUnlocked, canCancel } = progress || {};
+ const { show } = S.Progress;
+ const list = S.Progress.getList();
+ const cn = [ 'progress' ];
- if (!status) {
+ if (!show || !list.length) {
return null;
};
-
- const text = U.Common.sprintf(status, current, total);
- const cn = [ 'progress', (isUnlocked ? 'isUnlocked' : '') ];
-
+
+ const Item = (item: any) => {
+ const percent = item.total > 0 ? Math.min(100, Math.ceil(item.current / item.total * 100)) : 0;
+ const isError = item.state == I.ProgressState.Error;
+ const canCancel = item.canCancel && !isError;
+
+ return (
+
+
+ );
+ };
+
return (
+
+ {canCancel ? this.onCancel(item.id)} /> : ''}
+
+
+ {isError ? (
+
+
+
+ )}
+ this.node = node}
className={cn.join(' ')}
>
{
};
case I.ToastAction.Lock: {
- if (!object) {
- break;
- };
-
- textObject = {
typeKey = J.Constant.typeKey.collection;
break;
};
-
- case J.Constant.widgetId.chat: {
- details.layout = I.ObjectLayout.Chat;
- typeKey = J.Constant.typeKey.chat;
- break;
- };
};
};
@@ -627,11 +621,6 @@ const WidgetIndex = observer(class WidgetIndex extends React.Component {
filters.push({ relationKey: 'layout', condition: I.FilterCondition.Equal, value: I.ObjectLayout.Collection });
break;
};
-
- case J.Constant.widgetId.chat: {
- filters.push({ relationKey: 'layout', condition: I.FilterCondition.Equal, value: I.ObjectLayout.Chat });
- break;
- };
};
U.Data.searchSubscribe({
diff --git a/src/ts/interface/account.ts b/src/ts/interface/account.ts
index 7a5a91f818..f305675e5e 100644
--- a/src/ts/interface/account.ts
+++ b/src/ts/interface/account.ts
@@ -24,6 +24,7 @@ export interface AccountInfo {
widgetsId: string;
analyticsId: string;
networkId: string;
+ workspaceObjectId: string;
};
export interface AccountConfig {
diff --git a/src/ts/interface/object.ts b/src/ts/interface/object.ts
index aa23d6a63a..63e92c3579 100644
--- a/src/ts/interface/object.ts
+++ b/src/ts/interface/object.ts
@@ -20,8 +20,8 @@ export enum ObjectLayout {
SpaceView = 18,
Participant = 19,
Pdf = 20,
- Chat = 21,
- ChatDerived = 22,
+ ChatOld = 21,
+ Chat = 22,
Empty = 100,
Navigation = 101,
diff --git a/src/ts/interface/progress.ts b/src/ts/interface/progress.ts
index bb7b9b6813..a9be23ba08 100644
--- a/src/ts/interface/progress.ts
+++ b/src/ts/interface/progress.ts
@@ -1,26 +1,28 @@
export enum ProgressType {
- File = 0,
- Import = 1,
- Export = 2,
- Download = 3,
- Recover = 4,
- Migration = 5,
+ Drop = 'dropFiles',
+ Import = 'import',
+ Export = 'export',
+ Save = 'saveFile',
+ Migrate = 'migration',
+ Update = 'update',
+ UpdateCheck = 'updateCheck',
};
export enum ProgressState {
- None = 0,
- Running = 1,
- Done = 2,
- Canceled = 3,
- Error = 4,
+ None = 0,
+ Running = 1,
+ Done = 2,
+ Canceled = 3,
+ Error = 4,
};
export interface Progress {
id?: string;
+ spaceId?: string;
type?: ProgressType;
- status?: string;
current?: number;
total?: number;
- isUnlocked?: boolean;
+ state?: ProgressState;
canCancel?: boolean;
+ error?: string;
};
\ No newline at end of file
diff --git a/src/ts/lib/animation.ts b/src/ts/lib/animation.ts
index 399b7fff52..32b781f6b2 100644
--- a/src/ts/lib/animation.ts
+++ b/src/ts/lib/animation.ts
@@ -3,7 +3,7 @@ import $ from 'jquery';
import { I } from 'Lib';
const Duration = {
- Normal: 0.1,
+ Normal: 0.05,
Word: 0.01,
};
diff --git a/src/ts/lib/api/command.ts b/src/ts/lib/api/command.ts
index 642a98917d..fc6daa898a 100644
--- a/src/ts/lib/api/command.ts
+++ b/src/ts/lib/api/command.ts
@@ -107,19 +107,21 @@ export const WalletCloseSession = (token: string, callBack?: (message: any) => v
// ---------------------- WORKSPACE ---------------------- //
-export const WorkspaceCreate = (details: any, usecase: I.Usecase, callBack?: (message: any) => void) => {
+export const WorkspaceCreate = (details: any, usecase: I.Usecase, withChat: boolean, callBack?: (message: any) => void) => {
const request = new Rpc.Workspace.Create.Request();
request.setDetails(Encode.struct(details));
request.setUsecase(usecase as number);
+ request.setWithchat(withChat);
dispatcher.request(WorkspaceCreate.name, request, callBack);
};
-export const WorkspaceOpen = (spaceId: string, callBack?: (message: any) => void) => {
+export const WorkspaceOpen = (spaceId: string, withChat: boolean, callBack?: (message: any) => void) => {
const request = new Rpc.Workspace.Open.Request();
request.setSpaceid(spaceId);
+ request.setWithchat(withChat);
dispatcher.request(WorkspaceOpen.name, request, callBack);
};
@@ -1922,6 +1924,14 @@ export const DebugStat = (callBack?: (message: any) => void) => {
dispatcher.request(DebugStat.name, request, callBack);
};
+export const DebugNetCheck = (config: string, callBack?: (message: any) => void) => {
+ const request = new Rpc.Debug.NetCheck.Request();
+
+ request.setClientyml(config);
+
+ dispatcher.request(DebugNetCheck.name, request, callBack);
+};
+
// ---------------------- NOTIFICATION ---------------------- //
export const NotificationList = (includeRead: boolean, limit: number, callBack?: (message: any) => void) => {
diff --git a/src/ts/lib/api/dispatcher.ts b/src/ts/lib/api/dispatcher.ts
index c5a66f80fd..c21111834b 100644
--- a/src/ts/lib/api/dispatcher.ts
+++ b/src/ts/lib/api/dispatcher.ts
@@ -244,7 +244,6 @@ class Dispatcher {
if (id == rootId) {
S.Block.checkBlockType(rootId);
- S.Block.checkBlockChat(rootId);
};
updateParents = true;
@@ -816,7 +815,6 @@ class Dispatcher {
S.Detail.delete(rootId, id, keys);
S.Block.checkBlockType(rootId);
- S.Block.checkBlockChat(rootId);
updateMarkup = true;
break;
@@ -977,40 +975,38 @@ class Dispatcher {
break;
};
- case 'ProcessNew':
- case 'ProcessUpdate':
- case 'ProcessDone': {
+ case 'ProcessNew': {
const { process } = mapped;
- const { id, progress, state, type } = process;
+ const { progress, type } = process;
- switch (state) {
- case I.ProgressState.Running: {
- let canCancel = true;
- let isUnlocked = true;
+ S.Progress.update({
+ ...process,
+ current: progress.done,
+ total: progress.total,
+ canCancel: [
+ I.ProgressType.Migrate,
+ I.ProgressType.Import,
+ I.ProgressType.Export,
+ I.ProgressType.Drop,
+ ].includes(type),
+ });
+ break;
+ };
- if ([ I.ProgressType.Recover, I.ProgressType.Migration ].includes(type)) {
- canCancel = false;
- isUnlocked = false;
- };
+ case 'ProcessUpdate': {
+ const { process } = mapped;
+ const { progress } = process;
- S.Common.progressSet({
- id,
- status: translate(`progress${type}`),
- current: progress.done,
- total: progress.total,
- isUnlocked,
- canCancel,
- });
- break;
- };
+ S.Progress.update({
+ ...process,
+ current: progress.done,
+ total: progress.total,
+ });
+ break;
+ };
- case I.ProgressState.Error:
- case I.ProgressState.Done:
- case I.ProgressState.Canceled: {
- S.Common.progressClear();
- break;
- };
- };
+ case 'ProcessDone': {
+ S.Progress.delete(mapped.process.id);
break;
};
@@ -1073,7 +1069,6 @@ class Dispatcher {
};
S.Block.checkBlockType(rootId);
- S.Block.checkBlockChat(rootId);
};
if (undefined !== details.setOf) {
@@ -1178,7 +1173,6 @@ class Dispatcher {
S.Block.updateNumbers(contextId);
S.Block.updateMarkup(contextId);
S.Block.checkBlockType(contextId);
- S.Block.checkBlockChat(contextId);
keyboard.setWindowTitle();
};
diff --git a/src/ts/lib/api/mapper.ts b/src/ts/lib/api/mapper.ts
index 2801781c3c..daf4d85782 100644
--- a/src/ts/lib/api/mapper.ts
+++ b/src/ts/lib/api/mapper.ts
@@ -57,6 +57,19 @@ export const Mapper = {
return t;
},
+ ProcessType (v: Events.Model.Process.MessageCase) {
+ const V = Events.Model.Process.MessageCase;
+
+ let t = '';
+ if (v == V.DROPFILES) t = 'dropFiles';
+ if (v == V.IMPORT) t = 'import';
+ if (v == V.EXPORT) t = 'export';
+ if (v == V.SAVEFILE) t = 'saveFile';
+ if (v == V.MIGRATION) t = 'migration';
+
+ return t;
+ },
+
From: {
Account: (obj: Model.Account): I.Account => {
@@ -81,6 +94,7 @@ export const Mapper = {
widgetsId: obj.getWidgetsid(),
analyticsId: obj.getAnalyticsid(),
networkId: obj.getNetworkid(),
+ workspaceObjectId: obj.getWorkspaceobjectid(),
};
},
@@ -590,11 +604,15 @@ export const Mapper = {
},
Process: (obj: Events.Model.Process) => {
+ const type = Mapper.ProcessType(obj.getMessageCase());
+
return {
id: obj.getId(),
state: obj.getState() as number,
- type: obj.getType() as number,
- progress: Mapper.From.Progress(obj.getProgress())
+ type,
+ spaceId: obj.getSpaceid(),
+ progress: Mapper.From.Progress(obj.getProgress()),
+ error: obj.getError(),
};
},
diff --git a/src/ts/lib/api/response.ts b/src/ts/lib/api/response.ts
index a87645fcc1..c93beb7d60 100644
--- a/src/ts/lib/api/response.ts
+++ b/src/ts/lib/api/response.ts
@@ -56,6 +56,12 @@ export const DebugStat = (response: Rpc.Debug.Stat.Response) => {
return res;
};
+export const DebugNetCheck = (response: Rpc.Debug.NetCheck.Response) => {
+ return {
+ result: response.getResult(),
+ };
+};
+
export const Export = (response: any) => {
return {
path: response.getPath(),
diff --git a/src/ts/lib/focus.ts b/src/ts/lib/focus.ts
index 91a7bc536a..090d38ce04 100644
--- a/src/ts/lib/focus.ts
+++ b/src/ts/lib/focus.ts
@@ -99,11 +99,11 @@ class Focus {
const ch = container.height();
const no = node.offset().top;
const hh = J.Size.header;
- const o = J.Size.lastBlock + ch / 2 + hh;
+ const o = J.Size.lastBlock + hh;
const st = container.scrollTop();
const y = isPopup ? (no - container.offset().top + st) : no;
- if ((y >= st) && (y <= st + ch / 2 - o)) {
+ if ((y >= st) && (y <= st + ch - o)) {
return;
};
diff --git a/src/ts/lib/keyboard.ts b/src/ts/lib/keyboard.ts
index 168b2c563e..f96f71357e 100644
--- a/src/ts/lib/keyboard.ts
+++ b/src/ts/lib/keyboard.ts
@@ -592,6 +592,34 @@ class Keyboard {
break;
};
+ case 'debugNet': {
+ const { networkConfig } = S.Auth;
+ const { path } = networkConfig;
+
+ C.DebugNetCheck(path, (message: any) => {
+ const result = String(message.result || '').trim();
+
+ if (!result) {
+ return;
+ };
+
+ S.Popup.open('confirm', {
+ className: 'isWide techInfo isLeft',
+ data: {
+ title: translate('menuHelpNet'),
+ text: U.Common.lbBr(result),
+ textConfirm: translate('commonCopy'),
+ colorConfirm: 'blank',
+ canCancel: false,
+ onConfirm: () => {
+ U.Common.copyToast(translate('libKeyboardNetInformation'), result);
+ },
+ }
+ });
+ });
+ break;
+ };
+
case 'resetOnboarding': {
Storage.delete('onboarding');
break;
diff --git a/src/ts/lib/relation.ts b/src/ts/lib/relation.ts
index 3655dd6ea7..3c7c4b5eb5 100644
--- a/src/ts/lib/relation.ts
+++ b/src/ts/lib/relation.ts
@@ -494,7 +494,7 @@ class Relation {
value = String(value || '');
let ret = '';
- if (type == I.RelationType.Url && !value.match(/:\/\//)) {
+ if (type == I.RelationType.Url) {
ret = 'http://';
};
if (type == I.RelationType.Email) {
@@ -506,6 +506,17 @@ class Relation {
return ret;
};
+ public checkUrlScheme (type: I.RelationType, value: string): string {
+ value = String(value || '');
+
+ if (!value) {
+ return '';
+ };
+
+ const scheme = U.Common.getScheme(value);
+ return scheme ? value : this.getUrlScheme(type, value) + value;
+ };
+
public getSetOfObjects (rootId: string, objectId: string, layout: I.ObjectLayout): any[] {
const object = S.Detail.get(rootId, objectId, [ 'setOf' ]);
const setOf = this.getArrayValue(object.setOf);
diff --git a/src/ts/lib/util/common.ts b/src/ts/lib/util/common.ts
index b24593a3b5..6608529d39 100644
--- a/src/ts/lib/util/common.ts
+++ b/src/ts/lib/util/common.ts
@@ -441,7 +441,7 @@ class UtilCommon {
const scheme = this.getScheme(url);
if (!scheme) {
- url = 'http://' + url;
+ url = `http://${url}`;
};
return url;
@@ -636,7 +636,9 @@ class UtilCommon {
getScheme (url: string): string {
url = String(url || '');
- return url.indexOf('://') >= 0 ? String(url.split('://')[0] || '') : '';
+
+ const m = url.match(/^([a-z]+):/);
+ return m ? m[1] : '';
};
intercept (obj: any, change: any) {
@@ -1007,6 +1009,22 @@ class UtilCommon {
};
};
+ isAlphaVersion (): boolean {
+ return !!this.getElectron().version.app.match(/alpha/);
+ };
+
+ isBetaVersion (): boolean {
+ return !!this.getElectron().version.app.match(/beta/);
+ };
+
+ isChatAllowed () {
+ const { config, space } = S.Common;
+ return config.experimental;
+
+ //return config.experimental || (space == J.Constant.localLoversSpaceId);
+ //return this.isAlphaVersion() || this.isBetaVersion() || !this.getElectron().isPackaged;
+ };
+
};
export default new UtilCommon();
diff --git a/src/ts/lib/util/data.ts b/src/ts/lib/util/data.ts
index 5e327679ce..643599c019 100644
--- a/src/ts/lib/util/data.ts
+++ b/src/ts/lib/util/data.ts
@@ -160,6 +160,7 @@ class UtilData {
S.Block.widgetsSet(info.widgetsId);
S.Block.profileSet(info.profileObjectId);
S.Block.spaceviewSet(info.spaceViewId);
+ S.Block.workspaceSet(info.workspaceObjectId);
S.Common.gatewaySet(info.gatewayUrl);
S.Common.spaceSet(info.accountSpaceId);
@@ -548,7 +549,7 @@ class UtilData {
};
getObjectTypesForNewObject (param?: any) {
- const { withSet, withCollection, withChat, limit } = param || {};
+ const { withSet, withCollection, limit } = param || {};
const { space, config } = S.Common;
const pageLayouts = U.Object.getPageLayouts();
const skipLayouts = U.Object.getSetLayouts();
@@ -570,10 +571,6 @@ class UtilData {
items.push(S.Record.getSetType());
};
- if (withChat && config.experimental) {
- items.push(S.Record.getChatType());
- };
-
if (withCollection) {
items.push(S.Record.getCollectionType());
};
@@ -788,9 +785,10 @@ class UtilData {
const { config } = S.Common;
const { ignoreHidden, ignoreDeleted, withArchived } = param;
const filters = param.filters || [];
- const chatDerivedType = S.Record.getChatDerivedType();
+ const skipLayouts = [ I.ObjectLayout.Chat, I.ObjectLayout.ChatOld ];
- filters.push({ relationKey: 'uniqueKey', condition: I.FilterCondition.NotEqual, value: J.Constant.typeKey.chatDerived });
+ filters.push({ relationKey: 'layout', condition: I.FilterCondition.NotIn, value: skipLayouts });
+ filters.push({ relationKey: 'recommendedLayout', condition: I.FilterCondition.NotIn, value: skipLayouts });
if (ignoreHidden && !config.debug.hiddenObject) {
filters.push({ relationKey: 'isHidden', condition: I.FilterCondition.NotEqual, value: true });
@@ -805,20 +803,6 @@ class UtilData {
filters.push({ relationKey: 'isArchived', condition: I.FilterCondition.NotEqual, value: true });
};
- if (!config.experimental) {
- const chatType = S.Record.getChatType();
-
- if (chatType) {
- filters.push({ relationKey: 'type', condition: I.FilterCondition.NotEqual, value: chatType?.id });
- };
-
- filters.push({ relationKey: 'uniqueKey', condition: I.FilterCondition.NotEqual, value: J.Constant.typeKey.chat });
- };
-
- if (chatDerivedType) {
- filters.push({ relationKey: 'type', condition: I.FilterCondition.NotEqual, value: chatDerivedType.id });
- };
-
return filters;
};
diff --git a/src/ts/lib/util/file.ts b/src/ts/lib/util/file.ts
index 4ffd504be5..a87f3e0465 100644
--- a/src/ts/lib/util/file.ts
+++ b/src/ts/lib/util/file.ts
@@ -121,13 +121,7 @@ class UtilFile {
};
iconPath (object: any) {
- const tp = S.Common.getThemePath();
- return `img/${tp}icon/file/${this.icon(object)}.svg`;
- };
-
- iconImage (object: any): string {
- const tp = S.Common.getThemePath();
- return require(`img/${tp}icon/file/${this.icon(object)}.svg`).default;
+ return `./img/${S.Common.getThemePath()}icon/file/${this.icon(object)}.svg`;
};
loadPreviewCanvas (file: any, param: any, success?: (canvas: any) => void) {
diff --git a/src/ts/lib/util/menu.ts b/src/ts/lib/util/menu.ts
index 3b07833b91..98d5bf742b 100644
--- a/src/ts/lib/util/menu.ts
+++ b/src/ts/lib/util/menu.ts
@@ -109,7 +109,7 @@ class UtilMenu {
};
getBlockObject () {
- const items = U.Data.getObjectTypesForNewObject({ withSet: true, withCollection: true, withChat: true });
+ const items = U.Data.getObjectTypesForNewObject({ withSet: true, withCollection: true });
const ret: any[] = [
{ type: I.BlockType.Page, id: 'existingPage', icon: 'existing', lang: 'ExistingPage', arrow: true, aliases: [ 'link' ] },
{ type: I.BlockType.File, id: 'existingFile', icon: 'existing', lang: 'ExistingFile', arrow: true, aliases: [ 'file' ] }
@@ -426,7 +426,6 @@ class UtilMenu {
if ([
J.Constant.widgetId.set,
J.Constant.widgetId.collection,
- J.Constant.widgetId.chat,
].includes(id)) {
options = options.filter(it => it != I.WidgetLayout.Tree);
};
@@ -855,7 +854,6 @@ class UtilMenu {
const { config } = S.Common;
return [
{ id: J.Constant.widgetId.favorite, name: translate('widgetFavorite'), iconEmoji: '⭐' },
- config.experimental ? { id: J.Constant.widgetId.chat, name: translate('widgetChat'), iconEmoji: '💬' } : null,
{ id: J.Constant.widgetId.set, name: translate('widgetSet'), iconEmoji: '🔍' },
{ id: J.Constant.widgetId.collection, name: translate('widgetCollection'), iconEmoji: '🗂️' },
{ id: J.Constant.widgetId.recentEdit, name: translate('widgetRecent'), iconEmoji: '📝' },
diff --git a/src/ts/lib/util/object.ts b/src/ts/lib/util/object.ts
index 327cff4ce2..1266c008c1 100644
--- a/src/ts/lib/util/object.ts
+++ b/src/ts/lib/util/object.ts
@@ -24,6 +24,7 @@ class UtilObject {
case I.ObjectLayout.Archive: r = 'archive'; break;
case I.ObjectLayout.Block: r = 'block'; break;
case I.ObjectLayout.Empty: r = 'empty'; break;
+ case I.ObjectLayout.Space:
case I.ObjectLayout.Chat: r = 'chat'; break;
};
return r;
@@ -138,6 +139,9 @@ class UtilObject {
window.setTimeout(() => S.Popup.open('page', param), S.Popup.getTimeout());
};
+ /**
+ Opens object based on user setting 'Open objects in fullscreen mode'
+ */
openConfig (object: any, param?: any) {
S.Common.fullscreenObject ? this.openAuto(object, param) : this.openPopup(object, param);
};
@@ -295,6 +299,10 @@ class UtilObject {
return layout == I.ObjectLayout.SpaceView;
};
+ isSpaceLayout (layout: I.ObjectLayout): boolean {
+ return layout == I.ObjectLayout.Space;
+ };
+
isSetLayout (layout: I.ObjectLayout): boolean {
return layout == I.ObjectLayout.Set;
};
@@ -392,7 +400,6 @@ class UtilObject {
I.ObjectLayout.Dashboard,
I.ObjectLayout.Space,
I.ObjectLayout.SpaceView,
- I.ObjectLayout.ChatDerived,
];
};
@@ -430,7 +437,6 @@ class UtilObject {
I.ObjectLayout.Option,
I.ObjectLayout.SpaceView,
I.ObjectLayout.Space,
- I.ObjectLayout.ChatDerived,
];
};
@@ -445,7 +451,7 @@ class UtilObject {
};
isAllowedObject (layout: I.ObjectLayout): boolean {
- return this.getPageLayouts().concat(I.ObjectLayout.Chat).includes(layout);
+ return this.getPageLayouts().includes(layout);
};
};
diff --git a/src/ts/lib/util/router.ts b/src/ts/lib/util/router.ts
index 4633ac5b7d..83909d5c3c 100644
--- a/src/ts/lib/util/router.ts
+++ b/src/ts/lib/util/router.ts
@@ -4,6 +4,7 @@ import { I, C, S, U, J, Preview, analytics, Storage } from 'Lib';
class UtilRouter {
history: any = null;
+ isOpening = false;
init (history: any) {
this.history = history;
@@ -129,18 +130,29 @@ class UtilRouter {
};
switchSpace (id: string, route: string, sendEvent: boolean, routeParam: any) {
+ if (this.isOpening) {
+ return;
+ };
+
if (!id) {
console.log('[UtilRouter].swithSpace: id is empty');
return;
};
+ const withChat = U.Common.isChatAllowed();
+
S.Menu.closeAllForced();
+ S.Progress.showSet(false);
if (sendEvent) {
analytics.event('SwitchSpace');
};
- C.WorkspaceOpen(id, (message: any) => {
+ this.isOpening = true;
+
+ C.WorkspaceOpen(id, withChat, (message: any) => {
+ this.isOpening = false;
+
if (message.error.code) {
U.Data.onAuthWithoutSpace();
return;
diff --git a/src/ts/lib/util/space.ts b/src/ts/lib/util/space.ts
index a1d0ac6bdd..ce4fe884b5 100644
--- a/src/ts/lib/util/space.ts
+++ b/src/ts/lib/util/space.ts
@@ -1,4 +1,4 @@
-import { I, S, U, J, Storage, translate } from 'Lib';
+import { I, C, S, U, J, Storage, translate } from 'Lib';
class UtilSpace {
@@ -248,6 +248,12 @@ class UtilSpace {
};
};
+ getInvite (id: string, callBack: (cid: string, key: string) => void) {
+ C.SpaceInviteGetCurrent(id, (message: any) => {
+ callBack(message.inviteCid, message.inviteKey);
+ });
+ };
+
};
-export default new UtilSpace();
+export default new UtilSpace();
\ No newline at end of file
diff --git a/src/ts/model/account.ts b/src/ts/model/account.ts
index affb32956b..50684eda0a 100644
--- a/src/ts/model/account.ts
+++ b/src/ts/model/account.ts
@@ -14,6 +14,7 @@ class AccountInfo implements I.AccountInfo {
widgetsId = '';
analyticsId = '';
networkId = '';
+ workspaceObjectId = '';
constructor (props: I.AccountInfo) {
this.homeObjectId = String(props.homeObjectId || '');
@@ -27,6 +28,7 @@ class AccountInfo implements I.AccountInfo {
this.widgetsId = String(props.widgetsId || '');
this.analyticsId = String(props.analyticsId || '');
this.networkId = String(props.networkId || '');
+ this.workspaceObjectId = String(props.workspaceObjectId || '');
makeObservable(this, {
homeObjectId: observable,
@@ -40,6 +42,7 @@ class AccountInfo implements I.AccountInfo {
widgetsId: observable,
analyticsId: observable,
networkId: observable,
+ workspaceObjectId: observable,
});
intercept(this as any, change => U.Common.intercept(this, change));
diff --git a/src/ts/model/notification.ts b/src/ts/model/notification.ts
index e296203fce..193ed19370 100644
--- a/src/ts/model/notification.ts
+++ b/src/ts/model/notification.ts
@@ -42,16 +42,8 @@ class Notification implements I.Notification {
switch (this.type) {
case I.NotificationType.Import: {
- const codes = [
- J.Error.Code.NO_OBJECTS_TO_IMPORT,
- J.Error.Code.IMPORT_IS_CANCELED,
- J.Error.Code.LIMIT_OF_ROWS_OR_RELATIONS_EXCEEDED,
- J.Error.Code.FILE_LOAD_ERROR,
- J.Error.Code.INSUFFICIENT_PERMISSIONS,
- ];
-
- if (codes.includes(errorCode)) {
- this.title = translate(`notificationImportErrorTitle${errorCode}`);
+ if (Object.values(J.Error.Code.Import).includes(errorCode)) {
+ this.title = translate('commonError');
this.text = translate(`notificationImportErrorText${errorCode}`);
};
break;
diff --git a/src/ts/store/block.ts b/src/ts/store/block.ts
index 57c7ded8ad..60bf2620f2 100644
--- a/src/ts/store/block.ts
+++ b/src/ts/store/block.ts
@@ -8,6 +8,7 @@ class BlockStore {
public widgetsId = '';
public rootId = '';
public spaceviewId = '';
+ public workspaceId = '';
public treeMap: Map> = new Map();
public blockMap: Map> = new Map();
@@ -20,16 +21,20 @@ class BlockStore {
profileId: observable,
spaceviewId: observable,
widgetsId: observable,
+ workspaceId: observable,
profile: computed,
root: computed,
spaceview: computed,
widgets: computed,
+ workspace: computed,
rootSet: action,
profileSet: action,
widgetsSet: action,
spaceviewSet: action,
+ workspaceSet: action,
+
set: action,
clear: action,
clearAll: action,
@@ -57,6 +62,10 @@ class BlockStore {
return String(this.spaceviewId || '');
};
+ get workspace (): string {
+ return String(this.workspaceId || '');
+ };
+
profileSet (id: string) {
this.profileId = String(id || '');
};
@@ -72,6 +81,10 @@ class BlockStore {
spaceviewSet (id: string) {
this.spaceviewId = String(id || '');
};
+
+ workspaceSet (id: string) {
+ this.workspaceId = String(id || '');
+ };
set (rootId: string, blocks: I.Block[]) {
const map: Map = new Map();
@@ -572,8 +585,9 @@ class BlockStore {
checkBlockType (rootId: string) {
const { header, type } = J.Constant.blockId;
const element = this.getMapElement(rootId, header);
+ const canWrite = U.Space.canMyParticipantWrite();
- if (!element) {
+ if (!element || !canWrite) {
return;
};
@@ -593,32 +607,6 @@ class BlockStore {
return header ? header.childrenIds.includes(J.Constant.blockId.type) : false;
};
- checkBlockChat (rootId: string) {
- return;
-
- const element = this.getMapElement(rootId, rootId);
-
- if (!element) {
- return;
- };
-
- const object = S.Detail.get(rootId, rootId, [ 'layout', 'chatId' ], true);
- if (U.Object.isChatLayout(object.layout)) {
- return;
- };
-
- if (object.chatId && !this.checkBlockChatExists(rootId)) {
- const childrenIds = element.childrenIds.concat(J.Constant.blockId.chat);
-
- this.updateStructure(rootId, rootId, childrenIds);
- };
- };
-
- checkBlockChatExists (rootId: string): boolean {
- const element = this.getMapElement(rootId, rootId);
- return element ? element.childrenIds.includes(J.Constant.blockId.chat) : false;
- };
-
getLayoutIds (rootId: string, ids: string[]) {
if (!ids.length) {
return [];
diff --git a/src/ts/store/common.ts b/src/ts/store/common.ts
index 215efe32ad..011d24d318 100644
--- a/src/ts/store/common.ts
+++ b/src/ts/store/common.ts
@@ -106,7 +106,6 @@ class CommonStore {
spaceId: observable,
membershipTiersList: observable,
config: computed,
- progress: computed,
preview: computed,
toast: computed,
filter: computed,
@@ -119,8 +118,6 @@ class CommonStore {
shareTooltip: computed,
showVault: computed,
gatewaySet: action,
- progressSet: action,
- progressClear: action,
filterSetFrom: action,
filterSetText: action,
filterSet: action,
@@ -153,10 +150,6 @@ class CommonStore {
return config;
};
- get progress (): I.Progress {
- return this.progressObj;
- };
-
get preview (): I.Preview {
return this.previewObj;
};
@@ -295,14 +288,6 @@ class CommonStore {
return [ this.gateway, 'image', String(id || '') ].join('/') + `?width=${Number(width) || 0}`;
};
- progressSet (v: I.Progress) {
- this.progressObj = v;
- };
-
- progressClear () {
- this.progressObj = null;
- };
-
filterSetFrom (from: number) {
this.filterObj.from = from;
};
diff --git a/src/ts/store/detail.ts b/src/ts/store/detail.ts
index 6bc2eb4b94..1418816308 100644
--- a/src/ts/store/detail.ts
+++ b/src/ts/store/detail.ts
@@ -286,8 +286,8 @@ class DetailStore {
object.readersLimit = Number(object.readersLimit) || 0;
object.writersLimit = Number(object.writersLimit) || 0;
object.spaceId = Relation.getStringValue(object.spaceId);
- object.spaceMainChatId = Relation.getStringValue(object.spaceMainChatId);
object.spaceDashboardId = Relation.getStringValue(object.spaceDashboardId);
+ object.chatId = Relation.getStringValue(object.chatId);
object.targetSpaceId = Relation.getStringValue(object.targetSpaceId);
object.iconOption = Number(object.iconOption) || 1;
diff --git a/src/ts/store/index.ts b/src/ts/store/index.ts
index 8f2230b6e6..7884aff344 100644
--- a/src/ts/store/index.ts
+++ b/src/ts/store/index.ts
@@ -8,6 +8,7 @@ import { Popup } from './popup';
import { Notification } from './notification';
import { Extension } from './extension';
import { Chat } from './chat';
+import { Progress } from './progress';
export {
Common,
@@ -20,4 +21,5 @@ export {
Notification,
Extension,
Chat,
+ Progress,
};
\ No newline at end of file
diff --git a/src/ts/store/progress.ts b/src/ts/store/progress.ts
new file mode 100644
index 0000000000..4416ffc197
--- /dev/null
+++ b/src/ts/store/progress.ts
@@ -0,0 +1,84 @@
+import { observable, action, makeObservable, set, computed } from 'mobx';
+import { I, S } from 'Lib';
+
+class ProgressStore {
+
+ public showValue = false;
+ public listValue: I.Progress[] = [];
+
+ constructor () {
+ makeObservable(this, {
+ listValue: observable,
+ showValue: observable,
+ list: computed,
+ show: computed,
+ add: action,
+ update: action,
+ delete: action,
+ showSet: action,
+ });
+ };
+
+ get show (): boolean {
+ return this.showValue;
+ };
+
+ get list (): I.Progress[] {
+ return this.listValue || [];
+ };
+
+ add (item: Partial): void {
+ this.listValue.unshift(item);
+ };
+
+ update (param: Partial): void {
+ const item = this.getItem(param.id);
+
+ if (item) {
+ set(item, param);
+ } else {
+ this.add(param);
+ };
+ };
+
+ delete (id: string) {
+ this.listValue = this.listValue.filter(it => it.id != id);
+ };
+
+ showSet (v: boolean): void {
+ this.showValue = Boolean(v);
+ };
+
+ getList () {
+ const { space } = S.Common;
+ const skip = [ I.ProgressState.Done, I.ProgressState.Canceled ];
+
+ return this.list.filter(it => (!it.spaceId || (it.spaceId == space)) && !skip.includes(it.state));
+ };
+
+ getItem (id: string): I.Progress {
+ return this.getList().find(it => it.id == id);
+ };
+
+ getField (field: string): number {
+ return this.getList().reduce((acc, it) => acc + (Number(it[field]) || 0), 0);
+ };
+
+ getCurrent (): number {
+ return this.getField('current');
+ };
+
+ getTotal (): number {
+ return this.getField('total');
+ };
+
+ getPercent (): number {
+ const current = this.getCurrent();
+ const total = this.getTotal();
+
+ return total > 0 ? Math.min(100, Math.ceil(current / total * 100)) : 0;
+ };
+
+};
+
+export const Progress: ProgressStore = new ProgressStore();
\ No newline at end of file
diff --git a/src/ts/store/record.ts b/src/ts/store/record.ts
index 8cffc86111..521d71e51f 100644
--- a/src/ts/store/record.ts
+++ b/src/ts/store/record.ts
@@ -282,10 +282,6 @@ class RecordStore {
return this.getTypeByKey(J.Constant.typeKey.chat);
};
- getChatDerivedType () {
- return this.getTypeByKey(J.Constant.typeKey.chatDerived);
- };
-
getSpaceType () {
return this.getTypeByKey(J.Constant.typeKey.space);
};
diff --git a/tsconfig.json b/tsconfig.json
index 64e045cd10..ab03859de7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,6 +13,9 @@
"allowJs": true,
"baseUrl": "./src",
"lib": [ "es5", "dom" ],
+ "isolatedModules": true,
+ "incremental": true,
+ "types": [ "node", "@rspack/core/module" ],
"paths": {
"json": [
diff --git a/update-ci.sh b/update-ci.sh
index c510fe8aa8..426f5a64fc 100755
--- a/update-ci.sh
+++ b/update-ci.sh
@@ -13,7 +13,7 @@ folder="build";
if [ "$platform" = "ubuntu-latest" ]; then
arch="linux-$arch";
folder="$arch";
-elif [ "$platform" = "macos-12" ]; then
+elif [ "$platform" = "macos-13" ]; then
arch="darwin-$arch";
folder="$arch";
elif [ "$platform" = "windows-latest" ]; then
@@ -36,7 +36,7 @@ mwv=`cat middleware.version`
version=`curl -u "$user:$token" -H "Accept: application/vnd.github.v3+json" -sL https://$GITHUB/repos/$REPO/releases/tags/v$mwv | jq .`
tag=`echo $version | jq ".tag_name"`
-asset_id=`echo $version | jq ".assets | map(select(.name | match(\"js_v[0-9]+.[0-9]+.[0-9]+(-rc[0-9]+)?_$arch\";\"i\")))[0].id"`
+asset_id=`echo $version | jq ".assets | map(select(.name | match(\"js_v[0-9]+.[0-9]+.[0-9]+([^_]+)?_$arch\";\"i\")))[0].id"`
if [ "$asset_id" = "" ]; then
echo "ERROR: version not found"
diff --git a/update.sh b/update.sh
index 3e1ee8141f..1dea52a68c 100755
--- a/update.sh
+++ b/update.sh
@@ -11,7 +11,7 @@ folder="build";
if [ "$platform" = "ubuntu-latest" ]; then
arch="linux-$arch";
folder="$arch";
-elif [ "$platform" = "macos-12" ]; then
+elif [ "$platform" = "macos-13" ]; then
arch="darwin-$arch";
folder="$arch";
elif [ "$platform" = "windows-latest" ]; then
@@ -34,7 +34,7 @@ mwv=`cat middleware.version`
version=`curl -H "Accept: application/vnd.github.v3+json" -sL https://$GITHUB/repos/$REPO/releases/tags/v$mwv | jq .`
tag=`echo $version | jq ".tag_name"`
-asset_id=`echo $version | jq ".assets | map(select(.name | match(\"js_v[0-9]+.[0-9]+.[0-9]+(-rc[0-9]+)?_$arch\";\"i\")))[0].id"`
+asset_id=`echo $version | jq ".assets | map(select(.name | match(\"js_v[0-9]+.[0-9]+.[0-9]+([^_]+)?_$arch\";\"i\")))[0].id"`
if [ "$asset_id" = "" ]; then
echo "ERROR: version not found"
-
- {canCancel ?
@@ -50,39 +73,22 @@ const Progress = observer(class Progress extends React.Component {
componentDidMount () {
this._isMounted = true;
+ this.resize();
};
componentDidUpdate () {
- const { progress } = S.Common;
- if (!progress) {
- return;
- };
-
- const { current, total } = progress;
const win = $(window);
- const node = $(this.node);
- node.removeClass('hide');
this.resize();
-
win.off('resize.progress').on('resize.progress', () => this.resize());
-
- if (total && (current >= total)) {
- node.addClass('hide');
- win.off('resize.progress');
-
- window.setTimeout(() => S.Common.progressClear(), 200);
- };
};
componentWillUnmount () {
this._isMounted = false;
+ $(window).off('resize.progress');
};
- onCancel (e: any) {
- const { progress } = S.Common;
- const { id } = progress;
-
+ onCancel (id: string) {
C.ProcessCancel(id);
};
@@ -107,6 +113,7 @@ const Progress = observer(class Progress extends React.Component {
const y = e.pageY - this.dy - win.scrollTop();
this.setStyle(x, y);
+ Storage.set('progress', { x, y }, true);
};
onDragEnd (e: any) {
@@ -119,6 +126,9 @@ const Progress = observer(class Progress extends React.Component {
checkCoords (x: number, y: number): { x: number, y: number } {
const { ww, wh } = U.Common.getWindowDimensions();
+ this.width = Number(this.width) || 0;
+ this.height = Number(this.height) || 0;
+
x = Number(x) || 0;
x = Math.max(0, x);
x = Math.min(ww - this.width, x);
@@ -139,6 +149,10 @@ const Progress = observer(class Progress extends React.Component {
const coords = Storage.get('progress');
this.obj = node.find('#inner');
+ if (!this.obj.length) {
+ return;
+ };
+
this.height = this.obj.outerHeight();
this.width = this.obj.outerWidth();
@@ -150,10 +164,7 @@ const Progress = observer(class Progress extends React.Component {
setStyle (x: number, y: number) {
const coords = this.checkCoords(x, y);
- if ((coords.x !== null) && (coords.y !== null)) {
- this.obj.css({ margin: 0, left: coords.x, top: coords.y });
- Storage.set('progress', coords, true);
- };
+ this.obj.css({ margin: 0, left: coords.x, top: coords.y, bottom: 'auto' });
};
});
diff --git a/src/ts/component/util/toast.tsx b/src/ts/component/util/toast.tsx
index 677cf80394..83ef432ec8 100644
--- a/src/ts/component/util/toast.tsx
+++ b/src/ts/component/util/toast.tsx
@@ -52,11 +52,7 @@ const Toast = observer(class Toast extends React.Component
-
+
+
+
+
+
+ {list.map(item =>