Merge pull request #1516 from nextcloud/backport/1513/stable28

[stable28] fix(ActivityTab): Typo in try-catch

Author: susnux

.github/workflows/node.yml

@@ -48,6 +48,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: ${{ github.head_ref }}
 
       - name: Read package.json node and npm engines version
         uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2

js/Activity-b9f27b2e.mjs js/Activity-095c590c.mjsjs/Activity-b9f27b2e.mjs renamed to js/Activity-095c590c.mjs

@@ -0,0 +1,3 @@
+(function(){"use strict";try{if(typeof document<"u"){var e=document.createElement("style");e.appendChild(document.createTextNode("[data-v-395262ee] .empty-content__icon span{background-size:64px;width:64px;height:64px}.activity__actions[data-v-395262ee]{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 o,a as r,c}from"./index.es-479f5d11.mjs";import{d as l,r as u,o as f,g as v,h as p,t as s,a as d}from"./index-224ad6c5.mjs";import{A as g,p as y,v as m,d as h}from"./Activity-095c590c.mjs";import{g as _,a as A,b as I}from"./api-00dfc954.mjs";import{l as b}from"./logger-a53a57b5.mjs";import{l as S}from"./activity-sidebar.mjs";import"./index-65a5f423.mjs";const w=l({__name:"ActivitySidebarPlugin",props:{plugin:null,fileInfo:null},emits:["reload-activities"],setup(t,{emit:i}){const a=t,n=u();return f(()=>a.plugin.mount(n.value,{context:v()?.proxy,fileInfo:a.fileInfo,reload:()=>i("reload-activities")})),p(()=>a.plugin.unmount()),{__sfc:!0,props:a,emit:i,attachTarget:n}}});var x=function(){var t=this,i=t._self._c;return t._self._setupProxy,i("div",{ref:"attachTarget"})},N=[],P=o(w,x,N,!1,null,null,null,null);const C=P.exports;const k={name:"ActivityTab",components:{Activity:g,NcEmptyContent:y,NcIconSvgWrapper:m,NcLoadingIcon:r,ActivitySidebarPlugin:C},data(){return{error:"",loading:!0,fileInfo:null,activities:[],lightningBoltSVG:S,sidebarPlugins:[]}},mounted(){this.sidebarPlugins=_()},methods:{async update(t){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=s("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 c.get(d("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 h(a)),b.debug(`Processed ${t.length} activity(ies)`,{activities:t,fileInfo:this.fileInfo});const i=I();return t.filter(a=>!i||i.every(n=>n(a)))},t:s}};var E=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(T){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=o(k,E,j,!1,null,"395262ee",null,null);const F=L.exports;export{F as default};

js/Activity-b9f27b2e.mjs.map js/Activity-095c590c.mjs.mapjs/Activity-b9f27b2e.mjs.map renamed to js/Activity-095c590c.mjs.map

@@ -1,2 +1,2 @@
 /*! third party licenses: js/vendor.LICENSE.txt */
-import{V as n,t as m,f as d}from"./index-224ad6c5.mjs";import{S as o,m as s,a as c,A as p,V as u,s as a}from"./settings-store-f9d5ccf0.mjs";import{c as f}from"./NcCheckboxRadioSwitch-1b1322cb.mjs";import{n as l}from"./index.es-9b260a7e.mjs";import"./index-65a5f423.mjs";import"./logger-a53a57b5.mjs";const g={name:"AdminSettings",components:{NcCheckboxRadioSwitch:f,NcSettingsSection:o},computed:{...s({emailEnabled:"emailEnabled"}),settingDescription(){return this.emailEnabled?t("activity","Choose for which activities you want to get an email or push notification."):t("activity","Choose for which activities you want to get a push notification.")}},mounted(){this.setEndpoint({endpoint:"/apps/activity/settings/admin"})},methods:{...c(["setEndpoint","toggleEmailEnabled"])}};var h=function(){var i=this,e=i._self._c;return e("NcSettingsSection",{attrs:{name:i.t("activity","Notification")}},[e("NcCheckboxRadioSwitch",{attrs:{type:"checkbox",checked:i.emailEnabled},on:{"update:checked":function(r){return i.toggleEmailEnabled({emailEnabled:r})}}},[i._v(" "+i._s(i.t("activity","Enable notification emails"))+" ")])],1)},v=[],y=l(g,h,v,!1,null,null,null,null);const E=y.exports,S={name:"DefaultActivitySettings",components:{ActivityGrid:p,NcSettingsSection:o},computed:{...s({emailEnabled:"emailEnabled"})},mounted(){this.setEndpoint({endpoint:"/apps/activity/settings/admin"})},methods:{...c(["setEndpoint","toggleEmailEnabled"])}};var b=function(){var i=this,e=i._self._c;return e("NcSettingsSection",{attrs:{name:i.t("activity","Default settings"),description:i.t("activity","Configure the default notification settings for new accounts.")}},[e("ActivityGrid")],1)},w=[],A=l(S,b,w,!1,null,null,null,null);const N=A.exports;n.prototype.t=m,n.prototype.n=d,n.use(u),new n({el:"#activity-admin-settings",store:a,name:"ActivityPersonalSettings",render:i=>i(E)}),new n({el:"#activity-default-settings",store:a,name:"ActivityDefaultSettings",render:i=>i(N)});
+import{V as n,t as m,f as d}from"./index-224ad6c5.mjs";import{S as o,m as s,a as c,A as p,V as u,s as a}from"./settings-store-cc1b30c2.mjs";import{c as f}from"./NcCheckboxRadioSwitch-5b3d6d34.mjs";import{n as l}from"./index.es-479f5d11.mjs";import"./index-65a5f423.mjs";import"./logger-a53a57b5.mjs";const g={name:"AdminSettings",components:{NcCheckboxRadioSwitch:f,NcSettingsSection:o},computed:{...s({emailEnabled:"emailEnabled"}),settingDescription(){return this.emailEnabled?t("activity","Choose for which activities you want to get an email or push notification."):t("activity","Choose for which activities you want to get a push notification.")}},mounted(){this.setEndpoint({endpoint:"/apps/activity/settings/admin"})},methods:{...c(["setEndpoint","toggleEmailEnabled"])}};var h=function(){var i=this,e=i._self._c;return e("NcSettingsSection",{attrs:{name:i.t("activity","Notification")}},[e("NcCheckboxRadioSwitch",{attrs:{type:"checkbox",checked:i.emailEnabled},on:{"update:checked":function(r){return i.toggleEmailEnabled({emailEnabled:r})}}},[i._v(" "+i._s(i.t("activity","Enable notification emails"))+" ")])],1)},v=[],y=l(g,h,v,!1,null,null,null,null);const E=y.exports,S={name:"DefaultActivitySettings",components:{ActivityGrid:p,NcSettingsSection:o},computed:{...s({emailEnabled:"emailEnabled"})},mounted(){this.setEndpoint({endpoint:"/apps/activity/settings/admin"})},methods:{...c(["setEndpoint","toggleEmailEnabled"])}};var b=function(){var i=this,e=i._self._c;return e("NcSettingsSection",{attrs:{name:i.t("activity","Default settings"),description:i.t("activity","Configure the default notification settings for new accounts.")}},[e("ActivityGrid")],1)},w=[],A=l(S,b,w,!1,null,null,null,null);const N=A.exports;n.prototype.t=m,n.prototype.n=d,n.use(u),new n({el:"#activity-admin-settings",store:a,name:"ActivityPersonalSettings",render:i=>i(E)}),new n({el:"#activity-default-settings",store:a,name:"ActivityDefaultSettings",render:i=>i(N)});