Skip to content

fix: position versions loading spinner without shifting the details layout #3065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dschmidt merged 1 commit into from
Aug 10, 2026
+95 −90
Merged

fix: position versions loading spinner without shifting the details layout #3065

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
185 changes: 95 additions & 90 deletions packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,97 +30,102 @@
<oc-status-indicators :resource="resource" :indicators="shareIndicators" />
<p class="my-0 mx-2" v-text="detailSharingInformation" />
</div>
<div class="flex justify-end min-h-5">
<oc-spinner
v-if="versionsLoading"
v-oc-tooltip="$gettext('Loading version information')"
size="small"
:aria-label="$gettext('Loading version information')"
/>
<oc-icon
v-else-if="versionsError"
v-oc-tooltip="$gettext('Version information could not be loaded')"
name="error-warning"
fill-type="line"
size="small"
class="text-role-error"
/>
<div class="relative">
<div
v-if="versionsLoading || versionsError"
class="absolute top-0 right-0 z-20 flex items-center"
>
<oc-spinner
v-if="versionsLoading"
v-oc-tooltip="$gettext('Loading version information')"
size="small"
:aria-label="$gettext('Loading version information')"
/>
<oc-icon
v-else
v-oc-tooltip="$gettext('Version information could not be loaded')"
name="error-warning"
fill-type="line"
size="small"
class="text-role-error"
/>
</div>
<dl
class="details-list"
:aria-label="$gettext('Overview of the information about the selected file')"
>
<template v-if="hasDeletionDate">
<dt>{{ $gettext('Deleted at') }}</dt>
<dd data-testid="delete-timestamp">{{ capitalizedTimestamp }}</dd>
</template>
<template v-if="hasTimestamp">
<dt>{{ $gettext('Last modified') }}</dt>
<dd data-testid="timestamp">
<oc-button
v-if="showVersions"
v-oc-tooltip="seeVersionsLabel"
appearance="raw"
:aria-label="seeVersionsLabel"
no-hover
@click="openSideBarPanel('versions')"
>
{{ capitalizedTimestamp }}
</oc-button>
<span v-else v-text="capitalizedTimestamp" />
</dd>
</template>
<template v-if="resource.locked">
<dt>{{ $gettext('Locked via') }}</dt>
<dd data-testid="locked-by">
<span>{{ resource.lockOwner }}</span>
<span v-if="resource.lockTime">({{ formatDateRelative(resource.lockTime) }})</span>
</dd>
</template>
<template v-if="showSharedVia">
<dt>{{ $gettext('Shared via') }}</dt>
<dd data-testid="shared-via">
<router-link :to="sharedAncestorRoute">
<span v-oc-tooltip="sharedViaTooltip" v-text="sharedAncestor.path" />
</router-link>
</dd>
</template>
<template v-if="showSharedBy">
<dt>{{ $gettext('Shared by') }}</dt>
<dd data-testid="shared-by">{{ sharedByDisplayNames }}</dd>
</template>
<template v-if="ownerDisplayName && ownerDisplayName !== sharedByDisplayNames">
<dt>{{ $gettext('Owner') }}</dt>
<dd data-testid="ownerDisplayName">
<p class="m-0">
{{ ownerDisplayName }}
<span v-if="ownedByCurrentUser" v-text="$gettext('(me)')" />
</p>
</dd>
</template>
<template v-if="showSize">
<dt>{{ $gettext('Size') }}</dt>
<dd data-testid="sizeInfo">{{ resourceSize }}</dd>
</template>
<web-dav-details v-if="showWebDavDetails" :space="space" />
<template v-if="versionsRowVisible">
<dt>{{ $gettext('Version') }}</dt>
<dd data-testid="versionsInfo">
<span v-if="versionsPlaceholder" aria-hidden="true">&nbsp;</span>
<oc-button
v-else
v-oc-tooltip="seeVersionsLabel"
appearance="raw"
:aria-label="seeVersionsLabel"
no-hover
@click="openSideBarPanel('versions')"
>
{{ versions.length }}
</oc-button>
</dd>
</template>
<custom-component-target :extension-point="fileSideBarFileDetailsTableExtensionPoint" />
</dl>
</div>
<dl
class="details-list"
:aria-label="$gettext('Overview of the information about the selected file')"
>
<template v-if="hasDeletionDate">
<dt>{{ $gettext('Deleted at') }}</dt>
<dd data-testid="delete-timestamp">{{ capitalizedTimestamp }}</dd>
</template>
<template v-if="hasTimestamp">
<dt>{{ $gettext('Last modified') }}</dt>
<dd data-testid="timestamp">
<oc-button
v-if="showVersions"
v-oc-tooltip="seeVersionsLabel"
appearance="raw"
:aria-label="seeVersionsLabel"
no-hover
@click="openSideBarPanel('versions')"
>
{{ capitalizedTimestamp }}
</oc-button>
<span v-else v-text="capitalizedTimestamp" />
</dd>
</template>
<template v-if="resource.locked">
<dt>{{ $gettext('Locked via') }}</dt>
<dd data-testid="locked-by">
<span>{{ resource.lockOwner }}</span>
<span v-if="resource.lockTime">({{ formatDateRelative(resource.lockTime) }})</span>
</dd>
</template>
<template v-if="showSharedVia">
<dt>{{ $gettext('Shared via') }}</dt>
<dd data-testid="shared-via">
<router-link :to="sharedAncestorRoute">
<span v-oc-tooltip="sharedViaTooltip" v-text="sharedAncestor.path" />
</router-link>
</dd>
</template>
<template v-if="showSharedBy">
<dt>{{ $gettext('Shared by') }}</dt>
<dd data-testid="shared-by">{{ sharedByDisplayNames }}</dd>
</template>
<template v-if="ownerDisplayName && ownerDisplayName !== sharedByDisplayNames">
<dt>{{ $gettext('Owner') }}</dt>
<dd data-testid="ownerDisplayName">
<p class="m-0">
{{ ownerDisplayName }}
<span v-if="ownedByCurrentUser" v-text="$gettext('(me)')" />
</p>
</dd>
</template>
<template v-if="showSize">
<dt>{{ $gettext('Size') }}</dt>
<dd data-testid="sizeInfo">{{ resourceSize }}</dd>
</template>
<web-dav-details v-if="showWebDavDetails" :space="space" />
<template v-if="versionsRowVisible">
<dt>{{ $gettext('Version') }}</dt>
<dd data-testid="versionsInfo">
<span v-if="versionsPlaceholder" aria-hidden="true">&nbsp;</span>
<oc-button
v-else
v-oc-tooltip="seeVersionsLabel"
appearance="raw"
:aria-label="seeVersionsLabel"
no-hover
@click="openSideBarPanel('versions')"
>
{{ versions.length }}
</oc-button>
</dd>
</template>
<custom-component-target :extension-point="fileSideBarFileDetailsTableExtensionPoint" />
</dl>
<div v-if="hasTags" class="mt-2">
<div class="inline-flex items-center text-sm mb-0.5">
{{ $gettext('Tags') }}
Expand Down
Loading