@sprucelabs/spruce-feed-view-controllers 0.0.143 → 0.0.146

package/build/esm/feed.types.d.ts

@@ -1,6 +1,6 @@
 import { SpruceSchemas } from '@sprucelabs/spruce-core-schemas';
-export declare type FeedPredicate = SpruceSchemas.Mercury.v2020_12_25.FeedPredicate;
-export declare type FeedItem = SpruceSchemas.Spruce.v2020_07_22.FeedItem;
-export declare type Feed = SpruceSchemas.Spruce.v2020_07_22.Feed;
-export declare type CardSection = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CardSection;
-export declare type Card = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;
+export type FeedPredicate = SpruceSchemas.Mercury.v2020_12_25.FeedPredicate;
+export type FeedItem = SpruceSchemas.Spruce.v2020_07_22.FeedItem;
+export type Feed = SpruceSchemas.Spruce.v2020_07_22.Feed;
+export type CardSection = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CardSection;
+export type Card = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;

package/build/esm/index-module.d.ts

@@ -1,2 +1,2 @@
-export { default as FeedCardViewController } from './viewControllers/FeedCard.vc';
+export { default as FeedCardViewController } from './root/FeedCard.vc';
 export * from './types-module';

package/build/esm/index-module.js

@@ -1,2 +1,2 @@
-export { default as FeedCardViewController } from './viewControllers/FeedCard.vc.js';
+export { default as FeedCardViewController } from './root/FeedCard.vc.js';
 export * from './types-module.js';

package/build/esm/{viewControllers → root}/FeedCard.vc.d.ts

@@ -1,48 +1,32 @@
-import { AbstractViewController, Authenticator, CardViewController, FormViewController, ViewControllerOptions } from '@sprucelabs/heartwood-view-controllers';
+import { AbstractViewController, Authenticator, CardViewController, FeedViewController, ViewControllerOptions } from '@sprucelabs/heartwood-view-controllers';
 import { Card, FeedPredicate } from '../feed.types';
 export default class FeedCardViewController extends AbstractViewController<Card> {
     static id: string;
     private isLoaded;
     protected cardVc: CardViewController;
     private predicates;
-    protected formVc: FormViewController<MessageFormSchema>;
-    private shouldEnableChat;
     private auth;
     private sentMessageCount;
     private pendingAddedMessages;
+    protected feedVc: FeedViewController;
     constructor(options: ViewControllerOptions & FeedCardViewControllerOptions);
+    private FeedVc;
     private CardVc;
-    private FormVc;
-    private handleChangeForm;
     private handleSubmitForm;
-    private setMessage;
     private handleDidUpdateFeed;
     private sendMessage;
     private removeItem;
     private pushItem;
     private addSentMessage;
-    private getFeed;
     getIsLoaded(): boolean;
     load(options: {
         predicates: FeedPredicate[];
         authenticator: Authenticator;
     }): Promise<void>;
     private refresh;
-    getShouldEnableChat(): boolean;
     private handleTryAgain;
     render(): import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;
 }
-export declare type FeedCardViewControllerOptions = {
+export type FeedCardViewControllerOptions = {
     id?: string;
-    shouldEnableChat?: boolean;
 };
-declare const messageFormSchema: {
-    id: string;
-    fields: {
-        message: {
-            type: "text";
-        };
-    };
-};
-declare type MessageFormSchema = typeof messageFormSchema;
-export {};

package/build/esm/{viewControllers → root}/FeedCard.vc.js

@@ -7,8 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { AbstractViewController, buildForm, } from '@sprucelabs/heartwood-view-controllers';
-import { assertOptions, buildSchema } from '@sprucelabs/schema';
+import { AbstractViewController, } from '@sprucelabs/heartwood-view-controllers';
+import { assertOptions } from '@sprucelabs/schema';
 export default class FeedCardViewController extends AbstractViewController {
     constructor(options) {
         super(options);
@@ -16,26 +16,23 @@ export default class FeedCardViewController extends AbstractViewController {
         this.predicates = [];
         this.sentMessageCount = 0;
         this.pendingAddedMessages = [];
-        const { shouldEnableChat } = options;
-        this.shouldEnableChat = !!shouldEnableChat;
-        this.formVc = this.FormVc();
+        this.feedVc = this.FeedVc();
         this.cardVc = this.CardVc(options);
     }
+    FeedVc() {
+        return this.Controller('feed', {
+            items: [],
+            onSubmitMessage: this.handleSubmitForm.bind(this),
+        });
+    }
     CardVc(options) {
-        const { id, shouldEnableChat } = options;
+        const { id } = options;
         const sections = [
             {
                 id: 'feed',
-                feed: {
-                    items: [],
-                },
+                feed: this.feedVc.render(),
             },
         ];
-        if (shouldEnableChat) {
-            sections.push({
-                form: this.formVc.render(),
-            });
-        }
         return this.Controller('card', {
             id,
             body: {
@@ -44,48 +41,9 @@ export default class FeedCardViewController extends AbstractViewController {
             },
         });
     }
-    FormVc() {
-        return this.Controller('form', buildForm({
-            id: 'message',
-            schema: messageFormSchema,
-            isEnabled: false,
-            onChange: this.handleChangeForm.bind(this),
-            onSubmit: this.handleSubmitForm.bind(this),
-            sections: [
-                {
-                    fields: [
-                        {
-                            name: 'message',
-                            renderAs: 'textarea',
-                        },
-                    ],
-                },
-            ],
-            shouldShowCancelButton: false,
-        }));
-    }
-    handleChangeForm() {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const message = (_a = this.formVc.getValue('message')) !== null && _a !== void 0 ? _a : '';
-            if (message.length > 0) {
-                this.formVc.enable();
-            }
-            else {
-                this.formVc.disable();
-            }
-        });
-    }
-    handleSubmitForm() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const message = this.formVc.getValue('message');
-            yield this.setMessage(null);
-            yield this.sendMessage(message);
-        });
-    }
-    setMessage(value) {
+    handleSubmitForm(message) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.formVc.setValue('message', value);
+            return this.sendMessage(message);
         });
     }
     handleDidUpdateFeed(item) {
@@ -116,24 +74,21 @@ export default class FeedCardViewController extends AbstractViewController {
             }
             catch (err) {
                 this.removeItem(added.id);
-                yield this.setMessage(added.message);
                 yield this.alert({
                     title: 'Failed to send message!',
                     message: err.message,
                 });
                 console.error((_a = err.stack) !== null && _a !== void 0 ? _a : err.message);
+                return false;
             }
+            return true;
         });
     }
     removeItem(id) {
-        const feed = this.getFeed();
-        feed.items = feed.items.filter((i) => i.id !== id);
-        this.cardVc.updateSection('feed', { feed });
+        this.feedVc.removeItem(id);
     }
     pushItem(item) {
-        const { items } = this.getFeed();
-        items.push(item);
-        this.cardVc.triggerRender();
+        this.feedVc.addItem(item);
     }
     addSentMessage(message) {
         const person = this.auth.getPerson();
@@ -142,7 +97,7 @@ export default class FeedCardViewController extends AbstractViewController {
             isMe: true,
             message: message,
             fromCasualName: person.casualName,
-            dateCreated: new Date().getTime(),
+            dateCreated: this.dates.date(),
             avatar: person.avatar,
             source: {
                 personId: person.id,
@@ -151,10 +106,6 @@ export default class FeedCardViewController extends AbstractViewController {
         this.pushItem(item);
         return item;
     }
-    getFeed() {
-        const { feed } = this.cardVc.getSection('feed');
-        return feed;
-    }
     getIsLoaded() {
         return this.isLoaded;
     }
@@ -181,9 +132,7 @@ export default class FeedCardViewController extends AbstractViewController {
                     },
                 });
                 feed.items.reverse();
-                this.cardVc.setSection('feed', {
-                    feed: Object.assign(Object.assign({}, feed), { shouldEnableChat: true }),
-                });
+                this.feedVc.setItems(feed.items);
             }
             catch (err) {
                 this.cardVc.setCriticalError({
@@ -201,9 +150,6 @@ export default class FeedCardViewController extends AbstractViewController {
             this.cardVc.setIsBusy(false);
         });
     }
-    getShouldEnableChat() {
-        return this.shouldEnableChat;
-    }
     handleTryAgain() {
         return __awaiter(this, void 0, void 0, function* () {
             this.cardVc.clearCriticalError();
@@ -215,11 +161,3 @@ export default class FeedCardViewController extends AbstractViewController {
     }
 }
 FeedCardViewController.id = 'feed-card';
-const messageFormSchema = buildSchema({
-    id: 'message',
-    fields: {
-        message: {
-            type: 'text',
-        },
-    },
-});

package/build/esm/types-module.d.ts

@@ -1,5 +1,5 @@
 import { FeedCardViewController } from './index-module';
-import { FeedCardViewControllerOptions } from './viewControllers/FeedCard.vc';
+import { FeedCardViewControllerOptions } from './root/FeedCard.vc';
 declare module '@sprucelabs/heartwood-view-controllers/build/types/heartwood.types' {
     interface ViewControllerMap {
         feedCard: FeedCardViewController;

package/build/feed.types.d.ts

@@ -1,6 +1,6 @@
 import { SpruceSchemas } from '@sprucelabs/spruce-core-schemas';
-export declare type FeedPredicate = SpruceSchemas.Mercury.v2020_12_25.FeedPredicate;
-export declare type FeedItem = SpruceSchemas.Spruce.v2020_07_22.FeedItem;
-export declare type Feed = SpruceSchemas.Spruce.v2020_07_22.Feed;
-export declare type CardSection = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CardSection;
-export declare type Card = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;
+export type FeedPredicate = SpruceSchemas.Mercury.v2020_12_25.FeedPredicate;
+export type FeedItem = SpruceSchemas.Spruce.v2020_07_22.FeedItem;
+export type Feed = SpruceSchemas.Spruce.v2020_07_22.Feed;
+export type CardSection = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.CardSection;
+export type Card = SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;

package/build/index-module.d.ts

@@ -1,2 +1,2 @@
-export { default as FeedCardViewController } from './viewControllers/FeedCard.vc';
+export { default as FeedCardViewController } from './root/FeedCard.vc';
 export * from './types-module';

package/build/index-module.js

@@ -18,6 +18,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FeedCardViewController = void 0;
-var FeedCard_vc_1 = require("./viewControllers/FeedCard.vc");
+var FeedCard_vc_1 = require("./root/FeedCard.vc");
 Object.defineProperty(exports, "FeedCardViewController", { enumerable: true, get: function () { return __importDefault(FeedCard_vc_1).default; } });
 __exportStar(require("./types-module"), exports);

package/build/{viewControllers → root}/FeedCard.vc.d.ts

@@ -1,48 +1,32 @@
-import { AbstractViewController, Authenticator, CardViewController, FormViewController, ViewControllerOptions } from '@sprucelabs/heartwood-view-controllers';
+import { AbstractViewController, Authenticator, CardViewController, FeedViewController, ViewControllerOptions } from '@sprucelabs/heartwood-view-controllers';
 import { Card, FeedPredicate } from '../feed.types';
 export default class FeedCardViewController extends AbstractViewController<Card> {
     static id: string;
     private isLoaded;
     protected cardVc: CardViewController;
     private predicates;
-    protected formVc: FormViewController<MessageFormSchema>;
-    private shouldEnableChat;
     private auth;
     private sentMessageCount;
     private pendingAddedMessages;
+    protected feedVc: FeedViewController;
     constructor(options: ViewControllerOptions & FeedCardViewControllerOptions);
+    private FeedVc;
     private CardVc;
-    private FormVc;
-    private handleChangeForm;
     private handleSubmitForm;
-    private setMessage;
     private handleDidUpdateFeed;
     private sendMessage;
     private removeItem;
     private pushItem;
     private addSentMessage;
-    private getFeed;
     getIsLoaded(): boolean;
     load(options: {
         predicates: FeedPredicate[];
         authenticator: Authenticator;
     }): Promise<void>;
     private refresh;
-    getShouldEnableChat(): boolean;
     private handleTryAgain;
     render(): import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.Card;
 }
-export declare type FeedCardViewControllerOptions = {
+export type FeedCardViewControllerOptions = {
     id?: string;
-    shouldEnableChat?: boolean;
 };
-declare const messageFormSchema: {
-    id: string;
-    fields: {
-        message: {
-            type: "text";
-        };
-    };
-};
-declare type MessageFormSchema = typeof messageFormSchema;
-export {};

package/build/{viewControllers → root}/FeedCard.vc.js

@@ -9,26 +9,23 @@ class FeedCardViewController extends heartwood_view_controllers_1.AbstractViewCo
         this.predicates = [];
         this.sentMessageCount = 0;
         this.pendingAddedMessages = [];
-        const { shouldEnableChat } = options;
-        this.shouldEnableChat = !!shouldEnableChat;
-        this.formVc = this.FormVc();
+        this.feedVc = this.FeedVc();
         this.cardVc = this.CardVc(options);
     }
+    FeedVc() {
+        return this.Controller('feed', {
+            items: [],
+            onSubmitMessage: this.handleSubmitForm.bind(this),
+        });
+    }
     CardVc(options) {
-        const { id, shouldEnableChat } = options;
+        const { id } = options;
         const sections = [
             {
                 id: 'feed',
-                feed: {
-                    items: [],
-                },
+                feed: this.feedVc.render(),
             },
         ];
-        if (shouldEnableChat) {
-            sections.push({
-                form: this.formVc.render(),
-            });
-        }
         return this.Controller('card', {
             id,
             body: {
@@ -37,43 +34,8 @@ class FeedCardViewController extends heartwood_view_controllers_1.AbstractViewCo
             },
         });
     }
-    FormVc() {
-        return this.Controller('form', (0, heartwood_view_controllers_1.buildForm)({
-            id: 'message',
-            schema: messageFormSchema,
-            isEnabled: false,
-            onChange: this.handleChangeForm.bind(this),
-            onSubmit: this.handleSubmitForm.bind(this),
-            sections: [
-                {
-                    fields: [
-                        {
-                            name: 'message',
-                            renderAs: 'textarea',
-                        },
-                    ],
-                },
-            ],
-            shouldShowCancelButton: false,
-        }));
-    }
-    async handleChangeForm() {
-        var _a;
-        const message = (_a = this.formVc.getValue('message')) !== null && _a !== void 0 ? _a : '';
-        if (message.length > 0) {
-            this.formVc.enable();
-        }
-        else {
-            this.formVc.disable();
-        }
-    }
-    async handleSubmitForm() {
-        const message = this.formVc.getValue('message');
-        await this.setMessage(null);
-        await this.sendMessage(message);
-    }
-    async setMessage(value) {
-        await this.formVc.setValue('message', value);
+    async handleSubmitForm(message) {
+        return this.sendMessage(message);
     }
     handleDidUpdateFeed(item) {
         const idx = this.pendingAddedMessages.indexOf(item.message);
@@ -102,23 +64,20 @@ class FeedCardViewController extends heartwood_view_controllers_1.AbstractViewCo
         }
         catch (err) {
             this.removeItem(added.id);
-            await this.setMessage(added.message);
             await this.alert({
                 title: 'Failed to send message!',
                 message: err.message,
             });
             console.error((_a = err.stack) !== null && _a !== void 0 ? _a : err.message);
+            return false;
         }
+        return true;
     }
     removeItem(id) {
-        const feed = this.getFeed();
-        feed.items = feed.items.filter((i) => i.id !== id);
-        this.cardVc.updateSection('feed', { feed });
+        this.feedVc.removeItem(id);
     }
     pushItem(item) {
-        const { items } = this.getFeed();
-        items.push(item);
-        this.cardVc.triggerRender();
+        this.feedVc.addItem(item);
     }
     addSentMessage(message) {
         const person = this.auth.getPerson();
@@ -127,7 +86,7 @@ class FeedCardViewController extends heartwood_view_controllers_1.AbstractViewCo
             isMe: true,
             message: message,
             fromCasualName: person.casualName,
-            dateCreated: new Date().getTime(),
+            dateCreated: this.dates.date(),
             avatar: person.avatar,
             source: {
                 personId: person.id,
@@ -136,10 +95,6 @@ class FeedCardViewController extends heartwood_view_controllers_1.AbstractViewCo
         this.pushItem(item);
         return item;
     }
-    getFeed() {
-        const { feed } = this.cardVc.getSection('feed');
-        return feed;
-    }
     getIsLoaded() {
         return this.isLoaded;
     }
@@ -163,9 +118,7 @@ class FeedCardViewController extends heartwood_view_controllers_1.AbstractViewCo
                 },
             });
             feed.items.reverse();
-            this.cardVc.setSection('feed', {
-                feed: Object.assign(Object.assign({}, feed), { shouldEnableChat: true }),
-            });
+            this.feedVc.setItems(feed.items);
         }
         catch (err) {
             this.cardVc.setCriticalError({
@@ -182,9 +135,6 @@ class FeedCardViewController extends heartwood_view_controllers_1.AbstractViewCo
         this.isLoaded = true;
         this.cardVc.setIsBusy(false);
     }
-    getShouldEnableChat() {
-        return this.shouldEnableChat;
-    }
     async handleTryAgain() {
         this.cardVc.clearCriticalError();
         await this.refresh();
@@ -195,11 +145,3 @@ class FeedCardViewController extends heartwood_view_controllers_1.AbstractViewCo
 }
 exports.default = FeedCardViewController;
 FeedCardViewController.id = 'feed-card';
-const messageFormSchema = (0, schema_1.buildSchema)({
-    id: 'message',
-    fields: {
-        message: {
-            type: 'text',
-        },
-    },
-});

package/build/types-module.d.ts

@@ -1,5 +1,5 @@
 import { FeedCardViewController } from './index-module';
-import { FeedCardViewControllerOptions } from './viewControllers/FeedCard.vc';
+import { FeedCardViewControllerOptions } from './root/FeedCard.vc';
 declare module '@sprucelabs/heartwood-view-controllers/build/types/heartwood.types' {
     interface ViewControllerMap {
         feedCard: FeedCardViewController;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sprucelabs/spruce-feed-view-controllers",
   "description": "Spruce feed view controllers",
-  "version": "0.0.143",
+  "version": "0.0.146",
   "skill": {
     "namespace": "feed"
   },
@@ -16,12 +16,12 @@
   "files": [
     "build/index-module.js",
     "build/index-module.d.ts",
-    "build/viewControllers/FeedCard.vc.js",
-    "build/viewControllers/FeedCard.vc.d.ts",
+    "build/root/FeedCard.vc.js",
+    "build/root/FeedCard.vc.d.ts",
     "build/esm/index-module.js",
     "build/esm/index-module.d.ts",
-    "build/esm/viewControllers/FeedCard.vc.js",
-    "build/esm/viewControllers/FeedCard.vc.d.ts",
+    "build/esm/root/FeedCard.vc.js",
+    "build/esm/root/FeedCard.vc.d.ts",
     "build/types-module.js",
     "build/types-module.d.ts",
     "build/esm/types-module.js",