Commit 755112b1 authored by Stelios Milidonis's avatar Stelios Milidonis

post-build changes

parent 3832092c
......@@ -162,6 +162,11 @@ exports[`components/AdminConsole should generate the routes 1`] = `
path="/authentication/gitlab"
render={[Function]}
/>
<Route
key="phabricator"
path="/phabricator"
render={[Function]}
/>
<Route
key="plugins/plugin_management"
path="/plugins/plugin_management"
......
......@@ -576,18 +576,18 @@ exports[`components/AdminSidebar Plugins should match snapshot 1`] = `
}
/>
<AdminSidebarSection
key="16"
name="phabricator"
parentLink=""
subsection={false}
title={
<FormattedMessage
defaultMessage="Phabricator"
id="admin.sidebar.phabricator"
values={Object {}}
/>
key="10"
name="phabricator"
parentLink=""
subsection={false}
title={
<FormattedMessage
defaultMessage="Phabricator"
id="admin.sidebar.phabricator"
values={Object {}}
/>
}
/>
/>
</AdminSidebarCategory>
<AdminSidebarCategory
icon="fa-plug"
......@@ -1181,27 +1181,27 @@ exports[`components/AdminSidebar should match snapshot 1`] = `
}
/>
<AdminSidebarSection
key="16"
name="authentication/phabricator"
key="9"
name="authentication/gitlab"
parentLink=""
subsection={false}
title={
<FormattedMessage
defaultMessage="Phabricator"
id="admin.sidebar.phabricator"
defaultMessage="GitLab"
id="admin.sidebar.gitlab"
values={Object {}}
/>
}
/>
<AdminSidebarSection
key="9"
name="authentication/gitlab"
key="10"
name="phabricator"
parentLink=""
subsection={false}
title={
<FormattedMessage
defaultMessage="GitLab"
id="admin.sidebar.gitlab"
defaultMessage="Phabricator"
id="admin.sidebar.phabricator"
values={Object {}}
/>
}
......@@ -1614,19 +1614,6 @@ exports[`components/AdminSidebar should match snapshot, not prevent the console
/>
}
/>
<AdminSidebarSection
key="16"
name="authentication/phabricator"
parentLink=""
subsection={false}
title={
<FormattedMessage
defaultMessage="Phabricator"
id="admin.sidebar.phabricator"
values={Object {}}
/>
}
/>
</AdminSidebarCategory>
<AdminSidebarCategory
icon="fa-cogs"
......@@ -1824,6 +1811,19 @@ exports[`components/AdminSidebar should match snapshot, not prevent the console
/>
}
/>
<AdminSidebarSection
key="10"
name="phabricator"
parentLink=""
subsection={false}
title={
<FormattedMessage
defaultMessage="Phabricator"
id="admin.sidebar.phabricator"
values={Object {}}
/>
}
/>
</AdminSidebarCategory>
<AdminSidebarCategory
icon="fa-plug"
......@@ -2422,6 +2422,19 @@ exports[`components/AdminSidebar should match snapshot, not render the plugin in
/>
}
/>
<AdminSidebarSection
key="10"
name="phabricator"
parentLink=""
subsection={false}
title={
<FormattedMessage
defaultMessage="Phabricator"
id="admin.sidebar.phabricator"
values={Object {}}
/>
}
/>
</AdminSidebarCategory>
<AdminSidebarCategory
icon="fa-plug"
......@@ -3165,7 +3178,7 @@ exports[`components/AdminSidebar should match snapshot, with license (with all f
}
/>
<AdminSidebarSection
key="10"
key="11"
name="authentication/oauth"
parentLink=""
subsection={false}
......@@ -3178,7 +3191,7 @@ exports[`components/AdminSidebar should match snapshot, with license (with all f
}
/>
<AdminSidebarSection
key="11"
key="12"
name="authentication/guest_access"
parentLink=""
subsection={false}
......@@ -3895,7 +3908,7 @@ exports[`components/AdminSidebar should match snapshot, with license (without an
}
/>
<AdminSidebarSection
key="10"
key="11"
name="authentication/oauth"
parentLink=""
subsection={false}
......@@ -3908,7 +3921,7 @@ exports[`components/AdminSidebar should match snapshot, with license (without an
}
/>
<AdminSidebarSection
key="11"
key="12"
name="authentication/guest_access"
parentLink=""
subsection={false}
......
......@@ -83,6 +83,20 @@ exports[`components/error_page/ErrorMessage should match snapshot, oauth_access_
</p>
`;
exports[`components/error_page/ErrorMessage should match snapshot, oauth_access_denied type 2`] = `
<p>
<FormattedMessage
defaultMessage="You must authorize Mattermost to log in with {service}."
id="error.oauth_access_denied"
values={
Object {
"service": "Phabricator",
}
}
/>
</p>
`;
exports[`components/error_page/ErrorMessage should match snapshot, oauth_missing_code type 1`] = `
<div>
<p>
......@@ -141,6 +155,112 @@ exports[`components/error_page/ErrorMessage should match snapshot, oauth_missing
}
/>
</p>
<p>
<FormattedMessage
defaultMessage="For {link} please make sure you followed the setup instructions."
id="error.oauth_missing_code.phabricator"
values={
Object {
"link": <ErrorLink
defaultMessage="Phabricator"
messageId="error.oauth_missing_code.phabricator.link"
url="https://docs.mattermost.com/deployment/sso-phabricator.html"
/>,
}
}
/>
</p>
<p>
<FormattedMessage
defaultMessage="If you reviewed the above and are still having trouble with configuration, you may post in our {link} where we'll be happy to help with issues during setup."
id="error.oauth_missing_code.forum"
values={
Object {
"link": <ErrorLink
defaultMessage="Troubleshooting forum"
messageId="error.oauth_missing_code.forum.link"
url="https://forum.mattermost.org/c/trouble-shoot"
/>,
}
}
/>
</p>
</div>
`;
exports[`components/error_page/ErrorMessage should match snapshot, oauth_missing_code type 2`] = `
<div>
<p>
<FormattedMessage
defaultMessage="The service provider {service} did not provide an authorization code in the redirect URL."
id="error.oauth_missing_code"
values={
Object {
"service": "Phabricator",
}
}
/>
</p>
<p>
<FormattedMessage
defaultMessage="For {link} make sure your administrator enabled the Google+ API."
id="error.oauth_missing_code.google"
values={
Object {
"link": <ErrorLink
defaultMessage="Google Apps"
messageId="error.oauth_missing_code.google.link"
url="https://docs.mattermost.com/deployment/sso-google.html"
/>,
}
}
/>
</p>
<p>
<FormattedMessage
defaultMessage="For {link} make sure the administrator of your Microsoft organization has enabled the Mattermost app."
id="error.oauth_missing_code.office365"
values={
Object {
"link": <ErrorLink
defaultMessage="Office 365"
messageId="error.oauth_missing_code.office365.link"
url="https://docs.mattermost.com/deployment/sso-office.html"
/>,
}
}
/>
</p>
<p>
<FormattedMessage
defaultMessage="For {link} please make sure you followed the setup instructions."
id="error.oauth_missing_code.gitlab"
values={
Object {
"link": <ErrorLink
defaultMessage="GitLab"
messageId="error.oauth_missing_code.gitlab.link"
url="https://docs.mattermost.com/deployment/sso-gitlab.html"
/>,
}
}
/>
</p>
<p>
<FormattedMessage
defaultMessage="For {link} please make sure you followed the setup instructions."
id="error.oauth_missing_code.phabricator"
values={
Object {
"link": <ErrorLink
defaultMessage="Phabricator"
messageId="error.oauth_missing_code.phabricator.link"
url="https://docs.mattermost.com/deployment/sso-phabricator.html"
/>,
}
}
/>
</p>
<p>
<FormattedMessage
defaultMessage="If you reviewed the above and are still having trouble with configuration, you may post in our {link} where we'll be happy to help with issues during setup."
......
......@@ -50,6 +50,24 @@ describe('components/error_page/ErrorMessage', () => {
expect(wrapper).toMatchSnapshot();
});
test('should match snapshot, oauth_missing_code type', () => {
const props = {...baseProps, type: ErrorPageTypes.OAUTH_MISSING_CODE, service: 'Phabricator'};
const wrapper = shallow(
<ErrorMessage {...props}/>
);
expect(wrapper).toMatchSnapshot();
});
test('should match snapshot, oauth_access_denied type', () => {
const props = {...baseProps, type: ErrorPageTypes.OAUTH_ACCESS_DENIED, service: 'Phabricator'};
const wrapper = shallow(
<ErrorMessage {...props}/>
);
expect(wrapper).toMatchSnapshot();
});
test('should match snapshot, page_not_found type', () => {
const props = {...baseProps, type: ErrorPageTypes.PAGE_NOT_FOUND};
const wrapper = shallow(
......
......@@ -71,7 +71,7 @@ exports[`components/SignupController should match snapshot for addUserToTeamFrom
id="signup_user_completed.haveAccount"
values={Object {}}
/>
<Link
to="/login?id=ppni7a9t87fn3j4d56rwocdctc"
>
......@@ -170,6 +170,24 @@ exports[`components/SignupController should match snapshot for all signup option
</span>
</span>
</a>
<a
className="btn btn-custom-login btn--full phabricator"
href="/oauth/phabricator/signup"
key="phabricator"
>
<span>
<span
className="icon"
/>
<span>
<FormattedMessage
defaultMessage="Phabricator Single Sign-On"
id="signup.phabricator"
values={Object {}}
/>
</span>
</span>
</a>
</div>
<span
className="color--light"
......@@ -179,44 +197,7 @@ exports[`components/SignupController should match snapshot for all signup option
id="signup_user_completed.haveAccount"
values={Object {}}
/>
<Link
to="/login"
>
<FormattedMessage
defaultMessage="Click here to sign in."
id="signup_user_completed.signIn"
values={Object {}}
/>
</Link>
<a
className="btn btn-custom-login btn--full phabricator"
href="/oauth/phabricator/signup"
key="phabricator"
>
<span>
<span
className="icon"
/>
<span>
<FormattedMessage
defaultMessage="Phabricator Single Sign-On"
id="signup.phabricator"
values={Object {}}
/>
</span>
</span>
</a>
</div>
<span
className="color--light"
>
<FormattedMessage
defaultMessage="Already have an account?"
id="signup_user_completed.haveAccount"
values={Object {}}
/>
<Link
to="/login"
>
......@@ -424,7 +405,7 @@ exports[`components/SignupController should match snapshot for all signup option
id="signup_user_completed.haveAccount"
values={Object {}}
/>
<Link
to="/login"
>
......
......@@ -295,12 +295,11 @@ export default class UserSettingsDisplay extends React.Component {
format[0] = true;
} else if (value === secondOption.value) {
format[1] = true;
} else {
} else if (thirdOption && value === thirdOption.value) {
format[2] = true;
} else {
} else {
format[3] = true;
}
}
const name = section + 'Format';
......
......@@ -5398,7 +5398,7 @@
},
"p-cancelable": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
"resolved": "http://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
"integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
"dev": true,
"optional": true
......@@ -7463,14 +7463,14 @@
"dependencies": {
"file-type": {
"version": "3.9.0",
"resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
"resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
"integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
"dev": true,
"optional": true
},
"get-stream": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
"resolved": "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
"integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
"dev": true,
"optional": true,
......@@ -10719,7 +10719,7 @@
"integrity": "sha512-LGLpSsbkHUT0T+EKrIJltYoejYzUqg1eW+n6wm/FTte1pDiYjeKTxO0uJvrE3jgv6V9eBzMAjF6A8jH16C0+eQ==",
"dev": true,
"requires": {
"icu4c-data": "^0.63.2"
"icu4c-data": "^0.64.2"
}
},
"function-bind": {
......@@ -11667,9 +11667,9 @@
}
},
"icu4c-data": {
"version": "0.63.2",
"resolved": "https://registry.npmjs.org/icu4c-data/-/icu4c-data-0.63.2.tgz",
"integrity": "sha512-vT6/47CcBzDemlhRzkL7dZLoNvuUWjjiuKZHMt5T4dbkKAqLBh7ZQ33GU13ecC/aIcMlIdBOqtF4uIYTgWML4Q==",
"version": "0.64.2",
"resolved": "https://registry.npmjs.org/icu4c-data/-/icu4c-data-0.64.2.tgz",
"integrity": "sha512-BPuTfkRTkplmK1pNrqgyOLJ0qB2UcQ12EotVLwiWh4ErtZR1tEYoRZk/LBLmlDfK5v574/lQYLB4jT9vApBiBQ==",
"dev": true
},
"identity-obj-proxy": {
......@@ -12340,7 +12340,7 @@
},
"into-stream": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
"resolved": "http://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
"integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
"dev": true,
"optional": true,
......@@ -15758,7 +15758,7 @@
},
"p-is-promise": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
"resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
"integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
"dev": true,
"optional": true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment