Docker/planka
Docker/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-22 22:59:44 +02:00
Code Issues Releases Activity

ref: Collapse image data into one column

Browse source
This commit is contained in:
Maksim Eltyshev 2022-06-21 12:01:41 +02:00
parent e7495e0067
commit 6268ced4cb
10 changed files with 102 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/src/components/CardModal/Attachments/Attachments.jsx
View file

@ -57,11 +57,8 @@ const Attachments = React.memo(
}, [toggleAllVisible]);
const galleryItemsNode = items.map((item, index) => {
const props = item.coverUrl
? {
width: item.imageWidth,
height: item.imageHeight,
}
const props = item.image
? item.image
: {
content: (
<Grid verticalAlign="middle" className={styles.contentWrapper}>
@ -91,7 +88,7 @@ const Attachments = React.memo(
createdAt={item.createdAt}
isCover={item.isCover}
isPersisted={item.isPersisted}
onClick={item.coverUrl ? open : undefined}
onClick={item.image ? open : undefined}
onCoverSelect={() => handleCoverSelect(item.id)}
onCoverDeselect={handleCoverDeselect}
onUpdate={(data) => handleUpdate(item.id, data)}

1
client/src/models/Attachment.js
View file

@ -9,6 +9,7 @@ export default class extends Model {
id: attr(),
url: attr(),
coverUrl: attr(),
image: attr(),
name: attr(),
cardId: fk({
to: 'Card',

4
server/api/controllers/attachments/create.js
View file

@ -54,10 +54,8 @@ module.exports = {
const attachment = await sails.helpers.attachments.createOne(
{
dirname: file.extra.dirname,
...file.extra,
filename: file.filename,
isImage: file.extra.isImage,
name: file.extra.name,
},
currentUser,
card,

2
server/api/controllers/attachments/download-thumbnail.js
View file

@ -46,7 +46,7 @@ module.exports = {
}
}
if (!attachment.isImage) {
if (!attachment.image) {
throw Errors.ATTACHMENT_NOT_FOUND;
}

2
server/api/controllers/attachments/download.js
View file

@ -53,7 +53,7 @@ module.exports = {
}
this.res.type(attachment.filename);
if (!attachment.isImage && path.extname(attachment.filename) !== '.pdf') {
if (!attachment.image && path.extname(attachment.filename) !== '.pdf') {
this.res.set('Content-Disposition', 'attachment');
}
this.res.set('Cache-Control', 'private, max-age=900'); // TODO: move to config

2
server/api/helpers/attachments/create-one.js
View file

@ -38,7 +38,7 @@ module.exports = {
inputs.request,
);
if (!inputs.card.coverAttachmentId && attachment.isImage) {
if (!inputs.card.coverAttachmentId && attachment.image) {
await sails.helpers.cards.updateOne(inputs.card, {
coverAttachmentId: attachment.id,
});

30
server/api/helpers/utils/create-attachment-receiver.js
View file

@ -43,15 +43,20 @@ module.exports = {
await writeFile(path.join(rootPath, filename), buffer);
const image = sharp(buffer);
let imageMetadata;
let metadata;
try {
imageMetadata = await image.metadata();
metadata = await image.metadata();
} catch (error) {} // eslint-disable-line no-empty
if (imageMetadata) {
const extra = {
dirname,
name: file.filename,
};
if (metadata && !['svg', 'pdf'].includes(metadata.format)) {
let cover256Buffer;
if (imageMetadata.height > imageMetadata.width) {
if (metadata.height > metadata.width) {
cover256Buffer = await image
.resize(256, 320)
.jpeg({
@ -75,17 +80,16 @@ module.exports = {
fs.mkdirSync(thumbnailsPath);
await writeFile(path.join(thumbnailsPath, 'cover-256.jpg'), cover256Buffer);
extra.image = _.pick(metadata, ['width', 'height']);
} else {
extra.image = null;
}
// eslint-disable-next-line no-param-reassign
file.extra = {
dirname,
isImage: !!imageMetadata,
name: file.filename,
};
// eslint-disable-next-line no-param-reassign
file.filename = filename;
Object.assign(file, {
filename,
extra,
});
return done();
} catch (error) {

20
server/api/models/Attachment.js
View file

@ -19,20 +19,8 @@ module.exports = {
type: 'string',
required: true,
},
isImage: {
type: 'boolean',
required: true,
columnName: 'is_image',
},
imageWidth: {
type: 'number',
allowNull: true,
columnName: 'image_width',
},
imageHeight: {
type: 'number',
allowNull: true,
columnName: 'image_height',
image: {
type: 'json',
},
name: {
type: 'string',
@ -61,9 +49,9 @@ module.exports = {
customToJSON() {
return {
..._.omit(this, ['dirname', 'filename', 'isImage']),
..._.omit(this, ['dirname', 'filename']),
url: `${sails.config.custom.attachmentsUrl}/${this.id}/download/${this.filename}`,
coverUrl: this.isImage
coverUrl: this.image
? `${sails.config.custom.attachmentsUrl}/${this.id}/download/thumbnails/cover-256.jpg`
: null,
};

45
server/db/migrations/20220523131229_add_image_sizes_to_attachment_table.js
View file

@ -1,45 +0,0 @@
const path = require('path');
const sharp = require('sharp');
const getConfig = require('../../get-config');
module.exports.up = async (knex) => {
await knex.schema.table('attachment', (table) => {
/* Columns */
table.integer('image_width');
table.integer('image_height');
});
const config = await getConfig();
const attachments = await knex('attachment');
// eslint-disable-next-line no-restricted-syntax
for (attachment of attachments) {
if (attachment.is_image) {
const image = sharp(
path.join(config.custom.attachmentsPath, attachment.dirname, attachment.filename),
);
let metadata;
try {
metadata = await image.metadata(); // eslint-disable-line no-await-in-loop
} catch (error) {
continue; // eslint-disable-line no-continue
}
// eslint-disable-next-line no-await-in-loop
await knex('attachment')
.update({
image_width: metadata.width,
image_height: metadata.height,
})
.where('id', attachment.id);
}
}
};
module.exports.down = (knex) =>
knex.schema.table('attachment', (table) => {
table.dropColumns('image_width', 'image_height');
});

73
server/db/migrations/20220523131229_add_image_to_attachment_table.js Normal file
View file

@ -0,0 +1,73 @@
const path = require('path');
const sharp = require('sharp');
const _ = require('lodash');
const getConfig = require('../../get-config');
module.exports.up = async (knex) => {
await knex.schema.table('attachment', (table) => {
/* Columns */
table.jsonb('image');
});
const config = await getConfig();
const attachments = await knex('attachment');
// eslint-disable-next-line no-restricted-syntax
for (attachment of attachments) {
if (attachment.is_image) {
const image = sharp(
path.join(config.custom.attachmentsPath, attachment.dirname, attachment.filename),
);
let metadata;
try {
metadata = await image.metadata(); // eslint-disable-line no-await-in-loop
} catch (error) {
continue; // eslint-disable-line no-continue
}
if (!['svg', 'pdf'].includes(metadata.format)) {
// eslint-disable-next-line no-await-in-loop
await knex('attachment')
.update({
image: _.pick(metadata, ['width', 'height']),
})
.where('id', attachment.id);
}
}
}
return knex.schema.table('attachment', (table) => {
table.dropColumn('is_image');
});
};
module.exports.down = async (knex) => {
await knex.schema.table('attachment', (table) => {
/* Columns */
table.boolean('is_image');
});
const attachments = await knex('attachment');
// eslint-disable-next-line no-restricted-syntax
for (attachment of attachments) {
// eslint-disable-next-line no-await-in-loop
await knex('attachment')
.update({
is_image: !!attachment.image,
})
.where('id', attachment.id);
}
await knex.schema.table('attachment', (table) => {
table.dropColumn('image');
});
return knex.schema.alterTable('attachment', (table) => {
table.boolean('is_image').notNullable().alter();
});
};