Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-15 05:58:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Remove pwix:blaze-layout

Browse source
This commit is contained in:
Harry Adel 2026-01-14 00:13:21 +02:00
parent 9ebf4d2426
commit 0635a663f0
38 changed files with 771 additions and 432 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.eslintrc.json
View file

@ -97,7 +97,7 @@
"Avatar": true,
"Avatars": true,
"BlazeComponent": false,
"BlazeLayout": false,
"CollectionHooks": false,
"DocHead": false,
"ESSearchResults": false,

4
.meteor/packages
View file

@ -26,7 +26,6 @@ mquandalle:collection-mutations
# Account system
accounts-password@2.4.0
useraccounts:core
useraccounts:flow-routing
useraccounts:unstyled
simple:rest-accounts-password
wekan-ldap
@ -91,5 +90,6 @@ logging@1.3.3
wekan-fullcalendar
momentjs:moment@2.29.3
# wekan-fontawesome
useraccounts:flow-routing-extra
ostrio:flow-router-extra
pwix:blaze-layout

8
.meteor/versions
View file

@ -54,7 +54,6 @@ idmontie:migrations@1.0.3
inter-process-messaging@0.1.1
jquery@3.0.0
kadira:dochead@1.5.0
kadira:flow-router@2.12.1
konecty:mongo-counter@0.0.5_3
lmieulet:meteor-coverage@1.1.4
localstorage@1.2.0
@ -101,7 +100,7 @@ ordered-dict@1.1.0
ostrio:cookies@2.7.2
ostrio:cstorage@4.0.1
ostrio:files@2.3.3
ostrio:flow-router-extra@3.9.0
ostrio:flow-router-extra@3.10.1
ostrio:i18n@3.2.1
pascoual:pdfkit@1.0.7
peerlibrary:assert@0.3.0
@ -112,7 +111,6 @@ peerlibrary:data-lookup@0.3.0
peerlibrary:reactive-field@0.6.0
percolate:synced-cron@1.5.2
promise@0.12.2
pwix:blaze-layout@2.3.3
raix:eventemitter@0.1.3
raix:handlebar-helpers@0.2.5
random@1.2.1
@ -147,7 +145,7 @@ ui@1.0.13
underscore@1.0.13
url@1.3.2
useraccounts:core@1.16.2
useraccounts:flow-routing@1.15.0
useraccounts:flow-routing-extra@1.1.0
useraccounts:unstyled@1.14.2
webapp@1.13.6
webapp-hashing@1.1.1
@ -160,4 +158,4 @@ wekan-ldap@0.0.2
wekan-markdown@1.0.9
wekan-oidc@1.0.12
yasaricli:slugify@0.0.7
zodern:types@1.0.10
zodern:types@1.0.13

1
client/components/boards/boardArchive.js
View file

@ -1,4 +1,5 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
BlazeComponent.extendComponent({
onCreated() {

1
client/components/boards/boardBody.js
View file

@ -1,5 +1,6 @@
import { ReactiveCache } from '/imports/reactiveCache';
import '../gantt/gantt.js';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
import { TAPi18n } from '/imports/i18n';
import dragscroll from '@wekanteam/dragscroll';
import { boardConverter } from '/client/lib/boardConverter';

1
client/components/boards/boardHeader.js
View file

@ -1,5 +1,6 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { TAPi18n } from '/imports/i18n';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
import dragscroll from '@wekanteam/dragscroll';
/*

390
client/components/boards/boardsList.js
View file

@ -1,5 +1,6 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { TAPi18n } from '/imports/i18n';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
const subManager = new SubsManager();
@ -17,7 +18,7 @@ Template.boardList.helpers({
BoardMultiSelection() {
return BoardMultiSelection;
},
})
});
Template.boardListHeaderBar.events({
'click .js-open-archived-board'() {
@ -25,8 +26,7 @@ Template.boardListHeaderBar.events({
},
});
Template.boardList.events({
});
Template.boardList.events({});
Template.boardListHeaderBar.helpers({
title() {
@ -54,7 +54,7 @@ BlazeComponent.extendComponent({
let currUser = ReactiveCache.getCurrentUser();
let userLanguage;
if (currUser && currUser.profile) {
userLanguage = currUser.profile.language
userLanguage = currUser.profile.language;
}
if (userLanguage) {
TAPi18n.setLanguage(userLanguage);
@ -69,7 +69,7 @@ BlazeComponent.extendComponent({
reorderWorkspaces(draggedSpaceId, targetSpaceId) {
const tree = this.workspacesTreeVar.get();
// Helper to remove a space from tree
const removeSpace = (nodes, id) => {
for (let i = 0; i < nodes.length; i++) {
@ -86,7 +86,7 @@ BlazeComponent.extendComponent({
}
return { tree: nodes, removed: null };
};
// Helper to insert a space after target
const insertAfter = (nodes, targetId, spaceToInsert) => {
for (let i = 0; i < nodes.length; i++) {
@ -102,17 +102,20 @@ BlazeComponent.extendComponent({
}
return false;
};
// Clone the tree
const newTree = EJSON.clone(tree);
// Remove the dragged space
const { tree: treeAfterRemoval, removed } = removeSpace(newTree, draggedSpaceId);
const { tree: treeAfterRemoval, removed } = removeSpace(
newTree,
draggedSpaceId,
);
if (removed) {
// Insert after target
insertAfter(treeAfterRemoval, targetSpaceId, removed);
// Save the new tree
Meteor.call('setWorkspacesTree', treeAfterRemoval, (err) => {
if (err) console.error(err);
@ -123,7 +126,6 @@ BlazeComponent.extendComponent({
onRendered() {
// jQuery sortable is disabled in favor of HTML5 drag-and-drop for space management
// The old sortable code has been removed to prevent conflicts
/* OLD SORTABLE CODE - DISABLED
const itemsSelector = '.js-board:not(.placeholder)';
@ -166,30 +168,28 @@ BlazeComponent.extendComponent({
*/
},
userHasTeams() {
if (ReactiveCache.getCurrentUser()?.teams?.length > 0)
return true;
else
return false;
if (ReactiveCache.getCurrentUser()?.teams?.length > 0) return true;
else return false;
},
teamsDatas() {
const teams = ReactiveCache.getCurrentUser()?.teams
const teams = ReactiveCache.getCurrentUser()?.teams;
if (teams)
return teams.sort((a, b) => a.teamDisplayName.localeCompare(b.teamDisplayName));
else
return [];
return teams.sort((a, b) =>
a.teamDisplayName.localeCompare(b.teamDisplayName),
);
else return [];
},
userHasOrgs() {
if (ReactiveCache.getCurrentUser()?.orgs?.length > 0)
return true;
else
return false;
if (ReactiveCache.getCurrentUser()?.orgs?.length > 0) return true;
else return false;
},
orgsDatas() {
const orgs = ReactiveCache.getCurrentUser()?.orgs;
if (orgs)
return orgs.sort((a, b) => a.orgDisplayName.localeCompare(b.orgDisplayName));
else
return [];
return orgs.sort((a, b) =>
a.orgDisplayName.localeCompare(b.orgDisplayName),
);
else return [];
},
userHasOrgsOrTeams() {
const ret = this.userHasOrgs() || this.userHasTeams();
@ -198,7 +198,7 @@ BlazeComponent.extendComponent({
currentMenuPath() {
const sel = this.selectedMenu.get();
const currentUser = ReactiveCache.getCurrentUser();
// Helper to find space by id in tree
const findSpaceById = (nodes, targetId, path = []) => {
for (const node of nodes) {
@ -206,13 +206,16 @@ BlazeComponent.extendComponent({
return [...path, node];
}
if (node.children && node.children.length > 0) {
const result = findSpaceById(node.children, targetId, [...path, node]);
const result = findSpaceById(node.children, targetId, [
...path,
node,
]);
if (result) return result;
}
}
return null;
};
if (sel === 'starred') {
return { icon: '⭐', text: TAPi18n.__('allboards.starred') };
} else if (sel === 'templates') {
@ -224,8 +227,11 @@ BlazeComponent.extendComponent({
const tree = this.workspacesTreeVar.get();
const spacePath = findSpaceById(tree, sel);
if (spacePath && spacePath.length > 0) {
const pathText = spacePath.map(s => s.name).join(' / ');
return { icon: '🗂️', text: `${TAPi18n.__('allboards.workspaces')} / ${pathText}` };
const pathText = spacePath.map((s) => s.name).join(' / ');
return {
icon: '🗂️',
text: `${TAPi18n.__('allboards.workspaces') || 'Workspaces'} / ${pathText}`,
};
}
return { icon: '🗂️', text: TAPi18n.__('allboards.workspaces') };
}
@ -235,18 +241,23 @@ BlazeComponent.extendComponent({
$and: [
{ archived: false },
{ type: { $in: ['board', 'template-container'] } },
{ title: { $not: { $regex: /^\^.*\^$/ } } }
]
{ title: { $not: { $regex: /^\^.*\^$/ } } },
],
};
const membershipOrs = [];
let allowPrivateVisibilityOnly = TableVisibilityModeSettings.findOne('tableVisibilityMode-allowPrivateOnly');
let allowPrivateVisibilityOnly = TableVisibilityModeSettings.findOne(
'tableVisibilityMode-allowPrivateOnly',
);
if (FlowRouter.getRouteName() === 'home') {
membershipOrs.push({ 'members.userId': Meteor.userId() });
if (allowPrivateVisibilityOnly !== undefined && allowPrivateVisibilityOnly.booleanValue) {
query.$and.push({ 'permission': 'private' });
if (
allowPrivateVisibilityOnly !== undefined &&
allowPrivateVisibilityOnly.booleanValue
) {
query.$and.push({ permission: 'private' });
}
const currUser = ReactiveCache.getCurrentUser();
@ -270,11 +281,13 @@ BlazeComponent.extendComponent({
//query.$and[2].$or.push({'teams': { $elemMatch : {teamId: teamsIds[0]}}});
membershipOrs.push({ 'teams.teamId': { $in: teamsIds } });
}
if (membershipOrs.length) {
query.$and.splice(2, 0, { $or: membershipOrs });
}
}
else if (allowPrivateVisibilityOnly !== undefined && !allowPrivateVisibilityOnly.booleanValue) {
if (membershipOrs.length) {
query.$and.splice(2, 0, { $or: membershipOrs });
}
} else if (
allowPrivateVisibilityOnly !== undefined &&
!allowPrivateVisibilityOnly.booleanValue
) {
query = {
archived: false,
//type: { $in: ['board','template-container'] },
@ -288,28 +301,33 @@ BlazeComponent.extendComponent({
let list = boards;
// Apply left menu filtering
const sel = this.selectedMenu.get();
const assignments = (currentUser && currentUser.profile && currentUser.profile.boardWorkspaceAssignments) || {};
const assignments =
(currentUser &&
currentUser.profile &&
currentUser.profile.boardWorkspaceAssignments) ||
{};
if (sel === 'starred') {
list = list.filter(b => currentUser && currentUser.hasStarred(b._id));
list = list.filter((b) => currentUser && currentUser.hasStarred(b._id));
} else if (sel === 'templates') {
list = list.filter(b => b.type === 'template-container');
list = list.filter((b) => b.type === 'template-container');
} else if (sel === 'remaining') {
// Show boards not in any workspace AND not templates
// Keep starred boards visible in Remaining too
list = list.filter(b =>
!assignments[b._id] &&
b.type !== 'template-container'
list = list.filter(
(b) => !assignments[b._id] && b.type !== 'template-container',
);
} else {
// assume sel is a workspaceId
// Keep starred boards visible in their workspace too
list = list.filter(b => assignments[b._id] === sel);
list = list.filter((b) => assignments[b._id] === sel);
}
if (currentUser && typeof currentUser.sortBoardsForUser === 'function') {
return currentUser.sortBoardsForUser(list);
}
return list.slice().sort((a, b) => (a.title || '').localeCompare(b.title || ''));
return list
.slice()
.sort((a, b) => (a.title || '').localeCompare(b.title || ''));
},
boardLists(boardId) {
/* Bug Board icons random dance https://github.com/wekan/wekan/issues/4214
@ -369,29 +387,35 @@ BlazeComponent.extendComponent({
},
'click .js-add-workspace'(evt) {
evt.preventDefault();
const name = prompt(TAPi18n.__('allboards.add-workspace-prompt') || 'New Space name');
const name = prompt(
TAPi18n.__('allboards.add-workspace-prompt') || 'New Space name',
);
if (name && name.trim()) {
Meteor.call('createWorkspace', { parentId: null, name: name.trim() }, (err, res) => {
if (err) console.error(err);
});
Meteor.call(
'createWorkspace',
{ parentId: null, name: name.trim() },
(err, res) => {
if (err) console.error(err);
},
);
}
},
'click .js-add-board'(evt) {
// Store the currently selected workspace/menu for board creation
const selectedWorkspaceId = this.selectedWorkspaceIdVar.get();
const selectedMenu = this.selectedMenu.get();
if (selectedWorkspaceId) {
Session.set('createBoardInWorkspace', selectedWorkspaceId);
} else {
Session.set('createBoardInWorkspace', null);
}
// Open different popup based on context
if (selectedMenu === 'templates') {
Popup.open('createTemplateContainer')(evt);
} else {
Popup.open('createBoard')(evt);
// Open different popup based on context
if (selectedMenu === 'templates') {
Popup.open('createTemplateContainer')(evt);
} else {
Popup.open('createBoard')(evt);
}
},
'click .js-star-board'(evt) {
@ -405,16 +429,27 @@ BlazeComponent.extendComponent({
// HTML5 DnD from boards to spaces
'dragstart .js-board'(evt) {
const boardId = this.currentData()._id;
// Support multi-drag
if (BoardMultiSelection.isActive() && BoardMultiSelection.isSelected(boardId)) {
if (
BoardMultiSelection.isActive() &&
BoardMultiSelection.isSelected(boardId)
) {
const selectedIds = BoardMultiSelection.getSelectedBoardIds();
try {
evt.originalEvent.dataTransfer.setData('text/plain', JSON.stringify(selectedIds));
evt.originalEvent.dataTransfer.setData('application/x-board-multi', 'true');
try {
evt.originalEvent.dataTransfer.setData(
'text/plain',
JSON.stringify(selectedIds),
);
evt.originalEvent.dataTransfer.setData(
'application/x-board-multi',
'true',
);
} catch (e) {}
} else {
try { evt.originalEvent.dataTransfer.setData('text/plain', boardId); } catch (e) {}
try {
evt.originalEvent.dataTransfer.setData('text/plain', boardId);
} catch (e) {}
}
},
'click .js-clone-board'(evt) {
@ -487,8 +522,11 @@ BlazeComponent.extendComponent({
'click .js-archive-selected-boards'(evt) {
evt.preventDefault();
const selectedBoards = BoardMultiSelection.getSelectedBoardIds();
if (selectedBoards.length > 0 && confirm(TAPi18n.__('archive-board-confirm'))) {
selectedBoards.forEach(boardId => {
if (
selectedBoards.length > 0 &&
confirm(TAPi18n.__('archive-board-confirm'))
) {
selectedBoards.forEach((boardId) => {
Meteor.call('archiveBoard', boardId);
});
BoardMultiSelection.reset();
@ -497,8 +535,11 @@ BlazeComponent.extendComponent({
'click .js-duplicate-selected-boards'(evt) {
evt.preventDefault();
const selectedBoards = BoardMultiSelection.getSelectedBoardIds();
if (selectedBoards.length > 0 && confirm(TAPi18n.__('duplicate-board-confirm'))) {
selectedBoards.forEach(boardId => {
if (
selectedBoards.length > 0 &&
confirm(TAPi18n.__('duplicate-board-confirm'))
) {
selectedBoards.forEach((boardId) => {
const board = ReactiveCache.getBoard(boardId);
if (board) {
Meteor.call(
@ -511,7 +552,7 @@ BlazeComponent.extendComponent({
},
(err, res) => {
if (err) console.error(err);
}
},
);
}
});
@ -519,35 +560,42 @@ BlazeComponent.extendComponent({
}
},
'click #resetBtn'(event) {
let allBoards = document.getElementsByClassName("js-board");
let allBoards = document.getElementsByClassName('js-board');
let currBoard;
for (let i = 0; i < allBoards.length; i++) {
currBoard = allBoards[i];
currBoard.style.display = "block";
currBoard.style.display = 'block';
}
},
'click #filterBtn'(event) {
event.preventDefault();
let selectedTeams = document.querySelectorAll('#jsAllBoardTeams option:checked');
let selectedTeamsValues = Array.from(selectedTeams).map(function (elt) { return elt.value });
let index = selectedTeamsValues.indexOf("-1");
let selectedTeams = document.querySelectorAll(
'#jsAllBoardTeams option:checked',
);
let selectedTeamsValues = Array.from(selectedTeams).map(
function (elt) {
return elt.value;
},
);
let index = selectedTeamsValues.indexOf('-1');
if (index > -1) {
selectedTeamsValues.splice(index, 1);
}
let selectedOrgs = document.querySelectorAll('#jsAllBoardOrgs option:checked');
let selectedOrgsValues = Array.from(selectedOrgs).map(function (elt) { return elt.value });
index = selectedOrgsValues.indexOf("-1");
let selectedOrgs = document.querySelectorAll(
'#jsAllBoardOrgs option:checked',
);
let selectedOrgsValues = Array.from(selectedOrgs).map(function (elt) {
return elt.value;
});
index = selectedOrgsValues.indexOf('-1');
if (index > -1) {
selectedOrgsValues.splice(index, 1);
}
if (selectedTeamsValues.length > 0 || selectedOrgsValues.length > 0) {
const query = {
$and: [
{ archived: false },
{ type: 'board' }
]
$and: [{ archived: false }, { type: 'board' }],
};
const ors = [];
if (selectedTeamsValues.length > 0) {
@ -561,7 +609,7 @@ BlazeComponent.extendComponent({
}
let filteredBoards = ReactiveCache.getBoards(query, {});
let allBoards = document.getElementsByClassName("js-board");
let allBoards = document.getElementsByClassName('js-board');
let currBoard;
if (filteredBoards.length > 0) {
let currBoardId;
@ -573,16 +621,13 @@ BlazeComponent.extendComponent({
return board._id == currBoardId;
});
if (found !== undefined)
currBoard.style.display = "block";
else
currBoard.style.display = "none";
if (found !== undefined) currBoard.style.display = 'block';
else currBoard.style.display = 'none';
}
}
else {
} else {
for (let i = 0; i < allBoards.length; i++) {
currBoard = allBoards[i];
currBoard.style.display = "none";
currBoard.style.display = 'none';
}
}
}
@ -591,7 +636,7 @@ BlazeComponent.extendComponent({
evt.preventDefault();
evt.stopPropagation();
const workspaceId = evt.currentTarget.getAttribute('data-id');
// Find the space in the tree
const findSpace = (nodes, id) => {
for (const node of nodes) {
@ -603,33 +648,43 @@ BlazeComponent.extendComponent({
}
return null;
};
const tree = this.workspacesTreeVar.get();
const space = findSpace(tree, workspaceId);
if (space) {
const newName = prompt(TAPi18n.__('allboards.edit-workspace-name') || 'Space name:', space.name);
const newIcon = prompt(TAPi18n.__('allboards.edit-workspace-icon') || 'Space icon (markdown):', space.icon || '📁');
const newName = prompt(
TAPi18n.__('allboards.edit-workspace-name') || 'Space name:',
space.name,
);
const newIcon = prompt(
TAPi18n.__('allboards.edit-workspace-icon') ||
'Space icon (markdown):',
space.icon || '📁',
);
if (newName !== null && newName.trim()) {
// Update space in tree
const updateSpaceInTree = (nodes, id, updates) => {
return nodes.map(node => {
return nodes.map((node) => {
if (node.id === id) {
return { ...node, ...updates };
}
if (node.children) {
return { ...node, children: updateSpaceInTree(node.children, id, updates) };
return {
...node,
children: updateSpaceInTree(node.children, id, updates),
};
}
return node;
});
};
const updatedTree = updateSpaceInTree(tree, workspaceId, {
name: newName.trim(),
icon: newIcon || '📁'
const updatedTree = updateSpaceInTree(tree, workspaceId, {
name: newName.trim(),
icon: newIcon || '📁',
});
Meteor.call('setWorkspacesTree', updatedTree, (err) => {
if (err) console.error(err);
});
@ -640,19 +695,29 @@ BlazeComponent.extendComponent({
evt.preventDefault();
evt.stopPropagation();
const parentId = evt.currentTarget.getAttribute('data-id');
const name = prompt(TAPi18n.__('allboards.add-subworkspace-prompt') || 'Subspace name:');
const name = prompt(
TAPi18n.__('allboards.add-subworkspace-prompt') || 'Subspace name:',
);
if (name && name.trim()) {
Meteor.call('createWorkspace', { parentId, name: name.trim() }, (err) => {
if (err) console.error(err);
});
Meteor.call(
'createWorkspace',
{ parentId, name: name.trim() },
(err) => {
if (err) console.error(err);
},
);
}
},
'dragstart .workspace-node'(evt) {
const workspaceId = evt.currentTarget.getAttribute('data-workspace-id');
const workspaceId =
evt.currentTarget.getAttribute('data-workspace-id');
evt.originalEvent.dataTransfer.effectAllowed = 'move';
evt.originalEvent.dataTransfer.setData('application/x-workspace-id', workspaceId);
evt.originalEvent.dataTransfer.setData(
'application/x-workspace-id',
workspaceId,
);
// Create a better drag image
const dragImage = evt.currentTarget.cloneNode(true);
dragImage.style.position = 'absolute';
@ -661,25 +726,28 @@ BlazeComponent.extendComponent({
document.body.appendChild(dragImage);
evt.originalEvent.dataTransfer.setDragImage(dragImage, 0, 0);
setTimeout(() => document.body.removeChild(dragImage), 0);
evt.currentTarget.classList.add('dragging');
},
'dragend .workspace-node'(evt) {
evt.currentTarget.classList.remove('dragging');
document.querySelectorAll('.workspace-node').forEach(el => {
document.querySelectorAll('.workspace-node').forEach((el) => {
el.classList.remove('drag-over');
});
},
'dragover .workspace-node'(evt) {
evt.preventDefault();
evt.stopPropagation();
const draggingEl = document.querySelector('.workspace-node.dragging');
const targetEl = evt.currentTarget;
// Allow dropping boards on any space
// Or allow dropping spaces on other spaces (but not on itself or descendants)
if (!draggingEl || (targetEl !== draggingEl && !draggingEl.contains(targetEl))) {
if (
!draggingEl ||
(targetEl !== draggingEl && !draggingEl.contains(targetEl))
) {
evt.originalEvent.dataTransfer.dropEffect = 'move';
targetEl.classList.add('drag-over');
}
@ -690,19 +758,25 @@ BlazeComponent.extendComponent({
'drop .workspace-node'(evt) {
evt.preventDefault();
evt.stopPropagation();
const targetEl = evt.currentTarget;
targetEl.classList.remove('drag-over');
// Check what's being dropped - board or workspace
const draggedWorkspaceId = evt.originalEvent.dataTransfer.getData('application/x-workspace-id');
const isMultiBoard = evt.originalEvent.dataTransfer.getData('application/x-board-multi');
const boardData = evt.originalEvent.dataTransfer.getData('text/plain');
const draggedWorkspaceId = evt.originalEvent.dataTransfer.getData(
'application/x-workspace-id',
);
const isMultiBoard = evt.originalEvent.dataTransfer.getData(
'application/x-board-multi',
);
const boardData =
evt.originalEvent.dataTransfer.getData('text/plain');
if (draggedWorkspaceId && !boardData) {
// This is a workspace reorder operation
const targetWorkspaceId = targetEl.getAttribute('data-workspace-id');
const targetWorkspaceId =
targetEl.getAttribute('data-workspace-id');
if (draggedWorkspaceId !== targetWorkspaceId) {
this.reorderWorkspaces(draggedWorkspaceId, targetWorkspaceId);
}
@ -710,13 +784,13 @@ BlazeComponent.extendComponent({
// This is a board assignment operation
// Get the workspace ID directly from the dropped workspace-node's data-workspace-id attribute
const workspaceId = targetEl.getAttribute('data-workspace-id');
if (workspaceId) {
if (isMultiBoard) {
// Multi-board drag
try {
const boardIds = JSON.parse(boardData);
boardIds.forEach(boardId => {
boardIds.forEach((boardId) => {
Meteor.call('assignBoardToWorkspace', boardId, workspaceId);
});
} catch (e) {
@ -732,7 +806,7 @@ BlazeComponent.extendComponent({
'dragover .js-select-menu'(evt) {
evt.preventDefault();
evt.stopPropagation();
const menuType = evt.currentTarget.getAttribute('data-type');
// Only allow drop on "remaining" menu to unassign boards from spaces
if (menuType === 'remaining') {
@ -746,22 +820,25 @@ BlazeComponent.extendComponent({
'drop .js-select-menu'(evt) {
evt.preventDefault();
evt.stopPropagation();
const menuType = evt.currentTarget.getAttribute('data-type');
evt.currentTarget.classList.remove('drag-over');
// Only handle drops on "remaining" menu
if (menuType !== 'remaining') return;
const isMultiBoard = evt.originalEvent.dataTransfer.getData('application/x-board-multi');
const boardData = evt.originalEvent.dataTransfer.getData('text/plain');
const isMultiBoard = evt.originalEvent.dataTransfer.getData(
'application/x-board-multi',
);
const boardData =
evt.originalEvent.dataTransfer.getData('text/plain');
if (boardData) {
if (isMultiBoard) {
// Multi-board drag - unassign all from workspaces
try {
const boardIds = JSON.parse(boardData);
boardIds.forEach(boardId => {
boardIds.forEach((boardId) => {
Meteor.call('unassignBoardFromWorkspace', boardId);
});
} catch (e) {
@ -791,50 +868,59 @@ BlazeComponent.extendComponent({
},
menuItemCount(type) {
const currentUser = ReactiveCache.getCurrentUser();
const assignments = (currentUser && currentUser.profile && currentUser.profile.boardWorkspaceAssignments) || {};
const assignments =
(currentUser &&
currentUser.profile &&
currentUser.profile.boardWorkspaceAssignments) ||
{};
// Get all boards for counting
let query = {
$and: [
{ archived: false },
{ type: { $in: ['board', 'template-container'] } },
{ $or: [{ 'members.userId': Meteor.userId() }] },
{ title: { $not: { $regex: /^\^.*\^$/ } } }
]
{ title: { $not: { $regex: /^\^.*\^$/ } } },
],
};
const allBoards = ReactiveCache.getBoards(query, {});
if (type === 'starred') {
return allBoards.filter(b => currentUser && currentUser.hasStarred(b._id)).length;
return allBoards.filter(
(b) => currentUser && currentUser.hasStarred(b._id),
).length;
} else if (type === 'templates') {
return allBoards.filter(b => b.type === 'template-container').length;
return allBoards.filter((b) => b.type === 'template-container').length;
} else if (type === 'remaining') {
// Count boards not in any workspace AND not templates
// Include starred boards (they appear in both Starred and Remaining)
return allBoards.filter(b =>
!assignments[b._id] &&
b.type !== 'template-container'
return allBoards.filter(
(b) => !assignments[b._id] && b.type !== 'template-container',
).length;
}
return 0;
},
workspaceCount(workspaceId) {
const currentUser = ReactiveCache.getCurrentUser();
const assignments = (currentUser && currentUser.profile && currentUser.profile.boardWorkspaceAssignments) || {};
const assignments =
(currentUser &&
currentUser.profile &&
currentUser.profile.boardWorkspaceAssignments) ||
{};
// Get all boards for counting
let query = {
$and: [
{ archived: false },
{ type: { $in: ['board', 'template-container'] } },
{ $or: [{ 'members.userId': Meteor.userId() }] },
{ title: { $not: { $regex: /^\^.*\^$/ } } }
]
{ title: { $not: { $regex: /^\^.*\^$/ } } },
],
};
const allBoards = ReactiveCache.getBoards(query, {});
// Count boards directly assigned to this space (not including children)
return allBoards.filter(b => assignments[b._id] === workspaceId).length;
return allBoards.filter((b) => assignments[b._id] === workspaceId).length;
},
canModifyBoards() {
const currentUser = ReactiveCache.getCurrentUser();

1
client/components/cards/cardDetails.js
View file

@ -1,5 +1,6 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { TAPi18n } from '/imports/i18n';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
import { DatePicker } from '/client/lib/datepicker';
import {
formatDateTime,

1
client/components/cards/subtasks.js
View file

@ -1,4 +1,5 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
BlazeComponent.extendComponent({
addSubtask(event) {

2
client/components/gantt/gantt.js
View file

@ -1,3 +1,5 @@
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
// Add click handler to ganttView for card titles
Template.ganttView.events({
'click .js-gantt-card-title'(event, template) {

1
client/components/import/import.js
View file

@ -1,5 +1,6 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { trelloGetMembersToMap } from './trelloMembersMapper';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
import { wekanGetMembersToMap } from './wekanMembersMapper';
import { csvGetMembersToMap } from './csvMembersMapper';

1
client/components/lists/listBody.js
View file

@ -1,5 +1,6 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { TAPi18n } from '/imports/i18n';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
import { Spinner } from '/client/lib/spinner';
const subManager = new SubsManager();

1
client/components/lists/listHeader.js
View file

@ -1,4 +1,5 @@
import { ReactiveCache } from '/imports/reactiveCache';
import Lists from '../../../models/lists';
import { TAPi18n } from '/imports/i18n';
import dragscroll from '@wekanteam/dragscroll';

31
client/components/main/header.js
View file

@ -1,10 +1,11 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
Meteor.subscribe('user-admin');
Meteor.subscribe('boards');
Meteor.subscribe('setting');
Meteor.subscribe('announcements');
Template.header.onCreated(function(){
Template.header.onCreated(function () {
const templateInstance = this;
templateInstance.currentSetting = new ReactiveVar();
templateInstance.isLoading = new ReactiveVar(false);
@ -13,10 +14,21 @@ Template.header.onCreated(function(){
onReady() {
templateInstance.currentSetting.set(ReactiveCache.getCurrentSetting());
let currSetting = templateInstance.currentSetting.curValue;
if(currSetting && currSetting !== undefined && currSetting.customLoginLogoImageUrl !== undefined && document.getElementById("headerIsSettingDatabaseCallDone") != null)
document.getElementById("headerIsSettingDatabaseCallDone").style.display = 'none';
else if(document.getElementById("headerIsSettingDatabaseCallDone") != null)
document.getElementById("headerIsSettingDatabaseCallDone").style.display = 'block';
if (
currSetting &&
currSetting !== undefined &&
currSetting.customLoginLogoImageUrl !== undefined &&
document.getElementById('headerIsSettingDatabaseCallDone') != null
)
document.getElementById(
'headerIsSettingDatabaseCallDone',
).style.display = 'none';
else if (
document.getElementById('headerIsSettingDatabaseCallDone') != null
)
document.getElementById(
'headerIsSettingDatabaseCallDone',
).style.display = 'block';
return this.stop();
},
});
@ -74,10 +86,15 @@ Template.header.events({
},
'keypress .js-zoom-input'(evt) {
if (evt.which === 13) { // Enter key
if (evt.which === 13) {
// Enter key
const newZoomPercent = parseInt(evt.target.value);
if (!isNaN(newZoomPercent) && newZoomPercent >= 50 && newZoomPercent <= 300) {
if (
!isNaN(newZoomPercent) &&
newZoomPercent >= 50 &&
newZoomPercent <= 300
) {
const newZoom = newZoomPercent / 100;
Utils.setZoomLevel(newZoom);

92
client/components/main/layouts.js
View file

@ -1,7 +1,6 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { TAPi18n } from '/imports/i18n';
BlazeLayout.setRoot('body');
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
let alreadyCheck = 1;
let isCheckDone = false;
@ -47,7 +46,7 @@ Template.userFormsLayout.onCreated(function () {
Template.userFormsLayout.onRendered(() => {
Meteor.call('getAuthenticationsEnabled', (_, result) => {
let enabledAuthenticationMethods = [ 'password' ]; // we show/hide this based on isPasswordLoginEnabled
let enabledAuthenticationMethods = ['password']; // we show/hide this based on isPasswordLoginEnabled
if (result) {
Object.keys(result).forEach((m) => {
@ -88,16 +87,26 @@ Template.userFormsLayout.onRendered(() => {
EscapeActions.executeAll();
// Add autocomplete attribute to login input for WCAG compliance
const loginInput = document.querySelector('input[type="text"], input[type="email"]');
if (loginInput && loginInput.name && (loginInput.name.toLowerCase().includes('user') || loginInput.name.toLowerCase().includes('email'))) {
const loginInput = document.querySelector(
'input[type="text"], input[type="email"]',
);
if (
loginInput &&
loginInput.name &&
(loginInput.name.toLowerCase().includes('user') ||
loginInput.name.toLowerCase().includes('email'))
) {
loginInput.setAttribute('autocomplete', 'username email');
}
// Add autocomplete attributes to password fields for WCAG compliance
const passwordInputs = document.querySelectorAll('input[type="password"]');
passwordInputs.forEach(input => {
passwordInputs.forEach((input) => {
if (input.name && input.name.includes('password')) {
if (input.name.includes('password_again') || input.name.includes('new_password')) {
if (
input.name.includes('password_again') ||
input.name.includes('new_password')
) {
input.setAttribute('autocomplete', 'new-password');
} else {
input.setAttribute('autocomplete', 'current-password');
@ -111,18 +120,18 @@ Template.userFormsLayout.helpers({
isLegalNoticeLinkExist() {
const currSet = Template.instance().currentSetting.get();
if (currSet && currSet !== undefined && currSet != null) {
return currSet.legalNotice !== undefined && currSet.legalNotice.trim() != "";
}
else
return false;
return (
currSet.legalNotice !== undefined && currSet.legalNotice.trim() != ''
);
} else return false;
},
getLegalNoticeWithWritTraduction() {
let spanLegalNoticeElt = $("#legalNoticeSpan");
let spanLegalNoticeElt = $('#legalNoticeSpan');
if (spanLegalNoticeElt != null && spanLegalNoticeElt != undefined) {
spanLegalNoticeElt.html(TAPi18n.__('acceptance_of_our_legalNotice', {}));
}
let atLinkLegalNoticeElt = $("#legalNoticeAtLink");
let atLinkLegalNoticeElt = $('#legalNoticeAtLink');
if (atLinkLegalNoticeElt != null && atLinkLegalNoticeElt != undefined) {
atLinkLegalNoticeElt.html(TAPi18n.__('legalNotice', {}));
}
@ -180,43 +189,52 @@ Template.userFormsLayout.events({
'DOMSubtreeModified #at-oidc'(event) {
if (alreadyCheck <= 2) {
let currSetting = ReactiveCache.getCurrentSetting();
let oidcBtnElt = $("#at-oidc");
if (currSetting && currSetting !== undefined && currSetting.oidcBtnText !== undefined && oidcBtnElt != null && oidcBtnElt != undefined) {
let oidcBtnElt = $('#at-oidc');
if (
currSetting &&
currSetting !== undefined &&
currSetting.oidcBtnText !== undefined &&
oidcBtnElt != null &&
oidcBtnElt != undefined
) {
let htmlvalue = "<i class='fa fa-oidc'></i>" + currSetting.oidcBtnText;
if (alreadyCheck == 1) {
alreadyCheck++;
oidcBtnElt.html("");
}
else {
oidcBtnElt.html('');
} else {
alreadyCheck++;
oidcBtnElt.html(htmlvalue);
}
}
}
else {
} else {
alreadyCheck = 1;
}
},
'DOMSubtreeModified .at-form'(event) {
if (alreadyCheck <= 2 && !isCheckDone) {
if (document.getElementById("at-oidc") != null) {
if (document.getElementById('at-oidc') != null) {
let currSetting = ReactiveCache.getCurrentSetting();
let oidcBtnElt = $("#at-oidc");
if (currSetting && currSetting !== undefined && currSetting.oidcBtnText !== undefined && oidcBtnElt != null && oidcBtnElt != undefined) {
let htmlvalue = "<i class='fa fa-oidc'></i>" + currSetting.oidcBtnText;
let oidcBtnElt = $('#at-oidc');
if (
currSetting &&
currSetting !== undefined &&
currSetting.oidcBtnText !== undefined &&
oidcBtnElt != null &&
oidcBtnElt != undefined
) {
let htmlvalue =
"<i class='fa fa-oidc'></i>" + currSetting.oidcBtnText;
if (alreadyCheck == 1) {
alreadyCheck++;
oidcBtnElt.html("");
}
else {
oidcBtnElt.html('');
} else {
alreadyCheck++;
isCheckDone = true;
oidcBtnElt.html(htmlvalue);
}
}
}
}
else {
} else {
alreadyCheck = 1;
}
},
@ -247,14 +265,14 @@ async function authentication(event, templateInstance) {
switch (result) {
case 'ldap':
return new Promise(resolve => {
return new Promise((resolve) => {
Meteor.loginWithLDAP(match, password, function () {
resolve(FlowRouter.go('/'));
});
});
case 'saml':
return new Promise(resolve => {
return new Promise((resolve) => {
const provider = Meteor.settings.public.SAML_PROVIDER;
Meteor.loginWithSaml(
{
@ -267,7 +285,7 @@ async function authentication(event, templateInstance) {
});
case 'cas':
return new Promise(resolve => {
return new Promise((resolve) => {
Meteor.loginWithCas(match, password, function () {
resolve(FlowRouter.go('/'));
});
@ -279,9 +297,15 @@ async function authentication(event, templateInstance) {
}
function getAuthenticationMethod(
{ displayAuthenticationMethod, defaultAuthenticationMethod },
settings,
match,
) {
if (!settings) {
return getUserAuthenticationMethod(undefined, match);
}
const { displayAuthenticationMethod, defaultAuthenticationMethod } = settings;
if (displayAuthenticationMethod) {
return $('.select-authentication').val();
}
@ -289,7 +313,7 @@ function getAuthenticationMethod(
}
function getUserAuthenticationMethod(defaultAuthenticationMethod, match) {
return new Promise(resolve => {
return new Promise((resolve) => {
try {
Meteor.subscribe('user-authenticationMethod', match, {
onReady() {

1
client/components/settings/peopleBody.js
View file

@ -1,5 +1,6 @@
import { ReactiveCache } from '/imports/reactiveCache';
import LockoutSettings from '/models/lockoutSettings';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
const orgsPerPage = 25;
const teamsPerPage = 25;

1
client/components/sidebar/sidebar.js
View file

@ -1,5 +1,6 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { TAPi18n } from '/imports/i18n';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
Sidebar = null;

1
client/components/users/userHeader.js
View file

@ -1,5 +1,6 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { TAPi18n } from '/imports/i18n';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
Template.headerUserBar.events({
'click .js-open-header-member-menu': Popup.open('memberMenu'),

1
client/lib/keyboard.js
View file

@ -1,4 +1,5 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
// XXX There is no reason to define these shortcuts globally, they should be
// attached to a template (most of them will go in the `board` template).

1
client/lib/modal.js
View file

@ -1,4 +1,5 @@
const closedValue = null;
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
window.Modal = new (class {
constructor() {

1
client/lib/utils.js
View file

@ -1,4 +1,5 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
Utils = {
setBackgroundImage(url) {

1
config/accounts.js
View file

@ -1,4 +1,5 @@
import { TAPi18n } from '/imports/i18n';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
const passwordField = AccountsTemplates.removeField('password');
passwordField.autocomplete = 'current-password';

5
config/router.js
View file

@ -1,4 +1,5 @@
import { TAPi18n } from '/imports/i18n';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
let previousPath;
FlowRouter.triggers.exit([
@ -505,11 +506,11 @@ FlowRouter.route('/translation', {
},
});
FlowRouter.notFound = {
FlowRouter.route('*', {
action() {
this.render('defaultLayout', { content: 'notFound' });
},
};
});
// We maintain a list of redirections to ensure that we don't break old URLs
// when we change our routing scheme.

626
imports/reactiveCache.js
View file

File diff suppressed because it is too large Load diff

13
models/activities.js
View file

@ -202,7 +202,7 @@ if (Meteor.isServer) {
params.comment = comment.text;
if (board) {
const comment = params.comment;
const knownUsers = board.members.map(member => {
const knownUsers = board.members.map((member) => {
const u = ReactiveCache.getUser(member.userId);
if (u) {
member.username = u.username;
@ -223,7 +223,7 @@ if (Meteor.isServer) {
if (activity.boardId && username === 'board_members') {
// mentions all board members
const knownUids = knownUsers.map(u => u.userId);
const knownUids = knownUsers.map((u) => u.userId);
watchers = _.union(watchers, [...knownUids]);
title = 'act-atUserComment';
} else if (activity.cardId && username === 'card_members') {
@ -243,7 +243,6 @@ if (Meteor.isServer) {
title = 'act-atUserComment';
watchers = _.union(watchers, [uid]);
}
}
}
params.commentId = comment._id;
@ -300,7 +299,7 @@ if (Meteor.isServer) {
// due time reminder, if it doesn't have old value, it's a brand new set, need some differentiation
title = activity.timeOldValue ? 'act-withDue' : 'act-newDue';
}
['timeValue', 'timeOldValue'].forEach(key => {
['timeValue', 'timeOldValue'].forEach((key) => {
// copy time related keys & values to params
const value = activity[key];
if (value) params[key] = value;
@ -313,7 +312,7 @@ if (Meteor.isServer) {
if (new RegExp(BIGEVENTS).exec(atype)) {
watchers = _.union(
watchers,
board.activeMembers().map(member => member.userId),
board.activeMembers().map((member) => member.userId),
); // notify all active members for important events
}
} catch (e) {
@ -335,7 +334,7 @@ if (Meteor.isServer) {
_.intersection(participants, trackingUsers),
);
}
Notifications.getUsers(watchers).forEach(user => {
Notifications.getUsers(watchers).forEach((user) => {
// don't notify a user of their own behavior
if (user._id !== userId) {
Notifications.notify(user, title, description, params);
@ -350,7 +349,7 @@ if (Meteor.isServer) {
});
if (integrations.length > 0) {
params.watchers = watchers;
integrations.forEach(integration => {
integrations.forEach((integration) => {
Meteor.call(
'outgoingWebhooks',
integration,

2
models/boards.js
View file

@ -1,6 +1,7 @@
import { ReactiveCache } from '/imports/reactiveCache';
import escapeForRegex from 'escape-string-regexp';
import { TAPi18n } from '/imports/i18n';
import { CustomFields } from './customFields';
import {
ALLOWED_BOARD_COLORS,
ALLOWED_COLORS,
@ -9,6 +10,7 @@ import {
TYPE_TEMPLATE_CONTAINER,
} from '/config/const';
import Users from "./users";
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
import TableVisibilityModeSettings from "./tableVisibilityModeSettings";
// const escapeForRegex = require('escape-string-regexp');

1
models/cards.js
View file

@ -1,4 +1,5 @@
import { ReactiveCache, ReactiveMiniMongoIndex } from '/imports/reactiveCache';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
import {
formatDateTime,
formatDate,

1
models/exporter.js
View file

@ -1,6 +1,7 @@
import { ReactiveCache } from '/imports/reactiveCache';
const Papa = require('papaparse');
import { TAPi18n } from '/imports/i18n';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
import {
formatDateTime,
formatDate,

1
models/server/ExporterExcel.js
View file

@ -1,5 +1,6 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { TAPi18n } from '/imports/i18n';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
import { createWorkbook } from './createWorkbook';
import {
formatDateTime,

1
models/settings.js
View file

@ -1,5 +1,6 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { TAPi18n } from '/imports/i18n';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
//var nodemailer = require('nodemailer');
// Sandstorm context is detected using the METEOR_SETTINGS environment variable

1
models/trelloCreator.js
View file

@ -1,5 +1,6 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { TAPi18n } from '/imports/i18n';
import { CustomFields } from './customFields';
import {
formatDateTime,
formatDate,

1
models/users.js
View file

@ -2018,6 +2018,7 @@ Meteor.methods({
},
// Spaces: create a new space under parentId (or root when null)
createWorkspace({ parentId = null, name }) {
check(parentId, Match.OneOf(String, null));
check(name, String);
if (!this.userId) throw new Meteor.Error('not-logged-in');
const user = Users.findOne(this.userId) || {};

1
models/wekanCreator.js
View file

@ -1,4 +1,5 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { CustomFields } from './customFields';
import {
formatDateTime,
formatDate,

1
sandstorm.js
View file

@ -1,6 +1,7 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { Meteor } from 'meteor/meteor';
import { Picker } from 'meteor/communitypackages:picker';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
// Sandstorm context is detected using the METEOR_SETTINGS environment variable
// in the package definition.

1
server/publications/lockoutSettings.js
View file

@ -1,4 +1,5 @@
import LockoutSettings from '/models/lockoutSettings';
import { Settings } from '../../models/settings';
Meteor.publish('lockoutSettings', function() {
const ret = LockoutSettings.find();

1
server/publications/settings.js
View file

@ -1,4 +1,5 @@
import { ReactiveCache } from '/imports/reactiveCache';
import { Settings } from '../../models/settings';
Meteor.publish('globalwebhooks', () => {
const boardId = Integrations.Const.GLOBAL_WEBHOOK_ID;

2
server/publications/tableVisibilityModeSettings.js
View file

@ -1,3 +1,5 @@
import { Settings } from '../../models/settings';
Meteor.publish('tableVisibilityModeSettings', function() {
const ret = TableVisibilityModeSettings.find();
return ret;

1
server/routes/attachmentApi.js
View file

@ -3,6 +3,7 @@ import { Accounts } from 'meteor/accounts-base';
import { WebApp } from 'meteor/webapp';
import { ReactiveCache } from '/imports/reactiveCache';
import { Attachments, fileStoreStrategyFactory } from '/models/attachments';
import { Settings } from '../../models/settings';
import { moveToStorage } from '/models/lib/fileStoreStrategy';
import { STORAGE_NAME_FILESYSTEM, STORAGE_NAME_GRIDFS, STORAGE_NAME_S3 } from '/models/lib/fileStoreStrategy';
import AttachmentStorageSettings from '/models/attachmentStorageSettings';