ydb-embedded-ui 4.8.0 → 4.8.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.8.1](https://github.com/ydb-platform/ydb-embedded-ui/compare/v4.8.0...v4.8.1) (2023-06-26)
+
+
+### Bug Fixes
+
+* **Tenants:** fix tenant link ([#439](https://github.com/ydb-platform/ydb-embedded-ui/issues/439)) ([432c621](https://github.com/ydb-platform/ydb-embedded-ui/commit/432c621eb2fb2ffd5a747299af930236d5cc06f7))
+
 ## [4.8.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v4.7.0...v4.8.0) (2023-06-26)
 
 

package/dist/containers/AsideNavigation/AsideNavigation.tsx

@@ -120,19 +120,13 @@ enum Panel {
     UserSettings = 'UserSettings',
 }
 
-function AsideNavigation(props: AsideNavigationProps) {
+export const useGetLeftNavigationItems = () => {
     const location = useLocation();
     const history = useHistory();
 
-    const [visiblePanel, setVisiblePanel] = useState<Panel>();
-
     const [initialTenantPage, setInitialTenantPage] = useSetting<string>(TENANT_INITIAL_PAGE_KEY);
     const {tenantPage = initialTenantPage} = useTypedSelector((state) => state.tenant);
 
-    const setIsCompact = (compact: boolean) => {
-        props.setSettingValue(ASIDE_HEADER_COMPACT_KEY, JSON.stringify(compact));
-    };
-
     const {pathname} = location;
     const queryParams = parseQuery(location);
 
@@ -183,6 +177,20 @@ function AsideNavigation(props: AsideNavigationProps) {
         });
     }, [tenantPage, isTenantPage, setInitialTenantPage, history, queryParams]);
 
+    return menuItems;
+};
+
+function AsideNavigation(props: AsideNavigationProps) {
+    const history = useHistory();
+
+    const [visiblePanel, setVisiblePanel] = useState<Panel>();
+
+    const setIsCompact = (compact: boolean) => {
+        props.setSettingValue(ASIDE_HEADER_COMPACT_KEY, JSON.stringify(compact));
+    };
+
+    const menuItems = useGetLeftNavigationItems();
+
     return (
         <React.Fragment>
             <AsideHeader

package/dist/containers/Tenants/Tenants.js

@@ -18,14 +18,9 @@ import {AutoFetcher} from '../../utils/autofetcher';
 import routes, {createHref} from '../../routes';
 import {formatCPU, formatBytesToGigabyte, formatNumber} from '../../utils';
 import {withSearch} from '../../HOCS';
-import {DEFAULT_TABLE_SETTINGS, TENANT_INITIAL_PAGE_KEY} from '../../utils/constants';
-import {TENANT_PAGES_IDS} from '../../store/reducers/tenant/constants';
+import {DEFAULT_TABLE_SETTINGS} from '../../utils/constants';
 import {getTenantsInfo} from '../../store/reducers/tenants/tenants';
-import {
-    changeFilter,
-    getSettingValue,
-    ProblemFilterValues,
-} from '../../store/reducers/settings/settings';
+import {changeFilter, ProblemFilterValues} from '../../store/reducers/settings/settings';
 
 import {clusterName} from '../../store';
 import {TenantTabsGroups, TENANT_INFO_TABS} from '../Tenant/TenantPages';
@@ -115,7 +110,6 @@ class Tenants extends React.Component {
             filter,
             handleSearchQuery,
             additionalTenantsInfo = {},
-            savedTenantInitialTab,
         } = this.props;
 
         const filteredTenantsBySearch = tenants.filter((item) => {
@@ -124,7 +118,6 @@ class Tenants extends React.Component {
         });
         const filteredTenants = Tenants.filterTenants(filteredTenantsBySearch, filter);
 
-        const initialTenantGeneralTab = savedTenantInitialTab || TENANT_PAGES_IDS.query;
         const initialTenantInfoTab = TENANT_INFO_TABS[0].id;
 
         const getTenantBackend = (tenant) => {
@@ -154,7 +147,6 @@ class Tenants extends React.Component {
                                     name: value,
                                     backend,
                                     [TenantTabsGroups.info]: initialTenantInfoTab,
-                                    [TenantTabsGroups.general]: initialTenantGeneralTab,
                                 })}
                             />
                             {additionalTenantsInfo.name && additionalTenantsInfo.name(value, row)}
@@ -360,7 +352,6 @@ const mapStateToProps = (state) => {
         loading,
         error,
         filter: state.settings.problemFilter,
-        savedTenantInitialTab: getSettingValue(state, TENANT_INITIAL_PAGE_KEY),
     };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "4.8.0",
+  "version": "4.8.1",
   "files": [
     "dist"
   ],