From 15b7e8d1192370ea9e25fd1edb61197d0c5c442c Mon Sep 17 00:00:00 2001 From: Alex Grozav Date: Fri, 17 May 2024 10:58:35 +0300 Subject: [PATCH 1/5] fix: fix type errors in external secrets files --- packages/editor-ui/src/Interface.ts | 11 ++--- .../editor-ui/src/api/externalSecrets.ee.ts | 8 +--- .../ExternalSecretsProviderCard.ee.vue | 30 +++++++------ .../ExternalSecretsProviderModal.ee.vue | 43 +++++++++++-------- .../composables/useExternalSecretsProvider.ts | 43 +++++++++++-------- packages/editor-ui/src/shims.d.ts | 10 +++++ packages/editor-ui/src/utils/typeGuards.ts | 6 +++ 7 files changed, 91 insertions(+), 60 deletions(-) diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts index 0eddbadbce50c..a634cf7ba852a 100644 --- a/packages/editor-ui/src/Interface.ts +++ b/packages/editor-ui/src/Interface.ts @@ -1800,18 +1800,19 @@ export interface ExternalSecretsProviderSecret { export type ExternalSecretsProviderData = Record; +export type ExternalSecretsProviderProperty = INodeProperties; + +export type ExternalSecretsProviderState = 'connected' | 'tested' | 'initializing' | 'error'; + export interface ExternalSecretsProvider { icon: string; name: string; displayName: string; connected: boolean; connectedAt: string | false; - state: 'connected' | 'tested' | 'initializing' | 'error'; + state: ExternalSecretsProviderState; data?: ExternalSecretsProviderData; -} - -export interface ExternalSecretsProviderWithProperties extends ExternalSecretsProvider { - properties: INodeProperties[]; + properties?: ExternalSecretsProviderProperty[]; } export type CloudUpdateLinkSourceType = diff --git a/packages/editor-ui/src/api/externalSecrets.ee.ts b/packages/editor-ui/src/api/externalSecrets.ee.ts index 69c48f457cc3e..fb8cac9d77529 100644 --- a/packages/editor-ui/src/api/externalSecrets.ee.ts +++ b/packages/editor-ui/src/api/externalSecrets.ee.ts @@ -1,8 +1,4 @@ -import type { - IRestApiContext, - ExternalSecretsProvider, - ExternalSecretsProviderWithProperties, -} from '@/Interface'; +import type { IRestApiContext, ExternalSecretsProvider } from '@/Interface'; import { makeRestApiRequest } from '@/utils/apiUtils'; export const getExternalSecrets = async ( @@ -20,7 +16,7 @@ export const getExternalSecretsProviders = async ( export const getExternalSecretsProvider = async ( context: IRestApiContext, id: string, -): Promise => { +): Promise => { return await makeRestApiRequest(context, 'GET', `/external-secrets/providers/${id}`); }; diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue index eb20c7d90e2f8..729c5d9e9f5e4 100644 --- a/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue +++ b/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue @@ -1,5 +1,5 @@