From 468e711c59043cee6d4526944c119e1fcbe1a0a4 Mon Sep 17 00:00:00 2001 From: Denis Fuenzalida Date: Fri, 8 Nov 2024 13:27:10 -0800 Subject: [PATCH 1/3] Hide Tomcat 8.5.100, 9.0.93, 9.0.90, 9.0.88, 10.1.23, 10.1.25 and 10.1.28 for Windows sites (#7897) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Hide Tomcat 9.0.93, 9.0.90 and 9.0.88 for Windows sites * Hide Tomcat 8.5.100, 10.1.23, 10.1.25, 10.1.28 --------- Co-authored-by: Denis Fuenzalida 🐙 --- .../2020-10-01/stacks/web-app-stacks/JavaContainers.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/src/stacks/2020-10-01/stacks/web-app-stacks/JavaContainers.ts b/server/src/stacks/2020-10-01/stacks/web-app-stacks/JavaContainers.ts index f815e17812..4ae847dd9a 100644 --- a/server/src/stacks/2020-10-01/stacks/web-app-stacks/JavaContainers.ts +++ b/server/src/stacks/2020-10-01/stacks/web-app-stacks/JavaContainers.ts @@ -753,6 +753,7 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI windowsContainerSettings: { javaContainer: 'TOMCAT', javaContainerVersion: '10.1.28', + isHidden: true, }, linuxContainerSettings: { java11Runtime: 'TOMCAT|10.1.28-java11', @@ -768,6 +769,7 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI windowsContainerSettings: { javaContainer: 'TOMCAT', javaContainerVersion: '10.1.25', + isHidden: true, }, linuxContainerSettings: { java11Runtime: 'TOMCAT|10.1.25-java11', @@ -783,6 +785,7 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI windowsContainerSettings: { javaContainer: 'TOMCAT', javaContainerVersion: '10.1.23', + isHidden: true, }, linuxContainerSettings: { java11Runtime: 'TOMCAT|10.1.23-java11', @@ -946,6 +949,7 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI windowsContainerSettings: { javaContainer: 'TOMCAT', javaContainerVersion: '9.0.93', + isHidden: true, }, linuxContainerSettings: { java8Runtime: 'TOMCAT|9.0.93-java8', @@ -962,6 +966,7 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI windowsContainerSettings: { javaContainer: 'TOMCAT', javaContainerVersion: '9.0.90', + isHidden: true, }, linuxContainerSettings: { java8Runtime: 'TOMCAT|9.0.90-java8', @@ -978,6 +983,7 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI windowsContainerSettings: { javaContainer: 'TOMCAT', javaContainerVersion: '9.0.88', + isHidden: true, }, linuxContainerSettings: { java8Runtime: 'TOMCAT|9.0.88-java8', @@ -1252,6 +1258,7 @@ const getJavaContainersStack: (useIsoDateFormat: boolean) => WebAppStack = (useI javaContainer: 'TOMCAT', javaContainerVersion: '8.5.100', endOfLifeDate: tomcat8dot5EOL, + isHidden: true, }, }, }, From fa8cc9db27f519af8304027551083305701685c4 Mon Sep 17 00:00:00 2001 From: liuqidake <33185278+liuqidake@users.noreply.github.com> Date: Tue, 12 Nov 2024 08:58:14 -0800 Subject: [PATCH 2/3] filter stack options (#7895) Co-authored-by: Qi Liu --- .../app-settings/GeneralSettings/LinuxStacks/LinuxStacks.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client-react/src/pages/app/app-settings/GeneralSettings/LinuxStacks/LinuxStacks.tsx b/client-react/src/pages/app/app-settings/GeneralSettings/LinuxStacks/LinuxStacks.tsx index 9a3595cba0..11dfb03d78 100644 --- a/client-react/src/pages/app/app-settings/GeneralSettings/LinuxStacks/LinuxStacks.tsx +++ b/client-react/src/pages/app/app-settings/GeneralSettings/LinuxStacks/LinuxStacks.tsx @@ -41,7 +41,6 @@ const LinuxStacks: React.FC = props => { const { webAppStacks, stackVersionDetails } = useStacks(initialValues.config.properties.linuxFxVersion); const siteStateContext = useContext(SiteStateContext); - const runtimeOptions = getRuntimeStacks(webAppStacks); const { t } = useTranslation(); const scenarioService = new ScenarioService(t); @@ -54,6 +53,7 @@ const LinuxStacks: React.FC = props => { () => filterDeprecatedWebAppStack(webAppStacks, stackVersionDetails.runtimeStackName, stackVersionDetails.minorVersionRuntime), [webAppStacks, stackVersionDetails.runtimeStackName, stackVersionDetails.minorVersionRuntime] ); + const runtimeOptions = useMemo(() => getRuntimeStacks(filterredWebAppStacks), [filterredWebAppStacks]); const isRuntimeStackDirty = (): boolean => getRuntimeStack(values.config.properties.linuxFxVersion) !== getRuntimeStack(initialValues.config.properties.linuxFxVersion); @@ -152,6 +152,8 @@ const LinuxStacks: React.FC = props => { // eslint-disable-next-line react-hooks/exhaustive-deps }, [values.config.properties.linuxFxVersion]); + console.log(runtimeStack); + return ( <> {(scenarioService.checkScenario(ScenarioIds.linuxAppRuntime, { site }).status !== 'disabled' || siteStateContext.isWordPressApp) && ( From 33572b17817cd48f1903574b9327938251e5db99 Mon Sep 17 00:00:00 2001 From: "CSIGS@microsoft.com" Date: Tue, 12 Nov 2024 09:45:17 -0800 Subject: [PATCH 3/3] Juno: check in to users/csigs/hb_452267ed-f3ea-4b18-a9d2-7c2ed17cef14_20241112140922085. (#7899) Co-authored-by: shimedh --- .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ .../LocProject/lcl/Server/Resources/Resources.resx.lcl | 9 +++++++++ 17 files changed, 153 insertions(+) diff --git a/server/Resources/cs-CZ/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/cs-CZ/LocProject/lcl/Server/Resources/Resources.resx.lcl index e0aad2e564..65a192295f 100644 --- a/server/Resources/cs-CZ/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/cs-CZ/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15699,6 +15699,15 @@ + + + + + + + + + diff --git a/server/Resources/de-DE/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/de-DE/LocProject/lcl/Server/Resources/Resources.resx.lcl index 018cbd4f05..32d9ec0665 100644 --- a/server/Resources/de-DE/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/de-DE/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15675,6 +15675,15 @@ + + + + + + + + + diff --git a/server/Resources/es-ES/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/es-ES/LocProject/lcl/Server/Resources/Resources.resx.lcl index 06ec4eee1e..478c3676e0 100644 --- a/server/Resources/es-ES/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/es-ES/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15672,6 +15672,15 @@ + + + + + + + + + diff --git a/server/Resources/fr-FR/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/fr-FR/LocProject/lcl/Server/Resources/Resources.resx.lcl index 60a6f53d6d..7003bf1fdc 100644 --- a/server/Resources/fr-FR/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/fr-FR/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15660,6 +15660,15 @@ + + + + + + + + + diff --git a/server/Resources/hu-HU/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/hu-HU/LocProject/lcl/Server/Resources/Resources.resx.lcl index 6117b64c46..21e8a3eda6 100644 --- a/server/Resources/hu-HU/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/hu-HU/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15666,6 +15666,15 @@ + + + + + + + + + diff --git a/server/Resources/id-ID/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/id-ID/LocProject/lcl/Server/Resources/Resources.resx.lcl index 829593a5f6..1c955f45b1 100644 --- a/server/Resources/id-ID/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/id-ID/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15012,6 +15012,15 @@ + + + + + + + + + diff --git a/server/Resources/it-IT/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/it-IT/LocProject/lcl/Server/Resources/Resources.resx.lcl index f4a3d0b3b1..1d84bdbd14 100644 --- a/server/Resources/it-IT/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/it-IT/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15675,6 +15675,15 @@ + + + + + + + + + diff --git a/server/Resources/ko-KR/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/ko-KR/LocProject/lcl/Server/Resources/Resources.resx.lcl index 056df916e3..5c5820a463 100644 --- a/server/Resources/ko-KR/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/ko-KR/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15663,6 +15663,15 @@ + + + + + + + + + diff --git a/server/Resources/nl-NL/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/nl-NL/LocProject/lcl/Server/Resources/Resources.resx.lcl index 8e0b7b9aef..8716457b1e 100644 --- a/server/Resources/nl-NL/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/nl-NL/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15684,6 +15684,15 @@ + + + + + + + + + diff --git a/server/Resources/pl-PL/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/pl-PL/LocProject/lcl/Server/Resources/Resources.resx.lcl index 6b8c9739f2..44d9d66a2e 100644 --- a/server/Resources/pl-PL/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/pl-PL/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15675,6 +15675,15 @@ + + + + + + + + + diff --git a/server/Resources/pt-BR/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/pt-BR/LocProject/lcl/Server/Resources/Resources.resx.lcl index 9cb87922d4..48aa7e2659 100644 --- a/server/Resources/pt-BR/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/pt-BR/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15672,6 +15672,15 @@ + + + + + + + + + diff --git a/server/Resources/pt-PT/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/pt-PT/LocProject/lcl/Server/Resources/Resources.resx.lcl index 0be8c6676b..64ef8f39be 100644 --- a/server/Resources/pt-PT/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/pt-PT/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15657,6 +15657,15 @@ + + + + + + + + + diff --git a/server/Resources/ru-RU/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/ru-RU/LocProject/lcl/Server/Resources/Resources.resx.lcl index c768396719..aff2fdc4f8 100644 --- a/server/Resources/ru-RU/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/ru-RU/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15666,6 +15666,15 @@ + + + + + + + + + diff --git a/server/Resources/sv-SE/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/sv-SE/LocProject/lcl/Server/Resources/Resources.resx.lcl index aaeaad5ff5..925397a471 100644 --- a/server/Resources/sv-SE/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/sv-SE/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15678,6 +15678,15 @@ + + + + + + + + + diff --git a/server/Resources/tr-TR/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/tr-TR/LocProject/lcl/Server/Resources/Resources.resx.lcl index 877c5c6a2f..bd8cd26144 100644 --- a/server/Resources/tr-TR/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/tr-TR/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15684,6 +15684,15 @@ + + + + + + + + + diff --git a/server/Resources/zh-CN/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/zh-CN/LocProject/lcl/Server/Resources/Resources.resx.lcl index a4abbad889..c1122f4578 100644 --- a/server/Resources/zh-CN/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/zh-CN/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15666,6 +15666,15 @@ + + + + + + + + + diff --git a/server/Resources/zh-TW/LocProject/lcl/Server/Resources/Resources.resx.lcl b/server/Resources/zh-TW/LocProject/lcl/Server/Resources/Resources.resx.lcl index 9a88346f8a..ab002e2a82 100644 --- a/server/Resources/zh-TW/LocProject/lcl/Server/Resources/Resources.resx.lcl +++ b/server/Resources/zh-TW/LocProject/lcl/Server/Resources/Resources.resx.lcl @@ -15672,6 +15672,15 @@ + + + + + + + + +