Skip to content

Commit 365f70d

Browse files
committed
more link fixes
1 parent a3619bc commit 365f70d

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/components/CippComponents/CippApiDialog.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ export const CippApiDialog = (props) => {
295295
return getNestedValue(row, key) || `[${key}]`;
296296
});
297297

298-
if (linkWithRowData.startsWith("/")) {
298+
if (linkWithRowData.startsWith("/") && !api?.external) {
299299
// Internal link navigation
300300
setLinkClicked(true);
301301
router.push(linkWithRowData, undefined, { shallow: true });

src/components/CippComponents/CippTenantSelector.jsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export const CippTenantSelector = (props) => {
6666
}, [currentTenant?.value]);
6767

6868
useEffect(() => {
69-
if (tenant && currentTenant?.value && currentTenant?.value !== 'AllTenants') {
69+
if (tenant && currentTenant?.value && currentTenant?.value !== "AllTenants") {
7070
tenantDetails.refetch();
7171
}
7272
}, [tenant, offcanvasVisible]);
@@ -85,6 +85,7 @@ export const CippTenantSelector = (props) => {
8585
defaultDomainName: matchingTenant.defaultDomainName,
8686
displayName: matchingTenant.displayName,
8787
customerId: matchingTenant.customerId,
88+
initialDomainName: matchingTenant.initialDomainName,
8889
},
8990
}
9091
: {
@@ -192,12 +193,12 @@ export const CippTenantSelector = (props) => {
192193
actions={[
193194
{
194195
label: "M365 Admin Portal",
195-
link: `https://admin.microsoft.com/Partner/BeginClientSession.aspx?CTID=${currentTenant?.addedFields?.customerId}&CSDEST=o365admincenter`,
196+
link: `https://admin.cloud.microsoft/?delegatedOrg=${currentTenant?.addedFields?.initialDomainName}`,
196197
icon: <GlobeAltIcon />,
197198
},
198199
{
199200
label: "Exchange Portal",
200-
link: `https://admin.cloud.microsoft/exchange?landingpage=homepage&form=mac_sidebar&delegatedOrg=${currentTenant?.value}`,
201+
link: `https://admin.cloud.microsoft/exchange?delegatedOrg=${currentTenant?.addedFields?.initialDomainName}`,
201202
icon: <Mail />,
202203
},
203204
{
@@ -207,7 +208,7 @@ export const CippTenantSelector = (props) => {
207208
},
208209
{
209210
label: "Teams Portal",
210-
link: `https://admin.teams.microsoft.com/?delegatedOrg=${currentTenant?.value}`,
211+
link: `https://admin.teams.microsoft.com/?delegatedOrg=${currentTenant?.addedFields?.initialDomainName}`,
211212
icon: <FilePresent />,
212213
},
213214
{
@@ -222,8 +223,9 @@ export const CippTenantSelector = (props) => {
222223
},
223224
{
224225
label: "SharePoint Portal",
225-
link: `https://admin.microsoft.com/Partner/beginclientsession.aspx?CTID=${currentTenant?.addedFields?.customerId}&CSDEST=SharePoint`,
226+
link: `/api/ListSharePointAdminUrl?tenantFilter=${currentTenant?.value}`,
226227
icon: <Share />,
228+
external: true,
227229
},
228230
{
229231
label: "Security Portal",

0 commit comments

Comments
 (0)