Skip to content

Commit 98cd5ed

Browse files
authored
Merge pull request #2035 from nextcloud/artonge/chore/migrate_vue3
2 parents e0721a8 + 98f19a8 commit 98cd5ed

File tree

72 files changed

+2613
-3947
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+2613
-3947
lines changed
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# This workflow is provided via the organization template repository
2+
#
3+
# https://github.com/nextcloud/.github
4+
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
#
6+
# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
7+
# SPDX-License-Identifier: MIT
8+
9+
name: Block unconventional commits
10+
11+
on:
12+
pull_request:
13+
types: [opened, ready_for_review, reopened, synchronize]
14+
15+
permissions:
16+
contents: read
17+
18+
concurrency:
19+
group: block-unconventional-commits-${{ github.head_ref || github.run_id }}
20+
cancel-in-progress: true
21+
22+
jobs:
23+
block-unconventional-commits:
24+
name: Block unconventional commits
25+
26+
runs-on: ubuntu-latest-low
27+
28+
steps:
29+
- name: Checkout
30+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
31+
with:
32+
persist-credentials: false
33+
34+
- uses: webiny/action-conventional-commits@8bc41ff4e7d423d56fa4905f6ff79209a78776c7 # v1.3.0
35+
with:
36+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

cypress/e2e/settings.cy.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,27 +84,27 @@ describe('Check that user\'s settings survive a reload', () => {
8484
it('Activity summary survive a reload', () => {
8585
cy.intercept({ method: 'POST', url: '**/activity/settings' }).as('apiCall')
8686

87-
cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
87+
cy.contains('.checkbox-radio-switch-checkbox', 'Send daily activity summary in the morning')
8888
.find('input')
8989
.check({ force: true })
90-
cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
90+
cy.contains('.checkbox-radio-switch-checkbox', 'Send daily activity summary in the morning')
9191
.find('input')
9292
.should('be.checked')
9393
cy.wait('@apiCall')
9494
.reload()
9595

96-
cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
96+
cy.contains('.checkbox-radio-switch-checkbox', 'Send daily activity summary in the morning')
9797
.scrollIntoView()
9898
.find('input')
9999
.should('be.checked')
100100

101-
cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
101+
cy.contains('.checkbox-radio-switch-checkbox', 'Send daily activity summary in the morning')
102102
.find('input')
103103
.uncheck({ force: true })
104104
cy.wait('@apiCall')
105105
.reload()
106106

107-
cy.contains('[data-cy-checkbox]', 'Send daily activity summary in the morning')
107+
cy.contains('.checkbox-radio-switch-checkbox', 'Send daily activity summary in the morning')
108108
.scrollIntoView()
109109
.find('input')
110110
.should('not.be.checked')

eslint.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* SPDX-License-Identifier: CC0-1.0
44
*/
55

6-
import { recommendedVue2 } from '@nextcloud/eslint-config'
6+
import { recommended } from '@nextcloud/eslint-config'
77

88
export default [
9-
...recommendedVue2,
9+
...recommended,
1010
{
1111
ignores: [
1212
'js/**',

js/ActivityComponent-CQakH_Zc.chunk.mjs

Lines changed: 0 additions & 77 deletions
This file was deleted.

js/ActivityComponent-CQakH_Zc.chunk.mjs.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

js/ActivityComponent.vue_vue_type_script_setup_true_lang-Dl2LPLoe.chunk.mjs

Lines changed: 71 additions & 0 deletions
Large diffs are not rendered by default.

js/ActivityComponent.vue_vue_type_script_setup_true_lang-Dl2LPLoe.chunk.mjs.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/ActivityTab-B3IKkXvI.chunk.mjs

Lines changed: 0 additions & 3 deletions
This file was deleted.

js/ActivityTab-B3IKkXvI.chunk.mjs.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

js/ActivityTab-BHNw_dVJ.chunk.mjs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
(function(){"use strict";try{if(typeof document<"u"){var t=document.createElement("style");t.appendChild(document.createTextNode(".activity[data-v-2fda9824]{display:flex;flex-direction:column;overflow:hidden;height:100%}.activity__actions[data-v-2fda9824]{display:flex;flex-direction:column;width:100%}.activity__list[data-v-2fda9824]{flex-grow:1;overflow:scroll}.activity__empty-content[data-v-2fda9824]{height:100%}[data-v-2fda9824] .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)}})();
2+
import{l as w}from"./activity-sidebar.mjs";import{f as S,d as N,v as C,b as x}from"./_plugin-vue_export-helper-BGAprzst.chunk.mjs";import{k as I,r as E,x as R,C as j,y as G,c as s,o as a,H as g,E as L,b as o,d as l,h as d,g as m,G as y,l as B,I as u,f as T,n as V}from"./translation-CD_FiYBO-D7oPP82T.chunk.mjs";import{N as W,b as H,_ as U,A as $}from"./ActivityComponent.vue_vue_type_script_setup_true_lang-Dl2LPLoe.chunk.mjs";import{g as q,a as z,b as h}from"./api-AEva7FRs.chunk.mjs";import{l as _}from"./logger-bSyXKk3f.chunk.mjs";import"./preload-helper-Dh9HmuEY.chunk.mjs";import"./_commonjsHelpers-Cqwegr3R.chunk.mjs";const D=I({__name:"ActivitySidebarPlugin",props:{plugin:{},fileInfo:{}},emits:["reload-activities"],setup(i,{emit:t}){const e=i,n=t,r=E();return R(()=>e.plugin.mount(r.value,{context:j()?.proxy,fileInfo:e.fileInfo,reload:()=>n("reload-activities")})),G(()=>e.plugin.unmount()),(b,f)=>(a(),s("div",{ref_key:"attachTarget",ref:r},null,512))}}),F=I({name:"ActivityTab",components:{ActivityComponent:U,NcEmptyContent:H,NcIconSvgWrapper:W,NcLoadingIcon:S,ActivitySidebarPlugin:D},expose:["update"],data(){return{error:"",loading:!0,fileInfo:null,activities:[],lightningBoltSVG:w,sidebarPlugins:[]}},mounted(){this.sidebarPlugins=h()},methods:{async update(i){this.sidebarPlugins=[];const t=h();t.length>0&&L(()=>{this.sidebarPlugins=t}),this.fileInfo=i,this.resetState(),await this.getActivities()},async getActivities(){try{this.loading=!0;const i=await this.processActivities(await this.loadRealActivities()),t=await z({fileInfo:this.fileInfo});this.activities=[...i,...t].sort((e,n)=>n.timestamp-e.timestamp)}catch(i){this.error=g("activity","Unable to load the activity list"),_.error("Error loading the activity list",{error:i})}finally{this.loading=!1}},resetState(){this.loading=!0,this.error="",this.activities=[]},async loadRealActivities(){try{const{data:i}=await N.get(C("apps/activity/api/v2/activity/filter"),{params:{format:"json",object_type:"files",object_id:this.fileInfo.id}});return i.ocs.data}catch(i){if(i.response!==void 0&&i.response.status===304)return[];throw i}},processActivities(i){i=i.map(e=>new $(e)),_.debug(`Processed ${i.length} activity(ies)`,{activities:i,fileInfo:this.fileInfo});const t=q();return i.filter(e=>!t||t.every(n=>n(e)))},t:g}}),J={key:0,class:"activity__actions"},K={key:3,class:"activity__list"};function M(i,t,e,n,r,b){const f=o("NcIconSvgWrapper"),v=o("NcEmptyContent"),A=o("ActivitySidebarPlugin"),k=o("NcLoadingIcon"),P=o("ActivityComponent");return a(),s("div",{class:V([{"icon-loading":i.loading},"activity"])},[i.error||i.fileInfo===null?(a(),l(v,{key:0,name:i.error},{icon:d(()=>[m(f,{svg:i.lightningBoltSVG},null,8,["svg"])]),_:1},8,["name"])):(a(),s(y,{key:1},[i.sidebarPlugins.length>0?(a(),s("div",J,[(a(!0),s(y,null,u(i.sidebarPlugins,(c,p)=>(a(),l(A,{key:p,plugin:c,"file-info":i.fileInfo,onReloadActivities:t[0]||(t[0]=O=>i.getActivities())},null,8,["plugin","file-info"]))),128))])):B("",!0),i.loading?(a(),l(v,{key:1,class:"activity__empty-content",name:i.t("activity","Loading activities")},{icon:d(()=>[m(k)]),_:1},8,["name"])):i.activities.length===0?(a(),l(v,{key:2,class:"activity__empty-content",name:i.t("activity","No activity yet")},{icon:d(()=>t[2]||(t[2]=[T("span",{class:"icon-activity"},null,-1)])),_:1},8,["name"])):(a(),s("ul",K,[(a(!0),s(y,null,u(i.activities,c=>(a(),l(P,{key:c.id,activity:c,"show-previews":!1,onReload:t[1]||(t[1]=p=>i.getActivities())},null,8,["activity"]))),128))]))],64))],2)}const si=x(F,[["render",M],["__scopeId","data-v-2fda9824"]]);export{si as default};
3+
//# sourceMappingURL=ActivityTab-BHNw_dVJ.chunk.mjs.map

0 commit comments

Comments
 (0)