aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/SocketStub.ts1
-rw-r--r--src/client/documents/Documents.ts6
-rw-r--r--src/client/views/Main.tsx79
3 files changed, 48 insertions, 38 deletions
diff --git a/src/client/SocketStub.ts b/src/client/SocketStub.ts
index 18df4ca0a..c48f21f63 100644
--- a/src/client/SocketStub.ts
+++ b/src/client/SocketStub.ts
@@ -48,6 +48,7 @@ export class SocketStub {
public static SEND_FIELDS_REQUEST(fieldIds: FieldId[], callback: (fields: { [key: string]: Field }) => any) {
Utils.EmitCallback(Server.Socket, MessageStore.GetFields, fieldIds, (fields: any[]) => {
+ console.log(fieldIds);
let fieldMap: any = {};
for (let field of fields) {
fieldMap[field._id] = ServerUtils.FromJson(field);
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 1d24ff7d2..596652cf0 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -44,14 +44,14 @@ export namespace Documents {
const collProtoId = "collectionProto";
const kvpProtoId = "kvpProto";
- export function initProtos(mainDocId: string, callback: (mainDoc?: Document) => void) {
- Server.GetFields([collProtoId, textProtoId, imageProtoId, mainDocId], (fields) => {
+ export function initProtos(callback: () => void) {
+ Server.GetFields([collProtoId, textProtoId, imageProtoId], (fields) => {
collProto = fields[collProtoId] as Document;
imageProto = fields[imageProtoId] as Document;
textProto = fields[textProtoId] as Document;
webProto = fields[webProtoId] as Document;
kvpProto = fields[kvpProtoId] as Document;
- callback(fields[mainDocId] as Document)
+ callback();
});
}
function assignOptions(doc: Document, options: DocumentOptions): Document {
diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx
index 2f4264ad9..da7e17f1f 100644
--- a/src/client/views/Main.tsx
+++ b/src/client/views/Main.tsx
@@ -19,13 +19,14 @@ import { DocumentDecorations } from './DocumentDecorations';
import { DocumentView } from './nodes/DocumentView';
import "./Main.scss";
import { observer } from 'mobx-react';
+import { Field, Opt } from '../../fields/Field';
@observer
export class Main extends React.Component {
// dummy initializations keep the compiler happy
- @observable private mainDocId = "";
- @observable private mainContainer: Document = new Document;
- @observable private mainfreeform: Document = new Document;
+ @observable private mainContainer?: Document;
+ @observable private mainfreeform?: Document;
+ @observable private userWorkspaces: Document[] = [];
constructor(props: Readonly<{}>) {
super(props);
@@ -33,7 +34,9 @@ export class Main extends React.Component {
configure({ enforceActions: "observed" });
this.initEventListeners();
- this.initAuthenticationRouters();
+ Documents.initProtos(() => {
+ this.initAuthenticationRouters();
+ });
}
initEventListeners = () => {
@@ -50,46 +53,49 @@ export class Main extends React.Component {
initAuthenticationRouters = () => {
// Load the user's active workspace, or create a new one if initial session after signup
request.get(this.contextualize("getActiveWorkspaceId"), (error, response, body) => {
- this.requestWorkspace(body ? body : this.getNewWorkspace());
+ if (body) {
+ Server.GetField(body, field => {
+ if (field instanceof Document) {
+ this.openDocument(field);
+ } else {
+ this.createNewWorkspace();
+ }
+ });
+ } else {
+ this.createNewWorkspace();
+ }
});
}
- getNewWorkspace = (): string => {
- let newId = Utils.GenerateGuid();
+ @action
+ createNewWorkspace = (): void => {
+ let mainDoc = Documents.DockDocument(JSON.stringify({ content: [{ type: 'row', content: [] }] }), { title: "main container" });
+ let newId = mainDoc.Id;
request.post(this.contextualize("addWorkspaceId"), {
body: { target: newId },
json: true
- })
- return newId;
+ });
+
+ // bcz: strangely, we need a timeout to prevent exceptions/issues initializing GoldenLayout (the rendering engine for Main Container)
+ setTimeout(() => {
+ let freeformDoc = Documents.FreeformDocument([], { x: 0, y: 400, title: "mini collection" });
+
+ var dockingLayout = { content: [{ type: 'row', content: [CollectionDockingView.makeDocumentConfig(freeformDoc)] }] };
+ mainDoc.SetText(KeyStore.Data, JSON.stringify(dockingLayout));
+ mainDoc.Set(KeyStore.ActiveFrame, freeformDoc);
+ this.openDocument(mainDoc);
+ }, 0);
+ this.userWorkspaces.push(mainDoc);
}
@action
- requestWorkspace = (activeWorkspaceId: string) => {
+ openDocument = (doc: Document): void => {
request.post(this.contextualize("setActiveWorkspaceId"), {
- body: { target: activeWorkspaceId },
+ body: { target: doc.Id },
json: true
- })
- Documents.initProtos(activeWorkspaceId, this.prepareWorkspace);
- }
-
- @action.bound
- prepareWorkspace = (res?: Document) => {
- if (res instanceof Document) {
- this.mainContainer = res;
- this.mainContainer.GetAsync(KeyStore.ActiveFrame, field => this.mainfreeform = field as Document);
- }
- else {
- this.mainContainer = Documents.DockDocument(JSON.stringify({ content: [{ type: 'row', content: [] }] }), { title: "main container" }, this.mainDocId);
-
- // bcz: strangely, we need a timeout to prevent exceptions/issues initializing GoldenLayout (the rendering engine for Main Container)
- setTimeout(() => {
- this.mainfreeform = Documents.FreeformDocument([], { x: 0, y: 400, title: "mini collection" });
-
- var dockingLayout = { content: [{ type: 'row', content: [CollectionDockingView.makeDocumentConfig(this.mainfreeform)] }] };
- this.mainContainer.SetText(KeyStore.Data, JSON.stringify(dockingLayout));
- this.mainContainer.Set(KeyStore.ActiveFrame, this.mainfreeform);
- }, 0);
- }
+ });
+ this.mainContainer = doc;
+ this.mainContainer.GetAsync(KeyStore.ActiveFrame, field => this.mainfreeform = field as Document);
}
toggleWorkspaces = () => {
@@ -117,8 +123,11 @@ export class Main extends React.Component {
let addImageNode = action(() => Documents.ImageDocument(imgurl, { width: 200, height: 200, title: "an image of a cat" }));
let addWebNode = action(() => Documents.WebDocument(weburl, { width: 200, height: 200, title: "a sample web page" }));
- let addClick = (creator: () => Document) => action(() => this.mainfreeform.GetList<Document>(KeyStore.Data, []).push(creator()));
+ let addClick = (creator: () => Document) => action(() => this.mainfreeform!.GetList<Document>(KeyStore.Data, []).push(creator()));
+ if (!this.mainContainer) {
+ return <div></div>
+ }
return (
<div style={{ position: "absolute", width: "100%", height: "100%" }}>
<DocumentView Document={this.mainContainer}
@@ -131,7 +140,7 @@ export class Main extends React.Component {
ContainingCollectionView={undefined} />
<DocumentDecorations />
<ContextMenu />
- <WorkspacesMenu active={this.mainDocId} load={this.requestWorkspace} new={this.getNewWorkspace} />
+ <WorkspacesMenu active={this.mainContainer} open={this.openDocument} new={this.createNewWorkspace} allWorkspaces={this.userWorkspaces} />
<div className="main-buttonDiv" style={{ bottom: '0px' }} ref={imgRef} >
<button onPointerDown={setupDrag(imgRef, addImageNode)} onClick={addClick(addImageNode)}>Add Image</button></div>
<div className="main-buttonDiv" style={{ bottom: '25px' }} ref={webRef} >
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-12-07 15:16:44 +0000