Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Update CLI tab to use uppercase #2827

Merged
merged 6 commits into from
Nov 1, 2023
+22 −3
Merged

Fix: Update CLI tab to use uppercase #2827

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c54585
change to uppercase
ElinorW Oct 16, 2023
85fd978
update language order
ElinorW Oct 16, 2023
db03880
add unformatted language for snippet comments
ElinorW Oct 16, 2023
79e7678
use splice instead of filter
ElinorW Oct 25, 2023
275f700
add compare function
ElinorW Oct 31, 2023
1390df3
Merge branch 'dev' into fix/cli-tab
ElinorW Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/views/query-response/snippets/Snippets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function GetSnippets() {
sdkDownloadLink: 'https://aka.ms/msgraphpythonsdk',
sdkDocLink: 'https://aka.ms/sdk-doc'
},
'Cli' : {
'CLI' : {
sdkDownloadLink: 'https://aka.ms/msgraphclisdk',
sdkDocLink: 'https://aka.ms/sdk-doc'
}
Expand Down
9 changes: 7 additions & 2 deletions src/app/views/query-response/snippets/snippets-helper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable max-len */
import { ITheme, Label, Link, PivotItem, getTheme } from '@fluentui/react';
import { useEffect, useState } from 'react';
import { useDispatch } from 'react-redux';
Expand Down Expand Up @@ -30,10 +31,12 @@ interface ISupportedLanguages {

export function renderSnippets(supportedLanguages: ISupportedLanguages) {
const sortedSupportedLanguages: ISupportedLanguages = {};
Object.keys(supportedLanguages).sort().forEach(key => {
sortedSupportedLanguages.CSharp = supportedLanguages.CSharp;
Object.keys(supportedLanguages).filter((language) => language !== 'CSharp').sort().forEach(key => {
sortedSupportedLanguages[key] = supportedLanguages[key];
});


return Object.keys(sortedSupportedLanguages).
map((language: string) => (
<PivotItem
Expand All @@ -54,13 +57,15 @@ export function renderSnippets(supportedLanguages: ISupportedLanguages) {
function Snippet(props: ISnippetProps) {
let { language } = props;
const { sdkDownloadLink, sdkDocLink } = props.snippetInfo[language];
const unformattedLanguage = language;

/**
* Converting language lowercase so that we won't have to call toLowerCase() in multiple places.
*
* Ie the monaco component expects a lowercase string for the language prop and the graphexplorerapi expects
* a lowercase string for the param value.
*/

language = language.toLowerCase();

const { dimensions: { response }, snippets,
Expand Down Expand Up @@ -112,7 +117,7 @@ function Snippet(props: ISnippetProps) {
return (
<div style={snippetCommentStyles}>

{setCommentSymbol()} {translateMessage('Leverage libraries')} {language} {translateMessage('Client library')}
{setCommentSymbol()} {translateMessage('Leverage libraries')} {unformattedLanguage} {translateMessage('Client library')}

<Link href={sdkDownloadLink} underline styles={snippetLinkStyles}
onClick={(e) => trackLinkClickedEvent(sdkDownloadLink, e)} target={'_blank'} rel='noreferrer noopener'>
Expand Down