Group add last visited (#1351)

* Fixed compilation/project files on Visual Studio.

* Add group instance last visit (#1286)

* Fixed erroneous translation + remove x-link
This commit is contained in:
Thomas
2025-08-24 01:00:08 +01:00
committed by GitHub
parent ced458229b
commit f63b1bdca2
24 changed files with 300 additions and 39 deletions

View File

@@ -611,6 +611,14 @@
<span class="extra">{{ formatDateFilter(groupDialog.ref.createdAt, 'long') }}</span>
</div>
</div>
<el-tooltip :disabled="hideTooltips" placement="top" :content="t('dialog.user.info.open_previous_instance')">
<div class="x-friend-item" @click="showPreviousInstancesGroupDialog(groupDialog.ref)">
<div class="detail">
<span class="name">{{ t('dialog.group.info.last_visited') }}</span>
<span class="extra">{{formatDateFilter(groupDialog.lastVisit,'long') }}</span>
</div>
</div>
</el-tooltip>
<div class="x-friend-item" style="cursor: default">
<div class="detail">
<span class="name">{{ t('dialog.group.info.links') }}</span>
@@ -1166,6 +1174,10 @@
<!--Nested-->
<GroupPostEditDialog :dialog-data.sync="groupPostEditDialog" :selected-gallery-file="selectedGalleryFile" />
<InviteGroupDialog />
<PreviousInstancesGroupDialog
:previous-instances-group-dialog.sync="previousInstancesGroupDialog"
:current-user="currentUser"
/>
</safe-dialog>
</template>
@@ -1203,6 +1215,7 @@
} from '../../../stores';
import InviteGroupDialog from '../InviteGroupDialog.vue';
import GroupPostEditDialog from './GroupPostEditDialog.vue';
import PreviousInstancesGroupDialog from "../PreviousInstancesDialog/PreviousInstancesGroupDialog.vue";
const { t } = useI18n();
@@ -1253,6 +1266,12 @@
groupId: ''
});
const previousInstancesGroupDialog = ref({
visible: false,
openFlg: false,
groupRef: {}
});
let loadMoreGroupMembersParams = ref({
n: 100,
offset: 0,
@@ -1285,6 +1304,14 @@
inviteGroupDialog.value.visible = true;
}
function showPreviousInstancesGroupDialog(groupRef) {
const D = previousInstancesGroupDialog.value;
D.groupRef = groupRef;
D.visible = true;
D.openFlg = true;
nextTick(() => (D.openFlg = false));
}
function setGroupRepresentation(groupId) {
handleGroupRepresentationChange(groupId, true);
}

View File

@@ -0,0 +1,161 @@
<template>
<safe-dialog
ref="previousInstancesGroupDialogRef"
:visible.sync="isVisible"
:title="t('dialog.previous_instances.header')"
width="1000px"
append-to-body
>
<div style="display: flex; align-items: center; justify-content: space-between">
<span style="font-size: 14px" v-text="previousInstancesGroupDialog.groupRef.name"></span>
<el-input
v-model="previousInstancesGroupDialogTable.filters[0].value"
:placeholder="t('dialog.previous_instances.search_placeholder')"
style="width: 150px"
/>
</div>
<data-tables v-loading="loading" v-bind="previousInstancesGroupDialogTable" style="margin-top: 10px">
<el-table-column :label="t('table.previous_instances.date')" prop="created_at" sortable width="170">
<template #default="scope">
<span>{{ formatDateFilter(scope.row.created_at, 'long') }}</span>
</template>
</el-table-column>
<el-table-column :label="t('table.previous_instances.instance_name')" prop="name">
<template #default="scope">
<LocationWorld
:locationobject="scope.row.$location"
:grouphint="scope.row.groupName"
:currentuserid="currentUser.id"
/>
</template>
</el-table-column>
<el-table-column :label="t('table.previous_instances.instance_creator')" prop="location">
<template #default="scope">
<DisplayName
:userid="scope.row.$location.userId"
:location="scope.row.$location.tag"
:force-update-key="previousInstancesGroupDialog.forceUpdate"
/>
</template>
</el-table-column>
<el-table-column :label="t('table.previous_instances.time')" prop="time" width="100" sortable>
<template #default="scope">
<span v-text="scope.row.timer"></span>
</template>
</el-table-column>
<el-table-column :label="t('table.previous_instances.action')" width="90" align="right">
<template #default="scope">
<el-button
type="text"
icon="el-icon-s-data"
size="mini"
@click="showPreviousInstancesInfoDialog(scope.row.location)"
/>
<el-button
v-if="shiftHeld"
style="color: #f56c6c"
type="text"
icon="el-icon-close"
size="mini"
@click="deleteGameLogGroupInstance(scope.row)"
/>
<el-button
v-else
type="text"
icon="el-icon-close"
size="mini"
@click="deleteGameLogGroupInstancePrompt(scope.row)"
/>
</template>
</el-table-column>
</data-tables>
</safe-dialog>
</template>
<script setup>
import { ref, reactive, computed, watch, nextTick, getCurrentInstance } from 'vue';
import { parseLocation, compareByCreatedAt, timeToText, removeFromArray, adjustDialogZ, formatDateFilter } from '../../../shared/utils';
import { database } from '../../../service/database';
import { useI18n } from 'vue-i18n-bridge';
import { useInstanceStore, useUiStore, useUserStore } from '../../../stores';
const { proxy } = getCurrentInstance();
const { showPreviousInstancesInfoDialog } = useInstanceStore();
const { shiftHeld } = useUiStore();
const { currentUser } = useUserStore();
const { t } = useI18n();
const previousInstancesGroupDialogRef = ref(null);
const loading = ref(false);
const previousInstancesGroupDialogTable = reactive({
data: [],
filters: [{ prop: 'groupName', value: '' }],
tableProps: {
stripe: true,
size: 'mini',
defaultSort: { prop: 'created_at', order: 'descending' }
},
pageSize: 10,
paginationProps: { small: true, layout: 'sizes,prev,pager,next,total', pageSizes: [10, 25, 50, 100] }
});
const props = defineProps({
previousInstancesGroupDialog: { type: Object, required: true },
});
const emit = defineEmits(['update:previousInstancesGroupDialog']);
const isVisible = computed({
get: () => props.previousInstancesGroupDialog.visible,
set: (value) => {
emit('update:previousInstancesGroupDialog', {
...props.previousInstancesGroupDialog,
visible: value
});
}
});
watch(() => props.previousInstancesGroupDialog.openFlg, () => {
if (props.previousInstancesGroupDialog.visible) {
nextTick(() => {
adjustDialogZ(previousInstancesGroupDialogRef.value.$el);
});
refreshPreviousInstancesGroupTable();
}
});
function refreshPreviousInstancesGroupTable() {
loading.value = true;
const D = props.previousInstancesGroupDialog;
database.getPreviousInstancesByGroupName(D.groupRef.name).then((data) => {
const array = [];
for (const ref of data.values()) {
ref.$location = parseLocation(ref.location);
ref.timer = ref.time > 0 ? timeToText(ref.time) : '';
array.push(ref);
}
array.sort(compareByCreatedAt);
previousInstancesGroupDialogTable.data = array;
loading.value = false;
});
}
function deleteGameLogGroupInstance(row) {
database.deleteGameLogInstanceByInstanceId({ location: row.location });
removeFromArray(previousInstancesGroupDialogTable.data, row);
}
function deleteGameLogGroupInstancePrompt(row) {
proxy.$confirm('Continue? Delete GameLog Instance', 'Confirm', {
confirmButtonText: 'Confirm',
cancelButtonText: 'Cancel',
type: 'info',
callback: (action) => { if (action === 'confirm') deleteGameLogGroupInstance(row); }
});
}
</script>

View File

@@ -847,7 +847,7 @@
<el-tooltip
:disabled="hideTooltips"
placement="top"
:content="t('dialog.user.info.open_previouse_instance')">
:content="t('dialog.user.info.open_previous_instance')">
<div class="x-friend-item" @click="showPreviousInstancesUserDialog(userDialog.ref)">
<div class="detail">
<span class="name">
@@ -886,7 +886,7 @@
<el-tooltip
:disabled="hideTooltips || currentUser.id !== userDialog.id"
placement="top"
:content="t('dialog.user.info.open_previouse_instance')">
:content="t('dialog.user.info.open_previous_instance')">
<div class="x-friend-item" @click="showPreviousInstancesUserDialog(userDialog.ref)">
<div class="detail">
<span class="name">

View File

@@ -682,7 +682,7 @@
<el-tooltip
:disabled="hideTooltips"
placement="top"
:content="t('dialog.user.info.open_previouse_instance')">
:content="t('dialog.user.info.open_previous_instance')">
<div class="x-friend-item" @click="showPreviousInstancesWorldDialog(worldDialog.ref)">
<div class="detail">
<span class="name">