mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-06 22:46:06 +02:00
hide data table empty state when loading
This commit is contained in:
@@ -61,7 +61,7 @@
|
|||||||
<TableRow v-else>
|
<TableRow v-else>
|
||||||
<TableCell class="h-24 text-center" :colspan="table.getVisibleLeafColumns().length">
|
<TableCell class="h-24 text-center" :colspan="table.getVisibleLeafColumns().length">
|
||||||
<slot name="empty">
|
<slot name="empty">
|
||||||
<DataTableEmpty :type="emptyType" />
|
<DataTableEmpty v-if="!loading" :type="emptyType" />
|
||||||
</slot>
|
</slot>
|
||||||
</TableCell>
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
|||||||
@@ -92,25 +92,25 @@ const feed = {
|
|||||||
if (search.startsWith('wrld_') || search.startsWith('grp_')) {
|
if (search.startsWith('wrld_') || search.startsWith('grp_')) {
|
||||||
return this.getFeedByInstanceId(search, filters, vipList);
|
return this.getFeedByInstanceId(search, filters, vipList);
|
||||||
}
|
}
|
||||||
var vipQuery = '';
|
let vipQuery = '';
|
||||||
var vipArgs = {};
|
const vipArgs = {};
|
||||||
if (vipList.length > 0) {
|
if (vipList.length > 0) {
|
||||||
var vipPlaceholders = [];
|
const vipPlaceholders = [];
|
||||||
vipList.forEach((vip, i) => {
|
vipList.forEach((vip, i) => {
|
||||||
var key = `@vip_${i}`;
|
const key = `@vip_${i}`;
|
||||||
vipArgs[key] = vip;
|
vipArgs[key] = vip;
|
||||||
vipPlaceholders.push(key);
|
vipPlaceholders.push(key);
|
||||||
});
|
});
|
||||||
vipQuery = `AND user_id IN (${vipPlaceholders.join(', ')})`;
|
vipQuery = `AND user_id IN (${vipPlaceholders.join(', ')})`;
|
||||||
}
|
}
|
||||||
var gps = true;
|
let gps = true;
|
||||||
var status = true;
|
let status = true;
|
||||||
var bio = true;
|
let bio = true;
|
||||||
var avatar = true;
|
let avatar = true;
|
||||||
var online = true;
|
let online = true;
|
||||||
var offline = true;
|
let offline = true;
|
||||||
var aviPublic = search.includes('public');
|
const aviPublic = search.includes('public');
|
||||||
var aviPrivate = search.includes('private');
|
const aviPrivate = search.includes('private');
|
||||||
if (filters.length > 0) {
|
if (filters.length > 0) {
|
||||||
gps = false;
|
gps = false;
|
||||||
status = false;
|
status = false;
|
||||||
@@ -141,9 +141,9 @@ const feed = {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
var searchLike = `%${search}%`;
|
const searchLike = `%${search}%`;
|
||||||
var selects = [];
|
const selects = [];
|
||||||
var baseColumns = [
|
const baseColumns = [
|
||||||
'id',
|
'id',
|
||||||
'created_at',
|
'created_at',
|
||||||
'user_id',
|
'user_id',
|
||||||
@@ -183,7 +183,7 @@ const feed = {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (avatar) {
|
if (avatar) {
|
||||||
var avatarQuery = '';
|
let avatarQuery = '';
|
||||||
if (aviPrivate) {
|
if (aviPrivate) {
|
||||||
avatarQuery = 'AND user_id = owner_id';
|
avatarQuery = 'AND user_id = owner_id';
|
||||||
} else if (aviPublic) {
|
} else if (aviPublic) {
|
||||||
@@ -194,7 +194,7 @@ const feed = {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (online || offline) {
|
if (online || offline) {
|
||||||
var query = '';
|
let query = '';
|
||||||
if (!online || !offline) {
|
if (!online || !offline) {
|
||||||
if (online) {
|
if (online) {
|
||||||
query = "AND type = 'Online'";
|
query = "AND type = 'Online'";
|
||||||
@@ -209,8 +209,8 @@ const feed = {
|
|||||||
if (selects.length === 0) {
|
if (selects.length === 0) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
var feedDatabase = [];
|
const feedDatabase = [];
|
||||||
var args = {
|
const args = {
|
||||||
'@searchLike': searchLike,
|
'@searchLike': searchLike,
|
||||||
'@limit': maxEntries,
|
'@limit': maxEntries,
|
||||||
'@perTable': maxEntries,
|
'@perTable': maxEntries,
|
||||||
@@ -218,8 +218,8 @@ const feed = {
|
|||||||
};
|
};
|
||||||
await sqliteService.execute(
|
await sqliteService.execute(
|
||||||
(dbRow) => {
|
(dbRow) => {
|
||||||
var type = dbRow[4];
|
const type = dbRow[4];
|
||||||
var row = {
|
const row = {
|
||||||
rowId: dbRow[0],
|
rowId: dbRow[0],
|
||||||
created_at: dbRow[1],
|
created_at: dbRow[1],
|
||||||
userId: dbRow[2],
|
userId: dbRow[2],
|
||||||
@@ -273,23 +273,23 @@ const feed = {
|
|||||||
vipList,
|
vipList,
|
||||||
maxEntries = dbVars.maxTableSize
|
maxEntries = dbVars.maxTableSize
|
||||||
) {
|
) {
|
||||||
var vipQuery = '';
|
let vipQuery = '';
|
||||||
var vipArgs = {};
|
const vipArgs = {};
|
||||||
if (vipList.length > 0) {
|
if (vipList.length > 0) {
|
||||||
var vipPlaceholders = [];
|
const vipPlaceholders = [];
|
||||||
vipList.forEach((vip, i) => {
|
vipList.forEach((vip, i) => {
|
||||||
var key = `@vip_${i}`;
|
const key = `@vip_${i}`;
|
||||||
vipArgs[key] = vip;
|
vipArgs[key] = vip;
|
||||||
vipPlaceholders.push(key);
|
vipPlaceholders.push(key);
|
||||||
});
|
});
|
||||||
vipQuery = `AND user_id IN (${vipPlaceholders.join(', ')})`;
|
vipQuery = `AND user_id IN (${vipPlaceholders.join(', ')})`;
|
||||||
}
|
}
|
||||||
var gps = true;
|
let gps = true;
|
||||||
var status = true;
|
let status = true;
|
||||||
var bio = true;
|
let bio = true;
|
||||||
var avatar = true;
|
let avatar = true;
|
||||||
var online = true;
|
let online = true;
|
||||||
var offline = true;
|
let offline = true;
|
||||||
if (filters.length > 0) {
|
if (filters.length > 0) {
|
||||||
gps = false;
|
gps = false;
|
||||||
status = false;
|
status = false;
|
||||||
@@ -320,8 +320,8 @@ const feed = {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
var selects = [];
|
const selects = [];
|
||||||
var baseColumns = [
|
const baseColumns = [
|
||||||
'id',
|
'id',
|
||||||
'created_at',
|
'created_at',
|
||||||
'user_id',
|
'user_id',
|
||||||
@@ -366,7 +366,7 @@ const feed = {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (online || offline) {
|
if (online || offline) {
|
||||||
var query = '';
|
let query = '';
|
||||||
if (!online || !offline) {
|
if (!online || !offline) {
|
||||||
if (online) {
|
if (online) {
|
||||||
query = "AND type = 'Online'";
|
query = "AND type = 'Online'";
|
||||||
@@ -381,16 +381,16 @@ const feed = {
|
|||||||
if (selects.length === 0) {
|
if (selects.length === 0) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
var feedDatabase = [];
|
const feedDatabase = [];
|
||||||
var args = {
|
const args = {
|
||||||
'@limit': maxEntries,
|
'@limit': maxEntries,
|
||||||
'@perTable': maxEntries,
|
'@perTable': maxEntries,
|
||||||
...vipArgs
|
...vipArgs
|
||||||
};
|
};
|
||||||
await sqliteService.execute(
|
await sqliteService.execute(
|
||||||
(dbRow) => {
|
(dbRow) => {
|
||||||
var type = dbRow[4];
|
const type = dbRow[4];
|
||||||
var row = {
|
const row = {
|
||||||
rowId: dbRow[0],
|
rowId: dbRow[0],
|
||||||
created_at: dbRow[1],
|
created_at: dbRow[1],
|
||||||
userId: dbRow[2],
|
userId: dbRow[2],
|
||||||
@@ -440,8 +440,8 @@ const feed = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
async getFeedByInstanceId(instanceId, filters, vipList) {
|
async getFeedByInstanceId(instanceId, filters, vipList) {
|
||||||
var feedDatabase = [];
|
const feedDatabase = [];
|
||||||
var vipQuery = '';
|
let vipQuery = '';
|
||||||
if (vipList.length > 0) {
|
if (vipList.length > 0) {
|
||||||
vipQuery = 'AND user_id IN (';
|
vipQuery = 'AND user_id IN (';
|
||||||
vipList.forEach((vip, i) => {
|
vipList.forEach((vip, i) => {
|
||||||
@@ -452,9 +452,9 @@ const feed = {
|
|||||||
});
|
});
|
||||||
vipQuery += ')';
|
vipQuery += ')';
|
||||||
}
|
}
|
||||||
var gps = true;
|
let gps = true;
|
||||||
var online = true;
|
let online = true;
|
||||||
var offline = true;
|
let offline = true;
|
||||||
if (filters.length > 0) {
|
if (filters.length > 0) {
|
||||||
gps = false;
|
gps = false;
|
||||||
online = false;
|
online = false;
|
||||||
@@ -475,7 +475,7 @@ const feed = {
|
|||||||
}
|
}
|
||||||
if (gps) {
|
if (gps) {
|
||||||
await sqliteService.execute((dbRow) => {
|
await sqliteService.execute((dbRow) => {
|
||||||
var row = {
|
const row = {
|
||||||
rowId: dbRow[0],
|
rowId: dbRow[0],
|
||||||
created_at: dbRow[1],
|
created_at: dbRow[1],
|
||||||
userId: dbRow[2],
|
userId: dbRow[2],
|
||||||
@@ -491,7 +491,7 @@ const feed = {
|
|||||||
}, `SELECT * FROM ${dbVars.userPrefix}_feed_gps WHERE location LIKE '%${instanceId}%' ${vipQuery} ORDER BY id DESC LIMIT ${dbVars.maxTableSize}`);
|
}, `SELECT * FROM ${dbVars.userPrefix}_feed_gps WHERE location LIKE '%${instanceId}%' ${vipQuery} ORDER BY id DESC LIMIT ${dbVars.maxTableSize}`);
|
||||||
}
|
}
|
||||||
if (online || offline) {
|
if (online || offline) {
|
||||||
var query = '';
|
let query = '';
|
||||||
if (!online || !offline) {
|
if (!online || !offline) {
|
||||||
if (online) {
|
if (online) {
|
||||||
query = "AND type = 'Online'";
|
query = "AND type = 'Online'";
|
||||||
@@ -500,7 +500,7 @@ const feed = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
await sqliteService.execute((dbRow) => {
|
await sqliteService.execute((dbRow) => {
|
||||||
var row = {
|
const row = {
|
||||||
rowId: dbRow[0],
|
rowId: dbRow[0],
|
||||||
created_at: dbRow[1],
|
created_at: dbRow[1],
|
||||||
userId: dbRow[2],
|
userId: dbRow[2],
|
||||||
@@ -514,9 +514,9 @@ const feed = {
|
|||||||
feedDatabase.push(row);
|
feedDatabase.push(row);
|
||||||
}, `SELECT * FROM ${dbVars.userPrefix}_feed_online_offline WHERE (location LIKE '%${instanceId}%' ${query}) ${vipQuery} ORDER BY id DESC LIMIT ${dbVars.maxTableSize}`);
|
}, `SELECT * FROM ${dbVars.userPrefix}_feed_online_offline WHERE (location LIKE '%${instanceId}%' ${query}) ${vipQuery} ORDER BY id DESC LIMIT ${dbVars.maxTableSize}`);
|
||||||
}
|
}
|
||||||
var compareByCreatedAt = function (a, b) {
|
const compareByCreatedAt = function (a, b) {
|
||||||
var A = a.created_at;
|
const A = a.created_at;
|
||||||
var B = b.created_at;
|
const B = b.created_at;
|
||||||
if (A < B) {
|
if (A < B) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user