Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 05:04:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move pin drop out of labs (PSG-664) (#9135)

Browse Source 
* Move pin drop out of labs (PSG-664)

Signed-off-by: Johannes Marbach <johannesm@element.io>

* Regenerate strings

Signed-off-by: Johannes Marbach <johannesm@element.io>
This commit is contained in:
Johannes Marbach 2022-08-08 10:57:38 +02:00 committed by GitHub
parent 94f3168ab8
commit 4a14882938
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cypress/e2e/location/location.spec.ts
View File

@ -18,7 +18,6 @@ limitations under the License.
import { SynapseInstance } from "../../plugins/synapsedocker"; import { SynapseInstance } from "../../plugins/synapsedocker";
import Chainable = Cypress.Chainable; import Chainable = Cypress.Chainable;
import { SettingLevel } from "../../../src/settings/SettingLevel";
describe("Location sharing", () => { describe("Location sharing", () => {
let synapse: SynapseInstance; let synapse: SynapseInstance;
@ -40,9 +39,6 @@ describe("Location sharing", () => {
cy.initTestUser(synapse, "Tom"); cy.initTestUser(synapse, "Tom");
}); });
// enable pin drop location sharing feature
cy.setSettingValue("feature_location_share_pin_drop", null, SettingLevel.DEVICE, true);
}); });
afterEach(() => { afterEach(() => {

2
src/components/views/location/LocationShareMenu.tsx
View File

@ -49,9 +49,7 @@ const getEnabledShareTypes = (relation): LocationShareType[] => {
enabledShareTypes.push(LocationShareType.Live); enabledShareTypes.push(LocationShareType.Live);
} }
if (SettingsStore.getValue("feature_location_share_pin_drop")) {
enabledShareTypes.push(LocationShareType.Pin); enabledShareTypes.push(LocationShareType.Pin);
}
return enabledShareTypes; return enabledShareTypes;
}; };

1
src/i18n/strings/en_EN.json
View File

@ -900,7 +900,6 @@
"Jump to date (adds /jumptodate and jump to date headers)": "Jump to date (adds /jumptodate and jump to date headers)", "Jump to date (adds /jumptodate and jump to date headers)": "Jump to date (adds /jumptodate and jump to date headers)",
"Send read receipts": "Send read receipts", "Send read receipts": "Send read receipts",
"Right-click message context menu": "Right-click message context menu", "Right-click message context menu": "Right-click message context menu",
"Location sharing - pin drop": "Location sharing - pin drop",
"Live Location Sharing (temporary implementation: locations persist in room history)": "Live Location Sharing (temporary implementation: locations persist in room history)", "Live Location Sharing (temporary implementation: locations persist in room history)": "Live Location Sharing (temporary implementation: locations persist in room history)",
"Favourite Messages (under active development)": "Favourite Messages (under active development)", "Favourite Messages (under active development)": "Favourite Messages (under active development)",
"Font size": "Font size", "Font size": "Font size",

7
src/settings/Settings.tsx
View File

@ -413,13 +413,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
displayName: _td("Right-click message context menu"), displayName: _td("Right-click message context menu"),
default: false, default: false,
}, },
"feature_location_share_pin_drop": {
isFeature: true,
labsGroup: LabGroup.Messaging,
supportedLevels: LEVELS_FEATURE,
displayName: _td("Location sharing - pin drop"),
default: false,
},
"feature_location_share_live": { "feature_location_share_live": {
isFeature: true, isFeature: true,
labsGroup: LabGroup.Messaging, labsGroup: LabGroup.Messaging,

2
test/components/views/location/LocationShareMenu-test.tsx
View File

@ -213,8 +213,6 @@ describe('<LocationShareMenu />', () => {
}); });
describe('with pin drop share type enabled', () => { describe('with pin drop share type enabled', () => {
beforeEach(() => enableSettings(["feature_location_share_pin_drop"]));
it('renders share type switch with own and pin drop options', () => { it('renders share type switch with own and pin drop options', () => {
const component = getComponent(); const component = getComponent();
expect(component.find('LocationPicker').length).toBe(0); expect(component.find('LocationPicker').length).toBe(0);