Skip to content

Commit

Permalink
Merge pull request #1771 from nextcloud/backport/1732/stable29
Browse files Browse the repository at this point in the history
[stable29] forces sidebarPlugins to unmount and mount during an ActivityTab update
  • Loading branch information
artonge authored Sep 9, 2024
2 parents b219ed3 + 06e51eb commit 7787960
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 6 deletions.
3 changes: 0 additions & 3 deletions js/ActivityTab-B5jIlo4R.mjs

This file was deleted.

3 changes: 3 additions & 0 deletions js/ActivityTab-CyAxu8aq.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
(function(){"use strict";try{if(typeof document<"u"){var e=document.createElement("style");e.appendChild(document.createTextNode("[data-v-d8f2888b] .empty-content__icon span{background-size:64px;width:64px;height:64px}.activity__actions[data-v-d8f2888b]{display:flex;flex-direction:column;width:100%}")),document.head.appendChild(e)}}catch(t){console.error("vite-plugin-css-injected-by-js",t)}})();
/*! third party licenses: js/vendor.LICENSE.txt */
import{n as l,c,a as u}from"./NcCheckboxRadioSwitch-hel9-sAH-DWj7ZO5U.mjs";import{d as f,r as v,o as p,g as d,h as g,t as o,a as y}from"./index-BY5PybuZ.mjs";import{A as h,e as m,a as _,f as b}from"./Activity-Dojq2ncI.mjs";import{g as r,a as A,b as I}from"./api-BKkaSPgn.mjs";import{l as S}from"./logger-BVTvLOjn.mjs";import{l as P}from"./activity-sidebar.mjs";import"./index-LkGPsUV3.mjs";const x=f({__name:"ActivitySidebarPlugin",props:{plugin:null,fileInfo:null},emits:["reload-activities"],setup(t,{emit:i}){const a=t,n=v();return p(()=>{var s;return a.plugin.mount(n.value,{context:(s=d())==null?void 0:s.proxy,fileInfo:a.fileInfo,reload:()=>i("reload-activities")})}),g(()=>a.plugin.unmount()),{__sfc:!0,props:a,emit:i,attachTarget:n}}});var w=function(){var t=this,i=t._self._c;return t._self._setupProxy,i("div",{ref:"attachTarget"})},N=[],k=l(x,w,N,!1,null,null,null,null);const C=k.exports,E={name:"ActivityTab",components:{Activity:h,NcEmptyContent:m,NcIconSvgWrapper:_,NcLoadingIcon:c,ActivitySidebarPlugin:C},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 A({fileInfo:this.fileInfo});this.activities=[...t,...i].sort((a,n)=>n.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(y("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=I();return t.filter(a=>!i||i.every(n=>n(a)))},t:o}};var T=function(){var t=this,i=t._self._c;return i("div",{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,n){return i("ActivitySidebarPlugin",{key:n,attrs:{plugin:a,"file-info":t.fileInfo},on:{"reload-activities":function(s){return t.getActivities()}}})}),1):t._e(),t.loading?i("NcEmptyContent",{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",{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(n){return t.getActivities()}}})}),1)]],2)},j=[],L=l(E,T,j,!1,null,"d8f2888b",null,null);const U=L.exports;export{U as default};
Loading

0 comments on commit 7787960

Please sign in to comment.