refactor: offline roles (#2169)

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

@@ -1,5 +1,4 @@
 export enum FeatureIdentifier {
-  AccountSwitcher = 'com.standardnotes.account-switcher',
   CloudLink = 'org.standardnotes.cloudlink',
   DailyDropboxBackup = 'org.standardnotes.daily-dropbox-backup',
   DailyEmailBackup = 'org.standardnotes.daily-email-backup',
@@ -21,7 +20,6 @@ export enum FeatureIdentifier {
   AutobiographyTheme = 'org.standardnotes.theme-autobiography',
   DynamicTheme = 'org.standardnotes.theme-dynamic',
   DarkTheme = 'org.standardnotes.theme-focus',
-  FocusMode = 'org.standardnotes.focus-mode',
   FuturaTheme = 'org.standardnotes.theme-futura',
   MidnightTheme = 'org.standardnotes.theme-midnight',
   SolarizedDarkTheme = 'org.standardnotes.theme-solarized-dark',

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

@@ -1,7 +1,5 @@
 import { FeatureDescription } from './FeatureDescription'
 import { FeatureIdentifier } from './FeatureIdentifier'
-import { editors } from '../Lists/Editors'
-import { themes } from '../Lists/Themes'
 import { serverFeatures } from '../Lists/ServerFeatures'
 import { clientFeatures } from '../Lists/ClientFeatures'
 import { GetDeprecatedFeatures } from '../Lists/DeprecatedFeatures'
@@ -9,14 +7,7 @@ import { experimentalFeatures } from '../Lists/ExperimentalFeatures'
 import { SubscriptionName } from '@standardnotes/common'
 
 export function GetFeatures(): FeatureDescription[] {
-  return [
-    ...themes(),
-    ...editors(),
-    ...serverFeatures(),
-    ...clientFeatures(),
-    ...experimentalFeatures(),
-    ...GetDeprecatedFeatures(),
-  ]
+  return [...serverFeatures(), ...clientFeatures(), ...experimentalFeatures(), ...GetDeprecatedFeatures()]
 }
 
 export function GetFeaturesForSubscription(subscription: SubscriptionName): FeatureDescription[] {

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

@@ -1,14 +1,19 @@
-import { ClientFeatureDescription } from '../Feature/FeatureDescription'
+import { FeatureDescription } from '../Feature/FeatureDescription'
 import { PermissionName } from '../Permission/PermissionName'
 import { FeatureIdentifier } from '../Feature/FeatureIdentifier'
 import { SubscriptionName } from '@standardnotes/common'
 import { RoleName } from '@standardnotes/domain-core'
+import { themes } from './Themes'
+import { editors } from './Editors'
 
-export function clientFeatures(): ClientFeatureDescription[] {
+export function clientFeatures(): FeatureDescription[] {
   return [
+    ...themes(),
+    ...editors(),
     {
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
       name: 'Tag Nesting',
+      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
+      availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
       identifier: FeatureIdentifier.TagNesting,
       permission_name: PermissionName.TagNesting,
       description: 'Organize your tags into folders.',
@@ -17,45 +22,26 @@ export function clientFeatures(): ClientFeatureDescription[] {
       name: 'Super Notes',
       identifier: FeatureIdentifier.SuperEditor,
       availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
+      availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
       permission_name: PermissionName.SuperEditor,
       description:
-        'Type / to bring up the block selection menu, or @ to embed images or link other tags and notes. Type - then space to start a list, or [] then space to start a checklist. Drag and drop an image or file to embed it in your note.',
-      availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
+        'A new way to edit notes. Type / to bring up the block selection menu, or @ to embed images or link other tags and notes. Type - then space to start a list, or [] then space to start a checklist. Drag and drop an image or file to embed it in your note. Cmd/Ctrl + F to bring up search and replace.',
     },
     {
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
       name: 'Smart Filters',
+      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
+      availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
       identifier: FeatureIdentifier.SmartFilters,
       permission_name: PermissionName.SmartFilters,
       description: 'Create smart filters for viewing notes matching specific criteria.',
     },
     {
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
       name: 'Encrypted files',
+      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
+      availableInRoles: [RoleName.NAMES.ProUser],
       identifier: FeatureIdentifier.Files,
       permission_name: PermissionName.Files,
       description: '',
     },
-    {
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
-      name: 'Focus Mode',
-      identifier: FeatureIdentifier.FocusMode,
-      permission_name: PermissionName.FocusMode,
-      description: '',
-    },
-    {
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
-      name: 'Listed Custom Domain',
-      identifier: FeatureIdentifier.ListedCustomDomain,
-      permission_name: PermissionName.ListedCustomDomain,
-      description: '',
-    },
-    {
-      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
-      name: 'Multiple accounts',
-      identifier: FeatureIdentifier.AccountSwitcher,
-      permission_name: PermissionName.AccountSwitcher,
-      description: '',
-    },
   ]
 }

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

@@ -10,6 +10,7 @@ import { NoteType } from '../Component/NoteType'
 import { FillEditorComponentDefaults } from './Utilities/FillEditorComponentDefaults'
 import { ComponentAction } from '../Component/ComponentAction'
 import { ComponentArea } from '../Component/ComponentArea'
+import { RoleName } from '@standardnotes/domain-core'
 
 export function GetDeprecatedFeatures(): FeatureDescription[] {
   const bold: EditorFeatureDescription = FillEditorComponentDefaults({
@@ -37,6 +38,7 @@ export function GetDeprecatedFeatures(): FeatureDescription[] {
     permission_name: PermissionName.BoldEditor,
     description: 'A simple and peaceful rich editor that helps you write and think clearly.',
     thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/bold.jpg',
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
   })
 
   const markdownBasic: EditorFeatureDescription = FillEditorComponentDefaults({
@@ -50,6 +52,7 @@ export function GetDeprecatedFeatures(): FeatureDescription[] {
     permission_name: PermissionName.MarkdownBasicEditor,
     description: 'A Markdown editor with dynamic split-pane preview.',
     thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/simple-markdown.jpg',
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
   })
 
   const markdownMinimist: EditorFeatureDescription = FillEditorComponentDefaults({
@@ -64,6 +67,7 @@ export function GetDeprecatedFeatures(): FeatureDescription[] {
     deprecated: true,
     description: 'A minimal Markdown editor with live rendering and in-text search via Ctrl/Cmd + F',
     thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/min-markdown.jpg',
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
   })
 
   const markdownMath: EditorFeatureDescription = FillEditorComponentDefaults({
@@ -78,6 +82,7 @@ export function GetDeprecatedFeatures(): FeatureDescription[] {
     index_path: 'index.html',
     description: 'A beautiful split-pane Markdown editor with synced-scroll, LaTeX support, and colorful syntax.',
     thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/fancy-markdown.jpg',
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
   })
 
   const filesafe: IframeComponentFeatureDescription = FillEditorComponentDefaults({
@@ -104,6 +109,7 @@ export function GetDeprecatedFeatures(): FeatureDescription[] {
     description:
       'Encrypted attachments for your notes using your Dropbox, Google Drive, or WebDAV server. Limited to 50MB per file.',
     thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/FileSafe-banner.png',
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
   })
 
   return [bold, markdownBasic, markdownMinimist, markdownMath, filesafe]

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

@@ -4,6 +4,7 @@ import { PermissionName } from '../Permission/PermissionName'
 import { FeatureIdentifier } from '../Feature/FeatureIdentifier'
 import { NoteType } from '../Component/NoteType'
 import { FillEditorComponentDefaults } from './Utilities/FillEditorComponentDefaults'
+import { RoleName } from '@standardnotes/domain-core'
 
 export function editors(): EditorFeatureDescription[] {
   const code: EditorFeatureDescription = FillEditorComponentDefaults({
@@ -20,6 +21,7 @@ export function editors(): EditorFeatureDescription[] {
       'Syntax highlighting and convenient keyboard shortcuts for over 120 programming' +
       ' languages. Ideal for code snippets and procedures.',
     thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/code.jpg',
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
   })
 
   const plus: EditorFeatureDescription = FillEditorComponentDefaults({
@@ -33,6 +35,7 @@ export function editors(): EditorFeatureDescription[] {
     description:
       'From highlighting to custom font sizes and colors, to tables and lists, this editor is perfect for crafting any document.',
     thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/plus-editor.jpg',
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
   })
 
   const markdown: EditorFeatureDescription = FillEditorComponentDefaults({
@@ -46,6 +49,7 @@ export function editors(): EditorFeatureDescription[] {
     description:
       'A fully featured Markdown editor that supports live preview, a styling toolbar, and split pane support.',
     thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/adv-markdown.jpg',
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
   })
 
   const markdownAlt: EditorFeatureDescription = FillEditorComponentDefaults({
@@ -59,6 +63,7 @@ export function editors(): EditorFeatureDescription[] {
     description:
       'A WYSIWYG-style Markdown editor that renders Markdown in preview-mode while you type without displaying any syntax.',
     index_path: 'build/index.html',
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
   })
 
   const task: EditorFeatureDescription = FillEditorComponentDefaults({
@@ -73,6 +78,7 @@ export function editors(): EditorFeatureDescription[] {
     description:
       'A great way to manage short-term and long-term to-do"s. You can mark tasks as completed, change their order, and edit the text naturally in place.',
     thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/task-editor.jpg',
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
   })
 
   const tokenvault: EditorFeatureDescription = FillEditorComponentDefaults({
@@ -86,6 +92,7 @@ export function editors(): EditorFeatureDescription[] {
     description:
       'Encrypt and protect your 2FA secrets for all your internet accounts. Authenticator handles your 2FA secrets so that you never lose them again, or have to start over when you get a new device.',
     thumbnail_url: 'https://standard-notes.s3.amazonaws.com/screenshots/models/editors/token-vault.png',
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
   })
 
   const spreadsheets: EditorFeatureDescription = FillEditorComponentDefaults({
@@ -99,6 +106,7 @@ export function editors(): EditorFeatureDescription[] {
     description:
       'A powerful spreadsheet editor with formatting and formula support. Not recommended for large data sets, as encryption of such data may decrease editor performance.',
     thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/spreadsheets.png',
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
   })
 
   return [code, plus, markdown, markdownAlt, task, tokenvault, spreadsheets]

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

@@ -65,5 +65,11 @@ export function serverFeatures(): ServerFeatureDescription[] {
       identifier: FeatureIdentifier.SubscriptionSharing,
       permission_name: PermissionName.SubscriptionSharing,
     },
+    {
+      availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
+      name: 'Listed Custom Domain',
+      identifier: FeatureIdentifier.ListedCustomDomain,
+      permission_name: PermissionName.ListedCustomDomain,
+    },
   ]
 }

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

@@ -3,6 +3,7 @@ import { PermissionName } from '../Permission/PermissionName'
 import { FeatureIdentifier } from '../Feature/FeatureIdentifier'
 import { FillThemeComponentDefaults } from './Utilities/FillThemeComponentDefaults'
 import { SubscriptionName } from '@standardnotes/common'
+import { RoleName } from '@standardnotes/domain-core'
 
 export function themes(): ThemeFeatureDescription[] {
   const midnight: ThemeFeatureDescription = FillThemeComponentDefaults({
@@ -17,10 +18,12 @@ export function themes(): ThemeFeatureDescription[] {
       foreground_color: '#ffffff',
       border_color: '#086DD6',
     },
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
   })
 
   const futura: ThemeFeatureDescription = FillThemeComponentDefaults({
     availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
     name: 'Futura',
     identifier: FeatureIdentifier.FuturaTheme,
     permission_name: PermissionName.FuturaTheme,
@@ -35,6 +38,7 @@ export function themes(): ThemeFeatureDescription[] {
 
   const solarizedDark: ThemeFeatureDescription = FillThemeComponentDefaults({
     availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
     name: 'Solarized Dark',
     identifier: FeatureIdentifier.SolarizedDarkTheme,
     permission_name: PermissionName.SolarizedDarkTheme,
@@ -49,6 +53,7 @@ export function themes(): ThemeFeatureDescription[] {
 
   const autobiography: ThemeFeatureDescription = FillThemeComponentDefaults({
     availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
     name: 'Autobiography',
     identifier: FeatureIdentifier.AutobiographyTheme,
     permission_name: PermissionName.AutobiographyTheme,
@@ -77,6 +82,7 @@ export function themes(): ThemeFeatureDescription[] {
 
   const titanium: ThemeFeatureDescription = FillThemeComponentDefaults({
     availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
     name: 'Titanium',
     identifier: FeatureIdentifier.TitaniumTheme,
     permission_name: PermissionName.TitaniumTheme,
@@ -90,6 +96,7 @@ export function themes(): ThemeFeatureDescription[] {
 
   const dynamic: ThemeFeatureDescription = FillThemeComponentDefaults({
     availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan],
+    availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser],
     name: 'Dynamic Panels',
     identifier: FeatureIdentifier.DynamicTheme,
     permission_name: PermissionName.ThemeDynamic,