@learningpool/ui 1.15.3 → 1.15.5

package/components/stream/AppHub/AppHubBannerAdvert.js

@@ -14,6 +14,7 @@ import { useState } from 'react';
 import { AppHubRow } from './AppHubStyles';
 import Grid from '@mui/material/Unstable_Grid2';
 import { StyledAdvertPaper, StyledAdvertLink, StyledAdvertImage } from './AppHubAdvertStyles';
+import { defaultMessages } from '../../../lang/en-us';
 var addUtmParams = function (baseUrl, source, medium, campaign) {
     try {
         var url = new URL(baseUrl);
@@ -36,5 +37,5 @@ export var renderBannerAdvertRow = function (rowData, rowIndex) {
     var validItems = items.filter(function (item) { return item.hubImageUrl && item.basePromoUrl; });
     if (!hasValidImage || validItems.length === 0)
         return null;
-    return (_jsx(AppHubRow, { children: _jsx(Grid, __assign({ container: true, spacing: 2 }, { children: validItems.map(function (item, index) { return (_jsx(Grid, __assign({ xs: 12 }, { children: _jsx(StyledAdvertPaper, __assign({ elevation: 0 }, { children: _jsx(StyledAdvertLink, __assign({ href: addUtmParams(item.basePromoUrl, 'hub', 'hub_dashboard_banner_advert', item.name), target: "_blank" }, { children: _jsx(StyledAdvertImage, { src: item.hubImageUrl, alt: item.altText || 'Banner image advertisement', onError: handleImageError }) })) })) }), index)); }) })) }, "row_".concat(rowIndex)));
+    return (_jsx(AppHubRow, { children: _jsx(Grid, __assign({ container: true, spacing: 2 }, { children: validItems.map(function (item, index) { return (_jsx(Grid, __assign({ xs: 12 }, { children: _jsx(StyledAdvertPaper, __assign({ elevation: 0 }, { children: _jsx(StyledAdvertLink, __assign({ href: addUtmParams(item.basePromoUrl, 'hub', 'hub_dashboard_banner_advert', item.name), target: "_blank" }, { children: _jsx(StyledAdvertImage, { src: item.hubImageUrl, alt: item.altText || defaultMessages['banner-image-alt-text'], onError: handleImageError }) })) })) }), index)); }) })) }, "row_".concat(rowIndex)));
 };

package/components/stream/AppSwitcher/AppSwitcher.js

@@ -110,7 +110,7 @@ var AppSwitcher = function (props) {
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 4, , 5]);
-                    return [4 /*yield*/, fetch("".concat(baseUrl !== null && baseUrl !== void 0 ? baseUrl : Constants.BaseUrl, "/promotional-campaigns?onlyLatest=true"), {
+                    return [4 /*yield*/, fetch("".concat(baseUrl !== null && baseUrl !== void 0 ? baseUrl : Constants.BaseUrl, "/promotional-campaigns?onlyLatest=true&isActive=true"), {
                             method: 'get',
                             headers: new Headers({
                                 Authorization: "Bearer ".concat(token),
@@ -367,6 +367,7 @@ var AppSwitcher = function (props) {
                         // Update state and cache if we have campaigns
                         if (Array.isArray(promotionalCampaigns_1) && promotionalCampaigns_1.length > 0) {
                             setPromotionalCampaigns(promotionalCampaigns_1);
+                            setValidCampaignCount(promotionalCampaigns_1.length);
                             window.localStorage.setItem(Constants.LocalStorageKey.PromotionalCampaigns, JSON.stringify(promotionalCampaigns_1));
                         }
                         else {
@@ -421,7 +422,7 @@ var AppSwitcher = function (props) {
             display: isAppSwitcherOpen ? 'block' : 'none',
             left: isDrawerOpen ? Constants.DrawerWidth.Expanded : Constants.DrawerWidth.Collapsed - 3
         }, role: 'dialog', "aria-label": "App Switcher", onKeyDown: handleKeyDown, "data-id": dataIds.AppSwitcherContainer, hasPromotionalCampaign: validCampaignCount > 0, onMouseDown: function (event) { return event.stopPropagation(); } }, { children: [activeTab === Constants.Tabs.ListApplications
-                ? (_jsxs("div", { children: [!hidePromotionalCampaign && promotionalCampaigns && promotionalCampaigns.length > 0 && (_jsx("div", __assign({ className: "promotional-campaigns-container" }, { children: promotionalCampaigns.map(function (campaign) { return (_jsx(PromotionalCampaignItem, { imageUrl: campaign.appSwitcherImageUrl, altText: campaign.altText, linkUrl: addUtmParams(campaign.basePromoUrl, 'hub', 'app_switcher_advert', campaign.name), onImageError: handleCampaignImageError }, campaign.id)); }) }))), _jsxs(AppListHeader, __assign({ "data-id": dataIds.AppSwitcherHeader }, { children: [messages['your-apps'], !props.hideStreamHomeButton &&
+                ? (_jsxs("div", { children: [!hidePromotionalCampaign && promotionalCampaigns && promotionalCampaigns.length > 0 && (_jsx("div", __assign({ className: "promotional-campaigns-container" }, { children: promotionalCampaigns.map(function (campaign) { return (_jsx(PromotionalCampaignItem, { imageUrl: campaign.appSwitcherImageUrl, altText: campaign.altText || messages['app-switcher-alt-text'], linkUrl: addUtmParams(campaign.basePromoUrl, document.title || 'app_switcher', 'app_switcher_advert', campaign.name), onImageError: handleCampaignImageError }, campaign.id)); }) }))), _jsxs(AppListHeader, __assign({ "data-id": dataIds.AppSwitcherHeader }, { children: [messages['your-apps'], !props.hideStreamHomeButton &&
                                     _jsx(StyleHomeButton, __assign({ "aria-label": messages['go-to-hub'], endIcon: _jsx(ChevronRightIcon, {}), onClick: function (e) { var _a; return window.open((_a = props.StreamHomeUrl) !== null && _a !== void 0 ? _a : Constants.DefaultStreamHomeUrl); } }, { children: messages['go-to-hub'] }))] })), _jsx(MenuContent, __assign({ style: {
                                 display: activeTab === 1 ? 'flex' : 'none'
                             }, "data-id": dataIds.AppSwitcherList }, { children: applications.map(function (_a) {

package/components/stream/AppSwitcher/PromotionalCampaignItem.js

@@ -24,13 +24,18 @@ var PromotionalCampaignItem = function (_a) {
     };
     if (!imageLoaded)
         return null;
-    return (_jsx(PromotionalCampaignCardStyled, { children: _jsx(PromotionalCampaignCardActionArea, __assign({ onClick: function () { return window.open(linkUrl, '_blank'); } }, { children: _jsx(CardMedia, { component: "img", image: imageUrl, alt: altText, onError: handleImageError, sx: {
+    return (_jsx(PromotionalCampaignCardStyled, { children: _jsx(PromotionalCampaignCardActionArea, __assign({ onClick: function () { return window.open(linkUrl, '_blank'); } }, { children: _jsx(CardMedia, __assign({ component: "div", sx: {
                     width: '100%',
                     height: '100%',
-                    objectFit: 'cover',
-                    '&.MuiCardMedia-img': {
-                        objectPosition: 'center'
-                    }
-                } }) })) }));
+                    position: 'relative'
+                } }, { children: _jsx("img", { src: imageUrl, alt: altText, onError: handleImageError, style: {
+                        width: '100%',
+                        height: '100%',
+                        objectFit: 'cover',
+                        objectPosition: 'center',
+                        position: 'absolute',
+                        top: 0,
+                        left: 0
+                    } }) })) })) }));
 };
 export default PromotionalCampaignItem;

package/components/stream/AppSwitcher/constants.d.ts

@@ -32,6 +32,7 @@ export declare const Constants: Readonly<{
         'select-org': string;
         'open-in-new-window': string;
         'stream-hub-welcome': string;
+        'app-switcher-alt-text': string;
     };
     DrawerWidth: {
         Collapsed: number;

package/components/stream/AppSwitcher/constants.js

@@ -31,7 +31,8 @@ export var Constants = Object.freeze({
         open: 'Open',
         'select-org': 'Organisation',
         'open-in-new-window': 'opens in a new window',
-        'stream-hub-welcome': 'Welcome to Stream Home'
+        'stream-hub-welcome': 'Welcome to Stream Home',
+        'app-switcher-alt-text': 'App Switcher image'
     },
     DrawerWidth: {
         Collapsed: 60,
@@ -55,7 +56,7 @@ export var promotionalContent = [
         appSwitcherImageUrl: 'https://uuicdn.learningpool.com/promotionalcampaigns/appswitcheradvert/latest/300x150.png',
         hubImageUrl: 'https://uuicdn.learningpool.com/promotionalcampaigns/banner/latest/1000x138.png',
         altText: 'AIC',
-        basePromoUrl: 'https://aic.lp-home-web-sever.js.com',
+        basePromoUrl: 'https://aic.design-system.com',
         isActive: true
     }
 ];

package/lang/en-us.d.ts

@@ -12,6 +12,7 @@ export const defaultMessages: {
     'select-org': string;
     'open-in-new-window': string;
     'stream-hub-welcome': string;
+    'banner-image-alt-text': string;
     'site-navigation': string;
     'open-navigation': string;
     'close-navigation': string;

package/lang/en-us.js

@@ -13,6 +13,7 @@ export var defaultMessages = {
     'select-org': 'Organisation',
     'open-in-new-window': 'opens in a new window',
     'stream-hub-welcome': 'Welcome to Stream Home',
+    'banner-image-alt-text': 'Banner Image advert',
     // Navigation
     'site-navigation': 'Site navigation',
     'open-navigation': 'Open navigation',

package/package.json

@@ -9,7 +9,7 @@
     "components",
     "ui"
   ],
-  "version": "1.15.3",
+  "version": "1.15.5",
   "private": false,
   "main": "index.js",
   "module": "index.js",