working RoomInfoStore
This commit is contained in:
parent
ff3c55e892
commit
82c1c47be6
@ -8,14 +8,14 @@
|
|||||||
"name": "📦 @appserver/common",
|
"name": "📦 @appserver/common",
|
||||||
"path": "packages\\asc-web-common"
|
"path": "packages\\asc-web-common"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "📦 @appserver/components",
|
|
||||||
"path": "packages\\asc-web-components"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "🚀 @appserver/files",
|
"name": "🚀 @appserver/files",
|
||||||
"path": "products\\ASC.Files\\Client"
|
"path": "products\\ASC.Files\\Client"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "📦 @appserver/components",
|
||||||
|
"path": "packages\\asc-web-components"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "🚀 @appserver/people",
|
"name": "🚀 @appserver/people",
|
||||||
"path": "products\\ASC.People\\Client"
|
"path": "products\\ASC.People\\Client"
|
||||||
|
@ -611,6 +611,8 @@ PageLayout.SectionHeader = SectionHeader;
|
|||||||
PageLayout.SectionFilter = SectionFilter;
|
PageLayout.SectionFilter = SectionFilter;
|
||||||
PageLayout.SectionBody = SectionBody;
|
PageLayout.SectionBody = SectionBody;
|
||||||
PageLayout.SectionPaging = SectionPaging;
|
PageLayout.SectionPaging = SectionPaging;
|
||||||
|
PageLayout.RoomInfoHeader = RoomInfoHeader;
|
||||||
|
PageLayout.RoomInfoBody = RoomInfoBody;
|
||||||
|
|
||||||
export default inject(({ auth }) => {
|
export default inject(({ auth }) => {
|
||||||
const { isLoaded, settingsStore } = auth;
|
const { isLoaded, settingsStore } = auth;
|
||||||
|
@ -1,16 +1,22 @@
|
|||||||
import { inject, observer } from "mobx-react";
|
import { inject, observer } from "mobx-react";
|
||||||
import React from "react";
|
import React from "react";
|
||||||
|
|
||||||
const SubRoomInfoBody = ({ children }) => {
|
const SubRoomInfoBody = ({ children, isVisible }) => {
|
||||||
console.log("SRIB children - ", children);
|
console.log("Body children - ", children);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
|
<p>Room Info Is {isVisible ? "Visible" : "Hidden"}</p>
|
||||||
<div>ROOM INFO BODY</div>
|
<div>ROOM INFO BODY</div>
|
||||||
<div>Children - {children}</div>
|
<div>Children - {children}</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default inject(() => {
|
export default inject(({ roomInfoStore }) => {
|
||||||
return {};
|
let isVisible = false;
|
||||||
|
if (roomInfoStore) isVisible = roomInfoStore.isVisible;
|
||||||
|
return {
|
||||||
|
isVisible,
|
||||||
|
};
|
||||||
})(observer(SubRoomInfoBody));
|
})(observer(SubRoomInfoBody));
|
||||||
|
@ -2,7 +2,7 @@ import { inject, observer } from "mobx-react";
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
|
|
||||||
const SubRoomInfoHeader = ({ children }) => {
|
const SubRoomInfoHeader = ({ children }) => {
|
||||||
console.log("SRIH children - ", { children });
|
console.log("Header children - ", { children });
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<div>ROOM INFO HEADER</div>
|
<div>ROOM INFO HEADER</div>
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
import { observer } from "mobx-react";
|
import { inject, observer } from "mobx-react";
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import styled from "styled-components";
|
import styled from "styled-components";
|
||||||
|
|
||||||
const RoomInfo = ({ children }) => {
|
const RoomInfo = ({ children, isVisible }) => {
|
||||||
|
if (!isVisible) return null;
|
||||||
|
|
||||||
const StyledRoomInfo = styled.div`
|
const StyledRoomInfo = styled.div`
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width: 400px;
|
width: 400px;
|
||||||
@ -14,4 +16,10 @@ const RoomInfo = ({ children }) => {
|
|||||||
return <StyledRoomInfo>{children}</StyledRoomInfo>;
|
return <StyledRoomInfo>{children}</StyledRoomInfo>;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default observer(RoomInfo);
|
export default inject(({ roomInfoStore }) => {
|
||||||
|
let isVisible = false;
|
||||||
|
if (roomInfoStore) isVisible = roomInfoStore.isVisible;
|
||||||
|
return {
|
||||||
|
isVisible,
|
||||||
|
};
|
||||||
|
})(RoomInfo);
|
||||||
|
@ -192,7 +192,10 @@ class SettingsStore {
|
|||||||
init = async () => {
|
init = async () => {
|
||||||
this.setIsLoading(true);
|
this.setIsLoading(true);
|
||||||
|
|
||||||
await Promise.all([this.getPortalSettings(), this.getBuildVersionInfo()]);
|
await Promise.all([
|
||||||
|
this.getPortalSettings(),
|
||||||
|
this.getBuildVersionInfo(),
|
||||||
|
]);
|
||||||
|
|
||||||
this.setIsLoading(false);
|
this.setIsLoading(false);
|
||||||
this.setIsLoaded(true);
|
this.setIsLoaded(true);
|
||||||
@ -302,7 +305,9 @@ class SettingsStore {
|
|||||||
};
|
};
|
||||||
|
|
||||||
getPortalPasswordSettings = async (confirmKey = null) => {
|
getPortalPasswordSettings = async (confirmKey = null) => {
|
||||||
const settings = await api.settings.getPortalPasswordSettings(confirmKey);
|
const settings = await api.settings.getPortalPasswordSettings(
|
||||||
|
confirmKey
|
||||||
|
);
|
||||||
this.setPasswordSettings(settings);
|
this.setPasswordSettings(settings);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,12 +1,7 @@
|
|||||||
import { inject, observer } from "mobx-react";
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { withTranslation } from "react-i18next";
|
|
||||||
import { withRouter } from "react-router";
|
|
||||||
|
|
||||||
const RoomInfoBodyContent = () => {
|
const RoomInfoBodyContent = () => {
|
||||||
return <div>NOTIFICATION BODY CONTENT</div>;
|
return <div>NOTIFICATION BODY CONTENT</div>;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default inject(({}) => {
|
export default RoomInfoBodyContent;
|
||||||
return {};
|
|
||||||
})(observer(RoomInfoBodyContent));
|
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
import { inject, observer } from "mobx-react";
|
import { inject, observer } from "mobx-react";
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { withTranslation } from "react-i18next";
|
|
||||||
import { withRouter } from "react-router";
|
|
||||||
|
|
||||||
const RoomInfoHeaderContent = () => {
|
const RoomInfoHeaderContent = () => {
|
||||||
return <div>NOTIFICATION HEADER CONTENT</div>;
|
return <div>NOTIFICATION HEADER CONTENT</div>;
|
||||||
|
@ -119,6 +119,11 @@ const StyledContainer = styled.div`
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.room-info-button {
|
||||||
|
position: absolute;
|
||||||
|
right: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.group-button-menu-container {
|
.group-button-menu-container {
|
||||||
@ -553,7 +558,7 @@ class SectionHeaderContent extends React.Component {
|
|||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
<span>
|
<>
|
||||||
<IconButton
|
<IconButton
|
||||||
iconName="/static/images/arrow.path.react.svg"
|
iconName="/static/images/arrow.path.react.svg"
|
||||||
size="15"
|
size="15"
|
||||||
@ -561,9 +566,9 @@ class SectionHeaderContent extends React.Component {
|
|||||||
hoverColor="#657077"
|
hoverColor="#657077"
|
||||||
isFill={true}
|
isFill={true}
|
||||||
onClick={this.onToggleRoomInfo}
|
onClick={this.onToggleRoomInfo}
|
||||||
className="trash-button"
|
className="room-info-button"
|
||||||
/>
|
/>
|
||||||
</span>
|
</>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@ -584,6 +589,7 @@ export default inject(
|
|||||||
filesActionsStore,
|
filesActionsStore,
|
||||||
settingsStore,
|
settingsStore,
|
||||||
treeFoldersStore,
|
treeFoldersStore,
|
||||||
|
roomInfoStore,
|
||||||
}) => {
|
}) => {
|
||||||
const {
|
const {
|
||||||
setSelected,
|
setSelected,
|
||||||
@ -621,6 +627,7 @@ export default inject(
|
|||||||
downloadAction,
|
downloadAction,
|
||||||
getHeaderMenu,
|
getHeaderMenu,
|
||||||
} = filesActionsStore;
|
} = filesActionsStore;
|
||||||
|
const toggleRoomInfo = roomInfoStore.toggleIsVisible;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
isDesktop: auth.settingsStore.isDesktopClient,
|
isDesktop: auth.settingsStore.isDesktopClient,
|
||||||
@ -630,6 +637,7 @@ export default inject(
|
|||||||
currentFolderId: selectedFolderStore.id,
|
currentFolderId: selectedFolderStore.id,
|
||||||
filter,
|
filter,
|
||||||
canCreate,
|
canCreate,
|
||||||
|
toggleRoomInfo,
|
||||||
isHeaderVisible,
|
isHeaderVisible,
|
||||||
isHeaderIndeterminate,
|
isHeaderIndeterminate,
|
||||||
isHeaderChecked,
|
isHeaderChecked,
|
||||||
|
@ -8,8 +8,12 @@ class RoomInfoStore {
|
|||||||
}
|
}
|
||||||
|
|
||||||
toggleIsVisible = () => {
|
toggleIsVisible = () => {
|
||||||
isVisible = !this.isVisible;
|
this.isVisible = !this.isVisible;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
get isVisible() {
|
||||||
|
return this.isVisible;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default RoomInfoStore;
|
export default RoomInfoStore;
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
import { makeAutoObservable } from "mobx";
|
|
||||||
import api from "@appserver/common/api";
|
import api from "@appserver/common/api";
|
||||||
import axios from "axios";
|
|
||||||
import {
|
import {
|
||||||
setFavoritesSetting,
|
setFavoritesSetting,
|
||||||
setRecentSetting,
|
setRecentSetting,
|
||||||
} from "@appserver/common/api/files";
|
} from "@appserver/common/api/files";
|
||||||
import { FolderType } from "@appserver/common/constants";
|
import { FolderType } from "@appserver/common/constants";
|
||||||
|
import axios from "axios";
|
||||||
|
import { makeAutoObservable } from "mobx";
|
||||||
|
|
||||||
class SettingsStore {
|
class SettingsStore {
|
||||||
thirdPartyStore;
|
thirdPartyStore;
|
||||||
@ -25,6 +25,8 @@ class SettingsStore {
|
|||||||
hideConfirmConvertSave = null;
|
hideConfirmConvertSave = null;
|
||||||
chunkUploadSize = 1024 * 1023; // 1024 * 1023; //~0.999mb
|
chunkUploadSize = 1024 * 1023; // 1024 * 1023; //~0.999mb
|
||||||
|
|
||||||
|
roomInfoIsVisible = false;
|
||||||
|
|
||||||
settingsIsLoaded = false;
|
settingsIsLoaded = false;
|
||||||
|
|
||||||
constructor(thirdPartyStore, treeFoldersStore) {
|
constructor(thirdPartyStore, treeFoldersStore) {
|
||||||
@ -34,6 +36,10 @@ class SettingsStore {
|
|||||||
this.treeFoldersStore = treeFoldersStore;
|
this.treeFoldersStore = treeFoldersStore;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get roomInfoIsVisible() {
|
||||||
|
return this.roomInfoIsVisible;
|
||||||
|
}
|
||||||
|
|
||||||
setIsLoaded = (isLoaded) => {
|
setIsLoaded = (isLoaded) => {
|
||||||
this.settingsIsLoaded = isLoaded;
|
this.settingsIsLoaded = isLoaded;
|
||||||
};
|
};
|
||||||
@ -81,8 +87,12 @@ class SettingsStore {
|
|||||||
for (let item of capabilities) {
|
for (let item of capabilities) {
|
||||||
item.splice(1, 1);
|
item.splice(1, 1);
|
||||||
}
|
}
|
||||||
this.thirdPartyStore.setThirdPartyCapabilities(capabilities); //TODO: Out of bounds read: 1
|
this.thirdPartyStore.setThirdPartyCapabilities(
|
||||||
this.thirdPartyStore.setThirdPartyProviders(providers);
|
capabilities
|
||||||
|
); //TODO: Out of bounds read: 1
|
||||||
|
this.thirdPartyStore.setThirdPartyProviders(
|
||||||
|
providers
|
||||||
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return this.setIsLoaded(true);
|
return this.setIsLoaded(true);
|
||||||
@ -131,7 +141,9 @@ class SettingsStore {
|
|||||||
for (let item of capabilities) {
|
for (let item of capabilities) {
|
||||||
item.splice(1, 1);
|
item.splice(1, 1);
|
||||||
}
|
}
|
||||||
this.thirdPartyStore.setThirdPartyCapabilities(capabilities); //TODO: Out of bounds read: 1
|
this.thirdPartyStore.setThirdPartyCapabilities(
|
||||||
|
capabilities
|
||||||
|
); //TODO: Out of bounds read: 1
|
||||||
this.thirdPartyStore.setThirdPartyProviders(providers);
|
this.thirdPartyStore.setThirdPartyProviders(providers);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
@ -140,7 +152,9 @@ class SettingsStore {
|
|||||||
};
|
};
|
||||||
|
|
||||||
setForceSave = (data, setting) =>
|
setForceSave = (data, setting) =>
|
||||||
api.files.forceSave(data).then((res) => this.setFilesSetting(setting, res));
|
api.files
|
||||||
|
.forceSave(data)
|
||||||
|
.then((res) => this.setFilesSetting(setting, res));
|
||||||
|
|
||||||
updateRootTreeFolders = (set, rootFolderIndex, folderType) => {
|
updateRootTreeFolders = (set, rootFolderIndex, folderType) => {
|
||||||
const {
|
const {
|
||||||
@ -151,7 +165,9 @@ class SettingsStore {
|
|||||||
|
|
||||||
getFoldersTree().then((root) => {
|
getFoldersTree().then((root) => {
|
||||||
if (set) {
|
if (set) {
|
||||||
const rootFolder = root.find((x) => x.rootFolderType === folderType);
|
const rootFolder = root.find(
|
||||||
|
(x) => x.rootFolderType === folderType
|
||||||
|
);
|
||||||
const newTreeFolders = treeFolders;
|
const newTreeFolders = treeFolders;
|
||||||
newTreeFolders.splice(rootFolderIndex, 0, rootFolder);
|
newTreeFolders.splice(rootFolderIndex, 0, rootFolder);
|
||||||
setTreeFolders(newTreeFolders);
|
setTreeFolders(newTreeFolders);
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
import RoomInfoStore from "./RoomInfoStore";
|
|
||||||
import store from "studio/store";
|
import store from "studio/store";
|
||||||
|
|
||||||
import DialogsStore from "./DialogsStore";
|
import DialogsStore from "./DialogsStore";
|
||||||
@ -11,6 +10,7 @@ import iconFormatsStore from "./IconFormatsStore";
|
|||||||
import MediaViewerDataStore from "./MediaViewerDataStore";
|
import MediaViewerDataStore from "./MediaViewerDataStore";
|
||||||
import mediaViewersFormatsStore from "./MediaViewersFormatsStore";
|
import mediaViewersFormatsStore from "./MediaViewersFormatsStore";
|
||||||
import PrimaryProgressDataStore from "./PrimaryProgressDataStore";
|
import PrimaryProgressDataStore from "./PrimaryProgressDataStore";
|
||||||
|
import RoomInfoStore from "./RoomInfoStore";
|
||||||
import SecondaryProgressDataStore from "./SecondaryProgressDataStore";
|
import SecondaryProgressDataStore from "./SecondaryProgressDataStore";
|
||||||
import selectedFilesStore from "./SelectedFilesStore";
|
import selectedFilesStore from "./SelectedFilesStore";
|
||||||
import selectedFolderStore from "./SelectedFolderStore";
|
import selectedFolderStore from "./SelectedFolderStore";
|
||||||
|
Loading…
Reference in New Issue
Block a user