imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fallback to event text in location body when map unavailable (#7982)

Browse source 
* center icon better

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove debug

Signed-off-by: Kerry Archibald <kerrya@element.io>

* retrigger all builds

Signed-off-by: Kerry Archibald <kerrya@element.io>

* set assetType on share event

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use pin marker on map for pin drop share

Signed-off-by: Kerry Archibald <kerrya@element.io>

* lint

Signed-off-by: Kerry Archibald <kerrya@element.io>

* test events

Signed-off-by: Kerry Archibald <kerrya@element.io>

* pin drop helper text

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use generic location type

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add navigationcontrol when in pin mode

Signed-off-by: Kerry Archibald <kerrya@element.io>

* allow pin drop without location permissions

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove geolocate control when pin dropping without geo perms

Signed-off-by: Kerry Archibald <kerrya@element.io>

* test locationpicker

Signed-off-by: Kerry Archibald <kerrya@element.io>

* test marker type, tidy

Signed-off-by: Kerry Archibald <kerrya@element.io>

* move findMapStyleUrl

Signed-off-by: Kerry Archibald <kerrya@element.io>

* fallback to event content when cant render map

Signed-off-by: Kerry Archibald <kerrya@element.io>

* update mocks in location picker, show same messages as timeline

Signed-off-by: Kerry Archibald <kerrya@element.io>

* style error message in location share menu

Signed-off-by: Kerry Archibald <kerrya@element.io>

* i18n

Signed-off-by: Kerry Archibald <kerrya@element.io>

* forgotten copyright

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add copyright

Signed-off-by: Kerry Archibald <kerrya@element.io>

* update style

Signed-off-by: Kerry Archibald <kerrya@element.io>

* icon bigger

Signed-off-by: Kerry Archibald <kerrya@element.io>
This commit is contained in:
Kerry 2022-03-11 09:52:57 +01:00 • committed by GitHub
parent 9082e07ff4
commit d38a1fa201
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 485 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/components/views/location/LocationPicker.tsx
View file

@ -26,12 +26,13 @@ import MemberAvatar from '../avatars/MemberAvatar';
import MatrixClientContext from '../../../contexts/MatrixClientContext';
import Modal from '../../../Modal';
import ErrorDialog from '../dialogs/ErrorDialog';
import { findMapStyleUrl } from '../messages/MLocationBody';
import { tileServerFromWellKnown } from '../../../utils/WellKnownUtils';
import { findMapStyleUrl } from './findMapStyleUrl';
import { LocationShareType } from './shareLocation';
import { Icon as LocationIcon } from '../../../../res/img/element-icons/location.svg';
import { LocationShareError } from './LocationShareErrors';
import AccessibleButton from '../elements/AccessibleButton';
import { MapError } from './MapError';
export interface ILocationPickerProps {
sender: RoomMember;
shareType: LocationShareType;
@ -48,7 +49,7 @@ interface IPosition {
}
interface IState {
position?: IPosition;
error: Error;
error?: LocationShareError;
}
/*
@ -104,10 +105,10 @@ class LocationPicker extends React.Component<ILocationPickerProps, IState> {
this.map.on('error', (e) => {
logger.error(
"Failed to load map: check map_style_url in config.json "
+ "has a valid URL and API key",
+ "has a valid URL and API key",
e.error,
);
this.setState({ error: e.error });
this.setState({ error: LocationShareError.MapStyleUrlNotReachable });
});
this.map.on('load', () => {
@ -129,7 +130,10 @@ class LocationPicker extends React.Component<ILocationPickerProps, IState> {
}
} catch (e) {
logger.error("Failed to render map", e);
this.setState({ error: e });
const errorType = e?.message === LocationShareError.MapStyleUrlNotConfigured ?
LocationShareError.MapStyleUrlNotConfigured :
LocationShareError.Default;
this.setState({ error: errorType });
}
}
@ -213,10 +217,13 @@ class LocationPicker extends React.Component<ILocationPickerProps, IState> {
};
render() {
const error = this.state.error ?
<div data-test-id='location-picker-error' className="mx_LocationPicker_error">
{ _t("Failed to load map") }
</div> : null;
if (this.state.error) {
return <div className="mx_LocationPicker mx_LocationPicker_hasError">
<MapError
error={this.state.error}
onFinished={this.props.onFinished} />
</div>;
}
return (
<div className="mx_LocationPicker">
@ -227,7 +234,6 @@ class LocationPicker extends React.Component<ILocationPickerProps, IState> {
</span>
</div>
}
{ error }
<div className="mx_LocationPicker_footer">
<form onSubmit={this.onOk}>