{
- {statusMessages(queryState, sampleQuery, actions)}
- {termsOfUseMessage(termsOfUse, actions, classes, geLocale)}
+
+ {statusMessages(queryState, sampleQuery, actions)}
+ {termsOfUseMessage(termsOfUse, actions, classes, geLocale)}
+
{
// @ts-ignore
@@ -409,7 +414,7 @@ class App extends Component {
}
const mapStateToProps = ({ sidebarProperties, theme,
- queryRunnerStatus, profile, sampleQuery, termsOfUse, authToken, graphExplorerMode,
+ queryRunnerStatus, profile, sampleQuery, termsOfUse, authToken, graphExplorerMode
}: IRootState) => {
const mobileScreen = !!sidebarProperties.mobileScreen;
const showSidebar = !!sidebarProperties.showSidebar;
@@ -424,7 +429,7 @@ const mapStateToProps = ({ sidebarProperties, theme,
termsOfUse,
minimised: !mobileScreen && !showSidebar,
sampleQuery,
- authenticated: !!authToken.token,
+ authenticated: !!authToken.token
};
};
@@ -438,10 +443,10 @@ const mapDispatchToProps = (dispatch: Dispatch) => {
setSampleQuery,
toggleSidebar,
...authActionCreators,
- changeTheme,
+ changeTheme
},
dispatch
- ),
+ )
};
};
diff --git a/src/app/views/app-sections/ResponseMessages.tsx b/src/app/views/app-sections/ResponseMessages.tsx
new file mode 100644
index 0000000000..992fae4175
--- /dev/null
+++ b/src/app/views/app-sections/ResponseMessages.tsx
@@ -0,0 +1,85 @@
+import { Link, MessageBar, MessageBarType } from '@fluentui/react';
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+import { IGraphResponse } from '../../../types/query-response';
+
+import { IQuery } from '../../../types/query-runner';
+import { runQuery } from '../../services/actions/query-action-creators';
+import { setSampleQuery } from '../../services/actions/query-input-action-creators';
+import { ONE_DRIVE_CONTENT_DOWNLOAD_DOCUMENTATION_LINK } from '../../services/graph-constants';
+
+interface ODataLink {
+ link: string;
+ name: string;
+}
+
+export function responseMessages(graphResponse: IGraphResponse, sampleQuery: IQuery, dispatch: Function) {
+
+ function getOdataLinkFromResponseBody(body: any): ODataLink | null {
+ const odataLinks = ['nextLink', 'deltaLink'];
+ let data = null;
+ if (body) {
+ odataLinks.forEach(link => {
+ if (body[`@odata.${link}`]) {
+ data = {
+ link: body[`@odata.${link}`],
+ name: link
+ };
+ }
+ });
+ }
+ return data;
+ }
+
+ const { body } = graphResponse;
+ const odataLink = getOdataLinkFromResponseBody(body);
+
+ const setQuery = () => {
+ const query: IQuery = { ...sampleQuery };
+ query.sampleUrl = odataLink!.link;
+ dispatch(setSampleQuery(query));
+ dispatch(runQuery(query));
+ }
+
+ // Display link to step to next result
+ if (odataLink) {
+ return (
+
+ : @odata.{odataLink!.name}
+ setQuery()}>
+
+
+
+ );
+ }
+
+ // Display link to downlod file response
+ if (body?.contentDownloadUrl) {
+ return (
+
+
+
+
+
+
+
+ {body?.isWorkaround &&
+
+
+ {!body?.isOriginalFormat &&
+
+
+
+
+ }
+
+
+
+ .
+
+
+ }
+
+ );
+ }
+}
diff --git a/src/app/views/app-sections/StatusMessages.tsx b/src/app/views/app-sections/StatusMessages.tsx
index fa32a087f0..3d6c6a7dc7 100644
--- a/src/app/views/app-sections/StatusMessages.tsx
+++ b/src/app/views/app-sections/StatusMessages.tsx
@@ -40,7 +40,7 @@ export function statusMessages(queryState: any, sampleQuery: IQuery, actions: an
const query: IQuery = { ...sampleQuery };
query.sampleUrl = link;
actions.setSampleQuery(query);
- };
+ }
if (queryState) {
const { messageType, statusText, status, duration, hint } = queryState;
diff --git a/src/app/views/app-sections/TermsOfUseMessage.tsx b/src/app/views/app-sections/TermsOfUseMessage.tsx
index 5a1014f051..441718adb4 100644
--- a/src/app/views/app-sections/TermsOfUseMessage.tsx
+++ b/src/app/views/app-sections/TermsOfUseMessage.tsx
@@ -1,7 +1,9 @@
import { MessageBar, MessageBarType } from '@fluentui/react';
import React from 'react';
import { FormattedMessage } from 'react-intl';
+
import { componentNames, telemetry } from '../../../telemetry';
+
export function termsOfUseMessage(termsOfUse: any, actions: any, classes: any, language: string) {
return termsOfUse && (
- telemetry.trackLinkClickEvent(e.currentTarget.href, componentNames.MICROSOFT_APIS_TERMS_OF_USE_LINK)}
+
+ telemetry.trackLinkClickEvent(e.currentTarget.href, componentNames.MICROSOFT_APIS_TERMS_OF_USE_LINK)}
className={classes.links} href={'https://docs.microsoft.com/' + language +
'/legal/microsoft-apis/terms-of-use?context=graph/context'} target='_blank' rel='noopener noreferrer'>
.
- telemetry.trackLinkClickEvent(e.currentTarget.href, componentNames.MICROSOFT_PRIVACY_STATEMENT_LINK)}
+
+ telemetry.trackLinkClickEvent(e.currentTarget.href, componentNames.MICROSOFT_PRIVACY_STATEMENT_LINK)}
className={classes.links} href={'https://privacy.microsoft.com/' + language + '/privacystatement'}
target='_blank' rel='noopener noreferrer'>
.
diff --git a/src/app/views/authentication/Authentication.styles.ts b/src/app/views/authentication/Authentication.styles.ts
index 87289077e0..0d87e45036 100644
--- a/src/app/views/authentication/Authentication.styles.ts
+++ b/src/app/views/authentication/Authentication.styles.ts
@@ -4,17 +4,17 @@ export const authenticationStyles = (theme: ITheme) => {
return {
authenticationLabel: {
fontSize: FontSizes.large,
- fontWeight: 400,
+ fontWeight: 400
},
keyIcon: {
- margin: '0 5px',
+ margin: '0 5px'
},
spinner: {
flexDirection: 'row',
alignItems: 'flex-start',
justifyContent: 'start',
marginRight: theme.spacing.s1,
- padding: theme.spacing.s1,
+ padding: theme.spacing.s1
},
spinnerContainer: {
display: 'flex',
diff --git a/src/app/views/authentication/Authentication.tsx b/src/app/views/authentication/Authentication.tsx
index 195855ca82..365087c1e9 100644
--- a/src/app/views/authentication/Authentication.tsx
+++ b/src/app/views/authentication/Authentication.tsx
@@ -29,7 +29,7 @@ const Authentication = (props: any) => {
const classes = classNames(props);
const {
- intl: { messages },
+ intl: { messages }
}: any = props;
const signIn = async (): Promise => {
setLoginInProgress(true);
@@ -62,7 +62,7 @@ const Authentication = (props: any) => {
{
ComponentName: componentNames.AUTHENTICATION_ACTION,
Message: `Authentication failed: ${errorCode ? removeUnderScore(errorCode) : ''
- }`,
+ }`
}
);
}
diff --git a/src/app/views/authentication/AuthenticationErrorsHints.ts b/src/app/views/authentication/AuthenticationErrorsHints.ts
index 2de5af8274..f334b41238 100644
--- a/src/app/views/authentication/AuthenticationErrorsHints.ts
+++ b/src/app/views/authentication/AuthenticationErrorsHints.ts
@@ -1,32 +1,33 @@
-import { translateMessage } from "../../utils/translate-messages";
+import { translateMessage } from '../../utils/translate-messages';
-const authErrorList : string[] = ['user_cancelled','null_or_empty_id_token',
-"authorization_code_missing_from_server_response",
-'no_tokens_found', 'invalid_request', "user_login_error","nonce_mismatch_error",
-'login_progress_error', 'interaction_in_progress',
-'interaction_required', 'invalid_grant', 'endpoints_resolution_error']
+const authErrorList: string[] = ['user_cancelled', 'null_or_empty_id_token',
+ 'authorization_code_missing_from_server_response',
+ 'no_tokens_found', 'invalid_request', 'user_login_error', 'nonce_mismatch_error',
+ 'login_progress_error', 'interaction_in_progress',
+ 'interaction_required', 'invalid_grant', 'endpoints_resolution_error', 'monitor_window_timeout']
-const scopeErrorList : string[] = ['interaction_required', 'consent_required', 'login_required', 'access_denied', 'user_cancelled' ]
+const scopeErrorList: string[] = ['interaction_required', 'consent_required',
+ 'login_required', 'access_denied', 'user_cancelled']
-export function getSignInAuthErrorHint(error: string): string{
- const authErrorHintAvailable = signInAuthError(error);
- return authErrorHintAvailable ? getHint(error) : '';
+export function getSignInAuthErrorHint(error: string): string {
+ const authErrorHintAvailable = signInAuthError(error);
+ return authErrorHintAvailable ? getHint(error) : '';
}
export function signInAuthError(error: string): boolean {
- return authErrorList.includes(error.trim());
+ return authErrorList.includes(error.trim());
}
-export function getConsentAuthErrorHint(error: string): string{
- const authErrorHintAvailable = scopeAuthError(error);
- const consentError = error + '_consent';
- return authErrorHintAvailable ? getHint(consentError) : '';
+export function getConsentAuthErrorHint(error: string): string {
+ const authErrorHintAvailable = scopeAuthError(error);
+ const consentError = error + '_consent';
+ return authErrorHintAvailable ? getHint(consentError) : '';
}
export function scopeAuthError(error: string): boolean {
- return scopeErrorList.includes(error);
+ return scopeErrorList.includes(error);
}
-function getHint( error: string): string {
- return translateMessage('Tip') + ' - ' + translateMessage(error);
+function getHint(error: string): string {
+ return translateMessage('Tip') + ' - ' + translateMessage(error);
}
\ No newline at end of file
diff --git a/src/app/views/authentication/auth-util-components/UtilComponents.tsx b/src/app/views/authentication/auth-util-components/UtilComponents.tsx
index 33704e0346..59e382fc5a 100644
--- a/src/app/views/authentication/auth-util-components/UtilComponents.tsx
+++ b/src/app/views/authentication/auth-util-components/UtilComponents.tsx
@@ -17,11 +17,11 @@ export function showSignInButtonOrProfile(
iconProps={{ iconName: 'Contact' }}
title={translateMessage('sign in')}
onClick={() => signIn()} /> : signIn()}
- >
+ ariaLabel={translateMessage('sign in')}
+ role='button'
+ iconProps={{ iconName: 'Contact' }}
+ onClick={() => signIn()}
+ >
{!mobileScreen && }
;
diff --git a/src/app/views/authentication/profile/Profile.tsx b/src/app/views/authentication/profile/Profile.tsx
index 1c35a44ad2..366e7490ac 100644
--- a/src/app/views/authentication/profile/Profile.tsx
+++ b/src/app/views/authentication/profile/Profile.tsx
@@ -5,6 +5,7 @@ import { useDispatch, useSelector } from 'react-redux';
import { geLocale } from '../../../../appLocale';
import { Mode } from '../../../../types/enums';
import { IRootState } from '../../../../types/root';
+import { getPolicies } from '../../../services/actions/ocps-action-creators';
import { getProfileInfo } from '../../../services/actions/profile-action-creators';
import { translateMessage } from '../../../utils/translate-messages';
import { classNames } from '../../classnames';
@@ -21,6 +22,7 @@ const Profile = (props: any) => {
useEffect(() => {
if (authenticated && !profile) {
dispatch(getProfileInfo());
+ dispatch(getPolicies());
}
}, [authenticated]);
@@ -56,7 +58,7 @@ const Profile = (props: any) => {
imageUrl: profile.profileImageUrl,
imageInitials: getInitials(profile.displayName),
text: profile.displayName,
- secondaryText: profile.emailAddress,
+ secondaryText: profile.emailAddress
};
const classes = classNames(props);
@@ -71,29 +73,29 @@ const Profile = (props: any) => {
href: `https://developer.microsoft.com/${geLocale}/office/dev-program`,
target: '_blank',
iconProps: {
- iconName: 'CommandPrompt',
- },
+ iconName: 'CommandPrompt'
+ }
},
{
key: 'sign-out',
text: translateMessage('sign out'),
onClick: () => handleSignOut(),
iconProps: {
- iconName: 'SignOut',
- },
- },
+ iconName: 'SignOut'
+ }
+ }
]
};
const personaStyleToken: any = {
primaryText: {
- paddingBottom: 5,
+ paddingBottom: 5
},
secondaryText:
{
paddingBottom: 10,
textTransform: 'lowercase'
- },
+ }
};
const defaultSize = minimised ? PersonaSize.size32 : PersonaSize.size48;
diff --git a/src/app/views/common/dimensions-adjustment.ts b/src/app/views/common/dimensions-adjustment.ts
index d3bf83a35d..f4983b1bfb 100644
--- a/src/app/views/common/dimensions-adjustment.ts
+++ b/src/app/views/common/dimensions-adjustment.ts
@@ -1,13 +1,19 @@
export function convertVhToPx(height: string, adjustment: number) {
- const newHeight = parseFloat(height.replace('vh', '')) / 100
+ const newHeight = parseFloat(height.replace('vh', '')) / 100
* document.documentElement.clientHeight;
- return Math.floor(newHeight - adjustment) + 'px';
+ return Math.floor(newHeight - adjustment) + 'px';
+}
+
+export function convertPxToVh(px: number){
+ const innerHeight = window.innerHeight;
+ const convertedHeight = (100*px)/innerHeight;
+ return convertedHeight+ 'vh';
}
export function getResponseHeight(height: any, responseAreaExpanded: any) {
- let responseHeight = height;
- if (responseAreaExpanded) {
- responseHeight = '90vh';
- }
- return responseHeight;
+ let responseHeight = height;
+ if (responseAreaExpanded) {
+ responseHeight = '90vh';
+ }
+ return responseHeight;
}
\ No newline at end of file
diff --git a/src/app/views/common/image/Image.tsx b/src/app/views/common/image/Image.tsx
index 760637c21b..3c02af4702 100644
--- a/src/app/views/common/image/Image.tsx
+++ b/src/app/views/common/image/Image.tsx
@@ -5,7 +5,7 @@ export class Image extends Component
constructor(props: any) {
super(props);
this.state = {
- imageUrl: '',
+ imageUrl: ''
};
}
diff --git a/src/app/views/common/monaco/Monaco.tsx b/src/app/views/common/monaco/Monaco.tsx
index bdcecd2c5b..72a23e262f 100644
--- a/src/app/views/common/monaco/Monaco.tsx
+++ b/src/app/views/common/monaco/Monaco.tsx
@@ -43,7 +43,7 @@ export function Monaco(props: IMonaco) {
scrollbar: {
horizontalHasArrows: true,
horizontal: 'visible',
- horizontalScrollbarSize: 17,
+ horizontalScrollbarSize: 17
},
wordWrap: 'on'
}}
diff --git a/src/app/views/common/submit-button/SubmitButton.tsx b/src/app/views/common/submit-button/SubmitButton.tsx
index e2c3d24a1c..624e0a9090 100644
--- a/src/app/views/common/submit-button/SubmitButton.tsx
+++ b/src/app/views/common/submit-button/SubmitButton.tsx
@@ -9,7 +9,8 @@ const SubmitButtonControl = ({
text,
ariaLabel,
role,
- disabled
+ disabled,
+ allowDisabledFocus
}: ISubmitButtonControl) => {
return (
@@ -18,6 +19,7 @@ const SubmitButtonControl = ({
onClick={() => handleOnClick()}
ariaLabel={ariaLabel}
role={role}
+ allowDisabledFocus={allowDisabledFocus}
>
{text}
{submitting && <>
diff --git a/src/app/views/query-response/QueryResponse.tsx b/src/app/views/query-response/QueryResponse.tsx
index 6f61dde29a..c17e2582bc 100644
--- a/src/app/views/query-response/QueryResponse.tsx
+++ b/src/app/views/query-response/QueryResponse.tsx
@@ -22,6 +22,7 @@ import { getPivotItems, onPivotItemClick } from './pivot-items/pivot-items';
import './query-response.scss';
import { IRootState } from '../../../types/root';
+
const QueryResponse = (props: IQueryResponseProps) => {
const dispatch = useDispatch();
@@ -29,11 +30,11 @@ const QueryResponse = (props: IQueryResponseProps) => {
const [showModal, setShowModal] = useState(false);
const [query, setQuery] = useState('');
const [responseHeight, setResponseHeight] = useState('610px');
-
const { dimensions, sampleQuery } = useSelector((state: IRootState) => state);
+
const {
- intl: { messages },
+ intl: { messages }
}: any = props;
useEffect(() => {
@@ -112,17 +113,19 @@ const QueryResponse = (props: IQueryResponseProps) => {
bounds={'window'}
size={{
height: responseHeight,
- width: '100%',
+ width: '100%'
}}
enable={{
- bottom: false,
+ bottom: false
}}
>
-
+
+
{getPivotItems()}
{
styles={{
root: {
float: 'right',
- zIndex: 1,
- },
+ zIndex: 1
+ }
}}
iconProps={{ iconName: 'Cancel' }}
ariaLabel={translateMessage('Close expanded response area')}
@@ -176,7 +179,7 @@ const QueryResponse = (props: IQueryResponseProps) => {
type: DialogType.normal,
title: 'Share Query',
isMultiline: true,
- subText: messages['Share Query Message'],
+ subText: messages['Share Query Message']
}}
>