{
- Object.keys(this.sources_on_event).forEach(source_key => {
- if (this.sources_on_event[source_key].routes.indexOf(data._route) >= 0) {
- this.sources_on_event[source_key].callback(event, data);
- }
- });
-
- if (event === 'event') {
- if (data.multiple && data.multiple.forEach) {
- data.multiple.forEach(item => {
- this.ws_message(item);
- });
- } else {
- this.ws_message(data);
- }
- }
- });
}
updatedOptions() {
@@ -345,7 +326,6 @@ export default class Collection extends Observable {
var ws_identifier = collection_id || this.collection_id;
// eslint-disable-next-line no-redeclare
var options = options || this.options || {};
- this.connections.addConnection(ws_identifier, options, http_options, key);
return true;
}
@@ -363,7 +343,6 @@ export default class Collection extends Observable {
if (this.total_subscribe_by_route[collection_id] <= 0) {
var ws_identifier = collection_id || this.collection_id;
- this.connections.removeConnection(ws_identifier);
}
return;
@@ -865,14 +844,7 @@ export default class Collection extends Observable {
}
//To use only on very specific cases !!!
- shareRemove(deleted_front_id) {
- this.connections.publish({
- client_id: this.client_id,
- action: 'remove',
- object_type: this.object_type,
- front_id: deleted_front_id,
- });
- }
+ shareRemove(deleted_front_id) {}
//To use only on very specific cases !!!
share(object) {
@@ -884,13 +856,6 @@ export default class Collection extends Observable {
delete object[key];
}
});
-
- this.connections.publish({
- client_id: this.client_id,
- action: 'save',
- object_type: this.object_type,
- object: object,
- });
}
ws_message(data) {
@@ -927,7 +892,6 @@ export default class Collection extends Observable {
data: data,
client_id: this.client_id,
};
- this.connections.publish(_d);
}
addWebsocketListener(callback) {
diff --git a/tdrive/frontend/src/app/deprecated/CollectionsV1/Collections/MultipleSecuredConnections.js b/tdrive/frontend/src/app/deprecated/CollectionsV1/Collections/MultipleSecuredConnections.js
deleted file mode 100755
index 2e8d7334..00000000
--- a/tdrive/frontend/src/app/deprecated/CollectionsV1/Collections/MultipleSecuredConnections.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import SecuredConnection from './SecuredConnection.js';
-/** MultipleSecuredConnections
- * Manage multiple secured connections as one (multiple publish and centralized event manager)
- */
-
-export default class MultipleSecuredConnections {
- constructor(callback, options) {
- if (!options) {
- options = {};
- }
-
- //Options :
- this.disableDuplicates = options.disableDuplicates !== false;
-
- this.secured_connections = {};
- this.callback = callback;
-
- this.removing_secured_connections_timeouts = {};
- }
-
- publish(data) {
- Object.keys(this.secured_connections).forEach(secured_connection_key => {
- var secured_connection = this.secured_connections[secured_connection_key];
- secured_connection.publish(data, () => {});
- });
- }
-
- event(route, event, data) {
- //Disable duplicates
- var string = JSON.stringify(data);
- if (
- string === this.last_event &&
- this.disableDuplicates &&
- !(event === 'close' || event === 'open' || event === 'init')
- ) {
- return;
- }
- this.last_event = string;
-
- if (!data) {
- data = {};
- }
- data._route = route;
- if (this.callback) this.callback(event, data);
- }
-
- addConnection(route, option, http_options, key) {
- if (this.secured_connections[route]) {
- this.secured_connections[route].removing = false;
- if (this.removing_secured_connections_timeouts[route]) {
- clearTimeout(this.removing_secured_connections_timeouts[route]);
- }
- return;
- }
-
- if (this.secured_connections[route]) {
- return;
- }
-
- this.secured_connections[route] = new SecuredConnection(
- route,
- option,
- (event, data) => {
- this.event(route, event, data);
- },
- http_options,
- key,
- );
- }
-
- removeConnection(route) {
- if (!this.secured_connections[route] || this.secured_connections[route].removing) {
- return;
- }
-
- if (this.removing_secured_connections_timeouts[route]) {
- clearTimeout(this.removing_secured_connections_timeouts[route]);
- }
-
- this.secured_connections[route].removing = true;
- this.removing_secured_connections_timeouts[route] = setTimeout(() => {
- if (this.secured_connections[route]) {
- this.secured_connections[route].close();
- delete this.secured_connections[route];
- }
- }, 10000);
- }
-
- getRoutes() {
- return Object.keys(this.secured_connections);
- }
-
- closeAll() {
- Object.keys(this.secured_connections).foEach(route => {
- this.removeConnection(route);
- });
- }
-}
diff --git a/tdrive/frontend/src/app/deprecated/CollectionsV1/Collections/SecuredConnection.js b/tdrive/frontend/src/app/deprecated/CollectionsV1/Collections/SecuredConnection.js
deleted file mode 100755
index a3fd7553..00000000
--- a/tdrive/frontend/src/app/deprecated/CollectionsV1/Collections/SecuredConnection.js
+++ /dev/null
@@ -1,265 +0,0 @@
-import Api from '@features/global/framework/api-service';
-import ws from '@deprecated/websocket/websocket.js';
-import CryptoJS from 'crypto-js';
-import sha256 from 'crypto-js/sha256';
-/** SecuredConnection
- * Create websockets encrypted connection
- */
-import Globals from '@features/global/services/globals-tdrive-app-service';
-
-export default class SecuredConnection {
- constructor(route, options, callback, http_options, collectionId) {
- this.ready = false;
- this.collectionId = collectionId;
-
- this.route = route;
- this.options = options;
-
- this.callback = callback;
-
- //Room idea
- this.websocket_id = '';
-
- //Store keys
- this.keys = [];
- this.keys_by_version = {};
- this.publish_buffer = [];
- this.http_options = http_options;
-
- this.init(http_options);
-
- Globals.window.CryptoAES = CryptoJS.AES;
- }
-
- init(http_options) {
- this.ready = false;
-
- this.options.get_options = http_options;
-
- var data = {
- collection_id: this.route,
- options: this.options,
- _grouped: true,
- };
- Api.GroupedQueryApiPost('/ajax/core/collections/init', data, res => {
- var did_get = false;
-
- if (res.data) {
- var data = res.data;
- this.ready = true;
- this.websocket_id = data.room_id;
- this.receiveNewKey(data.key, data.key_version, false);
- this.open();
-
- if (data.get) {
- this.callback('get', { collectionId: this.collectionId, data: data.get });
- did_get = true;
- }
- }
-
- if (!did_get) {
- this.callback('init', {});
- }
- });
- }
-
- open() {
- var websocket_id = this.websocket_id;
- ws.subscribe(
- 'collections/' + websocket_id,
- (uri, obj) => {
- this.receiveEvent(obj);
- },
- websocket_id,
- );
- ws.onReconnect(websocket_id, () => {
- this.close();
- this.init();
- });
-
- this.callback('open', {});
- this.publish();
- }
-
- close() {
- var websocket_id = this.websocket_id;
- ws.offReconnect(websocket_id);
- ws.unsubscribe(
- 'collections/' + websocket_id,
- (uri, obj) => {
- this.receiveEvent(obj);
- },
- websocket_id,
- );
-
- this.callback('close', {});
- }
-
- publish(data, callback) {
- if (!data) {
- //Read buffer
-
- var publish_buffer = JSON.parse(JSON.stringify(this.publish_buffer));
- this.publish_buffer = [];
-
- publish_buffer.forEach(item => {
- this.publish(item, callback);
- });
-
- return;
- }
-
- if (!this.ready) {
- this.publish_buffer.push(data);
- return;
- }
-
- var websocket_id = this.websocket_id;
- var encrypted = this.encrypt(data);
- ws.publish('collections/' + websocket_id, encrypted);
-
- if (callback) {
- callback();
- }
- }
-
- receiveEvent(event) {
- if (event.encrypted) {
- event = this.decrypt(event);
- }
-
- if (event.new_key) {
- this.receiveNewKey(event.new_key, event.key_version, true);
- return;
- }
-
- if (!event) {
- return;
- }
-
- this.callback('event', event);
- }
-
- //Receive new key as addon for previous key or as replacing key (sent by php server)
- receiveNewKey(key, version, asAddon) {
- if (asAddon) {
- var lastKey = this.keys[this.keys.length - 1];
- key = sha256(lastKey.key + key).toString(); //Mix keys
- }
-
- this.keys.push({
- key: key,
- version: version,
- });
- this.keys_by_version[version] = key;
-
- this.prepareEncryptKey();
- }
-
- prepareEncryptKey() {
- var lastKey = this.keys[this.keys.length - 1];
-
- try {
- if (this.prepared_key_original !== lastKey) {
- this.prepared_key_salt = CryptoJS.lib.WordArray.random(256);
- this.prepared_key_original = lastKey;
- this.prepared_key = CryptoJS.PBKDF2(lastKey.key, this.prepared_key_salt, {
- hasher: CryptoJS.algo.SHA512,
- keySize: 64 / 8,
- iterations: 9,
- });
- }
- } catch (e) {
- console.log(e);
- }
-
- return this.prepared_key;
- }
-
- encrypt(data) {
- var lastKey = this.keys[this.keys.length - 1];
- var prepared_key = this.prepareEncryptKey();
- if (!prepared_key) {
- prepared_key = '';
- }
- var iv = CryptoJS.lib.WordArray.random(16);
-
- var encrypted = CryptoJS.AES.encrypt(JSON.stringify(data), prepared_key, { iv: iv });
-
- // eslint-disable-next-line no-redeclare
- var data = {
- encrypted: CryptoJS.enc.Base64.stringify(encrypted.ciphertext),
- iv: CryptoJS.enc.Hex.stringify(iv),
- salt: CryptoJS.enc.Hex.stringify(this.prepared_key_salt),
- key_version: lastKey.version,
- };
-
- return data;
- }
-
- decrypt(data) {
- if (!data.key_version) {
- return false;
- }
- let res = '';
- let str = '';
- try {
- if (data.public) {
- return typeof data.public === 'string' ? JSON.parse(data.public) : data.public;
- }
-
- var encrypted_data = data.encrypted;
-
- var key = this.keys_by_version[data.key_version];
-
- if (!key) {
- if (
- this.getKeyTimestamp(key) > this.getKeyTimestamp(this.keys[this.keys.length - 1].version)
- ) {
- //We have a old key, we have to update and request the message again
- this.init(this.http_options);
- //TODO reask lost message after init
- } else {
- //We have only newer keys, ask everybody to update
- //TODO ws.publish('collections/' + websocket_id, encrypted);
- }
- return false;
- }
-
- var salt = CryptoJS.enc.Hex.parse(data.salt);
- var prepared_key = CryptoJS.PBKDF2(key, salt, {
- hasher: CryptoJS.algo.SHA512,
- keySize: 64 / 8,
- iterations: 9,
- });
-
- var iv = CryptoJS.enc.Hex.parse(data.iv);
- var bytes = CryptoJS.AES.decrypt(encrypted_data, prepared_key, { iv: iv });
- str = bytes.toString(CryptoJS.enc.Utf8);
-
- if (str) {
- res = JSON.parse(str);
- } else {
- res = '';
- }
- } catch (err) {
- console.error('Unable to read encrypted websocket event', str, err.message);
- }
-
- return res;
- }
-
- getKeyTimestamp(key) {
- try {
- if (typeof key !== 'string') {
- if (key !== undefined) {
- console.log('wrong websocket key format: ', key);
- }
- return 0;
- }
- return parseInt((key || '').split('-')[1]);
- } catch (e) {
- console.log(key, e);
- }
- }
-}
diff --git a/tdrive/frontend/src/app/deprecated/Configurators/ConfiguratorsManager.js b/tdrive/frontend/src/app/deprecated/Configurators/ConfiguratorsManager.js
deleted file mode 100755
index 96ee55eb..00000000
--- a/tdrive/frontend/src/app/deprecated/Configurators/ConfiguratorsManager.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import Observable from '@deprecated/CollectionsV1/observable.js';
-
-import Globals from '@features/global/services/globals-tdrive-app-service';
-
-class ConfiguratorsManager extends Observable {
- constructor() {
- super();
- this.setObservableName('configurators_manager');
- Globals.window.configuratorsManager = this;
-
- this.currentConfigurators = {};
- this.configurator_order = [];
- }
-
- openConfigurator(app, form, hidden_data, id) {
- this.currentConfigurators[app.id] = {
- app: app,
- form: form,
- hidden_data: hidden_data,
- id: id,
- };
-
- var _new_order = [];
- this.configurator_order.forEach(id => {
- if (app.id !== id) {
- _new_order.push(id);
- }
- });
- _new_order.push(app.id);
- this.configurator_order = _new_order;
-
- this.notify();
- }
-
- closeConfigurator(app) {
- delete this.currentConfigurators[app.id];
-
- var _new_order = [];
- this.configurator_order.forEach(id => {
- if (app.id !== id) {
- _new_order.push(id);
- }
- });
- this.configurator_order = _new_order;
- this.notify();
- }
-}
-
-const conf_serv = new ConfiguratorsManager();
-export default conf_serv;
diff --git a/tdrive/frontend/src/app/deprecated/SelectionsManager/SelectionsManager.js b/tdrive/frontend/src/app/deprecated/SelectionsManager/SelectionsManager.js
deleted file mode 100755
index 4b5d3045..00000000
--- a/tdrive/frontend/src/app/deprecated/SelectionsManager/SelectionsManager.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import Observable from '@deprecated/CollectionsV1/observable.js';
-
-import Globals from '@features/global/services/globals-tdrive-app-service';
-
-class SelectionsManager extends Observable {
- constructor() {
- super();
- this.setObservableName('selections_manager');
-
- this.type = '';
- this.selected_per_type = {};
- this.last_change = {};
-
- Globals.window.selected_drive = this;
- }
-
- toggle(id) {
- if (this.selected_per_type[this.type][id]) {
- this.unselect(id);
- } else {
- this.select(id);
- }
- }
-
- select(id) {
- this.selected_per_type[this.type][id] = true;
- this.last_change[id] = new Date();
- this.notify();
- }
-
- unselect(id) {
- delete this.selected_per_type[this.type][id];
- this.last_change[id] = new Date();
- this.notify();
- }
-
- unselectAll() {
- if (Object.keys(this.selected_per_type[this.type] || {}).length === 0) {
- return;
- }
- Object.keys(this.selected_per_type[this.type] || {}).forEach(id => {
- this.last_change[id] = new Date();
- });
- this.selected_per_type[this.type] = {};
- this.notify();
- }
-
- setType(type) {
- if (type !== this.type) {
- this.type = type;
- if (!this.selected_per_type[this.type]) {
- this.selected_per_type[this.type] = {};
- }
- }
- }
-
- //Observable improvement, a listener can listen only for modifications on some objects to prevent massive notify and state updates
- listenOnly(listener, object_front_ids) {
- if (!listener._observable) {
- listener._observable = {};
- }
- if (!listener._observable[this.observableName]) {
- listener._observable[this.observableName] = {};
- }
- listener._observable[this.observableName].listen_only = object_front_ids;
- }
- shouldNotify(node) {
- if (!this._last_modified) {
- this._last_modified = {};
- }
- var update = true;
- if (
- node._observable &&
- node._observable[this.observableName] &&
- node._observable[this.observableName].listen_only
- ) {
- update = false;
- // eslint-disable-next-line array-callback-return
- node._observable[this.observableName].listen_only.map(item => {
- if (!this._last_modified[item] || this.last_change[item] > this._last_modified[item]) {
- this._last_modified[item] = this.last_change[item];
- update = true;
- }
- });
- }
- return update;
- }
-}
-
-const service = new SelectionsManager();
-export default service;
diff --git a/tdrive/frontend/src/app/deprecated/login/account.js b/tdrive/frontend/src/app/deprecated/login/account.js
deleted file mode 100755
index 3d264422..00000000
--- a/tdrive/frontend/src/app/deprecated/login/account.js
+++ /dev/null
@@ -1,226 +0,0 @@
-import Api from '@features/global/framework/api-service';
-import Languages from '@features/global/services/languages-service';
-import DepreciatedCollections from '@deprecated/CollectionsV1/Collections/Collections.js';
-import Login from '../../features/auth/login-service';
-import { getUser } from '../../features/users/hooks/use-user-list';
-
-/**
- * This service is depreciated as Tdrive will exclusively use Console in the future
- */
-class Account {
- notify() {
- Login.notify();
- }
-
- /**
- * Recover password
- */
-
- recover(mail, funct, th) {
- var data = {
- email: mail,
- };
- var that = this;
- this.login_loading = true;
- that.error_recover_nosuchmail = false;
- this.notify();
- Api.post('/ajax/users/recover/mail', data, function (res) {
- if (res.data.token) {
- that.recover_token = res.data.token;
-
- that.login_loading = false;
- that.notify();
- funct(th);
- } else {
- that.error_recover_nosuchmail = true;
- that.login_loading = false;
-
- that.notify();
- //appel de funtion error
- }
- });
- }
-
- recoverCode(code, funct, th) {
- var data = {
- code: code,
- token: this.recover_token,
- };
- var that = this;
- that.error_recover_badcode = false;
- this.login_loading = true;
- this.notify();
- Api.post('/ajax/users/recover/verify', data, function (res) {
- if (res.data.status === 'success') {
- that.recover_code = code;
-
- that.login_loading = false;
- that.notify();
- funct(th);
- } else {
- that.error_recover_badcode = true;
- that.login_loading = false;
-
- that.notify();
- }
- });
- }
-
- recoverNewPassword(password, password2, funct, th) {
- this.login_loading = true;
- this.notify();
-
- if (password !== password2 || password.length < 8) {
- this.error_recover_badpasswords = true;
- this.login_loading = false;
- this.notify();
- return;
- }
-
- var data = {
- code: this.recover_code,
- token: this.recover_token,
- password: password,
- };
- var that = this;
- that.error_recover_badpasswords = false;
- that.error_recover_unknown = false;
- this.notify();
- Api.post('/ajax/users/recover/password', data, function (res) {
- if (res.data.status === 'success') {
- funct(th);
-
- that.login_loading = false;
- that.notify();
- } else {
- that.error_recover_unknown = true;
- that.login_loading = false;
-
- that.notify();
- }
- });
- }
-
- subscribeMail(username, password, name, first_name, phone, mail, newsletter, cb, th) {
- if (this.doing_subscribe) {
- return;
- }
- var data = {
- email: mail,
- username: username,
- password: password,
- name: name,
- first_name: first_name,
- phone: phone,
- language: Languages.language,
- newsletter: newsletter,
- };
- var that = this;
- that.error_subscribe_mailalreadyused = false;
- that.login_loading = true;
- that.doing_subscribe = true;
- this.notify();
- Api.post('/ajax/users/subscribe/mail', data, function (res) {
- that.login_loading = false;
- that.doing_subscribe = false;
- that.notify();
- if (res.data.token) {
- that.subscribe_token = res.data.token;
- cb(th, 0);
-
- that.waitForVerification(username, password, th);
- } else {
- cb(th, 1);
- that.error_subscribe_mailalreadyused = true;
- }
- });
- }
-
- waitForVerification(username, password, th) {
- if (this.waitForVerificationTimeout) {
- clearTimeout(this.waitForVerificationTimeout);
- }
- this.waitForVerificationTimeout = setTimeout(() => {
- this.waitForVerification(username, password, th);
- Login.login({ username, password }, true);
- }, 2000);
- }
-
- doVerifyMail(mail, code, token, success, fail) {
- Api.post(
- '/ajax/users/subscribe/doverifymail',
- {
- code: code,
- token: token,
- mail: mail,
- device: {},
- },
- function (res) {
- if (res.data.status === 'success') {
- success();
- } else {
- fail();
- }
- },
- );
- }
-
- checkMailandUsername(mail, username, callback, th) {
- var that = this;
-
- that.error_subscribe_username = false;
- that.error_subscribe_mailalreadyused = false;
- var data = {
- mail: mail,
- username: username,
- };
- that.login_loading = true;
- that.notify();
- Api.post('/ajax/users/subscribe/availability', data, function (res) {
- that.login_loading = false;
- if (res.data.status === 'success') {
- callback(th, 0);
- } else {
- if (res.errors.length === 1 && res.errors[0] === 'mailalreadytaken') {
- callback(th, 1);
- that.error_subscribe_mailalreadyused = true;
- } else if (res.errors.length === 1 && res.errors[0] === 'usernamealreadytaken') {
- callback(th, 2);
- that.error_subscribe_username = true;
- } else {
- callback(th, 3);
- that.error_subscribe_mailalreadyused = true;
- that.error_subscribe_username = true;
- }
- }
- that.notify();
- });
- }
-
- addNewMail(mail, cb, thot) {
- var that = this;
- that.loading = true;
- that.error_secondary_mail_already = false;
- that.error_code = false;
- that.notify();
- Api.post('/ajax/users/account/addmail', { mail: mail }, function (res) {
- that.loading = false;
-
- if (res.errors.indexOf('badmail') > -1) {
- that.error_secondary_mail_already = true;
- that.notify();
- } else {
- that.addmail_token = res.data.token;
- that.notify();
- cb(thot);
- }
- });
- }
-
- verifySecondMail(mail, code, cb, thot) {
- //unimplemented
- }
-}
-
-const æccount = new Account();
-export default æccount;
diff --git a/tdrive/frontend/src/app/deprecated/uploadManager/upload-manager.js b/tdrive/frontend/src/app/deprecated/uploadManager/upload-manager.js
deleted file mode 100755
index aef7c10a..00000000
--- a/tdrive/frontend/src/app/deprecated/uploadManager/upload-manager.js
+++ /dev/null
@@ -1,211 +0,0 @@
-import Observable from '@deprecated/CollectionsV1/observable.js';
-
-import Globals from '@features/global/services/globals-tdrive-app-service';
-
-class UploadManager extends Observable {
- constructor() {
- super();
- this.observableName = 'uploadService';
-
- this.globalStatus = 0;
- this.uploads = [];
- this.sessionUploaded = 0;
- this.uploaded_entities = [];
- this.uploading = 0;
-
- Globals.window.uploads = this;
- }
-
- updateData() {
- var totalSize = 0;
- var totalUp = 0;
- for (var i = 0; i < this.uploads.length; i++) {
- totalSize += this.uploads[i].size;
- totalUp += this.uploads[i].uploaded;
- this.uploads[i].status = (100 * this.uploads[i].uploaded) / (this.uploads[i].size + 1);
- }
-
- if (this.sessionUploaded + this.uploads.length === 0) {
- this.globalStatus = 0;
- } else if (totalSize === 0) {
- this.globalStatus =
- (100 * this.sessionUploaded) / (this.sessionUploaded + this.uploads.length);
- } else {
- this.globalStatus =
- (100 * (totalUp / totalSize + this.sessionUploaded)) /
- (this.sessionUploaded + this.uploads.length);
- }
-
- if (this.uploads.length === 0) {
- this.globalStatus = 0;
- this.sessionUploaded = 0;
-
- if (this.callback) {
- var uploaded = [];
- // eslint-disable-next-line no-redeclare
- for (var i = 0; i < this.uploaded_entities.length; i++) {
- uploaded.push(this.uploaded_entities[i]);
- }
-
- this.callback(uploaded);
- this.uploaded_entities = [];
- }
- }
-
- this.notify();
- }
-
- getFilesTree(event, fcb) {
- function newDirectoryApi(input, cb) {
- var fd = [],
- files = [];
- var iterate = function (entries, path, resolve) {
- var promises = [];
- entries.forEach(function (entry) {
- promises.push(
- new Promise(function (resolve) {
- if ('getFilesAndDirectories' in entry) {
- entry.getFilesAndDirectories().then(function (entries) {
- iterate(entries, entry.path + '/', resolve);
- });
- } else {
- if (entry.name) {
- var p = (path + entry.name).replace(/^[/\\]/, '');
- fd.push(entry);
- files.push(p);
- }
- resolve();
- }
- }),
- );
- });
- Promise.all(promises).then(resolve);
- };
- input.getFilesAndDirectories().then(function (entries) {
- new Promise(function (resolve) {
- iterate(entries, '/', resolve);
- }).then(cb.bind(null, fd, files));
- });
- }
-
- // old prefixed API implemented in Chrome 11+ as well as array fallback
- function arrayApi(input, cb) {
- var fd = [],
- files = [];
- [].slice.call(input.files).forEach(function (file) {
- fd.push(file);
- files.push(file.webkitRelativePath || file.name);
- });
- cb(fd, files);
- }
-
- // old drag and drop API implemented in Chrome 11+
- function entriesApi(items, cb) {
- var fd = [],
- files = [],
- rootPromises = [];
-
- function readEntries(entry, reader, oldEntries, cb) {
- var dirReader = reader || entry.createReader();
- dirReader.readEntries(function (entries) {
- var newEntries = oldEntries ? oldEntries.concat(entries) : entries;
- if (entries.length) {
- setTimeout(readEntries.bind(null, entry, dirReader, newEntries, cb), 0);
- } else {
- cb(newEntries);
- }
- });
- }
-
- function readDirectory(entry, path, resolve) {
- if (!path) path = entry.name;
- readEntries(entry, 0, 0, function (entries) {
- var promises = [];
- entries.forEach(function (entry) {
- promises.push(
- new Promise(function (resolve) {
- if (entry.isFile) {
- entry.file(function (file) {
- var p = path + '/' + file.name;
- fd.push(file);
- files.push(p);
- resolve();
- }, resolve.bind());
- } else readDirectory(entry, path + '/' + entry.name, resolve);
- }),
- );
- });
- Promise.all(promises).then(resolve.bind());
- });
- }
-
- [].slice.call(items).forEach(function (entry) {
- entry = entry.webkitGetAsEntry();
- if (entry) {
- rootPromises.push(
- new Promise(function (resolve) {
- if (entry.isFile) {
- entry.file(function (file) {
- fd.push(file);
- files.push(file.name);
- resolve();
- }, resolve.bind());
- } else if (entry.isDirectory) {
- readDirectory(entry, null, resolve);
- }
- }),
- );
- }
- });
- Promise.all(rootPromises).then(cb.bind(null, fd, files));
- }
-
- var cb = function (event, files, paths) {
- var tree = {};
- paths.forEach(function (path, file_index) {
- var dirs = tree;
- var real_file = files[file_index];
- path.split('/').forEach(function (dir, dir_index) {
- if (dir.indexOf('.') === 0) {
- return;
- }
- if (dir_index === path.split('/').length - 1) {
- dirs[dir] = real_file;
- } else {
- if (!dirs[dir]) {
- dirs[dir] = {};
- }
- dirs = dirs[dir];
- }
- });
- });
-
- fcb(tree);
- };
-
- if (event.dataTransfer) {
- var dt = event.dataTransfer;
- if (dt.items && dt.items.length && 'webkitGetAsEntry' in dt.items[0]) {
- entriesApi(dt.items, cb.bind(null, event));
- } else if ('getFilesAndDirectories' in dt) {
- newDirectoryApi(dt, cb.bind(null, event));
- } else if (dt.files) {
- arrayApi(dt, cb.bind(null, event));
- } else cb();
- } else if (event.target) {
- var t = event.target;
- if (t.files && t.files.length) {
- arrayApi(t, cb.bind(null, event));
- } else if ('getFilesAndDirectories' in t) {
- newDirectoryApi(t, cb.bind(null, event));
- } else {
- cb(event);
- }
- } else {
- fcb(event);
- }
- }
-}
-
-const upload = new UploadManager();
-export default upload;
diff --git a/tdrive/frontend/src/app/deprecated/user/CurrentUser.ts b/tdrive/frontend/src/app/deprecated/user/CurrentUser.ts
index b89dd360..e3fff98d 100755
--- a/tdrive/frontend/src/app/deprecated/user/CurrentUser.ts
+++ b/tdrive/frontend/src/app/deprecated/user/CurrentUser.ts
@@ -4,7 +4,6 @@ import $ from 'jquery';
import Login from '@features/auth/login-service';
import Collections from '@deprecated/CollectionsV1/Collections/Collections';
import Api from '@features/global/framework/api-service';
-import ws from '@deprecated/websocket/websocket';
import Observable from '@deprecated/CollectionsV1/observable';
import Number from '@features/global/utils/Numbers';
import AlertManager from '@features/global/services/alert-manager-service';
@@ -87,11 +86,7 @@ class CurrentUser extends Observable {
const data = {
status: user.tutorial_status,
};
- Api.post('/ajax/users/account/set_tutorial_status', data, () => {
- ws.publish('users/' + Login.currentUserId, {
- user: { tutorial_status: user.tutorial_status },
- });
- });
+ Api.post('/ajax/users/account/set_tutorial_status', data, () => {});
}
updateUserName(username: string) {
@@ -106,7 +101,6 @@ class CurrentUser extends Observable {
Api.post('/ajax/users/account/username', { username }, (res: any) => {
that.loading = false;
if (res.errors.length === 0) {
- ws.publish('users/' + Login.currentUserId, { user: update });
that.errorUsernameExist = false;
} else {
that.errorUsernameExist = true;
@@ -166,7 +160,6 @@ class CurrentUser extends Observable {
update.thumbnail = resp.data.thumbnail || '';
}
Collections.get('users').updateObject(update);
- ws.publish('users/' + Login.currentUserId, { user: update });
that.notify();
}
}
diff --git a/tdrive/frontend/src/app/deprecated/user/notification_parameters.js b/tdrive/frontend/src/app/deprecated/user/notification_parameters.js
deleted file mode 100755
index 999140e8..00000000
--- a/tdrive/frontend/src/app/deprecated/user/notification_parameters.js
+++ /dev/null
@@ -1,213 +0,0 @@
-import Languages from '@features/global/services/languages-service';
-import Observable from '@deprecated/CollectionsV1/observable.js';
-import ws from '@deprecated/websocket/websocket.js';
-import Api from '@features/global/framework/api-service';
-import Login from '@features/auth/login-service';
-import Collections from '@deprecated/CollectionsV1/Collections/Collections.js';
-import AlertManager from '@features/global/services/alert-manager-service';
-
-import Globals from '@features/global/services/globals-tdrive-app-service';
-
-/**
- * FIXME: This service seems still used by some components but we now have ./NotificationPreferences one which seems to overlap...
- */
-class NotificationParameters extends Observable {
- constructor() {
- super();
- this.setObservableName('notifications_parameters');
-
- Globals.window.notificationsParametersServices = this;
-
- this.preferences = {};
- this.loading = true;
- }
-
- initFirstTime() {
- //Save default 'do not disturb' with correct timezone
- this.init();
- }
-
- init(callback) {
- this.loading = true;
- this.notify();
- var that = this;
- Api.post('/ajax/users/account/get_notifications', {}, function (res) {
- that.preferences = res.data;
- that.original_preferences = JSON.parse(JSON.stringify(that.preferences));
-
- if (that.preferences['dont_disturb_between'] == null) {
- var l = that.transform_period(22, 8.5, new Date().getTimezoneOffset() / 60);
- that.preferences['dont_disturb_between'] = l[0];
- that.preferences['dont_disturb_and'] = l[1];
- that.save(['dont_disturb_and', 'dont_disturb_between']);
- }
-
- that.loading = false;
- that.notify();
-
- if (callback) callback();
- });
- }
-
- save(keys, no_notif) {
- if (!keys) {
- keys = [];
- }
-
- if (!this.preferences) {
- return;
- }
-
- if (!keys || keys.length === 0) {
- this.original_preferences = JSON.parse(JSON.stringify(this.preferences));
- }
-
- this.notify();
- var data = {
- preferences: JSON.parse(JSON.stringify(this.original_preferences)),
- };
-
- keys.forEach(key => {
- data.preferences[key] = this.preferences[key];
- });
- this.original_preferences = data.preferences;
-
- this.saveElements(data.preferences, no_notif);
- }
-
- saveElements(pref, no_notif) {
- var data = {
- preferences: JSON.parse(JSON.stringify(pref)),
- };
- var user = Collections.get('users').find(Login.currentUserId);
- if (!user.notifications_preferences) {
- user.notifications_preferences = {};
- }
- Object.keys(pref).forEach(key => {
- user.notifications_preferences[key] = pref[key];
- });
- Collections.get('users').updateObject(user);
-
- this.loading = true;
- var that = this;
- Api.post('/ajax/users/account/set_notifications', data, function (res) {
- that.loading = false;
- ws.publish('users/' + Login.currentUserId, {
- user: {
- notifications_preferences: Collections.get('users').find(Login.currentUserId)
- .notifications_preferences,
- },
- });
- that.notify();
-
- if (!no_notif) {
- AlertManager.alert(() => {}, {
- text: Languages.t(
- 'services.user.notification_parameters_update_alert',
- [],
- 'Les paramètres de notification ont été mis à jour.',
- ),
- });
- }
- });
- }
-
- is_in_period(a, b) {
- var currentDate = new Date().getHours() + Math.floor(new Date().getMinutes() / 30) / 2;
- if (a != null && b != null) {
- if (a < b && currentDate >= a && currentDate < b) {
- return true;
- }
- if (a > b && (currentDate >= a || currentDate < b)) {
- return true;
- }
- }
- return false;
- }
-
- hasNotificationsDisabled(preferences) {
- if (!preferences) {
- return false;
- }
- var l = this.transform_period(
- preferences.dont_disturb_between,
- preferences.dont_disturb_and,
- -new Date().getTimezoneOffset() / 60,
- );
- if (this.is_in_period(l[0], l[1])) {
- return true;
- }
- if (preferences.disable_until > new Date().getTime() / 1000) {
- return true;
- }
- return false;
- }
-
- getNotificationsStatus(user) {
- this.dont_disturb = this.transform_period(
- (user.notifications_preferences || {}).dont_disturb_between,
- (user.notifications_preferences || {}).dont_disturb_and,
- -new Date().getTimezoneOffset() / 60,
- );
- var notifications_state = 'on';
- if (
- (user.notifications_preferences || {}).disable_until < new Date().getTime() / 1000 &&
- !this.is_in_period(this.dont_disturb[0], this.dont_disturb[1])
- ) {
- notifications_state = 'on';
- } else if (
- (user.notifications_preferences || {}).disable_until <
- new Date().getTime() / 1000 + 60 * 60 * 24 ||
- this.is_in_period(this.dont_disturb[0], this.dont_disturb[1])
- ) {
- notifications_state = 'paused';
- } else {
- notifications_state = 'off';
- }
- return notifications_state;
- }
-
- transform_period(a, b, offset) {
- a = parseFloat(a);
- b = parseFloat(b);
-
- if (offset > 0) {
- offset += -24;
- }
-
- a += offset;
- b += offset;
-
- if (a < 0 || b < 0) {
- a += 24;
- b += 24;
-
- if (b >= 24) {
- if (a < b) {
- b += -24;
- } else {
- b += -24;
- var c = b;
- b = a;
- a = c;
- }
- }
-
- if (a >= 24) {
- if (b < a) {
- a += -24;
- } else {
- a += -24;
- // eslint-disable-next-line no-redeclare
- var c = a;
- a = b;
- b = c;
- }
- }
- }
-
- return [a, b];
- }
-}
-
-export default new NotificationParameters();
diff --git a/tdrive/frontend/src/app/deprecated/websocket/websocket.js b/tdrive/frontend/src/app/deprecated/websocket/websocket.js
deleted file mode 100755
index 036c2d1f..00000000
--- a/tdrive/frontend/src/app/deprecated/websocket/websocket.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import Number from '@features/global/utils/Numbers';
-import Observable from '@deprecated/CollectionsV1/observable.js';
-import LoginService from '@features/auth/login-service';
-import Logger from '@features/global/framework/logger-service';
-import Globals from '@features/global/services/globals-tdrive-app-service';
-import WebSocket from '../../features/global/types/websocket-types';
-
-/**
- * @deprecated Keeps old PHP websocket working doing the bridge with the new implementation
- */
-class DeprecatedWebsocket extends Observable {
- constructor() {
- super();
- this.logger = Logger.getLogger('Websocket');
- this.setObservableName('websockets');
-
- this.ws = null;
- this.connection = null;
- this.afterError = false;
- this.lastData = 1;
- this.testNetwork = false;
-
- this.connected = true;
- this.subscribed = {};
- this.subscribedKey = {};
- this.disconnectListeners = {};
-
- this.alive_connected = true;
-
- this.firstTime = true;
- this.last_reconnect_call = new Date();
- this.last_reconnect_call_if_needed = new Date();
-
- window.websocketsManager = this;
-
- this.window_focus = true;
- this.window_last_blur = new Date();
- this.deconnectionBlurTimeout = setTimeout(() => {}, 0);
- Globals.window.addEventListener('focus', () => {
- this.reconnectIfNeeded(60);
- clearTimeout(this.deconnectionBlurTimeout);
- this.didFocusedLastMinute = true;
- this.window_focus = true;
- this.window_last_blur = new Date();
- if (this.ws == null || new Date().getTime() - this.window_last_blur.getTime() > 30000) {
- this.alive_connected = false;
- this.alive();
- }
- });
- Globals.window.addEventListener('blur', () => {
- this.window_focus = false;
- this.window_last_blur = new Date();
- });
-
- this.alive.bind(this);
- this.message.bind(this);
- this.updateConnected.bind(this);
- }
-
- //Send I'm alive !
- alive() {
- var nw = new Date().getTime();
- if (!this.lastAlive || nw - this.lastAlive > 60000) {
- // Wait at least 60 seconds
- this.lastAlive = nw;
- this.alive_timeout = setTimeout(() => {
- this.alive_connected = false;
- }, 5100);
- this.reconnectIfNeeded();
- clearTimeout(this.alive_timeout);
- this.alive_connected = true;
- this.didFocusedLastMinute = Globals.isReactNative || Globals.window.document.hasFocus();
- }
- }
-
- //Receive server message
- message(unid, route, data) {
- route = (route || '').split('previous::').pop();
- if (unid !== this.subscribedKey[route]) {
- return;
- }
- if (this.subscribed[route]) {
- this.subscribed[route].forEach(c => {
- try {
- c.callback(route, data);
- } catch (err) {
- console.log(err);
- }
- });
- } else {
- this.unsubscribe(route);
- }
- }
-
- //Subscribe to channel
- subscribe(route, callback, key) {
- this.logger.debug(`Subscribe to ${route}`);
- route = (route || '').split('previous::').pop();
- if (!key) {
- key = callback.name;
- }
- if (!this.subscribed[route]) {
- this.subscribed[route] = [];
- }
- this.subscribed[route].push({ name: key, callback: callback });
- if (this.subscribed[route].length === 1) {
- const unid = Number.unid();
- this.subscribedKey[route] = unid;
- WebSocket.get().join('previous::' + route, '', '', (type, data) => {
- if (type === 'realtime:event') {
- this.message(unid, data.name, data.data);
- }
- if (type === 'connected') {
- this.updateConnected(true);
- }
- if (type === 'disconnected') {
- this.updateConnected(false);
- }
- });
- }
- }
-
- //Unsubscribe from channel
- unsubscribe(route, callback, key) {
- this.logger.debug(`Unsubscribe from ${route}`);
- route = (route || '').split('previous::').pop();
- if (!key && callback) {
- key = callback.name;
- }
- if (!key) {
- key = 'default';
- }
- if (!this.subscribed[route]) {
- this.subscribed[route] = [];
- }
- var remaining = [];
- this.subscribed[route].forEach(c => {
- if (c.name !== key) {
- remaining.push(c);
- }
- });
- this.subscribed[route] = remaining;
- if (this.subscribed[route].length === 0) {
- WebSocket.get().leave('previous::' + route, '');
- }
- }
-
- publish(route, value) {
- this.logger.debug(`Publish to ${route}`);
- WebSocket.get().send('previous::' + route, value);
- }
-
- reconnectIfNeeded(seconds = 30) {
- if (new Date().getTime() - this.last_reconnect_call_if_needed.getTime() > seconds * 1000) {
- //30 seconds
- if (LoginService.currentUserId) {
- LoginService.updateUser();
- }
-
- this.last_reconnect_call_if_needed = new Date();
- }
- }
-
- onReconnect(id, callback) {
- this.disconnectListeners[id] = callback;
- }
-
- offReconnect(id) {
- delete this.disconnectListeners[id];
- }
-
- updateConnected(state) {
- if (state !== this.connected) {
- this.connected = state;
- this.notify();
- }
- }
-
- isConnected() {
- return this.connected;
- }
-}
-
-export default new DeprecatedWebsocket();
diff --git a/tdrive/frontend/src/app/deprecated/workspaces/groups.js b/tdrive/frontend/src/app/deprecated/workspaces/groups.js
deleted file mode 100755
index bff154e2..00000000
--- a/tdrive/frontend/src/app/deprecated/workspaces/groups.js
+++ /dev/null
@@ -1,125 +0,0 @@
-import Observable from '@deprecated/CollectionsV1/observable.js';
-import Api from '@features/global/framework/api-service';
-import ws from '@deprecated/websocket/websocket.js';
-import Collections from '@deprecated/CollectionsV1/Collections/Collections.js';
-import Workspaces from '@deprecated/workspaces/workspaces.jsx';
-import ListenGroups from './listen_groups.js';
-
-import $ from 'jquery';
-import JWTStorage from '@features/auth/jwt-storage-service';
-import CompanyAPIClient from '../../features/companies/api/company-api-client';
-import UserService from '@features/users/services/current-user-service';
-import Globals from '@features/global/services/globals-tdrive-app-service';
-
-class Groups extends Observable {
- constructor() {
- super();
- this.setObservableName('groups');
- this.currentGroupId = null;
-
- this.user_groups = {};
- Globals.window.gs = this;
- }
-
- select(group) {
- if (this.currentGroupId === group.id) {
- return;
- }
-
- if (!group.id) {
- return;
- }
-
- if (this.currentGroupId) {
- ListenGroups.cancelListenGroup(this.currentGroupId);
- }
- ListenGroups.listenGroup(group.id);
-
- this.currentGroupId = group.id;
- Workspaces.changeGroup(group);
- this.notify();
- }
-
- addToUser(group) {
- var current_group = Collections.get('groups').find(group.id);
- if (current_group && current_group._user_hasnotifications) {
- group._user_hasnotifications =
- group._user_hasnotifications || current_group._user_hasnotifications;
- }
-
- var id = group.id;
- Collections.get('groups').updateObject(group);
- this.user_groups[id] = Collections.get('groups').known_objects_by_id[id];
- }
-
- async getOrderedGroups() {
- const userCompanies = await CompanyAPIClient.listCompanies(UserService.getCurrentUserId());
-
- return userCompanies;
- //.sort((a, b) => String(a.name).localeCompare(String(b.name)));
- }
-
- updateName(name) {
- var that = this;
- this.loading = true;
- this.notify();
- Api.post('/ajax/workspace/group/data/name', { groupId: this.currentGroupId, name }, res => {
- if (res.errors.length === 0) {
- var group = { id: that.currentGroupId, name: name };
- Collections.get('groups').updateObject(group);
- ws.publish('group/' + group.id, { data: { group: group } });
- }
- that.loading = false;
- that.notify();
- });
- }
- updateLogo(logo) {
- this.loading = true;
- this.notify();
- var route = `${Globals.api_root_url}/ajax/workspace/group/data/logo`;
-
- var data = new FormData();
- if (logo !== false) {
- data.append('logo', logo);
- }
- data.append('groupId', this.currentGroupId);
- var that = this;
-
- $.ajax({
- url: route,
- type: 'POST',
- data: data,
- cache: false,
- contentType: false,
- processData: false,
-
- headers: {
- Authorization: JWTStorage.getAutorizationHeader(),
- },
- xhrFields: {
- withCredentials: true,
- },
- xhr: function () {
- var myXhr = $.ajaxSettings.xhr();
- myXhr.onreadystatechange = function () {
- if (myXhr.readyState === XMLHttpRequest.DONE) {
- that.loading = false;
- var resp = JSON.parse(myXhr.responseText);
- if (resp.errors.indexOf('badimage') > -1) {
- that.error_identity_badimage = true;
- } else {
- var group = resp.data;
- Collections.get('groups').updateObject(group);
- ws.publish('group/' + group.id, { data: { group: group } });
- }
- that.notify();
- }
- };
- return myXhr;
- },
- });
- }
-}
-
-const service = new Groups();
-export default service;
diff --git a/tdrive/frontend/src/app/deprecated/workspaces/groups.ts b/tdrive/frontend/src/app/deprecated/workspaces/groups.ts
new file mode 100755
index 00000000..6ed7a964
--- /dev/null
+++ b/tdrive/frontend/src/app/deprecated/workspaces/groups.ts
@@ -0,0 +1,3 @@
+export const Groups: { currentGroupId: null | string } = {
+ currentGroupId: null,
+};
diff --git a/tdrive/frontend/src/app/deprecated/workspaces/listen_groups.js b/tdrive/frontend/src/app/deprecated/workspaces/listen_groups.js
deleted file mode 100755
index f30461c1..00000000
--- a/tdrive/frontend/src/app/deprecated/workspaces/listen_groups.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import ws from '@deprecated/websocket/websocket.js';
-import Collections from '@deprecated/CollectionsV1/Collections/Collections.js';
-
-class ListenGroups {
- constructor() {
- this.groups_repository = Collections.get('groups');
- this.listenerCount = {};
- }
-
- listenGroup(idGroup) {
- if (!idGroup) {
- return;
- }
-
- if (!this.listenerCount[idGroup]) {
- this.listenerCount[idGroup] = 0;
- }
- this.listenerCount[idGroup] += 1;
-
- var that = this;
- if (this.listenerCount[idGroup] === 1) {
- ws.subscribe('group/' + idGroup, function (uri, data) {
- data = data.data;
- if (data.group) {
- data.group.id = idGroup;
- that.groups_repository.updateObject(data.group);
- }
- });
- }
- }
-
- cancelListenGroup(idGroup) {
- if (!idGroup) {
- return;
- }
-
- if (this.listenerCount[idGroup]) {
- this.listenerCount[idGroup] += -1;
- }
- if (!this.listenerCount[idGroup] || this.listenerCount[idGroup] === 0) {
- ws.unsubscribe('group/' + idGroup);
- }
- }
-}
-
-const service = new ListenGroups();
-export default service;
diff --git a/tdrive/frontend/src/app/deprecated/workspaces/listen_workspace.js b/tdrive/frontend/src/app/deprecated/workspaces/listen_workspace.js
deleted file mode 100755
index 4811dd40..00000000
--- a/tdrive/frontend/src/app/deprecated/workspaces/listen_workspace.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import ws from '@deprecated/websocket/websocket.js';
-import Collections from '@deprecated/CollectionsV1/Collections/Collections.js';
-
-class ListenWorkspace {
- constructor() {
- this.workspaces_repository = Collections.get('workspaces');
- this.listenerCount = {};
- }
-
- listenWorkspace(idWorkspace) {
- if (!idWorkspace) {
- return;
- }
-
- if (!this.listenerCount[idWorkspace]) {
- this.listenerCount[idWorkspace] = 0;
- }
- this.listenerCount[idWorkspace] += 1;
-
- var that = this;
- if (this.listenerCount[idWorkspace] === 1) {
- ws.subscribe('workspace/' + idWorkspace, function (uri, data) {
- if (data.workspace) {
- data.workspace.id = idWorkspace;
- that.workspaces_repository.updateObject(data.workspace);
- }
- });
- }
- }
-
- cancelListenWorkspace(idWorkspace) {
- if (!idWorkspace) {
- return;
- }
-
- if (this.listenerCount[idWorkspace]) {
- this.listenerCount[idWorkspace] += -1;
- }
- if (!this.listenerCount[idWorkspace] || this.listenerCount[idWorkspace] === 0) {
- ws.unsubscribe('workspace/' + idWorkspace);
- }
- }
-}
-
-const service = new ListenWorkspace();
-export default service;
diff --git a/tdrive/frontend/src/app/deprecated/workspaces/workspaces.jsx b/tdrive/frontend/src/app/deprecated/workspaces/workspaces.jsx
index e26e577a..56da0d52 100755
--- a/tdrive/frontend/src/app/deprecated/workspaces/workspaces.jsx
+++ b/tdrive/frontend/src/app/deprecated/workspaces/workspaces.jsx
@@ -1,9 +1,6 @@
import DepreciatedCollections from '@deprecated/CollectionsV1/Collections/Collections.js';
import Observable from '@deprecated/CollectionsV1/observable.js';
import { default as popupManager, default as PopupManager } from '@deprecated/popupManager/popupManager.js';
-import ws from '@deprecated/websocket/websocket.js';
-import Groups from '@deprecated/workspaces/groups.js';
-import workspacesApps from '@deprecated/workspaces/workspaces_apps.jsx';
import JWTStorage from '@features/auth/jwt-storage-service';
import loginService from '@features/auth/login-service';
import ConsoleService from '@features/console/services/console-service';
@@ -41,42 +38,11 @@ class Workspaces extends Observable {
}
updateCurrentWorkspaceId(workspaceId, notify = false) {
- if (this.currentWorkspaceId !== workspaceId && workspaceId) {
- const workspace = DepreciatedCollections.get('workspaces').find(workspaceId);
- if (!workspace) {
- return;
- }
-
- this.currentWorkspaceId = workspaceId;
- this.currentWorkspaceIdByGroup[workspace.company_id] = workspaceId;
-
- if (!this.getting_details[workspaceId]) {
- this.getting_details[workspaceId] = true;
-
- workspacesApps.unload(this.currentWorkspaceId);
- WorkspaceAPIClient.get(workspace.company_id, workspaceId)
- .then(workspace => {
- if (!workspace) {
- this.removeFromUser(workspaceId);
- }
- DepreciatedCollections.get('workspaces').updateObject(workspace);
- notify && this.notify();
-
- // FIXME: What is this???
- setTimeout(() => {
- this.getting_details[workspaceId] = false;
- }, 10000);
- })
- .catch(() => {
- this.removeFromUser(workspaceId);
- });
- }
- }
+
}
updateCurrentCompanyId(companyId, notify = false) {
if (this.currentGroupId !== companyId && companyId) {
- Groups.currentGroupId = companyId;
this.currentGroupId = companyId;
notify && this.notify();
}
@@ -228,10 +194,7 @@ class Workspaces extends Observable {
name,
});
this.logger.debug('Workspace updated', result);
- DepreciatedCollections.get('workspaces').updateObject({
- id: this.currentWorkspaceId,
- name,
- });
+
} catch (err) {
this.logger.error('Can not update the workspace', err);
}
@@ -275,9 +238,6 @@ class Workspaces extends Observable {
that.error_identity_badimage = true;
that.notify();
} else {
- var update = resp.data;
- DepreciatedCollections.get('workspaces').updateObject(update);
- ws.publish('workspace/' + update.id, { workspace: update });
that.notify();
}
}
@@ -300,10 +260,6 @@ class Workspaces extends Observable {
}
window.location.reload();
}
-
- getCurrentWorkspace() {
- return DepreciatedCollections.get('workspaces').find(this.currentWorkspaceId) || {};
- }
}
export default new Workspaces();
diff --git a/tdrive/frontend/src/app/deprecated/workspaces/workspaces_apps.jsx b/tdrive/frontend/src/app/deprecated/workspaces/workspaces_apps.jsx
deleted file mode 100755
index e02ac315..00000000
--- a/tdrive/frontend/src/app/deprecated/workspaces/workspaces_apps.jsx
+++ /dev/null
@@ -1,262 +0,0 @@
-import React from 'react';
-import Observable from '@deprecated/CollectionsV1/observable.js';
-import CurrentUser from '@deprecated/user/CurrentUser';
-import Api from '@features/global/framework/api-service';
-import ws from '@deprecated/websocket/websocket.js';
-import Collections from '@deprecated/CollectionsV1/Collections/Collections.js';
-import Groups from './groups.js';
-import Workspaces from './workspaces.jsx';
-import Globals from '@features/global/services/globals-tdrive-app-service';
-import Icon from '@components/icon/icon';
-import { getUser } from '@features/users/hooks/use-user-list';
-import Login from '@features/auth/login-service';
-import { Folder, Calendar, CheckSquare, Hexagon } from 'react-feather';
-import { getCompanyApplication as getApplication } from '@features/applications/state/company-applications';
-
-class WorkspacesApps extends Observable {
- constructor() {
- super();
- this.setObservableName('workspaces_apps');
-
- Collections.get('applications');
- var options = {
- base_url: 'applications',
- use_cache: true,
- };
- Collections.updateOptions('applications', options);
-
- this.apps_by_workspace = {};
- this.apps_by_group = {};
- this.findingApp = {};
- this.did_first_load = {};
-
- Globals.window.workspacesApps = this;
-
- this.loading_by_workspace = {};
- }
-
- notifyApp(app_id, type, event, data, workspace_id = undefined, group_id = undefined) {
- workspace_id = workspace_id || Workspaces.currentWorkspaceId;
- group_id = group_id || Workspaces.currentGroupId;
-
- const connection_id = CurrentUser.unique_connection_id;
-
- // eslint-disable-next-line no-redeclare
- data = {
- workspace_id: workspace_id,
- company_id: group_id,
- app_id: app_id,
- type: type,
- name: event,
- data: { user: Collections.get('users').find(Login.currentUserId), ...data },
- content: {},
- connection_id: connection_id,
- };
-
- Api.post(
- `/internal/services/applications/v1/applications/${app_id}/event`,
- data,
- res => {},
- ).then();
- }
-
- unload(workspace_id) {
- ws.unsubscribe('workspace_apps/' + workspace_id);
- }
-
- load(workspace_id, reset_offset, options) {
- if (!workspace_id) {
- return;
- }
- if (!options) {
- options = {};
- }
-
- if (this.loading_by_workspace[workspace_id]) {
- return false;
- }
-
- this.loading_by_workspace[workspace_id] = true;
- this.notify();
-
- var data = {
- workspace_id: workspace_id,
- };
-
- var loadApps = data => {
- if (data.length > 0) {
- this.apps_by_workspace[data[0].workspace_id] = {};
- }
-
- data.forEach(item => {
- this.apps_by_workspace[item.workspace_id][item.app.id] = item.app;
- Collections.get('applications').updateObject(item.app);
- });
-
- this.did_first_load[workspace_id] = true;
-
- this.notify();
- };
-
- if (options.apps) {
- this.loading_by_workspace[workspace_id] = false;
- loadApps(options.apps);
- } else {
- Api.post('/ajax/workspace/apps/get', data, res => {
- if (res.data) {
- loadApps(res.data);
- }
-
- this.loading_by_workspace[workspace_id] = false;
- });
- }
- }
-
- loadGroupApps() {
- Api.post('/ajax/workspace/group/apps/get', { group_id: Groups.currentGroupId }, res => {
- if (res.data) {
- res.data.forEach(item => {
- var app_link = {
- workspace_count: item.workspace_count,
- workspace_default: item.workspace_default,
- app: item.app,
- };
- if (!this.apps_by_group) this.apps_by_group = {};
- if (!this.apps_by_group[item.group_id]) this.apps_by_group[item.group_id] = {};
- this.apps_by_group[item.group_id][item.app.id] = app_link;
- });
-
- this.notify();
- }
- });
- }
-
- recieveWS(res) {
- if (res.type === 'add') {
- var app_link = {
- workspace_count: res.workspace_app.workspace_count,
- workspace_default: res.workspace_app.workspace_default,
- app: res.workspace_app.app,
- };
- this.apps_by_workspace[res.workspace_app.workspace_id][res.workspace_app.app.id] =
- res.workspace_app.app;
- this.apps_by_group[res.workspace_app.group_id][res.workspace_app.app.id] = app_link;
- Collections.get('applications').completeObject(
- res.workspace_app.app,
- res.workspace_app.app.front_id,
- );
- } else if (res.type === 'remove') {
- delete this.apps_by_workspace[res.workspace_app.workspace_id][res.workspace_app.app.id];
- }
- this.notify();
- }
-
- forceInEntreprise(id) {
- var data = {
- group_id: Groups.currentGroupId,
- app_id: id,
- };
-
- if (
- this.apps_by_group[Groups.currentGroupId] &&
- this.apps_by_group[Groups.currentGroupId][id]
- ) {
- this.apps_by_workspace[Workspaces.currentWorkspaceId][id] =
- this.apps_by_group[Groups.currentGroupId][id].app;
- }
-
- Api.post('/ajax/workspace/group/application/force', data, function (res) {});
-
- this.notify();
- }
-
- forceRemoveFromEntreprise(id) {
- var data = {
- group_id: Groups.currentGroupId,
- app_id: id,
- };
-
- if (
- this.apps_by_group[Groups.currentGroupId] &&
- this.apps_by_group[Groups.currentGroupId][id]
- ) {
- delete this.apps_by_group[Groups.currentGroupId][id];
- }
- if (
- this.apps_by_workspace[Workspaces.currentWorkspaceId] &&
- this.apps_by_workspace[Workspaces.currentWorkspaceId][id]
- ) {
- delete this.apps_by_workspace[Workspaces.currentWorkspaceId][id];
- }
-
- Api.post('/ajax/workspace/group/application/remove', data, function (res) {});
-
- this.notify();
- }
-
- defaultForWorkspacesInEntreprise(id, state) {
- var data = {
- group_id: Groups.currentGroupId,
- app_id: id,
- state: state,
- };
-
- if (
- this.apps_by_group[Groups.currentGroupId] &&
- this.apps_by_group[Groups.currentGroupId][id]
- ) {
- this.apps_by_group[Groups.currentGroupId][id].workspace_default = state;
- }
-
- Api.post('/ajax/workspace/group/workspacedefault/set', data, function (res) {});
-
- this.notify();
- }
-
- openAppPopup(app_id) {}
-
- getAppIcon(app, feather = false) {
- if (app && app?.identity?.code) {
- switch (app?.identity?.code.toLocaleLowerCase()) {
- case 'tdrive_calendar':
- return feather ? Calendar : 'calendar-alt';
- case 'tdrive_drive':
- return feather ? Folder : 'folder';
- case 'tdrive_tasks':
- return feather ? CheckSquare : 'check-square';
- default:
- return app.identity?.icon || (feather ? Hexagon : 'puzzle-piece');
- }
- }
- return feather ? Hexagon : 'puzzle-piece';
- }
-
- getAppIconComponent(item, options = {}) {
- const application = getApplication(item.application_id ? item.application_id : item.id);
- const IconType = this.getAppIcon(application, true);
-
- if (item.code === 'jitsi') {
- return (
-
- );
- } else {
- if (typeof IconType === 'string') {
- return (
-
- );
- } else {
- return
;
- }
- }
- }
-}
-
-const workspaces = new WorkspacesApps();
-export default workspaces;
diff --git a/tdrive/frontend/src/app/features/applications/services/application-service.ts b/tdrive/frontend/src/app/features/applications/services/application-service.ts
index 9fbc240c..a144741d 100644
--- a/tdrive/frontend/src/app/features/applications/services/application-service.ts
+++ b/tdrive/frontend/src/app/features/applications/services/application-service.ts
@@ -3,7 +3,6 @@ import Logger from 'app/features/global/framework/logger-service';
import AccessRightsService from 'app/features/workspace-members/services/workspace-members-access-rights-service';
import CurrentUser from 'app/deprecated/user/CurrentUser';
import JWT from 'app/features/auth/jwt-storage-service';
-import WorkspacesListener from '../../workspaces/services/workspaces-listener-service';
import LocalStorage from '../../global/framework/local-storage-service';
import WebSocket from '../../global/types/websocket-types';
@@ -29,14 +28,11 @@ class Application {
const ws = WebSocket.get();
ws.connect();
- WorkspacesListener.startListen();
AccessRightsService.resetLevels();
-
CurrentUser.start();
}
stop(): void {
- WorkspacesListener.cancelListen();
LocalStorage.clear();
JWT.clear();
}
diff --git a/tdrive/frontend/src/app/features/applications/state/company-applications.ts b/tdrive/frontend/src/app/features/applications/state/company-applications.ts
index b345c385..40784289 100644
--- a/tdrive/frontend/src/app/features/applications/state/company-applications.ts
+++ b/tdrive/frontend/src/app/features/applications/state/company-applications.ts
@@ -19,7 +19,6 @@ export const onChangeCompanyApplications = (companyId: string, _applications: Ap
(applications || []).forEach(a => {
if (!_.isEqual(a, companyApplicationMap.get(a.id))) {
companyApplicationMap.set(a.id, a);
- Collections.get('applications').updateObject(a);
}
});
};
diff --git a/tdrive/frontend/src/app/features/auth/auth-service.ts b/tdrive/frontend/src/app/features/auth/auth-service.ts
index 9115eb63..058dd461 100644
--- a/tdrive/frontend/src/app/features/auth/auth-service.ts
+++ b/tdrive/frontend/src/app/features/auth/auth-service.ts
@@ -21,15 +21,7 @@ import LocalStorage from '@features/global/framework/local-storage-service';
import Globals from '@features/global/services/globals-tdrive-app-service';
type AccountType = 'remote' | 'internal';
-export type LoginState =
- | ''
- | 'app'
- | 'error'
- | 'signin'
- | 'verify_mail'
- | 'forgot_password'
- | 'logged_out'
- | 'logout';
+export type LoginState = '' | 'app' | 'error' | 'signin' | 'logged_out' | 'logout';
type InitState = '' | 'initializing' | 'initialized';
@TdriveService('AuthService')
diff --git a/tdrive/frontend/src/app/features/companies/hooks/use-companies.ts b/tdrive/frontend/src/app/features/companies/hooks/use-companies.ts
index f386c264..45c9c366 100644
--- a/tdrive/frontend/src/app/features/companies/hooks/use-companies.ts
+++ b/tdrive/frontend/src/app/features/companies/hooks/use-companies.ts
@@ -10,7 +10,6 @@ import _ from 'lodash';
import RouterService from '@features/router/services/router-service';
import WorkspacesService from '@deprecated/workspaces/workspaces.jsx';
import AccessRightsService from '@features/workspace-members/services/workspace-members-access-rights-service';
-import Groups from '@deprecated/workspaces/groups.js';
import LoginService from '@features/auth/login-service';
import UserAPIClient from '@features/users/api/user-api-client';
import { useRealtimeRoom } from '@features/global/hooks/use-realtime';
@@ -72,7 +71,6 @@ export const useCurrentCompany = () => {
//Always set the current company in localstorage to open it automatically later
if (routerCompanyId && company) {
//Depreciated retrocompatibility
- Groups.addToUser(company);
AccessRightsService.updateCompanyLevel(
company.id,
company.role === 'admin' || company.role === 'owner'
diff --git a/tdrive/frontend/src/app/features/companies/state/companies.ts b/tdrive/frontend/src/app/features/companies/state/companies.ts
index 8fe73a1f..0595066d 100644
--- a/tdrive/frontend/src/app/features/companies/state/companies.ts
+++ b/tdrive/frontend/src/app/features/companies/state/companies.ts
@@ -21,7 +21,6 @@ export const CompaniesState = atomFamily
({
onSet(company => {
if (company?.id) {
companies[company.id] = company;
- Collections.get('groups').updateObject(_.cloneDeep(company));
}
});
},
diff --git a/tdrive/frontend/src/app/features/files/hooks/use-upload.ts b/tdrive/frontend/src/app/features/files/hooks/use-upload.ts
index d9534f6f..45a596db 100644
--- a/tdrive/frontend/src/app/features/files/hooks/use-upload.ts
+++ b/tdrive/frontend/src/app/features/files/hooks/use-upload.ts
@@ -1,9 +1,8 @@
import FileUploadService from '@features/files/services/file-upload-service';
+import RouterServices from '@features/router/services/router-service';
import { useRecoilState, useRecoilValue } from 'recoil';
import { PendingFilesListState } from '../state/atoms/pending-files-list';
import { CurrentTaskSelector } from '../state/selectors/current-task';
-import RouterServices from '@features/router/services/router-service';
-import { AttachedFileType } from '@features/files/types/file';
export const useUpload = () => {
const { companyId } = RouterServices.getStateFromRoute();
diff --git a/tdrive/frontend/src/app/features/files/services/file-upload-service.ts b/tdrive/frontend/src/app/features/files/services/file-upload-service.ts
index 01a8c3aa..d998043f 100644
--- a/tdrive/frontend/src/app/features/files/services/file-upload-service.ts
+++ b/tdrive/frontend/src/app/features/files/services/file-upload-service.ts
@@ -2,15 +2,14 @@
/* eslint-disable @typescript-eslint/ban-types */
import { v1 as uuid } from 'uuid';
-import { FileType, PendingFileType } from '@features/files/types/file';
import JWTStorage from '@features/auth/jwt-storage-service';
-import RouterServices from '@features/router/services/router-service';
+import { FileType, PendingFileType } from '@features/files/types/file';
import Resumable from '@features/files/utils/resumable';
+import Logger from '@features/global/framework/logger-service';
+import RouterServices from '@features/router/services/router-service';
+import _ from 'lodash';
import FileUploadAPIClient from '../api/file-upload-api-client';
import { isPendingFileStatusPending } from '../utils/pending-files';
-import Logger from '@features/global/framework/logger-service';
-import _ from 'lodash';
-import { AttachedFileType } from '@features/files/types/file';
export enum Events {
ON_CHANGE = 'notify',
diff --git a/tdrive/frontend/src/app/features/global/services/languages-service.ts b/tdrive/frontend/src/app/features/global/services/languages-service.ts
index d826fb14..06f432f0 100755
--- a/tdrive/frontend/src/app/features/global/services/languages-service.ts
+++ b/tdrive/frontend/src/app/features/global/services/languages-service.ts
@@ -1,7 +1,6 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/ban-types */
import Observable from '@deprecated/CollectionsV1/observable';
-import DateTime from '@features/global/utils/datetime';
import i18n from 'i18next';
import { initReactI18next } from 'react-i18next';
import Backend from 'i18next-http-backend';
@@ -66,7 +65,6 @@ class LanguagesService extends Observable {
}
await i18n.changeLanguage(language);
- DateTime.setCurrentLanguage(language);
this.notify();
}
diff --git a/tdrive/frontend/src/app/features/global/utils/Autocomplete.js b/tdrive/frontend/src/app/features/global/utils/Autocomplete.js
deleted file mode 100755
index 8dfbfb45..00000000
--- a/tdrive/frontend/src/app/features/global/utils/Autocomplete.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import Observable from '@deprecated/CollectionsV1/observable.js';
-
-class Autocomplete extends Observable {
- constructor() {
- super();
- this.observableName = 'autocompleteService';
- this.isOpen = false;
- }
-
- open() {
- this.isOpen = true;
- this.notify();
- }
-
- close() {
- this.isOpen = false;
- this.notify();
- }
-}
-
-const autocompleteService = new Autocomplete();
-export default autocompleteService;
diff --git a/tdrive/frontend/src/app/features/global/utils/DroppableManager.js b/tdrive/frontend/src/app/features/global/utils/DroppableManager.js
deleted file mode 100755
index 868b842d..00000000
--- a/tdrive/frontend/src/app/features/global/utils/DroppableManager.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import $ from 'jquery';
-
-class DroppableManager {
- constructor() {
- this.drop = {};
- this.draggingData = {};
- this.dragging = false;
- }
-
- over(key, callback, event) {
- this.drop[key] = {
- callback: callback,
- element: event.target,
- };
- }
-
- out(key) {
- this.drop[key] = undefined;
- delete this.drop[key];
- }
-
- up() {
- var that = this;
- if (!that.draggingData.type || !that.draggingData.data || that.draggingData.data.length == 0) {
- return;
- }
- if (!this.dragging) {
- return;
- }
- this.drop.forEach(el => {
- if (el && el.callback) {
- el.callback(that.draggingData);
- }
- });
- }
-}
-
-const instanceDroppableManager = new DroppableManager();
-export default instanceDroppableManager;
diff --git a/tdrive/frontend/src/app/features/global/utils/datetime.js b/tdrive/frontend/src/app/features/global/utils/datetime.js
deleted file mode 100755
index 9a180be7..00000000
--- a/tdrive/frontend/src/app/features/global/utils/datetime.js
+++ /dev/null
@@ -1,191 +0,0 @@
-import moment from 'moment';
-import 'moment/locale/ru';
-import 'moment/locale/fr';
-import 'moment/locale/de';
-import 'moment/locale/ja';
-import 'moment/locale/es';
-import Observable from '@deprecated/CollectionsV1/observable.js';
-import UserService from '@features/users/services/current-user-service';
-
-import Globals from '@features/global/services/globals-tdrive-app-service';
-
-class DateTime extends Observable {
- constructor() {
- super();
-
- if (!Globals.window.navigator) {
- Globals.window.navigator = {};
- }
-
- this.observableName = 'dateTimeService';
- this.locale = this.cleanLocal(
- Globals.window.navigator.userLanguage || Globals.window.navigator.language || 'en',
- );
- }
- getCurrentLanguage() {
- return this.locale;
- }
- setCurrentLanguage(lang) {
- this.locale = this.cleanLocal(lang);
- moment.locale(this.locale);
- this.notify();
- }
- cleanLocal(string) {
- if (string.split('-').length > 1) {
- return string.split('-')[0];
- }
- return string;
- }
-
- getDefaultTimeFormat() {
- var h24list = [
- 'af',
- 'ar-dz',
- 'ar-kw',
- 'ar-ly',
- 'ar-ma',
- 'ar-sa',
- 'ar-tn',
- 'ar',
- 'az',
- 'be',
- 'bg',
- 'bn',
- 'bo',
- 'br',
- 'bs',
- 'ca',
- 'cs',
- 'cv',
- 'cy',
- 'da',
- 'de-at',
- 'de-ch',
- 'de',
- 'dv',
- 'el',
- 'en-au',
- 'en-ca',
- 'en-gb',
- 'en-ie',
- 'en-nz',
- 'eo',
- 'es-do',
- 'es',
- 'et',
- 'eu',
- 'fa',
- 'fi',
- 'fo',
- 'fr-ca',
- 'fr-ch',
- 'fr',
- 'fy',
- 'gd',
- 'gl',
- 'gom-latn',
- 'he',
- 'hi',
- 'hr',
- 'hu',
- 'hy-am',
- 'id',
- 'is',
- 'it',
- 'ja',
- 'jv',
- 'ka',
- 'kk',
- 'km',
- 'kn',
- 'ko',
- 'ky',
- 'lb',
- 'lo',
- 'lt',
- 'lv',
- 'me',
- 'mi',
- 'mk',
- 'ml',
- 'mr',
- 'ms-my',
- 'ms',
- 'my',
- 'nb',
- 'ne',
- 'nl-be',
- 'nl',
- 'nn',
- 'pa-in',
- 'pl',
- 'pt-br',
- 'pt',
- 'ro',
- 'ru',
- 'sd',
- 'se',
- 'si',
- 'sk',
- 'sl',
- 'sq',
- 'sr-cyrl',
- 'sr',
- 'ss',
- 'sv',
- 'sw',
- 'ta',
- 'te',
- 'tet',
- 'th',
- 'tl-ph',
- 'tlh',
- 'tr',
- 'tzl',
- 'tzm-latn',
- 'tzm',
- 'uk',
- 'ur',
- 'uz-latn',
- 'uz',
- 'vi',
- 'x-pseudo',
- 'yo',
- 'zh-cn',
- 'zh-hk',
- 'zh-tw',
- ];
- if (
- h24list.indexOf(
- (UserService.getCurrentUser() || {}).language ||
- Globals.window.navigator.language ||
- Globals.window.navigator.userLanguage ||
- 'en',
- ) >= 0
- ) {
- return 'H:mm';
- }
- return 'LT';
- }
- isDateFirstInFormat() {
- var numbers = moment().format('L').split('/');
- if (numbers[0] === new Date().getDate()) {
- return true;
- } else {
- return false;
- }
- }
- getDefaultDateFormat() {
- /*var numbers = moment().format("L").split("/");
- if(numbers[0] == (new Date()).getDate()){
- return "DD/MM/YYYY";
- }else{
- return "MM/DD/YYYY";
- }*/
- return 'LL'; //Default format for country better but US is "May 11, 2019" instead of "11 may 2019"
- }
-}
-
-var x = new DateTime();
-Globals.window.dateTimeService = x;
-export default x;
diff --git a/tdrive/frontend/src/app/features/global/utils/workspacePicker.js b/tdrive/frontend/src/app/features/global/utils/workspacePicker.js
deleted file mode 100755
index f78e07cb..00000000
--- a/tdrive/frontend/src/app/features/global/utils/workspacePicker.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Observable from '@deprecated/CollectionsV1/observable.js';
-import Api from '@features/global/framework/api-service';
-
-class WorkspacePicker extends Observable {
- constructor() {
- super();
- this.observableName = 'workspacePicker';
- this.searchedWorkspace = null;
- this.refresh = false;
- this.searchInput = '';
- this.searchLabel = '';
- this.isSearching = false;
- }
-
- getWorkspaceByName(name) {
- var data = {
- name: name,
- };
- this.isSearching = true;
- this.notify();
- var that = this;
- Api.post('/ajax/workspace/getByName', data, function (res) {
- that.searchedWorkspace = res.data.workspace;
- that.isSearching = false;
- that.notify();
- });
- }
-}
-
-const wsPicker = new WorkspacePicker();
-export default wsPicker;
diff --git a/tdrive/frontend/src/app/features/search/hooks/use-search-drive-items.tsx b/tdrive/frontend/src/app/features/search/hooks/use-search-drive-items.tsx
index 51f38be2..c03ebdaa 100644
--- a/tdrive/frontend/src/app/features/search/hooks/use-search-drive-items.tsx
+++ b/tdrive/frontend/src/app/features/search/hooks/use-search-drive-items.tsx
@@ -1,13 +1,13 @@
-import { delayRequest } from '@features/global/utils/managedSearchRequest';
-import { useRecoilState, useRecoilValue } from 'recoil';
-import { SearchInputState } from '../state/search-input';
import { DriveApiClient } from '@features/drive/api-client/api-client';
-import { LoadingState } from '@features/global/state/atoms/Loading';
-import { SearchDriveItemsResultsState } from '../state/search-drive-items-result';
-import { RecentDriveItemsState } from '../state/recent-drive-items';
-import _ from 'lodash';
import { useGlobalEffect } from '@features/global/hooks/use-global-effect';
+import { LoadingState } from '@features/global/state/atoms/Loading';
+import { delayRequest } from '@features/global/utils/managedSearchRequest';
import useRouterCompany from '@features/router/hooks/use-router-company';
+import _ from 'lodash';
+import { useRecoilState, useRecoilValue } from 'recoil';
+import { RecentDriveItemsState } from '../state/recent-drive-items';
+import { SearchDriveItemsResultsState } from '../state/search-drive-items-result';
+import { SearchInputState } from '../state/search-input';
import { useSearchModal } from './use-search';
export const useSearchDriveItemsLoading = () => {
diff --git a/tdrive/frontend/src/app/features/users/hooks/use-current-user.ts b/tdrive/frontend/src/app/features/users/hooks/use-current-user.ts
index cc678c93..46cc4055 100644
--- a/tdrive/frontend/src/app/features/users/hooks/use-current-user.ts
+++ b/tdrive/frontend/src/app/features/users/hooks/use-current-user.ts
@@ -6,7 +6,6 @@ import { useRecoilState } from 'recoil';
import { CurrentUserState } from '../state/atoms/current-user';
import { useRealtimeRoom } from '@features/global/hooks/use-realtime';
import Languages from '@features/global/services/languages-service';
-import ConfiguratorsManager from '@deprecated/Configurators/ConfiguratorsManager.js';
import { RealtimeApplicationEvent } from '@features/global/types/realtime-types';
import { useSetUserList } from './use-user-list';
@@ -41,25 +40,6 @@ export const useCurrentUser = () => {
return { user, refresh, updateStatus };
};
-const applicationEventHandler = (event: RealtimeApplicationEvent) => {
- switch (event.action) {
- case 'configure':
- if (event.form) {
- ConfiguratorsManager.openConfigurator(
- event.application,
- event.form,
- event.hidden_data,
- event.configurator_id,
- );
- } else {
- ConfiguratorsManager.closeConfigurator(event.application);
- }
- break;
- default:
- console.error(`Unknown application action: ${event.action}`);
- }
-};
-
export const useCurrentUserRealtime = () => {
const { user, refresh } = useCurrentUser();
const room = UserAPIClient.websocket(user?.id || '');
@@ -74,9 +54,6 @@ export const useCurrentUserRealtime = () => {
refresh();
}, 1000) as any;
break;
- case 'application':
- applicationEventHandler(resource);
- break;
default:
console.error('Unknown resource type');
}
diff --git a/tdrive/frontend/src/app/features/users/hooks/use-users-listener.ts b/tdrive/frontend/src/app/features/users/hooks/use-users-listener.ts
deleted file mode 100644
index fed5c751..00000000
--- a/tdrive/frontend/src/app/features/users/hooks/use-users-listener.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { useState, useEffect } from 'react';
-import { isArray } from 'lodash';
-import UserListenerService from '@features/users/services/listen-users-service';
-import Collections from '@deprecated/CollectionsV1/Collections/Collections';
-import UsersService from '@features/users/services/current-user-service';
-import userAsyncGet from '@features/users/utils/async-get';
-
-export const useUsersListener = (usersIds: string[] = []) => {
- const users = (isArray(usersIds) ? usersIds : []).filter(
- e => (usersIds.length || 0) === 1 || e !== UsersService.getCurrentUserId(),
- );
- Collections.get('users').useListener(useState, users);
-
- useEffect(() => {
- users.forEach(userId => {
- UserListenerService.listenUser(userId);
- userAsyncGet(userId);
- });
-
- return () => {
- users.forEach(userId => UserListenerService.cancelListenUser(userId));
- };
- }, [users]);
-
- return users;
-};
diff --git a/tdrive/frontend/src/app/features/users/services/listen-users-service.ts b/tdrive/frontend/src/app/features/users/services/listen-users-service.ts
deleted file mode 100755
index d98ba887..00000000
--- a/tdrive/frontend/src/app/features/users/services/listen-users-service.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-/* eslint-disable @typescript-eslint/no-this-alias */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import ws from '@deprecated/websocket/websocket';
-import Collections from '@deprecated/CollectionsV1/Collections/Collections';
-import UserService from './current-user-service';
-import Globals from '@features/global/services/globals-tdrive-app-service';
-import userAsyncGet from '@features/users/utils/async-get';
-
-type Timeout = ReturnType;
-
-class ListenUsers {
- users_repository: any;
- connectedPing: { [key: string]: Timeout };
- listenerCount: { [key: string]: number };
- pingTimeouts: { [key: string]: Timeout };
- was_connected_last_check: { [key: string]: boolean };
- lastPong: number;
-
- constructor() {
- this.users_repository = Collections.get('users');
- this.listenerCount = {};
- this.connectedPing = {};
- this.pingTimeouts = {};
- this.was_connected_last_check = {};
- this.lastPong = 0;
- (Globals.window as any).listenUsers = this;
- }
-
- /**
- * Check if the given user is active: new Date().getTime() - ws.lastAlive < 1000*60*5
- *
- * @param idUser
- */
- ping(idUser: string): void {
- ws.publish(`users/${idUser}`, {
- ping: true,
- user: { connected: true, id: UserService.getCurrentUserId() },
- });
-
- if (this.pingTimeouts[idUser]) {
- clearTimeout(this.pingTimeouts[idUser]);
- }
-
- this.pingTimeouts[idUser] = setTimeout(() => {
- //Only say this to me !
- const user = Collections.get('users').find(idUser);
-
- if (user) {
- if (user.connected) {
- user.connected = false;
- this.users_repository.updateObject(user);
- }
- }
- this.was_connected_last_check[idUser] = false;
- }, 5000);
- }
-
- pong(): void {
- this.lastPong = new Date().getTime();
-
- ws.publish(`users/${UserService.getCurrentUserId()}`, {
- user: { connected: true, id: UserService.getCurrentUserId() },
- });
- }
-
- listenUser(idUser: string): void {
- if (!idUser) {
- return;
- }
-
- if (!this.listenerCount[idUser]) {
- this.listenerCount[idUser] = 0;
- }
- this.listenerCount[idUser] += 1;
-
- const that = this;
- if (this.listenerCount[idUser] === 1) {
- ws.subscribe(
- `users/${idUser}`,
- (_uri: string, data: any) => {
- /*if (idUser == UserServiceImpl.getCurrentUserId()) {
- if (data.ping) {
- that.pong();
- }
- }*/
- if (data.user && data.user.id) {
- /*that.setUserPingTimeout(data.user.id);
- if (data.user.connected && that.pingTimeouts[idUser]) {
- clearTimeout(that.pingTimeouts[idUser]);
- }*/
- if (that.users_repository.find(data.user.id)) {
- that.was_connected_last_check[idUser] = data.user.connected;
- if (
- data.user.username ||
- data.user.notifications_preferences ||
- data.user.connected !== that.users_repository.find(data.user.id).connected
- ) {
- that.users_repository.updateObject(data.user);
- }
- } else if (data.user.id) {
- userAsyncGet(data.user.id);
- }
- }
- },
- null,
- );
-
- if (idUser !== UserService.getCurrentUserId()) {
- /*setTimeout(() => {
- if (idUser != UserServiceImpl.getCurrentUserId()) {
- this.setUserPingTimeout(idUser);
- this.ping(idUser);
- }
- }, 1000);
-
- if (new Date().getTime() - this.lastPong > 60000) {
- this.pong();
- }*/
- }
- }
- }
-
- setUserPingTimeout(idUser: string): void {
- if (this.connectedPing[idUser]) {
- clearTimeout(this.connectedPing[idUser]);
- }
-
- this.connectedPing[idUser] = setTimeout(() => {
- this.ping(idUser);
- this.setUserPingTimeout(idUser);
- }, 600000);
- }
-
- cancelListenUser(idUser: string) {
- if (!idUser) {
- return;
- }
-
- if (this.listenerCount[idUser]) {
- this.listenerCount[idUser] += -1;
- }
-
- if (!this.listenerCount[idUser] || this.listenerCount[idUser] === 0) {
- ws.unsubscribe(`users/${idUser}`, null, null);
-
- if (this.connectedPing[idUser]) {
- clearInterval(this.connectedPing[idUser]);
- }
- }
- }
-}
-
-const service = new ListenUsers();
-(Globals.services as any) = service;
-
-export default service;
diff --git a/tdrive/frontend/src/app/features/workspace-members/services/workspace-members-service.ts b/tdrive/frontend/src/app/features/workspace-members/services/workspace-members-service.ts
index fae4e4bd..0683464d 100755
--- a/tdrive/frontend/src/app/features/workspace-members/services/workspace-members-service.ts
+++ b/tdrive/frontend/src/app/features/workspace-members/services/workspace-members-service.ts
@@ -2,18 +2,14 @@
/* eslint-disable @typescript-eslint/no-this-alias */
/* eslint-disable @typescript-eslint/no-empty-function */
/* eslint-disable @typescript-eslint/no-explicit-any */
-import Languages from '@features/global/services/languages-service';
import Observable from '@deprecated/CollectionsV1/observable.js';
-import User from '@features/users/services/current-user-service';
-import Api from '@features/global/framework/api-service';
-import ws from '@deprecated/websocket/websocket.js';
-import Collections from '@deprecated/CollectionsV1/Collections/Collections.js';
import workspaceService from '@deprecated/workspaces/workspaces.jsx';
-import Numbers from '@features/global/utils/Numbers';
-import WorkspaceUserRights from '@features/workspaces/services/workspace-user-rights-service';
-import CurrentUser from '@deprecated/user/CurrentUser';
+import Api from '@features/global/framework/api-service';
import AlertManager from '@features/global/services/alert-manager-service';
import Globals from '@features/global/services/globals-tdrive-app-service';
+import Languages from '@features/global/services/languages-service';
+import User from '@features/users/services/current-user-service';
+import WorkspaceUserRights from '@features/workspaces/services/workspace-user-rights-service';
const prefixRoute = '/internal/services/workspaces/v1';
@@ -54,35 +50,13 @@ class WorkspacesUsers extends Observable {
(Globals.window as any).workspaceUserService = this;
}
getAdminLevel(idWorkspace = workspaceService.currentWorkspaceId) {
- const levels = Collections.get('workspaces').find(idWorkspace).levels;
- if (levels) {
- for (let i = 0; i < levels.length; i++) {
- if (levels[i].admin) {
- return levels[i];
- }
- }
- }
return false;
}
getDefaultLevel(idWorkspace = workspaceService.currentWorkspaceId) {
- const levels = Collections.get('workspaces').find(idWorkspace).levels;
- if (levels) {
- for (let i = 0; i < levels.length; i++) {
- if (levels[i].default) {
- return levels[i];
- }
- }
- }
return false;
}
isGroupManager() {}
getLevel(idLevel: string) {
- const levels = Collections.get('workspaces').find(workspaceService.currentWorkspaceId).levels;
- for (let i = 0; i < levels.length; i++) {
- if (idLevel === levels[i].id) {
- return levels[i];
- }
- }
return false;
}
@@ -90,113 +64,6 @@ class WorkspacesUsers extends Observable {
return (this.users_by_workspace || {})[workspace_id] || {};
}
- unload(workspace_id: string) {
- ws.unsubscribe('workspace_users/' + workspace_id, null, null);
- }
-
- load(workspace_id: string, reset_offset: string, options: any) {
- if (!options) {
- options = {};
- }
-
- const that = this;
- const workspace = Collections.get('workspaces').find(workspace_id);
- if (!workspace) {
- return;
- }
- const group_id = workspace?.group?.id || workspace.company_id;
-
- if (!this.users_by_group[group_id]) {
- this.users_by_group[group_id] = {};
- }
- if (!this.users_by_workspace[workspace_id]) {
- this.users_by_workspace[workspace_id] = {};
- }
-
- if (!this.offset_by_workspace_id[workspace_id] || reset_offset) {
- this.offset_by_workspace_id[workspace_id] = [0, false];
- }
- if (!this.offset_by_group_id[group_id] || reset_offset) {
- this.offset_by_group_id[group_id] = [0, false];
- }
-
- const loadMembers = (data: any) => {
- if (!data) {
- return;
- }
- if (typeof data.members === 'object' && data.members.members) {
- data = data.members;
- }
- if (data.members) {
- (data.members || []).forEach((item: any) => {
- if (
- !that.offset_by_workspace_id[workspace_id][1] ||
- Numbers.compareTimeuuid(item.user.id, that.offset_by_workspace_id[workspace_id][1]) > 0
- ) {
- that.offset_by_workspace_id[workspace_id][1] = item.user.id;
- }
- that.offset_by_workspace_id[workspace_id][0]++;
-
- Collections.get('users').completeObject(item.user, item.user.front_id);
-
- that.users_by_group[group_id][item.user.id] = item;
- that.users_by_workspace[workspace_id][item.user.id] = item;
- });
- that.notify();
- }
-
- if (data.mails) {
- that.membersPending = data.mails || [];
- that.notify();
- }
-
- if (data.stats.total_members > 1 && WorkspaceUserRights.hasWorkspacePrivilege()) {
- CurrentUser.updateTutorialStatus('did_invite_collaborators');
- }
- };
-
- const data = {
- workspaceId: workspace_id,
- max: this.offset_by_workspace_id[workspace_id][0] === 0 ? 100 : 40,
- };
-
- if (options.members) {
- loadMembers(options.members || []);
- } else {
- Api.post('/ajax/workspace/members/list', data, (res: any) => {
- if (res.data) {
- loadMembers({ members: res.data });
- }
- });
- Api.post('/ajax/workspace/members/pending', data, (res: any) => {
- if (res.data) {
- loadMembers({ mails: res.data });
- }
- });
- loadMembers(options.members || []);
- }
-
- const loadGroupUsers = (data: any) => {
- data.users.forEach((item: any) => {
- if (
- !that.offset_by_group_id[group_id][1] ||
- Numbers.compareTimeuuid(item.user.id, that.offset_by_group_id[group_id][1]) > 0
- ) {
- that.offset_by_group_id[group_id][1] = item.user.id;
- }
- that.offset_by_group_id[group_id][0]++;
-
- Collections.get('users').completeObject(item.user, item.user.front_id);
-
- that.users_by_group[group_id][item.user.id] = item;
- });
- that.notify();
- };
-
- if (options.group_users) {
- loadMembers(options.group_users);
- }
- }
canShowUserInWorkspaceList(member: any) {
// if user is interne or wexterne => no restriction
if (!WorkspaceUserRights.isInvite()) {
@@ -206,28 +73,6 @@ class WorkspacesUsers extends Observable {
// if other user is interne or wexterne
return true;
}
-
- // check in all channel if 2 chavite are in the same channel
- const channelsInWorkspace = Collections.get('channels').findBy({
- direct: false,
- application: false,
- original_workspace: workspaceService.currentWorkspaceId,
- });
- for (let i = 0; i < channelsInWorkspace.length; i++) {
- // check in all channel if 2 chavite are in the same channel
- if (channelsInWorkspace[i].ext_members) {
- let bothAreInChannel = 0; // if 1 : one of 2 users searched is in channel as chavite, 2 : both are in channel as chavite
- const extMembers = channelsInWorkspace[i].ext_members;
- for (let j = 0; j < extMembers.length; j++) {
- if (extMembers[j] === member || extMembers[j] === CurrentUser.get().id) {
- bothAreInChannel++;
- if (bothAreInChannel >= 2) {
- return true;
- }
- }
- }
- }
- }
}
return false;
}
diff --git a/tdrive/frontend/src/app/features/workspaces/hooks/use-workspaces.ts b/tdrive/frontend/src/app/features/workspaces/hooks/use-workspaces.ts
index c39cec53..bfadf90d 100644
--- a/tdrive/frontend/src/app/features/workspaces/hooks/use-workspaces.ts
+++ b/tdrive/frontend/src/app/features/workspaces/hooks/use-workspaces.ts
@@ -44,13 +44,6 @@ export const useWorkspacesCommons = (companyId = '') => {
);
}
- //Retro compatibility
- workspaces?.forEach(w => {
- Collections.get('workspaces').updateObject(_.cloneDeep(w));
- AccessRightsService.updateLevel(w.id, w.role as RightsOrNone);
- });
- //End
-
return { workspaces, loading, refresh };
};
diff --git a/tdrive/frontend/src/app/features/workspaces/services/workspaces-listener-service.ts b/tdrive/frontend/src/app/features/workspaces/services/workspaces-listener-service.ts
deleted file mode 100755
index c5a9b675..00000000
--- a/tdrive/frontend/src/app/features/workspaces/services/workspaces-listener-service.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import ws from '@deprecated/websocket/websocket.js';
-import Workspaces from '@deprecated/workspaces/workspaces.jsx';
-import User from '@features/users/services/current-user-service';
-import LoginService from '@features/auth/login-service';
-import { RightsOrNone } from '../../workspace-members/services/workspace-members-access-rights-service';
-import Logger from '@features/global/framework/logger-service';
-
-type WebsocketWorkspace = {
- type: 'remove' | 'add' | 'update_group_privileges' | 'update_workspace_level';
- group_id: string;
- workspace_id: string;
- level: RightsOrNone;
- workspace: any; // TODO
- privileges: any; // TODO
-};
-
-class WorkspacesListener {
- private logger: Logger.Logger;
-
- constructor() {
- this.logger = Logger.getLogger('WorkspacesListener');
- }
-
- startListen() {
- this.logger.debug('Start listener');
-
- ws.subscribe(
- `workspaces_of_user/${User.getCurrentUserId()}`,
- (_uri: any, data: WebsocketWorkspace) => {
- this.logger.debug('Got a message', data);
- LoginService.updateUser();
-
- if (data.workspace) {
- if (data.type === 'remove') {
- Workspaces.removeFromUser(data.workspace);
- Workspaces.notify();
- } else if (data.type === 'add') {
- Workspaces.notify();
- }
- }
- },
- null,
- );
- }
-
- cancelListen() {
- this.logger.debug('Cancel listener');
- ws.unsubscribe(`workspaces_of_user/${User.getCurrentUserId()}`, null, null);
- }
-}
-
-export default new WorkspacesListener();
diff --git a/tdrive/frontend/src/app/features/workspaces/state/workspace-list.ts b/tdrive/frontend/src/app/features/workspaces/state/workspace-list.ts
index 9a5b102e..fd29d9e8 100644
--- a/tdrive/frontend/src/app/features/workspaces/state/workspace-list.ts
+++ b/tdrive/frontend/src/app/features/workspaces/state/workspace-list.ts
@@ -22,9 +22,6 @@ export const WorkspaceListStateFamily = atomFamily({
({ onSet }) => {
onSet(workspaces => {
workspacesCompanyMap[companyId] = workspaces;
- workspaces.map(w => {
- Collections.get('workspaces').updateObject(_.cloneDeep(w));
- });
});
},
],
diff --git a/tdrive/frontend/src/app/views/client/index.tsx b/tdrive/frontend/src/app/views/client/index.tsx
index 28b7bf5f..ebb23121 100755
--- a/tdrive/frontend/src/app/views/client/index.tsx
+++ b/tdrive/frontend/src/app/views/client/index.tsx
@@ -2,7 +2,7 @@
import classNames from 'classnames';
import React, { Suspense, useState } from 'react';
-import ChatUploadsViewer from '@components/file-uploads/uploads-viewer';
+import UploadsViewer from '@components/file-uploads/uploads-viewer';
import { useFeatureToggles } from '@components/locked-features-components/feature-toggles-hooks';
import MenusBodyLayer from '@components/menus/menus-body-layer.jsx';
import ModalComponent from '@components/modal/modal-component';
@@ -16,7 +16,6 @@ import ConnectionIndicator from 'components/connection-indicator/connection-indi
import NewVersionComponent from 'components/new-version/new-version-component';
import PopupComponent from 'components/popup-component/popup-component.jsx';
import SearchPopup from 'components/search-popup/search-popup';
-import DriveUploadViewer from 'components/uploads/upload-viewer.jsx';
import MainView from './body';
import DownloadAppBanner from '@components/download-app-banner/download-app-banner';
@@ -94,12 +93,11 @@ export default React.memo((): JSX.Element => {
{PopupService.isOpen() && }
{page}
-
-
+
);
});
diff --git a/tdrive/frontend/src/app/views/client/popup/UserParameter/Pages/Assistant.tsx b/tdrive/frontend/src/app/views/client/popup/UserParameter/Pages/Assistant.tsx
deleted file mode 100755
index 836d5b12..00000000
--- a/tdrive/frontend/src/app/views/client/popup/UserParameter/Pages/Assistant.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import Languages from '@features/global/services/languages-service';
-import * as Text from '@atoms/text';
-import { ToasterService as Toaster } from '@features/global/services/toaster-service';
-import UserAPIClient from '@features/users/api/user-api-client';
-import { useCurrentUser } from '@features/users/hooks/use-current-user';
-import Radio from 'components/inputs/radio.jsx';
-
-export type preferencesType = Record;
-export type AssistantPreferencesType = {
- user_id: string;
- company_id: string;
- workspace_id: string;
- preferences: preferencesType;
-};
-
-let locked = false;
-
-export default () => {
- const { user, refresh } = useCurrentUser();
-
- const setPreferences = async (value: 'all' | 'nothing' | 'metadata') => {
- if (locked) return;
- locked = true;
- try {
- await UserAPIClient.setUserPreferences({
- knowledge_graph: value,
- });
- await refresh();
- Toaster.success(Languages.t('scenes.apps.account.assistant.success'));
- } catch (err) {
- Toaster.error('' + err);
- }
- locked = false;
- };
-
- return (
- <>
- {Languages.t('scenes.apps.account.assistant.title')}
-
- {Languages.t('scenes.apps.account.assistant.description')}
-
-
- {
- setPreferences('nothing');
- }}
- />
-
-
- {
- setPreferences('metadata');
- }}
- />
-
-
- {
- setPreferences('all');
- }}
- />
-
-
- );
-};
diff --git a/tdrive/frontend/src/app/views/client/popup/UserParameter/UserParameter.jsx b/tdrive/frontend/src/app/views/client/popup/UserParameter/UserParameter.jsx
index 23a9bb5a..c81e29ac 100755
--- a/tdrive/frontend/src/app/views/client/popup/UserParameter/UserParameter.jsx
+++ b/tdrive/frontend/src/app/views/client/popup/UserParameter/UserParameter.jsx
@@ -1,26 +1,23 @@
/* eslint-disable react/prop-types */
/* eslint-disable react/jsx-key */
-import React, { Component } from 'react';
+import { Component } from 'react';
-import Languages from '@features/global/services/languages-service';
-import Collections from '@deprecated/CollectionsV1/Collections/Collections.js';
-import LoginService from '@features/auth/login-service';
-import popupManager from '@deprecated/popupManager/popupManager.js';
-import userService from '@features/users/services/current-user-service';
-import currentUserService from '@deprecated/user/CurrentUser';
-import uploadService from '@deprecated/uploadManager/upload-manager.js';
-import ButtonWithTimeout from 'components/buttons/button-with-timeout.jsx';
-import Attribute from 'components/parameters/attribute.jsx';
-import Assistant from './Pages/Assistant';
-import MenuList from 'components/menus/menu-component.jsx';
-import './UserParameter.scss';
-import Input from 'components/inputs/input.jsx';
-import { Button } from '../../../../atoms/button/button';
-import { ExternalLinkIcon } from '@heroicons/react/outline';
-import InitService from '@features/global/services/init-service';
-import * as Text from '../../../../atoms/text';
-import workspaceService from '@deprecated/workspaces/workspaces.jsx';
import { getFilesTree } from '@components/uploads/file-tree-utils';
+import Collections from '@deprecated/CollectionsV1/Collections/Collections.js';
+import popupManager from '@deprecated/popupManager/popupManager.js';
+import currentUserService from '@deprecated/user/CurrentUser';
+import LoginService from '@features/auth/login-service';
+import InitService from '@features/global/services/init-service';
+import Languages from '@features/global/services/languages-service';
+import userService from '@features/users/services/current-user-service';
+import { ExternalLinkIcon } from '@heroicons/react/outline';
+import ButtonWithTimeout from 'components/buttons/button-with-timeout.jsx';
+import Input from 'components/inputs/input.jsx';
+import MenuList from 'components/menus/menu-component.jsx';
+import Attribute from 'components/parameters/attribute.tsx';
+import { Button } from '../../../../atoms/button/button';
+import * as Text from '../../../../atoms/text';
+import './UserParameter.scss';
export default class UserParameter extends Component {
constructor(props) {
@@ -605,9 +602,6 @@ export default class UserParameter extends Component {