From fe3c2e311d9aa0fbbb30405e1c47b4eddebb0345 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 29 Jun 2022 15:55:26 +0200 Subject: [PATCH] add model for preconfigured database --- src/Umbraco.Web.UI.Client/.env | 3 ++- src/Umbraco.Web.UI.Client/schemas/api/api.yml | 4 ++-- src/Umbraco.Web.UI.Client/schemas/generated-schema.ts | 2 +- src/Umbraco.Web.UI.Client/src/vite-env.d.ts | 4 ++++ src/Umbraco.Web.UI.Client/temp-schema-generator/installer.ts | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/.env b/src/Umbraco.Web.UI.Client/.env index b6bc14393c..b9c009664c 100644 --- a/src/Umbraco.Web.UI.Client/.env +++ b/src/Umbraco.Web.UI.Client/.env @@ -1,2 +1,3 @@ # Copy this to .env.local and change what you want to test. -VITE_UMBRACO_INSTALL_STATUS=true \ No newline at end of file +VITE_UMBRACO_INSTALL_STATUS=true +VITE_UMBRACO_INSTALL_PRECONFIGURED=false diff --git a/src/Umbraco.Web.UI.Client/schemas/api/api.yml b/src/Umbraco.Web.UI.Client/schemas/api/api.yml index 0a54357fda..25c6675c37 100644 --- a/src/Umbraco.Web.UI.Client/schemas/api/api.yml +++ b/src/Umbraco.Web.UI.Client/schemas/api/api.yml @@ -202,7 +202,7 @@ components: providerName: type: string nullable: true - isAvailable: + isConfigured: type: boolean requiresServer: type: boolean @@ -221,7 +221,7 @@ components: - displayName - defaultDatabaseName - providerName - - isAvailable + - isConfigured - requiresServer - serverPlaceholder - requiresCredentials diff --git a/src/Umbraco.Web.UI.Client/schemas/generated-schema.ts b/src/Umbraco.Web.UI.Client/schemas/generated-schema.ts index 9ea8d58001..209524ab15 100644 --- a/src/Umbraco.Web.UI.Client/schemas/generated-schema.ts +++ b/src/Umbraco.Web.UI.Client/schemas/generated-schema.ts @@ -55,7 +55,7 @@ export interface components { displayName: string; defaultDatabaseName: string; providerName: string | null; - isAvailable: boolean; + isConfigured: boolean; requiresServer: boolean; serverPlaceholder: string | null; requiresCredentials: boolean; diff --git a/src/Umbraco.Web.UI.Client/src/vite-env.d.ts b/src/Umbraco.Web.UI.Client/src/vite-env.d.ts index 11f02fe2a0..8d05a22c69 100644 --- a/src/Umbraco.Web.UI.Client/src/vite-env.d.ts +++ b/src/Umbraco.Web.UI.Client/src/vite-env.d.ts @@ -1 +1,5 @@ /// +interface ImportMetaEnv { + VITE_UMBRACO_INSTALL_STATUS: string; + VITE_UMBRACO_INSTALL_PRECONFIGURED: string; +} diff --git a/src/Umbraco.Web.UI.Client/temp-schema-generator/installer.ts b/src/Umbraco.Web.UI.Client/temp-schema-generator/installer.ts index 9dead39dc3..6caef1ebaf 100644 --- a/src/Umbraco.Web.UI.Client/temp-schema-generator/installer.ts +++ b/src/Umbraco.Web.UI.Client/temp-schema-generator/installer.ts @@ -89,7 +89,7 @@ export interface InstallDatabaseModel { displayName: string; defaultDatabaseName: string; providerName: null | string; - isAvailable: boolean; + isConfigured: boolean; requiresServer: boolean; serverPlaceholder: null | string; requiresCredentials: boolean;