feat(Layout): support security icon in additional drawer link

This commit is contained in:
Ali BARIN
2024-07-08 13:13:38 +00:00
parent 673ed25598
commit 45b7a399f2
4 changed files with 29 additions and 2 deletions

View File

@@ -97,6 +97,7 @@ const appConfig = {
disableNotificationsPage: process.env.DISABLE_NOTIFICATIONS_PAGE === 'true', disableNotificationsPage: process.env.DISABLE_NOTIFICATIONS_PAGE === 'true',
disableFavicon: process.env.DISABLE_FAVICON === 'true', disableFavicon: process.env.DISABLE_FAVICON === 'true',
additionalDrawerLink: process.env.ADDITIONAL_DRAWER_LINK, additionalDrawerLink: process.env.ADDITIONAL_DRAWER_LINK,
additionalDrawerLinkIcon: process.env.ADDITIONAL_DRAWER_LINK_ICON,
additionalDrawerLinkText: process.env.ADDITIONAL_DRAWER_LINK_TEXT, additionalDrawerLinkText: process.env.ADDITIONAL_DRAWER_LINK_TEXT,
disableSeedUser: process.env.DISABLE_SEED_USER === 'true', disableSeedUser: process.env.DISABLE_SEED_USER === 'true',
}; };

View File

@@ -7,6 +7,7 @@ export default async (request, response) => {
disableNotificationsPage: appConfig.disableNotificationsPage, disableNotificationsPage: appConfig.disableNotificationsPage,
disableFavicon: appConfig.disableFavicon, disableFavicon: appConfig.disableFavicon,
additionalDrawerLink: appConfig.additionalDrawerLink, additionalDrawerLink: appConfig.additionalDrawerLink,
additionalDrawerLinkIcon: appConfig.additionalDrawerLinkIcon,
additionalDrawerLinkText: appConfig.additionalDrawerLinkText, additionalDrawerLinkText: appConfig.additionalDrawerLinkText,
}; };

View File

@@ -4,6 +4,7 @@ import { createConfig } from '../../../../../test/factories/config.js';
import app from '../../../../app.js'; import app from '../../../../app.js';
import configMock from '../../../../../test/mocks/rest/api/v1/automatisch/config.js'; import configMock from '../../../../../test/mocks/rest/api/v1/automatisch/config.js';
import * as license from '../../../../helpers/license.ee.js'; import * as license from '../../../../helpers/license.ee.js';
import appConfig from '../../../../config/app.js';
describe('GET /api/v1/automatisch/config', () => { describe('GET /api/v1/automatisch/config', () => {
it('should return Automatisch config', async () => { it('should return Automatisch config', async () => {
@@ -48,4 +49,18 @@ describe('GET /api/v1/automatisch/config', () => {
expect(response.body).toEqual(expectedPayload); expect(response.body).toEqual(expectedPayload);
}); });
it('should return additional environment variables', async () => {
vi.spyOn(appConfig, 'disableNotificationsPage', 'get').mockReturnValue(true);
vi.spyOn(appConfig, 'disableFavicon', 'get').mockReturnValue(true);
vi.spyOn(appConfig, 'additionalDrawerLink', 'get').mockReturnValue('link');
vi.spyOn(appConfig, 'additionalDrawerLinkIcon', 'get').mockReturnValue('icon');
vi.spyOn(appConfig, 'additionalDrawerLinkText', 'get').mockReturnValue('text');
expect(appConfig.disableNotificationsPage).toEqual(true);
expect(appConfig.disableFavicon).toEqual(true);
expect(appConfig.additionalDrawerLink).toEqual('link');
expect(appConfig.additionalDrawerLinkIcon).toEqual('icon');
expect(appConfig.additionalDrawerLinkText).toEqual('text');
});
}); });

View File

@@ -8,8 +8,9 @@ import AppsIcon from '@mui/icons-material/Apps';
import SwapCallsIcon from '@mui/icons-material/SwapCalls'; import SwapCallsIcon from '@mui/icons-material/SwapCalls';
import HistoryIcon from '@mui/icons-material/History'; import HistoryIcon from '@mui/icons-material/History';
import NotificationsIcon from '@mui/icons-material/Notifications'; import NotificationsIcon from '@mui/icons-material/Notifications';
import ArrowBackIosNew from '@mui/icons-material/ArrowBackIosNew';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import ArrowBackIosNewIcon from '@mui/icons-material/ArrowBackIosNew';
import SecurityIcon from '@mui/icons-material/Security';
import * as URLS from 'config/urls'; import * as URLS from 'config/urls';
import useFormatMessage from 'hooks/useFormatMessage'; import useFormatMessage from 'hooks/useFormatMessage';
@@ -18,6 +19,11 @@ import AppBar from 'components/AppBar';
import Drawer from 'components/Drawer'; import Drawer from 'components/Drawer';
import useAutomatischConfig from 'hooks/useAutomatischConfig'; import useAutomatischConfig from 'hooks/useAutomatischConfig';
const additionalDrawerLinkIcons = {
Security: SecurityIcon,
ArrowBackIosNew: ArrowBackIosNewIcon,
};
const drawerLinks = [ const drawerLinks = [
{ {
Icon: SwapCallsIcon, Icon: SwapCallsIcon,
@@ -43,6 +49,7 @@ const generateDrawerBottomLinks = async ({
disableNotificationsPage, disableNotificationsPage,
notificationBadgeContent = 0, notificationBadgeContent = 0,
additionalDrawerLink, additionalDrawerLink,
additionalDrawerLinkIcon,
additionalDrawerLinkText, additionalDrawerLinkText,
formatMessage, formatMessage,
}) => { }) => {
@@ -57,7 +64,9 @@ const generateDrawerBottomLinks = async ({
additionalDrawerLink && additionalDrawerLinkText; additionalDrawerLink && additionalDrawerLinkText;
const additionalDrawerLinkObject = { const additionalDrawerLinkObject = {
Icon: ArrowBackIosNew, Icon:
additionalDrawerLinkIcons[additionalDrawerLinkIcon] ||
ArrowBackIosNewIcon,
primary: additionalDrawerLinkText || '', primary: additionalDrawerLinkText || '',
to: additionalDrawerLink || '', to: additionalDrawerLink || '',
target: '_blank', target: '_blank',
@@ -95,6 +104,7 @@ function PublicLayout({ children }) {
notificationBadgeContent: version.newVersionCount, notificationBadgeContent: version.newVersionCount,
disableNotificationsPage: config?.disableNotificationsPage, disableNotificationsPage: config?.disableNotificationsPage,
additionalDrawerLink: config?.additionalDrawerLink, additionalDrawerLink: config?.additionalDrawerLink,
additionalDrawerLinkIcon: config?.additionalDrawerLinkIcon,
additionalDrawerLinkText: config?.additionalDrawerLinkText, additionalDrawerLinkText: config?.additionalDrawerLinkText,
formatMessage, formatMessage,
}); });