A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
web: use new api for adding limits on settings
Abdullah Atta22e9ae6bf838
diff --git a/apps/web/src/dialogs/settings/app-lock-settings.ts b/apps/web/src/dialogs/settings/app-lock-settings.tsindex a31f380b0..ee0ca356a 100644--- a/apps/web/src/dialogs/settings/app-lock-settings.ts+++ b/apps/web/src/dialogs/settings/app-lock-settings.ts@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/import { strings } from "@notesnook/intl";-import { verifyAccount } from "../../common";+import { checkFeature, verifyAccount } from "../../common";import { Checkmark } from "../../components/icons";import { showPasswordDialog } from "../../dialogs/password-dialog";import {@@ -35,8 +35,6 @@ import { showToast } from "../../utils/toast";import { WebAuthn } from "../../utils/webauthn";import { PromptDialog } from "../prompt";import { SettingComponent, SettingsGroup } from "./types";-import { isFeatureAvailable } from "@notesnook/common";-import { BuyDialog } from "../buy-dialog";export const AppLockSettings: SettingsGroup[] = [{@@ -51,15 +49,11 @@ export const AppLockSettings: SettingsGroup[] = [title: "Enable app lock",onStateChange: (listener) =>useKeyStore.subscribe((s) => s.credentials, listener),+ featureId: "appLock",components: [{type: "toggle",toggle: async () => {- if (!useKeyStore.getState().credentials.some((c) => c.active)) {- const result = await isFeatureAvailable("appLock");- if (!result.isAllowed)- return BuyDialog.show({ plan: result.availableOn });- }const { credentials } = useKeyStore.getState();const defaultCredential = credentials.filter((c) => c.active)diff --git a/apps/web/src/dialogs/settings/behaviour-settings.ts b/apps/web/src/dialogs/settings/behaviour-settings.tsindex 87c262d71..5dc8e8ef0 100644--- a/apps/web/src/dialogs/settings/behaviour-settings.ts+++ b/apps/web/src/dialogs/settings/behaviour-settings.ts@@ -27,9 +27,7 @@ import dayjs from "dayjs";import { TimeFormat } from "@notesnook/core";import { TrashCleanupInterval } from "@notesnook/core";import { strings } from "@notesnook/intl";-import { BuyDialog } from "../buy-dialog";-import { isFeatureAvailable } from "@notesnook/common";-import { showFeatureNotAllowedToast } from "../../common/toasts";+import { checkFeature } from "../../common";export const BehaviourSettings: SettingsGroup[] = [{@@ -44,20 +42,12 @@ export const BehaviourSettings: SettingsGroup[] = [keywords: ["default sidebar tab"],onStateChange: (listener) =>useSettingStore.subscribe((s) => s.defaultSidebarTab, listener),+ featureId: "defaultSidebarTab",components: [{type: "dropdown",- onSelectionChanged: async (value) => {- const defaultSidebarTab = await isFeatureAvailable(- "defaultSidebarTab"- );- if (!defaultSidebarTab.isAllowed) {- BuyDialog.show({ plan: defaultSidebarTab.availableOn });- return;- }-- useSettingStore.getState().setDefaultSidebarTab(value as any);- },+ onSelectionChanged: (value) =>+ useSettingStore.getState().setDefaultSidebarTab(value as any),selectedOption: () => useSettingStore.getState().defaultSidebarTab,options: [{ value: "home", title: strings.routes.Notes() },@@ -78,11 +68,11 @@ export const BehaviourSettings: SettingsGroup[] = [{type: "dropdown",onSelectionChanged: async (value) => {- if (value === ImageCompressionOptions.DISABLE.toString()) {- const result = await isFeatureAvailable("fullQualityImages");- if (!result.isAllowed)- return showFeatureNotAllowedToast(result);- }+ if (+ value === ImageCompressionOptions.DISABLE.toString() &&+ !(await checkFeature("fullQualityImages"))+ )+ return;useSettingStore.getState().setImageCompression(parseInt(value));},@@ -170,13 +160,11 @@ export const BehaviourSettings: SettingsGroup[] = [{type: "dropdown",onSelectionChanged: async (value) => {- const disableTrashCleanup = await isFeatureAvailable(- "disableTrashCleanup"- );- if (value === "-1" && !disableTrashCleanup.isAllowed) {- BuyDialog.show({ plan: disableTrashCleanup.availableOn });+ if (+ value === "-1" &&+ !(await checkFeature("disableTrashCleanup"))+ )return;- }useSettingStore.getState()diff --git a/apps/web/src/dialogs/settings/editor-settings.ts b/apps/web/src/dialogs/settings/editor-settings.tsindex fa3a22f44..068a0dd83 100644--- a/apps/web/src/dialogs/settings/editor-settings.ts+++ b/apps/web/src/dialogs/settings/editor-settings.ts@@ -32,8 +32,6 @@ import { CustomizeToolbar } from "./components/customize-toolbar";import { DictionaryWords } from "./components/dictionary-words";import { strings } from "@notesnook/intl";import { isMac } from "../../utils/platform";-import { isFeatureAvailable } from "@notesnook/common";-import { showFeatureNotAllowedToast } from "../../common/toasts";export const EditorSettings: SettingsGroup[] = [{@@ -117,18 +115,12 @@ export const EditorSettings: SettingsGroup[] = [description: strings.mardownShortcutsDesc(),onStateChange: (listener) =>useSettingStore.subscribe((c) => c.markdownShortcuts, listener),+ featureId: "markdownShortcuts",components: [{type: "toggle",isToggled: () => useSettingStore.getState().markdownShortcuts,- toggle: async () => {- if (!useSettingStore.getState().markdownShortcuts) {- const result = await isFeatureAvailable("markdownShortcuts");- if (!result.isAllowed)- return showFeatureNotAllowedToast(result);- }- useSettingStore.getState().toggleMarkdownShortcuts();- }+ toggle: () => useSettingStore.getState().toggleMarkdownShortcuts()}]},@@ -138,15 +130,12 @@ export const EditorSettings: SettingsGroup[] = [description: strings.fontLigaturesDesc(),onStateChange: (listener) =>useSettingStore.subscribe((c) => c.fontLigatures, listener),+ featureId: "fontLigatures",components: [{type: "toggle",isToggled: () => useSettingStore.getState().fontLigatures,- toggle: async () => {- const result = await isFeatureAvailable("fontLigatures");- if (!result.isAllowed) return showFeatureNotAllowedToast(result);- useSettingStore.getState().toggleFontLigatures();- }+ toggle: () => useSettingStore.getState().toggleFontLigatures()}]}diff --git a/apps/web/src/dialogs/settings/sync-settings.ts b/apps/web/src/dialogs/settings/sync-settings.tsindex 90038a63f..2b8111d12 100644--- a/apps/web/src/dialogs/settings/sync-settings.ts+++ b/apps/web/src/dialogs/settings/sync-settings.ts@@ -23,6 +23,7 @@ import { useStore as useSettingStore } from "../../stores/setting-store";import { ConfirmDialog } from "../confirm";import { strings } from "@notesnook/intl";+import { withFeatureCheck } from "../../common";export const SyncSettings: SettingsGroup[] = [{@@ -37,6 +38,7 @@ export const SyncSettings: SettingsGroup[] = [keywords: ["sync off", "toggle sync"],onStateChange: (listener) =>useAppStore.subscribe((s) => s.isSyncEnabled, listener),+ featureId: "syncControls",components: [{type: "toggle",@@ -52,6 +54,7 @@ export const SyncSettings: SettingsGroup[] = [keywords: ["auto sync off", "automatic sync", "toggle auto sync"],onStateChange: (listener) =>useAppStore.subscribe((s) => s.isSyncEnabled, listener),+ featureId: "syncControls",components: [{type: "toggle",@@ -67,6 +70,7 @@ export const SyncSettings: SettingsGroup[] = [keywords: ["auto sync off", "automatic sync", "toggle auto sync"],onStateChange: (listener) =>useAppStore.subscribe((s) => s.isSyncEnabled, listener),+ featureId: "syncControls",components: [{type: "toggle",@@ -82,6 +86,7 @@ export const SyncSettings: SettingsGroup[] = [keywords: ["offline mode"],onStateChange: (listener) =>useSettingStore.subscribe((s) => s.isFullOfflineMode, listener),+ featureId: "fullOfflineMode",components: [{type: "toggle",