@social-mail/social-mail-client 1.2.201 → 1.2.203

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.2.201",
+  "version": "1.2.203",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/common/pages/files/FileHistoryPage.tsx

@@ -0,0 +1,53 @@
+import { PopupWindowPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
+import { IAppFile, IAppFileVersion } from "../../../model/model";
+import XNode from "@web-atoms/core/dist/core/XNode";
+import AtomRepeater from "@web-atoms/web-controls/dist/basic/AtomRepeater";
+import InfiniteRepeater from "../../controls/repeater/InfiniteRepeater";
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
+import { FileHistoryService } from "../../../services/files/FileHistoryService";
+import { DateFormats } from "../../date/DateFormats";
+import { toFileSize } from "../../NumberFormats";
+import { SaveIconTextButton } from "../../controls/buttons/IconButton";
+import Action from "@web-atoms/core/dist/view-model/Action";
+
+export default class FileHistoryPage extends PopupWindowPage<IAppFile, IAppFile> {
+
+
+    @InjectProperty
+    fileHistoryService: FileHistoryService;
+
+    async init() {
+        this.title = this.parameters.name + " History";
+
+        this.renderer = <div>
+            <AtomRepeater
+                data-layout="data-grid"
+                { ... InfiniteRepeater.pagedItems((start) => (c, e, cancelToken) => this.fileHistoryService.list({
+                    appFileID: this.parameters.appFileID,
+                    start,
+                    cancelToken
+                }))}
+                itemRenderer={(item: IAppFileVersion) => <div>
+                    <label text={item.versionID}/>
+                    <label text={ DateFormats.relative.short(item.dateCreated)}/>
+                    <label text={ toFileSize(item.fileContent.contentSize)}/>
+                    <br/>
+                    <SaveIconTextButton
+                        data-click-event="restore-file"
+                        text="Restore"
+                        />
+                </div>}
+                />
+        </div>;
+    }
+
+    @Action({
+        confirm: "Are you sure you want to restore this version?",
+        onEvent: "restore-file",
+        close: true,
+        success: "File restored successfully."
+    })
+    async restoreFile(version: IAppFileVersion) {
+        return await this.fileHistoryService.restore(version);
+    }
+}

package/src/common/pages/websites/studio/WebSiteStudioPage.tsx

@@ -26,6 +26,7 @@ import ViewWebSitePage from "../view/ViewWebSitePage";
 import WebSiteBlogsPage from "../blogs/WebSiteBlogsPage";
 import GrapesJSEditor from "../../../controls/html/grapes-js/GrapesJSEditor";
 import { apiPath } from "../../../apiPath";
+import FileHistoryPage from "../../files/FileHistoryPage";
 
 const css = styled.css `
     display: grid;
@@ -179,6 +180,11 @@ export default class WebSiteStudioPage extends ContentPage {
                                 icon="fas fa-copy"
                                 data-click-event="duplicate-html"
                                 label="Duplicate Page"
+                                />,
+                            <MenuItem
+                                icon="fas fa-history"
+                                data-click-event="file-history"
+                                label="File History"
                                 />
                         ]
                         : [])
@@ -303,6 +309,19 @@ export default class WebSiteStudioPage extends ContentPage {
         this.selectedFile = file;
     }
 
+    @Action({ onEvent: "file-history"})
+    async fileHistory(file: IAppFile) {
+        const { fileContentID, url, downloadUrl } = await PageNavigator.pushPageForResult(FileHistoryPage, file);
+        // restore...
+        const { selectedFile } = this;
+        if (file.appFileID === selectedFile?.appFileID) {
+            // refresh...
+            selectedFile.url = url;
+            selectedFile.downloadUrl = downloadUrl;
+            selectedFile.fileContentID = fileContentID;
+        }
+    }
+
     @Action({
         onEvent: "publish-website",
         confirm: "Are you sure you want to publish this version?",

package/src/services/files/FileHistoryService.ts

@@ -0,0 +1,45 @@
+import DITransient from "@web-atoms/core/dist/di/DITransient";
+import { Inject } from "@web-atoms/core/dist/di/Inject";
+import EntityService from "../EntityService";
+import { CancelToken } from "@web-atoms/core/dist/core/types";
+import { AppFile, AppFileVersion, IAppFileVersion } from "../../model/model";
+import { Sql } from "../../common/Sql";
+
+@DITransient()
+export class FileHistoryService {
+
+    @Inject
+    private entityService: EntityService;
+
+    async list({
+        start = 0,
+        size = 20,
+        appFileID = 0,
+        search = "",
+        cancelToken = void 0 as CancelToken
+    }) {
+        let q = this.entityService.query(AppFileVersion)
+            .where({ appFileID }, (p) => (x) => x.fileID === p.appFileID);
+        if (search) {
+            q = q.where({ search }, (p) => (x)  => Sql.text.includes( x.fileContent.textDocument.searchable, p.search));
+        }
+        return q
+            .include((x) => x.fileContent)
+            .orderByDescending((x) => x.versionID)
+            .toPagedList({
+                start,
+                size,
+                cancelToken
+            });
+    }
+
+    async restore(version: IAppFileVersion) {
+        const { fileID, fileContentID } = version;
+        const file = await this.entityService.query(AppFile)
+            .where({ fileID }, (p) => (x) => x.appFileID === p.fileID)
+            .firstOrDefault();
+        file.fileContentID = fileContentID;
+        await this.entityService.save(file);
+        return file;
+    }
+}

package/src/site-editor/blocks/MarqueeText.tsx

@@ -0,0 +1,46 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+
+import XNode from "@web-atoms/core/dist/core/XNode";
+import { Block } from "./Block";
+import { StylerSets } from "../styler/StylerSets";
+import styled from "@web-atoms/core/dist/style/styled";
+
+StylerSets.register("low", styled.css `
+
+
+    &:empty:before {
+        background-color: #ddd;
+        color: #000;
+        font-size: 16px;
+        font-weight: bold;
+        font-family: 'Courier New', Courier, monospace;
+        height: 100%;
+        display: flex;
+        justify-items: center;
+        align-items: center;
+        min-height: 30px;
+        opacity: 0.3;
+        border-radius: 3px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        content: "Marquee Text";
+
+    }
+`.expand("marquee-text"));
+
+/* eslint-disable @typescript-eslint/no-namespace */
+declare global {
+    namespace JSX {
+        interface IntrinsicElements {
+            "marquee-text": any;
+        }
+    }
+}
+
+export const MarqueeText = Block({
+    className: "fad fa-text",
+    title: "Add Marquee Text",
+    factory: () => <marquee-text
+        >Your Slding Text</marquee-text>
+});

package/src/site-editor/editor/HtmlPageEditor.tsx

@@ -41,6 +41,7 @@ import { InlinePopupButton } from "@web-atoms/web-controls/dist/basic/InlinePopu
 import { VideoPlayer } from "../blocks/VideoPlayer";
 import { BackgroundVideo } from "../blocks/BackgroundVideo";
 import { TextMask } from "../blocks/TextMask";
+import { MarqueeText } from "../blocks/MarqueeText";
 
     styled.css `
         display: grid;
@@ -304,6 +305,7 @@ export default class HtmlPageEditor extends AtomControl {
                     <BackgroundVideo/>
                     <TextMask/>
                     <ImageGallery/>
+                    <MarqueeText/>
                 </EditorToolbar>}></InlinePopupButton>
             </EditorToolbar>
             <div data-element="editor"