chore(release): publish

- @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].1
 - @standardnotes/[email protected].9
 - @standardnotes/[email protected].8
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].3
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected]
 - @standardnotes/[email protected].5
 - @standardnotes/[email protected].3

.github/workflows/publish.yml

@@ -67,11 +67,11 @@ jobs:
         uses: convictional/trigger-workflow-and-wait@master
         with:
           owner: standardnotes
-          repo: e2e
+          repo: self-hosted
           github_token: ${{ secrets.CI_PAT_TOKEN }}
-          workflow_file_name: testing-with-stable-server.yml
+          workflow_file_name: testing-with-updating-client-and-server.yml
           wait_interval: 30
-          client_payload: '{"image_tag": "${{ github.sha }}"}'
+          client_payload: '{"snjs_image_tag": "${{ github.sha }}"}'
           propagate_failure: true
           trigger_workflow: true
           wait_workflow: true

.github/workflows/snjs.pr.yml

@@ -43,11 +43,11 @@ jobs:
         uses: convictional/trigger-workflow-and-wait@master
         with:
           owner: standardnotes
-          repo: e2e
+          repo: self-hosted
           github_token: ${{ secrets.CI_PAT_TOKEN }}
-          workflow_file_name: testing-with-stable-server.yml
+          workflow_file_name: testing-with-updating-client-and-server.yml
           wait_interval: 30
-          client_payload: '{"image_tag": "${{ github.sha }}"}'
+          client_payload: '{"snjs_image_tag": "${{ github.sha }}"}'
           propagate_failure: true
           trigger_workflow: true
           wait_workflow: true

packages/api/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.20.26](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.20.25](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.20.24](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.20.23](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/api
+
+## [1.20.22](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-21)
+
+### Bug Fixes
+
+* **api:** handling expired token responses ([#2113](https://github.com/standardnotes/app/issues/2113)) ([2696b07](https://github.com/standardnotes/app/commit/2696b07759104fb1d40781897f69e63133ad824a))
+
 ## [1.20.21](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-19)
 
 **Note:** Version bump only for package @standardnotes/api

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api",
-  "version": "1.20.21",
+  "version": "1.20.26",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/api/src/Domain/Http/HttpService.ts

@@ -115,7 +115,7 @@ export class HttpService implements HttpServiceInterface {
       return false
     }
 
-    const response = (await this.post(joinPaths(this.host, Paths.v1.refreshSession), {
+    const response = (await this.post(Paths.v1.refreshSession, {
       access_token: this.session.accessToken.value,
       refresh_token: this.session.refreshToken.value,
     })) as SessionRefreshResponse
@@ -265,13 +265,12 @@ export class HttpService implements HttpServiceInterface {
     } catch (error) {
       console.error(error)
     }
-    if (httpStatus >= HttpStatusCode.Success && httpStatus < HttpStatusCode.MultipleChoices) {
-      resolve(response)
-    } else {
+    if (httpStatus >= HttpStatusCode.Success && httpStatus < HttpStatusCode.InternalServerError) {
       if (httpStatus === HttpStatusCode.Forbidden && response.data && response.data.error !== undefined) {
         ;(response.data as HttpErrorResponseBody).error.message = ErrorMessage.RateLimited
       }
-
+      resolve(response)
+    } else {
       reject(response)
     }
   }

packages/api/src/Domain/Http/HttpStatusCode.ts

@@ -7,4 +7,5 @@ export enum HttpStatusCode {
   Forbidden = 403,
   Gone = 410,
   ExpiredAccessToken = 498,
+  InternalServerError = 500,
 }

packages/blocks-editor/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.12.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-26)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+# [1.12.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-26)
+
+### Features
+
+* Clicking the link option in Super notes will automatically add the selected text as the link ([326e1a4](https://github.com/standardnotes/app/commit/326e1a455bb510d795f357123f617618267848cc))
+
+## [1.11.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+## [1.11.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+## [1.11.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
+# [1.11.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+### Features
+
+* Persist collapsible block state in Super notes ([#2119](https://github.com/standardnotes/app/issues/2119)) ([577318e](https://github.com/standardnotes/app/commit/577318e208367dc52caf2d76fd87419eaead7ed4))
+
+## [1.10.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-23)
+
+**Note:** Version bump only for package @standardnotes/blocks-editor
+
 ## [1.10.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-19)
 
 **Note:** Version bump only for package @standardnotes/blocks-editor

packages/blocks-editor/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@standardnotes/blocks-editor",
-  "version": "1.10.1",
+  "version": "1.12.1",
   "private": true,
   "main": "./src/index.ts",
   "scripts": {
     "tsc": "tsc -p tsconfig.json"
   },
   "dependencies": {
-    "@lexical/react": "^0.6.5",
+    "@lexical/react": "0.7.5",
     "@standardnotes/icons": "workspace:*",
     "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.9",
-    "lexical": "^0.6.5",
+    "lexical": "0.7.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

packages/blocks-editor/src/Editor/BlocksEditor.tsx

@@ -21,6 +21,7 @@ import DraggableBlockPlugin from '../Lexical/Plugins/DraggableBlockPlugin';
 import CodeHighlightPlugin from '../Lexical/Plugins/CodeHighlightPlugin';
 import FloatingTextFormatToolbarPlugin from '../Lexical/Plugins/FloatingTextFormatToolbarPlugin';
 import FloatingLinkEditorPlugin from '../Lexical/Plugins/FloatingLinkEditorPlugin';
+import {TabIndentationPlugin} from '../Lexical/Plugins/TabIndentationPlugin';
 import {truncateString} from './Utils';
 import {SuperEditorContentId} from './Constants';
 import {classNames} from '@standardnotes/utils';
@@ -107,7 +108,7 @@ export const BlocksEditor: FunctionComponent<BlocksEditorProps> = ({
             </div>
           </div>
         }
-        placeholder=""
+        placeholder={null}
         ErrorBoundary={LexicalErrorBoundary}
       />
       <ListPlugin />
@@ -125,6 +126,7 @@ export const BlocksEditor: FunctionComponent<BlocksEditorProps> = ({
       <TwitterPlugin />
       <YouTubePlugin />
       <CollapsiblePlugin />
+      <TabIndentationPlugin />
       {!readonly && floatingAnchorElem && (
         <>
           <FloatingTextFormatToolbarPlugin anchorElem={floatingAnchorElem} />

packages/blocks-editor/src/Lexical/Plugins/AutoEmbedPlugin/index.tsx

@@ -192,9 +192,10 @@ export function AutoEmbedDialog({
   const embedResult =
     text != null && urlMatch != null ? embedConfig.parseUrl(text) : null;
 
-  const onClick = () => {
-    if (embedResult != null) {
-      embedConfig.insertNode(editor, embedResult);
+  const onClick = async () => {
+    const result = await embedResult;
+    if (result != null) {
+      embedConfig.insertNode(editor, result);
       onClose();
     }
   };

packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/CollapsibleContainerNode.ts

@@ -20,6 +20,7 @@ type SerializedCollapsibleContainerNode = Spread<
   {
     type: 'collapsible-container';
     version: 1;
+    open: boolean;
   },
   SerializedElementNode
 >;
@@ -29,25 +30,27 @@ export class CollapsibleContainerNode extends ElementNode {
 
   constructor(open: boolean, key?: NodeKey) {
     super(key);
-    this.__open = open;
+    this.__open = open ?? false;
   }
 
-  static getType(): string {
+  static override getType(): string {
     return 'collapsible-container';
   }
 
-  static clone(node: CollapsibleContainerNode): CollapsibleContainerNode {
+  static override clone(
+    node: CollapsibleContainerNode,
+  ): CollapsibleContainerNode {
     return new CollapsibleContainerNode(node.__open, node.__key);
   }
 
-  createDOM(config: EditorConfig): HTMLElement {
+  override createDOM(config: EditorConfig): HTMLElement {
     const dom = document.createElement('details');
     dom.classList.add('Collapsible__container');
     dom.open = this.__open;
     return dom;
   }
 
-  updateDOM(
+  override updateDOM(
     prevNode: CollapsibleContainerNode,
     dom: HTMLDetailsElement,
   ): boolean {
@@ -62,18 +65,19 @@ export class CollapsibleContainerNode extends ElementNode {
     return {};
   }
 
-  static importJSON(
+  static override importJSON(
     serializedNode: SerializedCollapsibleContainerNode,
   ): CollapsibleContainerNode {
-    const node = $createCollapsibleContainerNode();
+    const node = $createCollapsibleContainerNode(serializedNode.open);
     return node;
   }
 
-  exportJSON(): SerializedCollapsibleContainerNode {
+  override exportJSON(): SerializedCollapsibleContainerNode {
     return {
       ...super.exportJSON(),
       type: 'collapsible-container',
       version: 1,
+      open: this.__open,
     };
   }
 
@@ -91,8 +95,10 @@ export class CollapsibleContainerNode extends ElementNode {
   }
 }
 
-export function $createCollapsibleContainerNode(): CollapsibleContainerNode {
-  return new CollapsibleContainerNode(true);
+export function $createCollapsibleContainerNode(
+  open: boolean,
+): CollapsibleContainerNode {
+  return new CollapsibleContainerNode(open);
 }
 
 export function $isCollapsibleContainerNode(

packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/CollapsibleContentNode.ts

@@ -24,21 +24,24 @@ type SerializedCollapsibleContentNode = Spread<
 >;
 
 export class CollapsibleContentNode extends ElementNode {
-  static getType(): string {
+  static override getType(): string {
     return 'collapsible-content';
   }
 
-  static clone(node: CollapsibleContentNode): CollapsibleContentNode {
+  static override clone(node: CollapsibleContentNode): CollapsibleContentNode {
     return new CollapsibleContentNode(node.__key);
   }
 
-  createDOM(config: EditorConfig): HTMLElement {
+  override createDOM(config: EditorConfig): HTMLElement {
     const dom = document.createElement('div');
     dom.classList.add('Collapsible__content');
     return dom;
   }
 
-  updateDOM(prevNode: CollapsibleContentNode, dom: HTMLElement): boolean {
+  override updateDOM(
+    prevNode: CollapsibleContentNode,
+    dom: HTMLElement,
+  ): boolean {
     return false;
   }
 
@@ -46,17 +49,17 @@ export class CollapsibleContentNode extends ElementNode {
     return {};
   }
 
-  static importJSON(
+  static override importJSON(
     serializedNode: SerializedCollapsibleContentNode,
   ): CollapsibleContentNode {
     return $createCollapsibleContentNode();
   }
 
-  isShadowRoot(): boolean {
+  override isShadowRoot(): boolean {
     return true;
   }
 
-  exportJSON(): SerializedCollapsibleContentNode {
+  override exportJSON(): SerializedCollapsibleContentNode {
     return {
       ...super.exportJSON(),
       type: 'collapsible-content',

packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/CollapsibleTitleNode.ts

@@ -31,21 +31,34 @@ type SerializedCollapsibleTitleNode = Spread<
 >;
 
 export class CollapsibleTitleNode extends ElementNode {
-  static getType(): string {
+  static override getType(): string {
     return 'collapsible-title';
   }
 
-  static clone(node: CollapsibleTitleNode): CollapsibleTitleNode {
+  static override clone(node: CollapsibleTitleNode): CollapsibleTitleNode {
     return new CollapsibleTitleNode(node.__key);
   }
 
-  createDOM(config: EditorConfig, editor: LexicalEditor): HTMLElement {
+  override createDOM(config: EditorConfig, editor: LexicalEditor): HTMLElement {
     const dom = document.createElement('summary');
     dom.classList.add('Collapsible__title');
+    dom.onclick = (event) => {
+      event.preventDefault();
+      event.stopPropagation();
+      editor.update(() => {
+        const containerNode = this.getParentOrThrow();
+        if ($isCollapsibleContainerNode(containerNode)) {
+          containerNode.toggleOpen();
+        }
+      });
+    };
     return dom;
   }
 
-  updateDOM(prevNode: CollapsibleTitleNode, dom: HTMLElement): boolean {
+  override updateDOM(
+    prevNode: CollapsibleTitleNode,
+    dom: HTMLElement,
+  ): boolean {
     return false;
   }
 
@@ -53,13 +66,13 @@ export class CollapsibleTitleNode extends ElementNode {
     return {};
   }
 
-  static importJSON(
+  static override importJSON(
     serializedNode: SerializedCollapsibleTitleNode,
   ): CollapsibleTitleNode {
     return $createCollapsibleTitleNode();
   }
 
-  exportJSON(): SerializedCollapsibleTitleNode {
+  override exportJSON(): SerializedCollapsibleTitleNode {
     return {
       ...super.exportJSON(),
       type: 'collapsible-title',
@@ -67,12 +80,12 @@ export class CollapsibleTitleNode extends ElementNode {
     };
   }
 
-  collapseAtStart(_selection: RangeSelection): boolean {
+  override collapseAtStart(_selection: RangeSelection): boolean {
     this.getParentOrThrow().insertBefore(this);
     return true;
   }
 
-  insertNewAfter(): ElementNode {
+  override insertNewAfter(): ElementNode {
     const containerNode = this.getParentOrThrow();
 
     if (!$isCollapsibleContainerNode(containerNode)) {

packages/blocks-editor/src/Lexical/Plugins/CollapsiblePlugin/index.ts

@@ -204,7 +204,7 @@ export default function CollapsiblePlugin(): JSX.Element | null {
             const content = $createCollapsibleContentNode().append(
               $createParagraphNode(),
             );
-            const container = $createCollapsibleContainerNode().append(
+            const container = $createCollapsibleContainerNode(true).append(
               title,
               content,
             );

packages/blocks-editor/src/Lexical/Plugins/DraggableBlockPlugin/index.tsx

@@ -12,6 +12,7 @@ import {mergeRegister} from '@lexical/utils';
 import {
   $getNearestNodeFromDOMNode,
   $getNodeByKey,
+  $getRoot,
   COMMAND_PRIORITY_HIGH,
   COMMAND_PRIORITY_LOW,
   DRAGOVER_COMMAND,
@@ -58,8 +59,7 @@ function getCurrentIndex(keysLength: number): number {
 }
 
 function getTopLevelNodeKeys(editor: LexicalEditor): string[] {
-  const root = editor.getEditorState()._nodeMap.get('root');
-  return root ? root.__children : [];
+  return editor.getEditorState().read(() => $getRoot().getChildrenKeys());
 }
 
 function elementContainingEventLocation(

packages/blocks-editor/src/Lexical/Plugins/FloatingTextFormatToolbarPlugin/index.tsx

@@ -54,6 +54,7 @@ import {
   ListNumbered,
 } from '@standardnotes/icons';
 import {IconComponent} from '../../Theme/IconComponent';
+import {sanitizeUrl} from '../../Utils/sanitizeUrl';
 
 const blockTypeToBlockName = {
   bullet: 'Bulleted List',
@@ -103,7 +104,15 @@ function TextFormatFloatingToolbar({
 
   const insertLink = useCallback(() => {
     if (!isLink) {
-      editor.dispatchCommand(TOGGLE_LINK_COMMAND, 'https://');
+      editor.update(() => {
+        const selection = $getSelection();
+        const textContent = selection?.getTextContent();
+        if (!textContent) {
+          editor.dispatchCommand(TOGGLE_LINK_COMMAND, 'https://');
+          return;
+        }
+        editor.dispatchCommand(TOGGLE_LINK_COMMAND, sanitizeUrl(textContent));
+      });
     } else {
       editor.dispatchCommand(TOGGLE_LINK_COMMAND, null);
     }

packages/blocks-editor/src/Lexical/Plugins/TabIndentationPlugin.tsx

@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+import {
+  $getSelection,
+  $isRangeSelection,
+  COMMAND_PRIORITY_EDITOR,
+  INDENT_CONTENT_COMMAND,
+  KEY_TAB_COMMAND,
+  OUTDENT_CONTENT_COMMAND,
+} from 'lexical';
+import {useEffect} from 'react';
+
+/**
+ * This plugin adds the ability to indent content using the tab key. Generally, we don't
+ * recommend using this plugin as it could negatively affect acessibility for keyboard
+ * users, causing focus to become trapped within the editor.
+ */
+export function TabIndentationPlugin(): null {
+  const [editor] = useLexicalComposerContext();
+
+  useEffect(() => {
+    return editor.registerCommand<KeyboardEvent>(
+      KEY_TAB_COMMAND,
+      (event) => {
+        const selection = $getSelection();
+
+        if (!$isRangeSelection(selection)) {
+          return false;
+        }
+
+        event.preventDefault();
+
+        return editor.dispatchCommand(
+          event.shiftKey ? OUTDENT_CONTENT_COMMAND : INDENT_CONTENT_COMMAND,
+          undefined,
+        );
+      },
+      COMMAND_PRIORITY_EDITOR,
+    );
+  });
+
+  return null;
+}

packages/desktop/CHANGELOG.md

@@ -3,6 +3,118 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.104.59](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.58](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.57](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.56](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.55](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.54](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.53](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.52](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.51](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.50](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.49](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-26)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.48](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-26)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.47](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-26)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.46](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-26)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.45](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.44](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.43](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.42](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.41](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.40](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.39](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.38](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.37](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-23)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.36](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-22)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.35](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.34](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-20)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.33](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-20)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
+## [3.104.32](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-20)
+
+**Note:** Version bump only for package @standardnotes/desktop
+
 ## [3.104.31](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-19)
 
 **Note:** Version bump only for package @standardnotes/desktop

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardnotes/desktop",
   "main": "./app/dist/index.js",
-  "version": "3.104.31",
+  "version": "3.104.59",
   "license": "AGPL-3.0-or-later",
   "author": "Standard Notes.",
   "private": true,

packages/docs/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+### Bug Fixes
+
+* **docs:** update self-hosted instructions ([1c48dd1](https://github.com/standardnotes/app/commit/1c48dd135ced93832495fdd89b2940635f04205a))
+
 ## [0.2.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-19)
 
 **Note:** Version bump only for package @standardnotes/docs

packages/docs/docs/self-hosting/docker.md

@@ -141,12 +141,12 @@ Due to mounted volumes, we recommend running the setup as a root user. If you wi
 
 ## Install Standard Notes
 
-1. Clone the `standalone` repo:
+1. Clone the `self-hosted` repo:
 
     ```shell
     cd ~
-    git clone --single-branch --branch main https://github.com/standardnotes/standalone.git
-    cd standalone
+    git clone --single-branch --branch main https://github.com/standardnotes/self-hosted.git
+    cd self-hosted
     ```
 
 1. Initialize default configuration files:
@@ -165,15 +165,9 @@ Due to mounted volumes, we recommend running the setup as a root user. If you wi
 1. Generate random values for the necessary environment variables:
 
     ```shell
-    sed -i "s/auth_jwt_secret/$(openssl rand -hex 32)/g" .env
-    sed -i "s/legacy_jwt_secret/$(openssl rand -hex 32)/g" docker/auth.env
-    sed -i "s/secret_key/$(openssl rand -hex 32)/g" docker/auth.env
-    sed -i "s/server_key/$(openssl rand -hex 32)/g" docker/auth.env
-    sed -i "s/secret/$(openssl rand -hex 32)/g" docker/auth.env
+    ./server.sh generate-keys
     ```
 
-    **Note:** If you are running `sed` on macOS or BSD, change instances of `sed -i` to `sed -i ''`.
-
 1. (Optional) Restart the server:
 
     ```shell
@@ -217,7 +211,7 @@ Due to mounted volumes, we recommend running the setup as a root user. If you wi
     syncing-server-js-worker-standalone   "./wait-for.sh db 33…"   syncing-server-js-worker   running
     ```
 
-    Your Standard Notes server is ready once all the services have a `STATUS` of `Up`. This process took about 11 minutes on a Ubuntu 20.04 server with 2GB RAM and 1 CPU.
+    Your Standard Notes server is ready once all the services have a `STATUS` of `Up`. This process took about 11 minutes on a Ubuntu 20.04 server with 2GB RAM and 1 CPU. If you want to control when this process finishes you can run `./server.sh wait-for-startup`.
 
 1. You should be able now to check that the syncing server is running by checking `http://localhost:3000/healthcheck`. You must do this on the server:
 

packages/docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/docs",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "license": "AGPL-3.0-or-later",
   "author": "Standard Notes.",
   "private": true,

packages/encryption/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.19.31](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.19.30](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.19.29](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
+## [1.19.28](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/encryption
+
 ## [1.19.27](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-08)
 
 **Note:** Version bump only for package @standardnotes/encryption

packages/encryption/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/encryption",
-  "version": "1.19.27",
+  "version": "1.19.31",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/features/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.57.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/features
+
+# [1.57.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+### Features
+
+* Added "Files Table View" to Labs ([b764296](https://github.com/standardnotes/app/commit/b764296c8f831d06f854dcf2982e644c27e14e7c))
+
 # [1.56.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-05)
 
 ### Features

packages/features/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/features",
-  "version": "1.56.0",
+  "version": "1.57.1",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/features/src/Domain/Feature/FeatureIdentifier.ts

@@ -38,6 +38,8 @@ export enum FeatureIdentifier {
   TaskEditor = 'org.standardnotes.simple-task-editor',
   TokenVaultEditor = 'org.standardnotes.token-vault',
 
+  FilesTableView = 'org.standardnotes.files-table-view',
+
   DeprecatedBoldEditor = 'org.standardnotes.bold-editor',
   DeprecatedMarkdownBasicEditor = 'org.standardnotes.simple-markdown-editor',
   DeprecatedMarkdownMathEditor = 'org.standardnotes.fancy-markdown-editor',
@@ -51,4 +53,4 @@ export enum FeatureIdentifier {
  */
 export const LegacyFileSafeIdentifier = 'org.standardnotes.legacy.file-safe'
 
-export const ExperimentalFeatures = []
+export const ExperimentalFeatures = [FeatureIdentifier.FilesTableView]

packages/features/src/Domain/Lists/ExperimentalFeatures.ts

@@ -1,5 +1,18 @@
+import { RoleName, SubscriptionName } from '@standardnotes/common'
 import { FeatureDescription } from '../Feature/FeatureDescription'
+import { FeatureIdentifier } from '../Feature/FeatureIdentifier'
+import { PermissionName } from '../Permission/PermissionName'
 
 export function experimentalFeatures(): FeatureDescription[] {
-  return []
+  const filesTableView: FeatureDescription = {
+    identifier: FeatureIdentifier.FilesTableView,
+    name: 'Files Table View',
+    description:
+      'Replaces the current Files view with a table view, with name, size, and date sort options. Requires reload to take effect.',
+    availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
+    availableInRoles: [RoleName.PlusUser, RoleName.ProUser],
+    permission_name: PermissionName.FilesTableView,
+  }
+
+  return [filesTableView]
 }

packages/features/src/Domain/Permission/PermissionName.ts

@@ -40,4 +40,5 @@ export enum PermissionName {
   TwoFactorAuth = 'server:two-factor-auth',
   SubscriptionSharing = 'server:subscription-sharing',
   SuperEditor = 'editor:super-editor',
+  FilesTableView = 'app:files-table-view',
 }

packages/filepicker/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.27.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.27.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.27.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.27.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
+## [1.27.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/filepicker
+
 ## [1.27.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-08)
 
 **Note:** Version bump only for package @standardnotes/filepicker

packages/filepicker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/filepicker",
-  "version": "1.27.4",
+  "version": "1.27.9",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/filepicker/src/Classic/ClassicReader.ts

@@ -46,6 +46,8 @@ function selectFiles(): Promise<File[]> {
         files.push(file)
       }
       resolve(files)
+      // Reset input value so that onchange is triggered again if the same file is selected
+      input.value = ''
     }
     input.click()
   })

packages/files/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.14.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.14.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.14.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/files
+
+## [1.14.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/files
+
 ## [1.14.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-08)
 
 **Note:** Version bump only for package @standardnotes/files

packages/files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/files",
-  "version": "1.14.4",
+  "version": "1.14.8",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/mobile/CHANGELOG.md

@@ -3,6 +3,118 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.49.56](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.55](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.54](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.53](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.52](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.51](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.50](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.49](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.48](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.47](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.46](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-26)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.45](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-26)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.44](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-26)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.43](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-26)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.42](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.41](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.40](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.39](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.38](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.37](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.36](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-23)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.35](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-23)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.34](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-23)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.33](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-22)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.32](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.31](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-20)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.30](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-20)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
+## [3.49.29](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-20)
+
+**Note:** Version bump only for package @standardnotes/mobile
+
 ## [3.49.28](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-19)
 
 **Note:** Version bump only for package @standardnotes/mobile

packages/mobile/ios/Podfile.lock

@@ -583,7 +583,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
+  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
   FBLazyVector: 48289402952f4f7a4e235de70a9a590aa0b79ef4
   FBReactNativeSpec: dd1186fd05255e3457baa2f4ca65e94c2cd1e3ac
   Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
@@ -596,7 +596,7 @@ SPEC CHECKSUMS:
   Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
   FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
+  glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
   hermes-engine: 2af7b7a59128f250adfd86f15aa1d5a2ecd39995
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c

packages/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/mobile",
-  "version": "3.49.28",
+  "version": "3.49.56",
   "author": "Standard Notes.",
   "private": true,
   "license": "AGPL-3.0-or-later",

packages/models/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.40.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.40.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/models
+
+## [1.40.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/models
+
+# [1.40.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+### Features
+
+* Allow changing per-view display preferences for system views ([#2120](https://github.com/standardnotes/app/issues/2120)) ([dc33aef](https://github.com/standardnotes/app/commit/dc33aef6608a364107a884ad2f26c14bceea23b7))
+
 ## [1.39.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-08)
 
 **Note:** Version bump only for package @standardnotes/models

packages/models/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/models",
-  "version": "1.39.3",
+  "version": "1.40.3",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/models/src/Domain/Runtime/Collection/CollectionSort.ts

@@ -7,6 +7,7 @@ export interface SortableItem {
   userModifiedDate: Date
   title?: string
   pinned: boolean
+  decryptedSize?: number
 }
 
 export const CollectionSort: Record<string, keyof SortableItem> = {

packages/models/src/Domain/Syncable/UserPrefs/PrefKey.ts

@@ -1,5 +1,7 @@
 import { CollectionSortProperty } from '../../Runtime/Collection/CollectionSort'
 import { EditorIdentifier, FeatureIdentifier } from '@standardnotes/features'
+import { SystemViewId } from '../SmartView'
+import { TagPreferences } from '../Tag'
 
 export enum PrefKey {
   TagsPanelWidth = 'tagsPanelWidth',
@@ -40,6 +42,7 @@ export enum PrefKey {
   DarkMode = 'darkMode',
   DefaultEditorIdentifier = 'defaultEditorIdentifier',
   MomentsDefaultTagUuid = 'momentsDefaultTagUuid',
+  SystemViewPreferences = 'systemViewPreferences',
 }
 
 export enum NewNoteTitleFormat {
@@ -105,4 +108,5 @@ export type PrefValue = {
   [PrefKey.DarkMode]: boolean
   [PrefKey.DefaultEditorIdentifier]: EditorIdentifier
   [PrefKey.MomentsDefaultTagUuid]: string | undefined
+  [PrefKey.SystemViewPreferences]: Partial<Record<SystemViewId, TagPreferences>>
 }

packages/releases/CHANGELOG.md

@@ -3,6 +3,118 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.82](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.81](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.80](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.79](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.78](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.77](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.76](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.75](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.74](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.73](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.72](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-26)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.71](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-26)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.70](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-26)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.69](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-26)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.68](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.67](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.66](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.65](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.64](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.63](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.62](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-23)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.61](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-23)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.60](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-23)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.59](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-22)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.58](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.57](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-20)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.56](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-20)
+
+**Note:** Version bump only for package @standardnotes/releases
+
+## [1.4.55](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-20)
+
+**Note:** Version bump only for package @standardnotes/releases
+
 ## [1.4.54](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-19)
 
 **Note:** Version bump only for package @standardnotes/releases

packages/releases/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/releases",
-  "version": "1.4.54",
+  "version": "1.4.82",
   "license": "AGPL-3.0-or-later",
   "main": "dist/releases.json",
   "types": "dist/index.d.ts",

packages/responses/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.12.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/responses
+
+## [1.12.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/responses
+
 ## [1.12.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-05)
 
 **Note:** Version bump only for package @standardnotes/responses

packages/responses/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/responses",
-  "version": "1.12.10",
+  "version": "1.12.12",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/services/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.50.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.50.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.50.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.50.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.50.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.50.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @standardnotes/services
+
+## [1.50.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-20)
+
+**Note:** Version bump only for package @standardnotes/services
+
 ## [1.50.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-19)
 
 **Note:** Version bump only for package @standardnotes/services

packages/services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/services",
-  "version": "1.50.7",
+  "version": "1.50.14",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/services/src/Domain/Application/WebApplicationInterface.ts

@@ -18,4 +18,5 @@ export interface WebApplicationInterface extends ApplicationInterface {
   handleAndroidBackButtonPressed(): void
   addAndroidBackHandlerEventListener(listener: () => boolean): (() => void) | undefined
   setAndroidBackHandlerFallbackListener(listener: () => boolean): void
+  generateUUID(): string
 }

packages/services/src/Domain/Item/ItemsClientInterface.ts

@@ -55,6 +55,8 @@ export interface ItemsClientInterface {
 
   getItems<T extends DecryptedItemInterface>(contentType: ContentType | ContentType[]): T[]
 
+  insertItem(item: DecryptedItemInterface): Promise<DecryptedItemInterface>
+
   notesMatchingSmartView(view: SmartView): SNNote[]
 
   addNoteCountChangeObserver(observer: TagItemCountChangeObserver): () => void

packages/services/src/Domain/Strings/InfoStrings.ts

@@ -4,8 +4,6 @@ export const InfoStrings = {
     'This backup file was created using a newer version of the application and cannot be imported here. Please update your application and try again.',
   BackupFileMoreRecentThanAccount:
     "This backup file was created using a newer encryption version than your account's. Please run the available encryption upgrade and try again.",
-  SavingWhileDocumentHidden:
-    'Attempting to save an item while the application is hidden. To protect data integrity, please refresh the application window and try again.',
   InvalidNote:
     "The note you are attempting to save can not be found or has been deleted. Changes you make will not be synced. Please copy this note's text and start a new note.",
 }

packages/snjs/CHANGELOG.md

@@ -3,6 +3,54 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.156.16](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.156.15](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.156.14](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.156.13](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.156.12](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
+## [2.156.11](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+### Bug Fixes
+
+* **snjs:** skip workspaces tests as they are a pending backlog feature ([8311271](https://github.com/standardnotes/app/commit/8311271a49fe707adc4e26c7b465861e65ee9006))
+
+## [2.156.10](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+### Bug Fixes
+
+* **snjs:** add error log upon not being able to reach the mock event publisher ([dd41082](https://github.com/standardnotes/app/commit/dd41082e7174a6068d1d7741e007867fc03a5da8))
+
+## [2.156.9](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-22)
+
+### Bug Fixes
+
+* Disabled Moments photo capture when app is passcode or biometrics locked ([#2114](https://github.com/standardnotes/app/issues/2114)) ([94c2802](https://github.com/standardnotes/app/commit/94c280256e0a71fb8078f0d0e4d7ad2b6d3c1462))
+
+## [2.156.8](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-21)
+
+### Bug Fixes
+
+* **api:** handling expired token responses ([#2113](https://github.com/standardnotes/app/issues/2113)) ([2696b07](https://github.com/standardnotes/app/commit/2696b07759104fb1d40781897f69e63133ad824a))
+
+## [2.156.7](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-20)
+
+**Note:** Version bump only for package @standardnotes/snjs
+
 ## [2.156.6](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-19)
 
 ### Bug Fixes

packages/snjs/lib/Application/Application.ts

@@ -178,6 +178,7 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
   private launched = false
   /** Whether the application has been destroyed via .deinit() */
   public dealloced = false
+  private isBiometricsSoftLockEngaged = false
   private revokingSession = false
   private handledFullSyncStage = false
 
@@ -940,11 +941,12 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
     return this.protocolService.hasPasscode()
   }
 
-  isLocked(): Promise<boolean> {
+  async isLocked(): Promise<boolean> {
     if (!this.started) {
       return Promise.resolve(true)
     }
-    return this.challengeService.isPasscodeLocked()
+    const isPasscodeLocked = await this.challengeService.isPasscodeLocked()
+    return isPasscodeLocked || this.isBiometricsSoftLockEngaged
   }
 
   public async lock(): Promise<void> {
@@ -964,10 +966,12 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli
 
     void this.promptForCustomChallenge(challenge)
 
+    this.isBiometricsSoftLockEngaged = true
     void this.notifyEvent(ApplicationEvent.BiometricsSoftLockEngaged)
 
     this.addChallengeObserver(challenge, {
       onComplete: () => {
+        this.isBiometricsSoftLockEngaged = false
         void this.notifyEvent(ApplicationEvent.BiometricsSoftLockDisengaged)
       },
     })

packages/snjs/mocha/lib/factory.js

@@ -72,7 +72,7 @@ export function getDefaultHost() {
 }
 
 export async function publishMockedEvent(eventType, eventPayload) {
-  await fetch(`${Defaults.getDefaultMockedEventServiceUrl()}/events`, {
+  const response = await fetch(`${Defaults.getDefaultMockedEventServiceUrl()}/events`, {
     method: 'POST',
     headers: {
       Accept: 'application/json',
@@ -83,6 +83,10 @@ export async function publishMockedEvent(eventType, eventPayload) {
       eventPayload,
     }),
   })
+
+  if (!response.ok) {
+    console.error(`Failed to publish mocked event: ${response.status} ${response.statusText}`)
+  }
 }
 
 export function createApplicationWithFakeCrypto(identifier, environment, platform, host) {

packages/snjs/mocha/subscriptions.test.js

@@ -2,7 +2,7 @@ import * as Factory from './lib/factory.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect
 
-describe.skip('subscriptions', function () {
+describe('subscriptions', function () {
   this.timeout(Factory.TwentySecondTimeout)
 
   let application

packages/snjs/mocha/workspaces.test.js

@@ -2,7 +2,7 @@ import * as Factory from './lib/factory.js'
 chai.use(chaiAsPromised)
 const expect = chai.expect
 
-describe('workspaces', function () {
+describe.skip('workspaces', function () {
   this.timeout(Factory.TwentySecondTimeout)
 
   let ownerContext

packages/snjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/snjs",
-  "version": "2.156.6",
+  "version": "2.156.16",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/ui-services/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.21.5](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-29)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.21.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-28)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.21.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.21.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.21.1](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-27)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+# [1.21.0](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-24)
+
+### Features
+
+* Added FileSend links to general account menu and preferences menu ([4f07b91](https://github.com/standardnotes/app/commit/4f07b915f0a60632a9e537b3b0394290d25fa071))
+
+## [1.20.4](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-21)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
+## [1.20.3](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-20)
+
+**Note:** Version bump only for package @standardnotes/ui-services
+
 ## [1.20.2](https://github.com/standardnotes/app/compare/@standardnotes/[email protected]...@standardnotes/[email protected]) (2022-12-19)
 
 **Note:** Version bump only for package @standardnotes/ui-services

packages/ui-services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/ui-services",
-  "version": "1.20.2",
+  "version": "1.21.5",
   "engines": {
     "node": ">=16.0.0 <17.0.0"
   },

packages/ui-services/src/Import/AegisConverter/AegisToAuthenticatorConverter.spec.ts

@@ -0,0 +1,89 @@
+import { FeatureIdentifier, NoteType } from '@standardnotes/features'
+import { WebApplicationInterface } from '@standardnotes/services'
+import { AegisToAuthenticatorConverter } from './AegisToAuthenticatorConverter'
+import data from './testData'
+
+describe('AegisConverter', () => {
+  let application: WebApplicationInterface
+
+  beforeEach(() => {
+    application = {
+      generateUUID: jest.fn().mockReturnValue('test'),
+    } as unknown as WebApplicationInterface
+  })
+
+  it('should parse entries', () => {
+    const converter = new AegisToAuthenticatorConverter(application)
+
+    const result = converter.parseEntries(data)
+
+    expect(result).not.toBeNull()
+    expect(result?.length).toBe(2)
+    expect(result?.[0]).toStrictEqual({
+      service: 'TestMail',
+      account: '[email protected]',
+      secret: 'TESTMAILTESTMAILTESTMAILTESTMAIL',
+      notes: 'Some note',
+    })
+    expect(result?.[1]).toStrictEqual({
+      service: 'Some Service',
+      account: '[email protected]',
+      secret: 'SOMESERVICESOMESERVICESOMESERVIC',
+      notes: 'Some other service',
+    })
+  })
+
+  it('should create note from entries with editor info', () => {
+    const converter = new AegisToAuthenticatorConverter(application)
+
+    const parsedEntries = converter.parseEntries(data)
+
+    const result = converter.createNoteFromEntries(
+      parsedEntries!,
+      {
+        lastModified: 123456789,
+        name: 'test.json',
+      },
+      true,
+    )
+
+    expect(result).not.toBeNull()
+    expect(result.content_type).toBe('Note')
+    expect(result.created_at).toBeInstanceOf(Date)
+    expect(result.updated_at).toBeInstanceOf(Date)
+    expect(result.uuid).not.toBeNull()
+    expect(result.content.title).toBe('test')
+    expect(result.content.text).toBe(
+      '[{"service":"TestMail","account":"[email protected]","secret":"TESTMAILTESTMAILTESTMAILTESTMAIL","notes":"Some note"},{"service":"Some Service","account":"[email protected]","secret":"SOMESERVICESOMESERVICESOMESERVIC","notes":"Some other service"}]',
+    )
+    expect(result.content.noteType).toBe(NoteType.Authentication)
+    expect(result.content.editorIdentifier).toBe(FeatureIdentifier.TokenVaultEditor)
+  })
+
+  it('should create note from entries without editor info', () => {
+    const converter = new AegisToAuthenticatorConverter(application)
+
+    const parsedEntries = converter.parseEntries(data)
+
+    const result = converter.createNoteFromEntries(
+      parsedEntries!,
+      {
+        lastModified: 123456789,
+        name: 'test.json',
+      },
+      false,
+    )
+
+    expect(result).not.toBeNull()
+    expect(result.content_type).toBe('Note')
+    expect(result.created_at).toBeInstanceOf(Date)
+    expect(result.updated_at).toBeInstanceOf(Date)
+    expect(result.uuid).not.toBeNull()
+    expect(result.content.title).toBe('test')
+    expect(result.content.text).toBe(
+      '[{"service":"TestMail","account":"[email protected]","secret":"TESTMAILTESTMAILTESTMAILTESTMAIL","notes":"Some note"},{"service":"Some Service","account":"[email protected]","secret":"SOMESERVICESOMESERVICESOMESERVIC","notes":"Some other service"}]',
+    )
+    expect(result.content.noteType).toBeFalsy()
+    expect(result.content.editorIdentifier).toBeFalsy()
+  })
+})

packages/ui-services/src/Import/AegisConverter/AegisToAuthenticatorConverter.ts

@@ -0,0 +1,92 @@
+import { DecryptedTransferPayload, NoteContent } from '@standardnotes/models'
+import { ContentType } from '@standardnotes/common'
+import { readFileAsText } from '../Utils'
+import { FeatureIdentifier, NoteType } from '@standardnotes/features'
+import { WebApplicationInterface } from '@standardnotes/services'
+import { Importer } from '../Importer'
+
+type AegisData = {
+  db: {
+    entries: {
+      issuer: string
+      name: string
+      info: {
+        secret: string
+      }
+      note: string
+    }[]
+  }
+}
+
+type AuthenticatorEntry = {
+  service: string
+  account: string
+  secret: string
+  notes: string
+}
+
+export class AegisToAuthenticatorConverter extends Importer {
+  constructor(protected override application: WebApplicationInterface) {
+    super(application)
+  }
+
+  createNoteFromEntries(
+    entries: AuthenticatorEntry[],
+    file: {
+      lastModified: number
+      name: string
+    },
+    addEditorInfo: boolean,
+  ): DecryptedTransferPayload<NoteContent> {
+    return {
+      created_at: new Date(file.lastModified),
+      created_at_timestamp: file.lastModified,
+      updated_at: new Date(file.lastModified),
+      updated_at_timestamp: file.lastModified,
+      uuid: this.application.generateUUID(),
+      content_type: ContentType.Note,
+      content: {
+        title: file.name.split('.')[0],
+        text: JSON.stringify(entries),
+        references: [],
+        ...(addEditorInfo && {
+          noteType: NoteType.Authentication,
+          editorIdentifier: FeatureIdentifier.TokenVaultEditor,
+        }),
+      },
+    }
+  }
+
+  async convertAegisBackupFileToNote(
+    file: File,
+    addEditorInfo: boolean,
+  ): Promise<DecryptedTransferPayload<NoteContent>> {
+    const content = await readFileAsText(file)
+
+    const entries = this.parseEntries(content)
+
+    if (!entries) {
+      throw new Error('Could not parse entries')
+    }
+
+    return this.createNoteFromEntries(entries, file, addEditorInfo)
+  }
+
+  parseEntries(data: string): AuthenticatorEntry[] | null {
+    try {
+      const json = JSON.parse(data) as AegisData
+      const entries = json.db.entries.map((entry) => {
+        return {
+          service: entry.issuer,
+          account: entry.name,
+          secret: entry.info.secret,
+          notes: entry.note,
+        } as AuthenticatorEntry
+      })
+      return entries
+    } catch (error) {
+      console.error(error)
+      return null
+    }
+  }
+}

packages/ui-services/src/Import/AegisConverter/testData.ts

@@ -0,0 +1,42 @@
+const data = {
+  version: 1,
+  header: {
+    slots: null,
+    params: null,
+  },
+  db: {
+    version: 2,
+    entries: [
+      {
+        type: 'totp',
+        uuid: 'c74a11c4-4f23-417b-818a-e11f6a4d51d7',
+        name: '[email protected]',
+        issuer: 'TestMail',
+        note: 'Some note',
+        icon: null,
+        info: {
+          secret: 'TESTMAILTESTMAILTESTMAILTESTMAIL',
+          algo: 'SHA1',
+          digits: 6,
+          period: 30,
+        },
+      },
+      {
+        type: 'totp',
+        uuid: '803ed58f-b2c4-386c-9aad-645a47309124',
+        name: '[email protected]',
+        issuer: 'Some Service',
+        note: 'Some other service',
+        icon: null,
+        info: {
+          secret: 'SOMESERVICESOMESERVICESOMESERVIC',
+          algo: 'SHA1',
+          digits: 6,
+          period: 30,
+        },
+      },
+    ],
+  },
+}
+
+export default JSON.stringify(data, null, 2)

packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.spec.ts

@@ -0,0 +1,72 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { ContentType } from '@standardnotes/common'
+import { WebApplicationInterface } from '@standardnotes/services'
+import { DecryptedTransferPayload, NoteContent, TagContent } from '@standardnotes/models'
+import { EvernoteConverter } from './EvernoteConverter'
+import data from './testData'
+
+// Mock dayjs so dayjs.extend() doesn't throw an error in EvernoteConverter.ts
+jest.mock('dayjs', () => {
+  return {
+    __esModule: true,
+    default: {
+      extend: jest.fn(),
+      utc: jest.fn().mockReturnValue({
+        toDate: jest.fn().mockReturnValue(new Date()),
+      }),
+    },
+  }
+})
+
+describe('EvernoteConverter', () => {
+  let application: WebApplicationInterface
+
+  beforeEach(() => {
+    application = {
+      generateUUID: jest.fn().mockReturnValue(Math.random()),
+    } as any as WebApplicationInterface
+  })
+
+  it('should parse and strip html', () => {
+    const converter = new EvernoteConverter(application)
+
+    const result = converter.parseENEXData(data, true)
+
+    expect(result).not.toBeNull()
+    expect(result?.length).toBe(3)
+    expect(result?.[0].content_type).toBe(ContentType.Note)
+    expect((result?.[0] as DecryptedTransferPayload<NoteContent>).content.text).toBe('This is a test.')
+    expect(result?.[1].content_type).toBe(ContentType.Note)
+    expect((result?.[1] as DecryptedTransferPayload<NoteContent>).content.text).toBe(
+      'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
+    )
+    expect(result?.[2].content_type).toBe(ContentType.Tag)
+    expect((result?.[2] as DecryptedTransferPayload<TagContent>).content.title).toBe('evernote')
+    expect((result?.[2] as DecryptedTransferPayload<TagContent>).content.references.length).toBe(2)
+    expect((result?.[2] as DecryptedTransferPayload<TagContent>).content.references[0].uuid).toBe(result?.[0].uuid)
+    expect((result?.[2] as DecryptedTransferPayload<TagContent>).content.references[1].uuid).toBe(result?.[1].uuid)
+  })
+
+  it('should parse and not strip html', () => {
+    const converter = new EvernoteConverter(application)
+
+    const result = converter.parseENEXData(data, false)
+
+    expect(result).not.toBeNull()
+    expect(result?.length).toBe(3)
+    expect(result?.[0].content_type).toBe(ContentType.Note)
+    expect((result?.[0] as DecryptedTransferPayload<NoteContent>).content.text).toBe('<div>This is a test.</div>')
+    expect(result?.[1].content_type).toBe(ContentType.Note)
+    expect((result?.[1] as DecryptedTransferPayload<NoteContent>).content.text).toBe(
+      '<div>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</div>',
+    )
+    expect(result?.[2].content_type).toBe(ContentType.Tag)
+    expect((result?.[2] as DecryptedTransferPayload<TagContent>).content.title).toBe('evernote')
+    expect((result?.[2] as DecryptedTransferPayload<TagContent>).content.references.length).toBe(2)
+    expect((result?.[2] as DecryptedTransferPayload<TagContent>).content.references[0].uuid).toBe(result?.[0].uuid)
+    expect((result?.[2] as DecryptedTransferPayload<TagContent>).content.references[1].uuid).toBe(result?.[1].uuid)
+  })
+})

packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.ts

@@ -0,0 +1,164 @@
+import { ContentType } from '@standardnotes/common'
+import { WebApplicationInterface } from '@standardnotes/services'
+import { DecryptedTransferPayload, NoteContent, TagContent } from '@standardnotes/models'
+import { readFileAsText } from '../Utils'
+import { Importer } from '../Importer'
+import dayjs from 'dayjs'
+import customParseFormat from 'dayjs/plugin/customParseFormat'
+import utc from 'dayjs/plugin/utc'
+dayjs.extend(customParseFormat)
+dayjs.extend(utc)
+
+const dateFormat = 'YYYYMMDDTHHmmss'
+
+export class EvernoteConverter extends Importer {
+  constructor(protected override application: WebApplicationInterface) {
+    super(application)
+  }
+
+  async convertENEXFileToNotesAndTags(file: File, stripHTML: boolean): Promise<DecryptedTransferPayload[]> {
+    const content = await readFileAsText(file)
+
+    const notesAndTags = this.parseENEXData(content, stripHTML)
+
+    return notesAndTags
+  }
+
+  parseENEXData(data: string, stripHTML = false, defaultTagName = 'evernote') {
+    const xmlDoc = this.loadXMLString(data, 'xml')
+    const xmlNotes = xmlDoc.getElementsByTagName('note')
+    const notes: DecryptedTransferPayload<NoteContent>[] = []
+    const tags: DecryptedTransferPayload<TagContent>[] = []
+    let defaultTag: DecryptedTransferPayload<TagContent> | undefined
+
+    if (defaultTagName) {
+      const now = new Date()
+      defaultTag = {
+        created_at: now,
+        created_at_timestamp: now.getTime(),
+        updated_at: now,
+        updated_at_timestamp: now.getTime(),
+        uuid: this.application.generateUUID(),
+        content_type: ContentType.Tag,
+        content: {
+          title: defaultTagName,
+          expanded: false,
+          iconString: '',
+          references: [],
+        },
+      }
+    }
+
+    function findTag(title: string | null) {
+      return tags.filter(function (tag) {
+        return tag.content.title == title
+      })[0]
+    }
+
+    function addTag(tag: DecryptedTransferPayload<TagContent>) {
+      tags.push(tag)
+    }
+
+    for (const [index, xmlNote] of Array.from(xmlNotes).entries()) {
+      const title = xmlNote.getElementsByTagName('title')[0].textContent
+      const created = xmlNote.getElementsByTagName('created')[0].textContent
+      const updatedNodes = xmlNote.getElementsByTagName('updated')
+      const updated = updatedNodes.length ? updatedNodes[0].textContent : null
+      const contentNode = xmlNote.getElementsByTagName('content')[0]
+      let contentXmlString
+      /** Find the node with the content */
+      for (const node of Array.from(contentNode.childNodes)) {
+        if (node instanceof CDATASection) {
+          contentXmlString = node.nodeValue
+          break
+        }
+      }
+      if (!contentXmlString) {
+        continue
+      }
+      const contentXml = this.loadXMLString(contentXmlString, 'html')
+      let contentHTML = contentXml.getElementsByTagName('en-note')[0].innerHTML
+      if (stripHTML) {
+        contentHTML = contentHTML.replace(/<\/div>/g, '</div>\n')
+        contentHTML = contentHTML.replace(/<li[^>]*>/g, '\n')
+        contentHTML = contentHTML.trim()
+      }
+      const text = stripHTML ? this.stripHTML(contentHTML) : contentHTML
+      const createdAtDate = created ? dayjs.utc(created, dateFormat).toDate() : new Date()
+      const updatedAtDate = updated ? dayjs.utc(updated, dateFormat).toDate() : createdAtDate
+      const note: DecryptedTransferPayload<NoteContent> = {
+        created_at: createdAtDate,
+        created_at_timestamp: createdAtDate.getTime(),
+        updated_at: updatedAtDate,
+        updated_at_timestamp: updatedAtDate.getTime(),
+        uuid: this.application.generateUUID(),
+        content_type: ContentType.Note,
+        content: {
+          title: !title ? `Imported note ${index + 1} from Evernote` : title,
+          text,
+          references: [],
+        },
+      }
+
+      if (defaultTag) {
+        defaultTag.content.references.push({
+          content_type: ContentType.Note,
+          uuid: note.uuid,
+        })
+      }
+
+      const xmlTags = xmlNote.getElementsByTagName('tag')
+      for (const tagXml of Array.from(xmlTags)) {
+        const tagName = tagXml.childNodes[0].nodeValue
+        let tag = findTag(tagName)
+        if (!tag) {
+          const now = new Date()
+          tag = {
+            uuid: this.application.generateUUID(),
+            content_type: ContentType.Tag,
+            created_at: now,
+            created_at_timestamp: now.getTime(),
+            updated_at: now,
+            updated_at_timestamp: now.getTime(),
+            content: {
+              title: tagName || `Imported tag ${index + 1} from Evernote`,
+              expanded: false,
+              iconString: '',
+              references: [],
+            },
+          }
+          addTag(tag)
+        }
+
+        note.content.references.push({ content_type: tag.content_type, uuid: tag.uuid })
+        tag.content.references.push({ content_type: note.content_type, uuid: note.uuid })
+      }
+
+      notes.push(note)
+    }
+
+    const allItems: DecryptedTransferPayload[] = [...notes, ...tags]
+    if (defaultTag) {
+      allItems.push(defaultTag)
+    }
+
+    return allItems
+  }
+
+  loadXMLString(string: string, type: 'html' | 'xml') {
+    let xmlDoc
+    if (window.DOMParser) {
+      const parser = new DOMParser()
+      xmlDoc = parser.parseFromString(string, `text/${type}`)
+    } else {
+      throw new Error('Could not parse XML string')
+    }
+    return xmlDoc
+  }
+
+  stripHTML(html: string) {
+    const tmp = document.createElement('html')
+    tmp.innerHTML = html
+    return tmp.textContent || tmp.innerText || ''
+  }
+}

packages/ui-services/src/Import/EvernoteConverter/testData.ts

@@ -0,0 +1,26 @@
+export default `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export3.dtd">
+<en-export export-date="20210408T052957Z" application="Evernote" version="10.8.5">
+  <note>
+    <title>Testing 1</title>
+    <created>20210308T051614Z</created>
+    <updated>20210308T051855Z</updated>
+    <note-attributes>
+    </note-attributes>
+    <content>
+      <![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd"><en-note><div>This is a test.</div></en-note>      ]]>
+    </content>
+  </note>
+  <note>
+    <title></title>
+    <created>20200508T234829Z</created>
+    <updated>20200508T235233Z</updated>
+    <note-attributes>
+    </note-attributes>
+    <content>
+      <![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd"><en-note><div>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</div></en-note>      ]]>
+    </content>
+  </note>
+</en-export>`

packages/ui-services/src/Import/GoogleKeepConverter/GoogleKeepConverter.spec.ts

@@ -0,0 +1,54 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { WebApplicationInterface } from '@standardnotes/snjs/dist/@types'
+import { jsonTestData, htmlTestData } from './testData'
+import { GoogleKeepConverter } from './GoogleKeepConverter'
+
+describe('GoogleKeepConverter', () => {
+  let application: WebApplicationInterface
+
+  beforeEach(() => {
+    application = {
+      generateUUID: jest.fn().mockReturnValue('uuid'),
+    } as unknown as WebApplicationInterface
+  })
+
+  it('should parse json data', () => {
+    const converter = new GoogleKeepConverter(application)
+
+    const result = converter.tryParseAsJson(jsonTestData)
+
+    expect(result).not.toBeNull()
+    expect(result?.created_at).toBeInstanceOf(Date)
+    expect(result?.updated_at).toBeInstanceOf(Date)
+    expect(result?.uuid).not.toBeNull()
+    expect(result?.content_type).toBe('Note')
+    expect(result?.content.title).toBe('Testing 1')
+    expect(result?.content.text).toBe('This is a test.')
+    expect(result?.content.trashed).toBe(false)
+    expect(result?.content.archived).toBe(false)
+    expect(result?.content.pinned).toBe(false)
+  })
+
+  it('should parse html data', () => {
+    const converter = new GoogleKeepConverter(application)
+
+    const result = converter.tryParseAsHtml(
+      htmlTestData,
+      {
+        name: 'note-2.html',
+      },
+      false,
+    )
+
+    expect(result).not.toBeNull()
+    expect(result?.created_at).toBeInstanceOf(Date)
+    expect(result?.updated_at).toBeInstanceOf(Date)
+    expect(result?.uuid).not.toBeNull()
+    expect(result?.content_type).toBe('Note')
+    expect(result?.content.title).toBe('Testing 2')
+    expect(result?.content.text).toBe('Lorem ipsum dolor sit amet, consectetur adipiscing elit.')
+  })
+})