Merge pull request #1010 from openedx/ea/ent-7433

chore: portal appearance tab appears by default
openedx · Jul 27, 2023 · 88357d6 · 88357d6
2 parents 70536da + 30545f9
commit 88357d6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/src/components/settings/SettingsTabs.jsx b/src/components/settings/SettingsTabs.jsx
@@ -48,6 +48,21 @@ const SettingsTabs = ({
 
   const tabArray = useMemo(() => {
     const initialTabs = [];
+    if (SETTINGS_PAGE_APPEARANCE_TAB) {
+      initialTabs.push(
+        <Tab
+          key={SETTINGS_TABS_VALUES.appearance}
+          eventKey={SETTINGS_TABS_VALUES.appearance}
+          title={SETTINGS_TAB_LABELS.appearance}
+        >
+          <SettingsAppearanceTab
+            enterpriseId={enterpriseId}
+            enterpriseBranding={enterpriseBranding}
+            updatePortalConfiguration={updatePortalConfiguration}
+          />
+        </Tab>,
+      );
+    }
     if (enableLearnerPortal) {
       initialTabs.push(
         <Tab
@@ -98,21 +113,6 @@ const SettingsTabs = ({
         </Tab>,
       );
     }
-    if (SETTINGS_PAGE_APPEARANCE_TAB) {
-      initialTabs.push(
-        <Tab
-          key={SETTINGS_TABS_VALUES.appearance}
-          eventKey={SETTINGS_TABS_VALUES.appearance}
-          title={SETTINGS_TAB_LABELS.appearance}
-        >
-          <SettingsAppearanceTab
-            enterpriseId={enterpriseId}
-            enterpriseBranding={enterpriseBranding}
-            updatePortalConfiguration={updatePortalConfiguration}
-          />
-        </Tab>,
-      );
-    }
     return initialTabs;
   }, [
     FEATURE_SSO_SETTINGS_TAB,

diff --git a/src/components/settings/data/constants.js b/src/components/settings/data/constants.js
@@ -71,7 +71,7 @@ export const SETTINGS_TAB_LABELS = {
 };
 
 /** Default tab when no parameter is given */
-export const DEFAULT_TAB = ACCESS_TAB;
+export const DEFAULT_TAB = APPEARANCE_TAB;
 
 /**
  * Url parameter that the set in the router

diff --git a/src/components/settings/tests/SettingsPage.test.jsx b/src/components/settings/tests/SettingsPage.test.jsx
@@ -36,10 +36,10 @@ describe('<SettingsPage />', () => {
     jest.clearAllMocks();
   });
 
-  it('Redirects to access tab when no param given', () => {
+  it('Redirects to appearance tab when no param given', () => {
     render(settingsPageWithRouter('/settings'));
     expect(screen.queryByText('404')).toBeFalsy();
-    expect(screen.queryByText('access')).toBeTruthy();
+    expect(screen.queryByText('appearance')).toBeTruthy();
   });
 
   it('Does not redirect when access is passed', () => {