@astral/features 4.0.0-alpha.21 → 4.0.0-alpha.22

package/node/productSwitcher/components/AstralProductSwitcher/AstralProductSwitcher.d.ts

@@ -10,9 +10,14 @@ export type AstralProductSwitcherType = {
     filterBy?: ProductFilterType;
     /** Код для фильтрации */
     code?: string;
+    /**
+     * Идентификатор экосистемы
+     * @deprecated
+     * */
+    tenantId?: string;
     /**
      * Альтернативная функция для фильтрации продуктов
      */
     filter?: ProductSwitcherProps['filter'];
 };
-export declare const AstralProductSwitcher: ({ identityUrl, filterBy, code, filter, }: AstralProductSwitcherType) => JSX.Element;
+export declare const AstralProductSwitcher: ({ identityUrl, filterBy, code, filter, tenantId, }: AstralProductSwitcherType) => JSX.Element;

package/node/productSwitcher/components/AstralProductSwitcher/AstralProductSwitcher.js

@@ -13,15 +13,22 @@ exports.AstralProductSwitcher = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const ui_1 = require("@astral/ui");
 const react_1 = require("react");
+const utils_1 = require("../../utils");
 const enums_1 = require("./enums");
-const utils_1 = require("./utils");
-const AstralProductSwitcher = ({ identityUrl, filterBy = enums_1.ProductFilterType.Tenant, code = 'astral', filter, }) => {
+const utils_2 = require("./utils");
+const AstralProductSwitcher = ({ identityUrl, filterBy = enums_1.ProductFilterType.Tenant, code = 'astral', filter, tenantId, }) => {
     const [products, setProducts] = (0, react_1.useState)([]);
     const handleGetProducts = () => __awaiter(void 0, void 0, void 0, function* () {
         if (products.length) {
             return products;
         }
-        const filteredProductsList = yield (0, utils_1.getFilteredProducts)(identityUrl, filterBy, code);
+        // Это заглушка для обратной совместимости, убрать после релиза мажорной версии
+        if (tenantId) {
+            const productsList = yield (0, utils_1.getIdentityProducts)(identityUrl, tenantId);
+            setProducts(productsList);
+            return productsList;
+        }
+        const filteredProductsList = yield (0, utils_2.getFilteredProducts)(identityUrl, filterBy, code);
         setProducts(filteredProductsList);
         return filteredProductsList;
     });

package/node/productSwitcher/components/IdentityProductSwitcher/styles.js

@@ -17,17 +17,14 @@ exports.StyledMenu = (0, ui_1.styled)(ui_1.Menu) `
 // as typeof MenuItem необходим для возможности прокинуть component
 // https://github.com/mui/material-ui/issues/15695
 exports.StyledMenuItem = (0, ui_1.styled)(ui_1.MenuItem) `
-  &.MuiMenuItem-gutters {
-    min-height: 56px;
-    padding-left: ${({ theme }) => theme.spacing(4)};
-  }
+  padding-left: ${({ theme }) => theme.spacing(6)};
 `;
 exports.Logo = (0, ui_1.styled)('img', {
     shouldForwardProp: (prop) => prop !== 'color',
 }) `
-  width: 32px;
-  height: 32px;
-  margin-right: ${({ theme }) => theme.spacing(2)};
+  width: 40px;
+  height: 40px;
+  margin-right: ${({ theme }) => theme.spacing(4)};
 
   background-color: ${({ color }) => color};
   border-radius: ${({ theme }) => theme.shape.small};

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@astral/features",
   "main": "./node/index.js",
-  "version": "4.0.0-alpha.21",
+  "version": "4.0.0-alpha.22",
   "dependencies": {
-    "@astral/ui": "4.0.0-alpha.21",
+    "@astral/ui": "4.0.0-alpha.22",
     "mobx": "^6.8.0",
     "mobx-react-lite": "^3.4.0",
     "@astral/cryptopro-cades": "^1.5.1"

package/productSwitcher/components/AstralProductSwitcher/AstralProductSwitcher.d.ts

@@ -10,9 +10,14 @@ export type AstralProductSwitcherType = {
     filterBy?: ProductFilterType;
     /** Код для фильтрации */
     code?: string;
+    /**
+     * Идентификатор экосистемы
+     * @deprecated
+     * */
+    tenantId?: string;
     /**
      * Альтернативная функция для фильтрации продуктов
      */
     filter?: ProductSwitcherProps['filter'];
 };
-export declare const AstralProductSwitcher: ({ identityUrl, filterBy, code, filter, }: AstralProductSwitcherType) => JSX.Element;
+export declare const AstralProductSwitcher: ({ identityUrl, filterBy, code, filter, tenantId, }: AstralProductSwitcherType) => JSX.Element;

package/productSwitcher/components/AstralProductSwitcher/AstralProductSwitcher.js

@@ -10,14 +10,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { jsx as _jsx } from "react/jsx-runtime";
 import { ProductSwitcher, } from '@astral/ui';
 import { useState } from 'react';
+import { getIdentityProducts } from '../../utils';
 import { ProductFilterType } from './enums';
 import { getFilteredProducts } from './utils';
-export const AstralProductSwitcher = ({ identityUrl, filterBy = ProductFilterType.Tenant, code = 'astral', filter, }) => {
+export const AstralProductSwitcher = ({ identityUrl, filterBy = ProductFilterType.Tenant, code = 'astral', filter, tenantId, }) => {
     const [products, setProducts] = useState([]);
     const handleGetProducts = () => __awaiter(void 0, void 0, void 0, function* () {
         if (products.length) {
             return products;
         }
+        // Это заглушка для обратной совместимости, убрать после релиза мажорной версии
+        if (tenantId) {
+            const productsList = yield getIdentityProducts(identityUrl, tenantId);
+            setProducts(productsList);
+            return productsList;
+        }
         const filteredProductsList = yield getFilteredProducts(identityUrl, filterBy, code);
         setProducts(filteredProductsList);
         return filteredProductsList;

package/productSwitcher/components/IdentityProductSwitcher/styles.js

@@ -14,17 +14,14 @@ export const StyledMenu = styled(Menu) `
 // as typeof MenuItem необходим для возможности прокинуть component
 // https://github.com/mui/material-ui/issues/15695
 export const StyledMenuItem = styled(MenuItem) `
-  &.MuiMenuItem-gutters {
-    min-height: 56px;
-    padding-left: ${({ theme }) => theme.spacing(4)};
-  }
+  padding-left: ${({ theme }) => theme.spacing(6)};
 `;
 export const Logo = styled('img', {
     shouldForwardProp: (prop) => prop !== 'color',
 }) `
-  width: 32px;
-  height: 32px;
-  margin-right: ${({ theme }) => theme.spacing(2)};
+  width: 40px;
+  height: 40px;
+  margin-right: ${({ theme }) => theme.spacing(4)};
 
   background-color: ${({ color }) => color};
   border-radius: ${({ theme }) => theme.shape.small};