From 86cd0b5277cba81d79ee57963455d798e746a986 Mon Sep 17 00:00:00 2001 From: Mo Date: Sat, 12 Aug 2023 06:57:26 -0500 Subject: [PATCH] chore: fix native feature check --- .../models/src/Domain/Runtime/Feature/UIFeature.ts | 4 ---- .../src/Domain/Runtime/Feature/UIFeatureInterface.ts | 1 - .../Services/ComponentManager/UseCase/GetFeatureUrl.ts | 10 +++++----- .../UseCase/RunWithPermissionsUseCase.ts | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/packages/models/src/Domain/Runtime/Feature/UIFeature.ts b/packages/models/src/Domain/Runtime/Feature/UIFeature.ts index f0ce699b6..fb1952c8d 100644 --- a/packages/models/src/Domain/Runtime/Feature/UIFeature.ts +++ b/packages/models/src/Domain/Runtime/Feature/UIFeature.ts @@ -24,10 +24,6 @@ export class UIFeature implements UIFeature return isItemBasedFeature(this.item) } - get isFeatureDescription(): boolean { - return isNativeFeature(this.item) - } - get isThemeComponent(): boolean { return isItemBasedFeature(this.item) && isTheme(this.item) } diff --git a/packages/models/src/Domain/Runtime/Feature/UIFeatureInterface.ts b/packages/models/src/Domain/Runtime/Feature/UIFeatureInterface.ts index da1d1af95..aa9d0642f 100644 --- a/packages/models/src/Domain/Runtime/Feature/UIFeatureInterface.ts +++ b/packages/models/src/Domain/Runtime/Feature/UIFeatureInterface.ts @@ -13,7 +13,6 @@ import { Uuid } from '@standardnotes/domain-core' export interface UIFeatureInterface { item: ComponentInterface | F get isComponent(): boolean - get isFeatureDescription(): boolean get isThemeComponent(): boolean get asComponent(): ComponentInterface get asFeatureDescription(): F diff --git a/packages/snjs/lib/Services/ComponentManager/UseCase/GetFeatureUrl.ts b/packages/snjs/lib/Services/ComponentManager/UseCase/GetFeatureUrl.ts index a0b184a1b..7bcb455b2 100644 --- a/packages/snjs/lib/Services/ComponentManager/UseCase/GetFeatureUrl.ts +++ b/packages/snjs/lib/Services/ComponentManager/UseCase/GetFeatureUrl.ts @@ -19,10 +19,10 @@ export class GetFeatureUrl { return this.urlForFeatureOnDesktop(uiFeature) } - if (uiFeature.isFeatureDescription) { + if (uiFeature.isNativeFeature) { return this.urlForNativeComponent( - uiFeature.asFeatureDescription.identifier, - uiFeature.asFeatureDescription.index_path, + uiFeature.featureDescription.identifier, + uiFeature.featureDescription.index_path, ) } @@ -55,9 +55,9 @@ export class GetFeatureUrl { throw new Error('Desktop manager is not defined') } - if (uiFeature.isFeatureDescription) { + if (uiFeature.isNativeFeature) { return `${this.desktopManager.getExtServerHost()}/components/${uiFeature.featureIdentifier}/${ - uiFeature.asFeatureDescription.index_path + uiFeature.featureDescription.index_path }` } else { if (uiFeature.asComponent.local_url) { diff --git a/packages/snjs/lib/Services/ComponentManager/UseCase/RunWithPermissionsUseCase.ts b/packages/snjs/lib/Services/ComponentManager/UseCase/RunWithPermissionsUseCase.ts index 5e11fc08d..4039d5815 100644 --- a/packages/snjs/lib/Services/ComponentManager/UseCase/RunWithPermissionsUseCase.ts +++ b/packages/snjs/lib/Services/ComponentManager/UseCase/RunWithPermissionsUseCase.ts @@ -59,7 +59,7 @@ export class RunWithPermissionsUseCase { return } - if (uiFeature.isFeatureDescription) { + if (uiFeature.isNativeFeature) { runFunction() return }