Skip to content

Commit

Permalink
Merge pull request #3065 from david-loe/master
Browse files Browse the repository at this point in the history
Export Board
  • Loading branch information
juliusknorr authored Dec 30, 2022
2 parents d3cad6a + d25c7fe commit 7f2cdd2
Show file tree
Hide file tree
Showing 9 changed files with 145 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ module.exports = {
'jsdoc/check-param-names': ['off'],
'jsdoc/no-undefined-types': ['off'],
'jsdoc/require-property-description': ['off'],
'import/no-named-as-default-member': ['off']
'import/no-named-as-default-member': ['off'],
},
}
1 change: 1 addition & 0 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
['name' => 'board#deleteAcl', 'url' => '/boards/{boardId}/acl/{aclId}', 'verb' => 'DELETE'],
['name' => 'board#clone', 'url' => '/boards/{boardId}/clone', 'verb' => 'POST'],
['name' => 'board#transferOwner', 'url' => '/boards/{boardId}/transferOwner', 'verb' => 'PUT'],
['name' => 'board#export', 'url' => '/boards/{boardId}/export', 'verb' => 'GET'],

// stacks
['name' => 'stack#index', 'url' => '/stacks/{boardId}', 'verb' => 'GET'],
Expand Down
26 changes: 13 additions & 13 deletions cypress.config.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
const { defineConfig } = require('cypress')

module.exports = defineConfig({
projectId: '1s7wkc',
viewportWidth: 1280,
viewportHeight: 720,
e2e: {
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
return require('./cypress/plugins/index.js')(on, config)
},
baseUrl: 'http://nextcloud.local/index.php',
experimentalSessionAndOrigin: true,
specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
},
projectId: '1s7wkc',
viewportWidth: 1280,
viewportHeight: 720,
e2e: {
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
return require('./cypress/plugins/index.js')(on, config)
},
baseUrl: 'http://nextcloud.local/index.php',
experimentalSessionAndOrigin: true,
specPattern: 'cypress/e2e/**/*.{js,jsx,ts,tsx}',
},
})
2 changes: 1 addition & 1 deletion l10n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -309,4 +309,4 @@
"Failed to transfer the board for {user}" : "Échec du transfert du tableau pour {user}",
"Are you sure you want to delete the board {title}? This will delete all the data of this board." : "Êtes-vous certain de vouloir supprimer le tableau {title} ? Cela supprimera l'ensemble des données de ce tableau."
},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
}
}
11 changes: 11 additions & 0 deletions lib/Controller/BoardController.php
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,15 @@ public function transferOwner(int $boardId, string $newOwner): DataResponse {

return new DataResponse([], HTTP::STATUS_UNAUTHORIZED);
}

/**
* @NoAdminRequired
* @param $boardId
* @return Board
* @throws \OCP\AppFramework\Db\DoesNotExistException
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
*/
public function export($boardId) {
return $this->boardService->export($boardId);
}
}
44 changes: 42 additions & 2 deletions lib/Service/BoardService.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ class BoardService {
public function __construct(
BoardMapper $boardMapper,
StackMapper $stackMapper,
CardMapper $cardMapper,
IConfig $config,
IL10N $l10n,
LabelMapper $labelMapper,
AclMapper $aclMapper,
PermissionService $permissionService,
NotificationHelper $notificationHelper,
AssignmentMapper $assignedUsersMapper,
CardMapper $cardMapper,
IUserManager $userManager,
IGroupManager $groupManager,
ActivityManager $activityManager,
Expand All @@ -105,6 +105,7 @@ public function __construct(
) {
$this->boardMapper = $boardMapper;
$this->stackMapper = $stackMapper;
$this->cardMapper = $cardMapper;
$this->labelMapper = $labelMapper;
$this->config = $config;
$this->aclMapper = $aclMapper;
Expand All @@ -119,7 +120,6 @@ public function __construct(
$this->changeHelper = $changeHelper;
$this->userId = $userId;
$this->urlGenerator = $urlGenerator;
$this->cardMapper = $cardMapper;
$this->connection = $connection;
$this->boardServiceValidator = $boardServiceValidator;
}
Expand Down Expand Up @@ -652,6 +652,27 @@ public function transferOwnership(string $owner, string $newOwner, bool $changeC
}
}

/**
* @param $id
* @return Board
* @throws DoesNotExistException
* @throws \OCA\Deck\NoPermissionException
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
* @throws BadRequestException
*/
public function export($id) : Board {
if (is_numeric($id) === false) {
throw new BadRequestException('board id must be a number');
}

$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_READ);
$board = $this->boardMapper->find($id);
$this->enrichWithCards($board);
$this->enrichWithLabels($board);

return $board;
}

private function enrichWithStacks($board, $since = -1) {
$stacks = $this->stackMapper->findAll($board->getId(), null, null, $since);

Expand Down Expand Up @@ -698,4 +719,23 @@ private function clearBoardFromCache(Board $board) {
$this->boardMapper->flushCache($boardId, $boardOwnerId);
unset($this->boardsCache[$boardId]);
}

private function enrichWithCards($board) {
$stacks = $this->stackMapper->findAll($board->getId());
foreach ($stacks as $stack) {
$cards = $this->cardMapper->findAllByStack($stack->getId());
$fullCards = [];
foreach ($cards as $card) {
$fullCard = $this->cardMapper->find($card->getId());
array_push($fullCards, $fullCard);
}
$stack->setCards($fullCards);
}

if (\count($stacks) === 0) {
return;
}

$board->setStacks($stacks);
}
}
10 changes: 10 additions & 0 deletions src/components/navigation/AppNavigationBoard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@
{{ t('deck', 'Archive board') }}
</NcActionButton>

<NcActionButton v-if="!board.archived && board.acl.length === 0" :icon="board.settings['notify-due'] === 'off' ? 'icon-sound' : 'icon-sound-off'" @click="board.settings['notify-due'] === 'off' ? updateSetting('notify-due', 'all') : updateSetting('notify-due', 'off')" />
<NcActionButton v-if="canManage && !board.archived"
icon="icon-download"
:close-after-click="true"
@click="actionExport">
{{ t('deck', 'Export board') }}
</NcActionButton>
<NcActionButton v-if="!board.archived && board.acl.length === 0" :icon="board.settings['notify-due'] === 'off' ? 'icon-sound' : 'icon-sound-off'" @click="board.settings['notify-due'] === 'off' ? updateSetting('notify-due', 'all') : updateSetting('notify-due', 'off')">
{{ board.settings['notify-due'] === 'off' ? t('deck', 'Turn on due date reminders') : t('deck', 'Turn off due date reminders') }}
</NcActionButton>
Expand Down Expand Up @@ -314,6 +321,9 @@ export default {
this.isDueSubmenuActive = false
this.updateDueSetting = null
},
actionExport() {
this.boardApi.exportBoard(this.board)
},
},
}
</script>
Expand Down
65 changes: 65 additions & 0 deletions src/services/BoardApi.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,71 @@ export class BoardApi {
}
}

exportBoard(board) {
return axios.get(this.url(`/boards/${board.id}/export`))
.then(
(response) => {
const fields = { title: t('deck', 'Card title'), description: t('deck', 'Description'), stackId: t('deck', 'List name'), labels: t('deck', 'Tags'), duedate: t('deck', 'Due date'), createdAt: t('deck', 'Created'), lastModified: t('deck', 'Modified') }
let row = ''
Object.keys(fields).forEach(field => {
row += '"' + fields[field] + '"' + '\t'
})

row = row.slice(0, -1)
let CSV = row + '\r\n'

response.data.stacks.forEach(stack => {
stack.cards.forEach(card => {
row = ''
Object.keys(fields).forEach(field => {
if (field === 'createdAt' || field === 'lastModified') {
const date = new Date(Number(card[field]) * 1000)
row += '"' + date.toLocaleDateString() + '"' + '\t'
} else if (field === 'stackId') {
row += '"' + stack.title + '"' + '\t'
} else if (field === 'labels') {
row += '"'
card[field].forEach(label => {
row += label.title + ', '
})
if (card[field].length > 0) {
row = row.slice(0, -1)
}
row += '"' + '\t'
} else {
row += '"' + card[field] + '"' + '\t'
}
})
row = row.slice(0, -1)
CSV += row + '\r\n'
})
})
let charCode = []
const byteArray = []
byteArray.push(255, 254)
for (let i = 0; i < CSV.length; ++i) {
charCode = CSV.charCodeAt(i)
byteArray.push(charCode & 0xff)
byteArray.push(charCode / 256 >>> 0)
}
const blob = new Blob([new Uint8Array(byteArray)], { type: 'text/csv;charset=UTF-16LE;' })
const blobUrl = URL.createObjectURL(blob)
const a = document.createElement('a')
a.href = blobUrl // 'data:' + data
a.download = response.data.title + '.csv'
a.click()
a.remove()
return Promise.resolve()
},
(err) => {
return Promise.reject(err)
}
)
.catch((err) => {
return Promise.reject(err)
})
}

// Label API Calls
deleteLabel(id) {
return axios.delete(this.url(`/labels/${id}`))
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Service/BoardServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,14 @@ public function setUp(): void {
$this->service = new BoardService(
$this->boardMapper,
$this->stackMapper,
$this->cardMapper,
$this->config,
$this->l10n,
$this->labelMapper,
$this->aclMapper,
$this->permissionService,
$this->notificationHelper,
$this->assignedUsersMapper,
$this->cardMapper,
$this->userManager,
$this->groupManager,
$this->activityManager,
Expand Down

0 comments on commit 7f2cdd2

Please sign in to comment.