{ apps }
+ { spinner }
{ this._canUserModify() && addWidget }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ee5006ce4c..9acde2b80c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -42,6 +42,7 @@
"Could not connect to the integration server": "Could not connect to the integration server",
"A conference call could not be started because the intgrations server is not available": "A conference call could not be started because the intgrations server is not available",
"Call in Progress": "Call in Progress",
+ "A call is currently being placed!": "A call is currently being placed!",
"A call is already in progress!": "A call is already in progress!",
"Permission Required": "Permission Required",
"You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
@@ -695,6 +696,8 @@
"Delete Widget": "Delete Widget",
"Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?",
"Delete widget": "Delete widget",
+ "Failed to remove widget": "Failed to remove widget",
+ "An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room",
"Revoke widget access": "Revoke widget access",
"Minimize apps": "Minimize apps",
"Reload widget": "Reload widget",
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 35cfe69086..fed0d7b4a1 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -1,6 +1,6 @@
/*
Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
new file mode 100644
index 0000000000..0d14ed1d60
--- /dev/null
+++ b/src/stores/WidgetEchoStore.js
@@ -0,0 +1,108 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import EventEmitter from 'events';
+
+/**
+ * Acts as a place to get & set widget state, storing local echo state and
+ * proxying through state from the js-sdk.
+ */
+class WidgetEchoStore extends EventEmitter {
+ constructor() {
+ super();
+
+ this._roomWidgetEcho = {
+ // Map as below. Object is the content of the widget state event,
+ // so for widgets that have been deleted locally, the object is empty.
+ // roomId: {
+ // widgetId: [object]
+ // }
+ };
+ }
+
+ /**
+ * Gets the widgets for a room, substracting those that are pending deletion.
+ * Widgets that are pending addition are not included, since widgets are
+ * represted as MatrixEvents, so to do this we'd have to create fake MatrixEvents,
+ * and we don't really need the actual widget events anyway since we just want to
+ * show a spinner / prevent widgets being added twice.
+ *
+ * @param {Room} roomId The ID of the room to get widgets for
+ * @param {MatrixEvent[]} currentRoomWidgets Current widgets for the room
+ * @returns {MatrixEvent[]} List of widgets in the room, minus any pending removal
+ */
+ getEchoedRoomWidgets(roomId, currentRoomWidgets) {
+ const echoedWidgets = [];
+
+ const roomEchoState = Object.assign({}, this._roomWidgetEcho[roomId]);
+
+ for (const w of currentRoomWidgets) {
+ const widgetId = w.getStateKey();
+ // If there's no echo, or the echo still has a widget present, show the *old* widget
+ // we don't include widgets that have changed for the same reason we don't include new ones,
+ // ie. we'd need to fake matrix events to do so and therte's currently no need.
+ if (!roomEchoState[widgetId] || Object.keys(roomEchoState[widgetId]).length !== 0) {
+ echoedWidgets.push(w);
+ }
+ delete roomEchoState[widgetId];
+ }
+
+ return echoedWidgets;
+ }
+
+ roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, type) {
+ const roomEchoState = Object.assign({}, this._roomWidgetEcho[roomId]);
+
+ // any widget IDs that are already in the room are not pending, so
+ // echoes for them don't count as pending.
+ for (const w of currentRoomWidgets) {
+ const widgetId = w.getStateKey();
+ delete roomEchoState[widgetId];
+ }
+
+ // if there's anything left then there are pending widgets.
+ if (type === undefined) {
+ return Object.keys(roomEchoState).length > 0;
+ } else {
+ return Object.values(roomEchoState).some((widget) => {
+ return widget.type === type;
+ });
+ }
+ }
+
+ roomHasPendingWidgets(roomId, currentRoomWidgets) {
+ return this.roomHasPendingWidgetsOfType(roomId, currentRoomWidgets);
+ }
+
+ setRoomWidgetEcho(roomId, widgetId, state) {
+ if (this._roomWidgetEcho[roomId] === undefined) this._roomWidgetEcho[roomId] = {};
+
+ this._roomWidgetEcho[roomId][widgetId] = state;
+ this.emit('update');
+ }
+
+ removeRoomWidgetEcho(roomId, widgetId) {
+ delete this._roomWidgetEcho[roomId][widgetId];
+ if (Object.keys(this._roomWidgetEcho[roomId]).length === 0) delete this._roomWidgetEcho[roomId];
+ this.emit('update');
+ }
+}
+
+let singletonWidgetEchoStore = null;
+if (!singletonWidgetEchoStore) {
+ singletonWidgetEchoStore = new WidgetEchoStore();
+}
+module.exports = singletonWidgetEchoStore;
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index 98239b3cec..008bed1005 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -19,6 +19,11 @@ import MatrixClientPeg from '../MatrixClientPeg';
import SdkConfig from "../SdkConfig";
import dis from '../dispatcher';
import * as url from "url";
+import WidgetEchoStore from '../stores/WidgetEchoStore';
+
+// How long we wait for the state event echo to come back from the server
+// before waitFor[Room/User]Widget rejects its promise
+const WIDGET_WAIT_TIME = 20000;
import SettingsStore from "../settings/SettingsStore";
/**
@@ -155,7 +160,7 @@ export default class WidgetUtils {
const timerId = setTimeout(() => {
MatrixClientPeg.get().removeListener('accountData', onAccountData);
reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear"));
- }, 10000);
+ }, WIDGET_WAIT_TIME);
MatrixClientPeg.get().on('accountData', onAccountData);
});
}
@@ -208,7 +213,7 @@ export default class WidgetUtils {
const timerId = setTimeout(() => {
MatrixClientPeg.get().removeListener('RoomState.events', onRoomStateEvents);
reject(new Error("Timed out waiting for widget ID " + widgetId + " to appear"));
- }, 10000);
+ }, WIDGET_WAIT_TIME);
MatrixClientPeg.get().on('RoomState.events', onRoomStateEvents);
});
}
@@ -271,11 +276,15 @@ export default class WidgetUtils {
content = {};
}
+ WidgetEchoStore.setRoomWidgetEcho(roomId, widgetId, content);
+
const client = MatrixClientPeg.get();
// TODO - Room widgets need to be moved to 'm.widget' state events
// https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing
return client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).then(() => {
return WidgetUtils.waitForRoomWidget(widgetId, roomId, addingWidget);
+ }).finally(() => {
+ WidgetEchoStore.removeRoomWidgetEcho(roomId, widgetId);
});
}