rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: display options menu logic

Browse Source
This commit is contained in:
Aman Harwara
2023-10-19 19:20:55 +05:30
parent c0358882c6
commit a62ffc6cf9
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/web/src/javascripts/Components/ContentListView/Header/DisplayOptionsMenu.tsx
View File

@@ -93,7 +93,7 @@ const DisplayOptionsMenu: FunctionComponent<DisplayOptionsMenuProps> = ({
: selectedTag.preferences : selectedTag.preferences
const [currentMode, setCurrentMode] = useState<PreferenceMode>(selectedTagPreferences ? 'tag' : 'global') const [currentMode, setCurrentMode] = useState<PreferenceMode>(selectedTagPreferences ? 'tag' : 'global')
const [preferences, setPreferences] = useState<TagPreferences>({}) const [preferences, setPreferences] = useState<TagPreferences>({})
const hasSubscription = application.subscriptionController.hasFirstPartySubscriptionOrOfflineRepo() const hasSubscription = application.subscriptionController.hasFirstPartyOnlineOrOfflineSubscription()
const controlsDisabled = currentMode === 'tag' && !hasSubscription const controlsDisabled = currentMode === 'tag' && !hasSubscription
const isDailyEntry = selectedTagPreferences?.entryMode === 'daily' const isDailyEntry = selectedTagPreferences?.entryMode === 'daily'

15
packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts
View File

@@ -89,20 +89,11 @@ export class SubscriptionController extends AbstractViewController implements In
} }
hasFirstPartyOnlineOrOfflineSubscription(): boolean { hasFirstPartyOnlineOrOfflineSubscription(): boolean {
if (this.sessions.isSignedIn()) { const offline = this.features.hasFirstPartyOfflineSubscription()
if (!this.sessions.isSignedIntoFirstPartyServer()) { if (!this.sessions.isSignedIn() || !this.sessions.isSignedIntoFirstPartyServer()) {
return false
}
return !!this.subscriptions.getOnlineSubscription()
} else {
const offline = this.features.hasFirstPartyOfflineSubscription()
return offline return offline
} }
} return !!this.subscriptions.getOnlineSubscription() || offline
hasFirstPartySubscriptionOrOfflineRepo(): boolean {
return this.hasFirstPartyOnlineOrOfflineSubscription() || this.features.hasOfflineRepo()
} }
get usedInvitationsCount(): number { get usedInvitationsCount(): number {