refactor: remove Uuid and RoleName from @standardnotes/common in favour of @standardnotes/domain-core value objects (#2167)
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import { useState } from 'react'
|
||||
import { observer } from 'mobx-react-lite'
|
||||
import { InvitationStatus, Uuid } from '@standardnotes/snjs'
|
||||
import { InvitationStatus } from '@standardnotes/snjs'
|
||||
|
||||
import { SubtitleLight, Text } from '@/Components/Preferences/PreferencesComponents/Content'
|
||||
import { SubscriptionController } from '@/Controllers/Subscription/SubscriptionController'
|
||||
@@ -25,7 +25,7 @@ const InvitationsList = ({ subscriptionState, application }: Props) => {
|
||||
[InvitationStatus.Declined, InvitationStatus.Canceled].includes(invitation.status),
|
||||
)
|
||||
|
||||
const handleCancel = async (invitationUuid: Uuid) => {
|
||||
const handleCancel = async (invitationUuid: string) => {
|
||||
if (lockContinue) {
|
||||
application.alertService.alert('Cancelation already in progress.').catch(console.error)
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import Icon from '@/Components/Icon/Icon'
|
||||
import { useListKeyboardNavigation } from '@/Hooks/useListKeyboardNavigation'
|
||||
import HistoryListItem from './HistoryListItem'
|
||||
import { previewHistoryEntryTitle } from './utils'
|
||||
import { FeaturesClientInterface, RevisionMetadata, RoleName } from '@standardnotes/snjs'
|
||||
import { FeaturesClientInterface, RevisionMetadata } from '@standardnotes/snjs'
|
||||
import { NoteHistoryController } from '@/Controllers/NoteHistory/NoteHistoryController'
|
||||
import Spinner from '@/Components/Spinner/Spinner'
|
||||
import { PremiumFeatureIconClass, PremiumFeatureIconName } from '../Icon/PremiumFeatureIcon'
|
||||
@@ -54,7 +54,7 @@ const RemoteHistoryList: FunctionComponent<RemoteHistoryListProps> = ({
|
||||
>
|
||||
<div className="flex flex-grow items-center justify-between">
|
||||
<div>{previewHistoryEntryTitle(entry)}</div>
|
||||
{!features.hasMinimumRole(entry.required_role as RoleName) && (
|
||||
{!features.hasMinimumRole(entry.required_role) && (
|
||||
<Icon type={PremiumFeatureIconName} className={PremiumFeatureIconClass} />
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -16,7 +16,6 @@ import {
|
||||
NoteHistoryEntry,
|
||||
PayloadEmitSource,
|
||||
RevisionMetadata,
|
||||
RoleName,
|
||||
SNNote,
|
||||
} from '@standardnotes/snjs'
|
||||
import { makeObservable, observable, action } from 'mobx'
|
||||
@@ -120,7 +119,7 @@ export class NoteHistoryController {
|
||||
return
|
||||
}
|
||||
|
||||
if (!this.application.features.hasMinimumRole(entry.required_role as RoleName)) {
|
||||
if (!this.application.features.hasMinimumRole(entry.required_role)) {
|
||||
this.setContentState(RevisionContentState.NotEntitled)
|
||||
this.setSelectedRevision(undefined)
|
||||
return
|
||||
|
||||
@@ -7,7 +7,6 @@ import {
|
||||
Invitation,
|
||||
InvitationStatus,
|
||||
SubscriptionClientInterface,
|
||||
Uuid,
|
||||
} from '@standardnotes/snjs'
|
||||
import { action, computed, makeObservable, observable, runInAction } from 'mobx'
|
||||
import { WebApplication } from '../../Application/Application'
|
||||
@@ -157,7 +156,7 @@ export class SubscriptionController extends AbstractViewController {
|
||||
return success
|
||||
}
|
||||
|
||||
async cancelSubscriptionInvitation(invitationUuid: Uuid): Promise<boolean> {
|
||||
async cancelSubscriptionInvitation(invitationUuid: string): Promise<boolean> {
|
||||
const success = await this.subscriptionManager.cancelInvitation(invitationUuid)
|
||||
|
||||
if (success) {
|
||||
|
||||
Reference in New Issue
Block a user