make topic and user deletions "hard"
This commit is contained in:
@@ -172,7 +172,6 @@ class SidepanelView extends React.Component {
|
|||||||
onCredDelete={this.props.onCredDelete}
|
onCredDelete={this.props.onCredDelete}
|
||||||
onCredConfirm={this.props.onCredConfirm}
|
onCredConfirm={this.props.onCredConfirm}
|
||||||
onBasicNavigate={this.props.onBasicNavigate}
|
onBasicNavigate={this.props.onBasicNavigate}
|
||||||
onCancel={this.props.onCancel}
|
|
||||||
onError={this.props.onError} /> :
|
onError={this.props.onError} /> :
|
||||||
|
|
||||||
view === 'notif' ?
|
view === 'notif' ?
|
||||||
|
|||||||
@@ -799,7 +799,7 @@ class TinodeWeb extends React.Component {
|
|||||||
break;
|
break;
|
||||||
case 'delete':
|
case 'delete':
|
||||||
// Ignore invitation by deleting it.
|
// Ignore invitation by deleting it.
|
||||||
response = topic.delTopic();
|
response = topic.delTopic(true);
|
||||||
break;
|
break;
|
||||||
case 'block':
|
case 'block':
|
||||||
// Ban the topic making futher invites impossible.
|
// Ban the topic making futher invites impossible.
|
||||||
@@ -1130,7 +1130,7 @@ class TinodeWeb extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleDeleteAccount() {
|
handleDeleteAccount() {
|
||||||
this.tinode.delCurrentUser().then((ctrl) => {
|
this.tinode.delCurrentUser(true).then((ctrl) => {
|
||||||
this.handleLogout();
|
this.handleLogout();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -198,7 +198,7 @@ class ContextMenu extends React.Component {
|
|||||||
console.log("Topic not found: ", params.topicName);
|
console.log("Topic not found: ", params.topicName);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
return topic.delTopic().catch((err) => {
|
return topic.delTopic(true).catch((err) => {
|
||||||
if (errorHandler) {
|
if (errorHandler) {
|
||||||
errorHandler(err.message, 'err');
|
errorHandler(err.message, 'err');
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-5
@@ -2195,9 +2195,10 @@ class InfoView extends react__WEBPACK_IMPORTED_MODULE_0___default.a.Component {
|
|||||||
case 'want':
|
case 'want':
|
||||||
toEdit = this.state.modeWant;
|
toEdit = this.state.modeWant;
|
||||||
toCompare = this.state.modeGiven;
|
toCompare = this.state.modeGiven;
|
||||||
toSkip = this.state.groupTopic ? 'O' : 'ASDO';
|
toSkip = this.state.owner ? 'O' : tinode_sdk__WEBPACK_IMPORTED_MODULE_2___default.a.AccessMode.encode(tinode_sdk__WEBPACK_IMPORTED_MODULE_2___default.a.AccessMode.diff('ASDO', this.state.modeGiven));
|
||||||
titleEdit = formatMessage(messages.requested);
|
titleEdit = formatMessage(messages.requested);
|
||||||
titleCompare = formatMessage(messages.granted);
|
titleCompare = formatMessage(messages.granted);
|
||||||
|
console.log("To skip", this.state.modeGiven, 'ASDO', tinode_sdk__WEBPACK_IMPORTED_MODULE_2___default.a.AccessMode.encode(tinode_sdk__WEBPACK_IMPORTED_MODULE_2___default.a.AccessMode.diff('ASDO', this.state.modeGiven)));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'given':
|
case 'given':
|
||||||
@@ -4276,7 +4277,6 @@ class SidepanelView extends react__WEBPACK_IMPORTED_MODULE_0___default.a.Compone
|
|||||||
onCredDelete: this.props.onCredDelete,
|
onCredDelete: this.props.onCredDelete,
|
||||||
onCredConfirm: this.props.onCredConfirm,
|
onCredConfirm: this.props.onCredConfirm,
|
||||||
onBasicNavigate: this.props.onBasicNavigate,
|
onBasicNavigate: this.props.onBasicNavigate,
|
||||||
onCancel: this.props.onCancel,
|
|
||||||
onError: this.props.onError
|
onError: this.props.onError
|
||||||
}) : view === 'notif' ? react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_acc_notifications_view_jsx__WEBPACK_IMPORTED_MODULE_9__["default"], {
|
}) : view === 'notif' ? react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_acc_notifications_view_jsx__WEBPACK_IMPORTED_MODULE_9__["default"], {
|
||||||
messageSounds: this.props.messageSounds,
|
messageSounds: this.props.messageSounds,
|
||||||
@@ -5134,7 +5134,7 @@ class TinodeWeb extends react__WEBPACK_IMPORTED_MODULE_0___default.a.Component {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 'delete':
|
case 'delete':
|
||||||
response = topic.delTopic();
|
response = topic.delTopic(true);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'block':
|
case 'block':
|
||||||
@@ -5537,7 +5537,7 @@ class TinodeWeb extends react__WEBPACK_IMPORTED_MODULE_0___default.a.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleDeleteAccount() {
|
handleDeleteAccount() {
|
||||||
this.tinode.delCurrentUser().then(ctrl => {
|
this.tinode.delCurrentUser(true).then(ctrl => {
|
||||||
this.handleLogout();
|
this.handleLogout();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -7385,7 +7385,7 @@ class ContextMenu extends react__WEBPACK_IMPORTED_MODULE_0___default.a.Component
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
return topic.delTopic().catch(err => {
|
return topic.delTopic(true).catch(err => {
|
||||||
if (errorHandler) {
|
if (errorHandler) {
|
||||||
errorHandler(err.message, 'err');
|
errorHandler(err.message, 'err');
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+45
-20
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user