moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'standalone-fix' into 'develop' 

Standalone: don't memoize isStandalone

See merge request soapbox-pub/soapbox-fe!703
This commit is contained in:
Alex Gleason 2021-08-31 17:37:57 +00:00
parent cfaba1d780 aa068fc123
commit ecdf73bbfd
2 changed files with 129 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap
View File

@ -1,5 +1,129 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP // Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`<LoginPage /> renders correctly on load 1`] = `null`; exports[`<LoginPage /> renders correctly on load 1`] = `
<form
className="simple_form new_user"
method="post"
onSubmit={[Function]}
>
<fieldset
disabled={false}
>
<div
className="fields-group"
>
<div
className="input email user_email"
>
<input
aria-label="Username"
autoComplete="off"
className="string email"
name="username"
placeholder="Username"
required={true}
type="text"
/>
</div>
<div
className="input password user_password"
>
<input
aria-label="Password"
autoComplete="off"
className="password"
name="password"
placeholder="Password"
required={true}
type="password"
/>
</div>
<p
className="hint subtle-hint"
>
<a
href="/auth/reset_password"
onClick={[Function]}
>
Trouble logging in?
</a>
</p>
</div>
</fieldset>
<div
className="actions"
>
<button
className="btn button button-primary"
name="button"
type="submit"
>
Log in
</button>
</div>
</form>
`;
exports[`<LoginPage /> renders correctly on load 2`] = `null`; exports[`<LoginPage /> renders correctly on load 2`] = `
<form
className="simple_form new_user"
method="post"
onSubmit={[Function]}
>
<fieldset
disabled={false}
>
<div
className="fields-group"
>
<div
className="input email user_email"
>
<input
aria-label="Username"
autoComplete="off"
className="string email"
name="username"
placeholder="Username"
required={true}
type="text"
/>
</div>
<div
className="input password user_password"
>
<input
aria-label="Password"
autoComplete="off"
className="password"
name="password"
placeholder="Password"
required={true}
type="password"
/>
</div>
<p
className="hint subtle-hint"
>
<a
href="/auth/reset_password"
onClick={[Function]}
>
Trouble logging in?
</a>
</p>
</div>
</fieldset>
<div
className="actions"
>
<button
className="btn button button-primary"
name="button"
type="submit"
>
Log in
</button>
</div>
</form>
`;

8
app/soapbox/utils/state.js
View File

@ -4,7 +4,6 @@
*/ */
import { getSoapboxConfig } from'soapbox/actions/soapbox'; import { getSoapboxConfig } from'soapbox/actions/soapbox';
import { createSelector } from 'reselect';
import { isPrerendered } from 'soapbox/precheck'; import { isPrerendered } from 'soapbox/precheck';
import { isURL } from 'soapbox/utils/auth'; import { isURL } from 'soapbox/utils/auth';
import { BACKEND_URL } from 'soapbox/build_config'; import { BACKEND_URL } from 'soapbox/build_config';
@ -24,8 +23,7 @@ export const federationRestrictionsDisclosed = state => {
* @param {object} state * @param {object} state
* @returns {boolean} * @returns {boolean}
*/ */
export const isStandalone = state => createSelector([ export const isStandalone = state => {
state => state.getIn(['meta', 'instance_fetch_failed'], false), const instanceFetchFailed = state.getIn(['meta', 'instance_fetch_failed'], false);
], instanceFetchFailed => {
return isURL(BACKEND_URL) ? false : (!isPrerendered && instanceFetchFailed); return isURL(BACKEND_URL) ? false : (!isPrerendered && instanceFetchFailed);
}); };