[stable30] Various fixes

js/ActivityTab.chunk.mjs

@@ -1,3 +1,3 @@
-(function(){"use strict";try{if(typeof document<"u"){var t=document.createElement("style");t.appendChild(document.createTextNode(".activity[data-v-4f32db6b]{display:flex;flex-direction:column;overflow:hidden;height:100%}.activity__actions[data-v-4f32db6b]{display:flex;flex-direction:column;width:100%}.activity__empty-content[data-v-4f32db6b]{height:100%}[data-v-4f32db6b] .empty-content__icon span{background-size:64px;width:64px;height:64px}")),document.head.appendChild(t)}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
+(function(){"use strict";try{if(typeof document<"u"){var e=document.createElement("style");e.appendChild(document.createTextNode(".activity[data-v-7e59872d]{display:flex;flex-direction:column;overflow:hidden;height:100%}.activity__actions[data-v-7e59872d]{display:flex;flex-direction:column;width:100%}.activity__list[data-v-7e59872d]{flex-grow:1;overflow:scroll}.activity__empty-content[data-v-7e59872d]{height:100%}[data-v-7e59872d] .empty-content__icon span{background-size:64px;width:64px;height:64px}")),document.head.appendChild(e)}}catch(t){console.error("vite-plugin-css-injected-by-js",t)}})();
 /*! third party licenses: js/vendor.LICENSE.txt */
-import{b as c,e as l,f as u,v}from"./NcCheckboxRadioSwitch-D2GbHtCS.chunk.mjs";import{d as f,r as p,o as d,g as y,f as g,t as o}from"./index.chunk.mjs";import{a as m,b as h,N as _,c as b}from"./Activity.chunk.mjs";import{g as r,a as I,b as A}from"./api.chunk.mjs";import{l as S}from"./logger.chunk.mjs";import{l as P}from"./activity-sidebar.mjs";import"./_commonjsHelpers.chunk.mjs";const x=f({__name:"ActivitySidebarPlugin",props:{plugin:null,fileInfo:null},emits:["reload-activities"],setup(t,{emit:i}){const a=t,s=p();return d(()=>{var n;return a.plugin.mount(s.value,{context:(n=y())==null?void 0:n.proxy,fileInfo:a.fileInfo,reload:()=>i("reload-activities")})}),g(()=>a.plugin.unmount()),{__sfc:!0,props:a,emit:i,attachTarget:s}}});var N=function(){var t=this,i=t._self._c;return t._self._setupProxy,i("div",{ref:"attachTarget"})},w=[],C=c(x,N,w,!1,null,null,null,null);const k=C.exports,E={name:"ActivityTab",components:{Activity:m,NcEmptyContent:h,NcIconSvgWrapper:_,NcLoadingIcon:l,ActivitySidebarPlugin:k},data(){return{error:"",loading:!0,fileInfo:null,activities:[],lightningBoltSVG:P,sidebarPlugins:[]}},mounted(){this.sidebarPlugins=r()},methods:{async update(t){this.sidebarPlugins=[];let i=r();i.length>0&&this.$nextTick(()=>{this.sidebarPlugins=i}),this.fileInfo=t,this.resetState(),await this.getActivities()},async getActivities(){try{this.loading=!0;const t=await this.processActivities(await this.loadRealActivities()),i=await I({fileInfo:this.fileInfo});this.activities=[...t,...i].sort((a,s)=>s.timestamp-a.timestamp)}catch(t){this.error=o("activity","Unable to load the activity list"),console.error("Error loading the activity list",t)}finally{this.loading=!1}},resetState(){this.loading=!0,this.error="",this.activities=[]},async loadRealActivities(){try{const{data:t}=await u.get(v("apps/activity/api/v2/activity/filter"),{params:{format:"json",object_type:"files",object_id:this.fileInfo.id}});return t.ocs.data}catch(t){if(t.response!==void 0&&t.response.status===304)return[];throw e}},processActivities(t){t=t.map(a=>new b(a)),S.debug("Processed ".concat(t.length," activity(ies)"),{activities:t,fileInfo:this.fileInfo});const i=A();return t.filter(a=>!i||i.every(s=>s(a)))},t:o}};var T=function(){var t=this,i=t._self._c;return i("div",{staticClass:"activity",class:{"icon-loading":t.loading}},[t.error?i("NcEmptyContent",{attrs:{name:t.error},scopedSlots:t._u([{key:"icon",fn:function(){return[i("NcIconSvgWrapper",{attrs:{svg:t.lightningBoltSVG}})]},proxy:!0}],null,!1,63559581)}):[t.sidebarPlugins.length>0?i("div",{staticClass:"activity__actions"},t._l(t.sidebarPlugins,function(a,s){return i("ActivitySidebarPlugin",{key:s,attrs:{plugin:a,"file-info":t.fileInfo},on:{"reload-activities":function(n){return t.getActivities()}}})}),1):t._e(),t.loading?i("NcEmptyContent",{staticClass:"activity__empty-content",attrs:{name:t.t("activity","Loading activities")},scopedSlots:t._u([{key:"icon",fn:function(){return[i("NcLoadingIcon")]},proxy:!0}],null,!1,3085876643)}):t.activities.length===0?i("NcEmptyContent",{staticClass:"activity__empty-content",attrs:{name:t.t("activity","No activity yet")},scopedSlots:t._u([{key:"icon",fn:function(){return[i("span",{staticClass:"icon-activity"})]},proxy:!0}])}):i("ul",t._l(t.activities,function(a){return i("Activity",{key:a.id,attrs:{activity:a,"show-previews":!1},on:{reload:function(s){return t.getActivities()}}})}),1)]],2)},j=[],L=c(E,T,j,!1,null,"4f32db6b",null,null);const U=L.exports;export{U as default};
+import{b as c,e as l,f as u,v}from"./NcCheckboxRadioSwitch-D2GbHtCS.chunk.mjs";import{d as f,r as p,o as d,g as y,f as g,t as o}from"./index.chunk.mjs";import{a as m,b as h,N as _,c as b}from"./Activity.chunk.mjs";import{g as r,a as I,b as A}from"./api.chunk.mjs";import{l as S}from"./logger.chunk.mjs";import{l as P}from"./activity-sidebar.mjs";import"./_commonjsHelpers.chunk.mjs";const x=f({__name:"ActivitySidebarPlugin",props:{plugin:null,fileInfo:null},emits:["reload-activities"],setup(t,{emit:i}){const s=t,a=p();return d(()=>{var n;return s.plugin.mount(a.value,{context:(n=y())==null?void 0:n.proxy,fileInfo:s.fileInfo,reload:()=>i("reload-activities")})}),g(()=>s.plugin.unmount()),{__sfc:!0,props:s,emit:i,attachTarget:a}}});var C=function(){var t=this,i=t._self._c;return t._self._setupProxy,i("div",{ref:"attachTarget"})},N=[],w=c(x,C,N,!1,null,null,null,null);const k=w.exports,E={name:"ActivityTab",components:{Activity:m,NcEmptyContent:h,NcIconSvgWrapper:_,NcLoadingIcon:l,ActivitySidebarPlugin:k},data(){return{error:"",loading:!0,fileInfo:null,activities:[],lightningBoltSVG:P,sidebarPlugins:[]}},mounted(){this.sidebarPlugins=r()},methods:{async update(t){this.sidebarPlugins=[];let i=r();i.length>0&&this.$nextTick(()=>{this.sidebarPlugins=i}),this.fileInfo=t,this.resetState(),await this.getActivities()},async getActivities(){try{this.loading=!0;const t=await this.processActivities(await this.loadRealActivities()),i=await I({fileInfo:this.fileInfo});this.activities=[...t,...i].sort((s,a)=>a.timestamp-s.timestamp)}catch(t){this.error=o("activity","Unable to load the activity list"),console.error("Error loading the activity list",t)}finally{this.loading=!1}},resetState(){this.loading=!0,this.error="",this.activities=[]},async loadRealActivities(){try{const{data:t}=await u.get(v("apps/activity/api/v2/activity/filter"),{params:{format:"json",object_type:"files",object_id:this.fileInfo.id}});return t.ocs.data}catch(t){if(t.response!==void 0&&t.response.status===304)return[];throw e}},processActivities(t){t=t.map(s=>new b(s)),S.debug("Processed ".concat(t.length," activity(ies)"),{activities:t,fileInfo:this.fileInfo});const i=A();return t.filter(s=>!i||i.every(a=>a(s)))},t:o}};var T=function(){var t=this,i=t._self._c;return i("div",{staticClass:"activity",class:{"icon-loading":t.loading}},[t.error?i("NcEmptyContent",{attrs:{name:t.error},scopedSlots:t._u([{key:"icon",fn:function(){return[i("NcIconSvgWrapper",{attrs:{svg:t.lightningBoltSVG}})]},proxy:!0}],null,!1,63559581)}):[t.sidebarPlugins.length>0?i("div",{staticClass:"activity__actions"},t._l(t.sidebarPlugins,function(s,a){return i("ActivitySidebarPlugin",{key:a,attrs:{plugin:s,"file-info":t.fileInfo},on:{"reload-activities":function(n){return t.getActivities()}}})}),1):t._e(),t.loading?i("NcEmptyContent",{staticClass:"activity__empty-content",attrs:{name:t.t("activity","Loading activities")},scopedSlots:t._u([{key:"icon",fn:function(){return[i("NcLoadingIcon")]},proxy:!0}],null,!1,3085876643)}):t.activities.length===0?i("NcEmptyContent",{staticClass:"activity__empty-content",attrs:{name:t.t("activity","No activity yet")},scopedSlots:t._u([{key:"icon",fn:function(){return[i("span",{staticClass:"icon-activity"})]},proxy:!0}])}):i("ul",{staticClass:"activity__list"},t._l(t.activities,function(s){return i("Activity",{key:s.id,attrs:{activity:s,"show-previews":!1},on:{reload:function(a){return t.getActivities()}}})}),1)]],2)},j=[],L=c(E,T,j,!1,null,"7e59872d",null,null);const U=L.exports;export{U as default};

src/components/activities/CommentActivity.vue

@@ -58,7 +58,7 @@ const authorDisplayName = computed(() => {
 /**
  * Timestamp of the activity as JS timestamp (ms)
  */
-const timestamp = computed(() => props.activity.timestamp * 1000)
+const timestamp = computed(() => props.activity.timestamp)
 
 /**
  * The activity's messageRichTemplate. Fallback to message if messageRichTemplate does not exists

src/components/activities/GenericActivity.vue

@@ -88,7 +88,7 @@ export default defineComponent({
 		 * The timestamp of the activity as JS timestamp
 		 */
 		timestamp() {
-			return this.activity.timestamp * 1000
+			return this.activity.timestamp
 		},
 		/**
 		 * @return {string} The activity's messageRichTemplate. Fallback to message if messageRichTemplate does not exists

src/models/ActivityModel.ts

@@ -255,7 +255,7 @@ export default class ActivityModel {
 	 * @memberof ActivityModel
 	 */
 	get timestamp(): number {
-		return moment(this._activity.datetime).unix()
+		return moment(this._activity.datetime).valueOf()
 	}
 
 	/**

src/views/ActivityTab.vue

@@ -37,7 +37,7 @@
 					<span class="icon-activity" />
 				</template>
 			</NcEmptyContent>
-			<ul v-else>
+			<ul v-else class="activity__list">
 				<Activity v-for="activity in activities"
 					:key="activity.id"
 					:activity="activity"
@@ -189,6 +189,11 @@ export default {
 		width: 100%;
 	}
 
+	&__list {
+		flex-grow: 1;
+		overflow: scroll;
+	}
+
 	&__empty-content {
 		height: 100%;
 	}