Merge pull request #5763 from brionmario/post-is7-fixes-22569

Fix tab getting removed in shared apps
wso2 · Mar 15, 2024 · 8eae2e1 · 8eae2e1
2 parents a9fef34 + 9879e1b
commit 8eae2e1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.changeset/seven-owls-wave.md b/.changeset/seven-owls-wave.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/console": patch
+---
+
+Fix tab getting removed in Shared apps
diff --git a/apps/console/src/extensions/configs/application.tsx b/apps/console/src/extensions/configs/application.tsx
@@ -447,12 +447,13 @@ export const applicationConfig: ApplicationConfig = {
                 && (!application?.advancedConfigurations?.fragment || window["AppUtils"].getConfig().ui.features?.
                     applicationRoles?.enabled)
                 && (
-                    application?.templateId === ApplicationManagementConstants.CUSTOM_APPLICATION_OIDC
+                    application?.advancedConfigurations?.fragment ||
+                    (application?.templateId === ApplicationManagementConstants.CUSTOM_APPLICATION_OIDC
                     || application?.templateId === ApplicationManagementConstants.CUSTOM_APPLICATION_SAML
                     || application?.templateId === MobileAppTemplate?.id
                     || application?.templateId === OIDCWebAppTemplate?.id
                     || application?.templateId === SinglePageAppTemplate?.id
-                    || application?.templateId === SamlWebAppTemplate?.id
+                    || application?.templateId === SamlWebAppTemplate?.id)
                 )
                 && application.name !== ApplicationManagementConstants.MY_ACCOUNT_APP_NAME
             ) {

diff --git a/apps/console/src/features/applications/pages/application-edit.tsx b/apps/console/src/features/applications/pages/application-edit.tsx
@@ -324,8 +324,10 @@ const ApplicationEditPage: FunctionComponent<ApplicationEditPageInterface> = (
          * {@link ApplicationManagementConstants.CUSTOM_APPLICATION_OIDC} to it.
          * Additionally @see InboundFormFactory.
          */
-        if (!application?.templateId) {
+        if (!application?.advancedConfigurations?.fragment && !application?.templateId) {
             if (application?.inboundProtocols?.length > 0) {
+                // FIXME: `application` object is directly mutated here causing unpredictable side effects.
+                // Tracker: https://github.com/wso2/product-is/issues/20016
                 application.templateId = InboundProtocolDefaultFallbackTemplates.get(
                     application.inboundProtocols[ 0 /*We pick the first*/ ].type
                 ) ?? ApplicationManagementConstants.CUSTOM_APPLICATION_OIDC;