admin/34916
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit - 20251017-135209538

Browse Source
This commit is contained in:
Flatlogic Bot 2025-10-17 13:52:28 +00:00
parent 0a2bfbdca7
commit 4591f2d5b9
24 changed files with 251 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
backend/src/db/api/archival_items.js
View File

@ -26,6 +26,10 @@ module.exports = class Archival_itemsDBApi {
{ transaction },
);
await archival_items.setPeriod(data.period || null, {
transaction,
});
await archival_items.setTags(data.tags || [], {
transaction,
});
@ -108,6 +112,14 @@ module.exports = class Archival_itemsDBApi {
await archival_items.update(updatePayload, { transaction });
if (data.period !== undefined) {
await archival_items.setPeriod(
data.period,
{ transaction },
);
}
if (data.tags !== undefined) {
await archival_items.setTags(data.tags, { transaction });
}
@ -194,6 +206,10 @@ module.exports = class Archival_itemsDBApi {
transaction,
});
output.period = await archival_items.getPeriod({
transaction,
});
return output;
}
@ -210,6 +226,32 @@ module.exports = class Archival_itemsDBApi {
const transaction = (options && options.transaction) || undefined;
let include = [
{
model: db.periods,
as: 'period',
where: filter.period
? {
[Op.or]: [
{
id: {
[Op.in]: filter.period
.split('|')
.map((term) => Utils.uuid(term)),
},
},
{
id: {
[Op.or]: filter.period
.split('|')
.map((term) => ({ [Op.iLike]: `%${term}%` })),
},
},
],
}
: {},
},
{
model: db.tags,
as: 'tags',

50
backend/src/db/api/periods.js
View File

@ -25,10 +25,6 @@ module.exports = class PeriodsDBApi {
{ transaction },
);
await periods.setArchival_items(data.archival_items || [], {
transaction,
});
return periods;
}
@ -76,10 +72,6 @@ module.exports = class PeriodsDBApi {
await periods.update(updatePayload, { transaction });
if (data.archival_items !== undefined) {
await periods.setArchival_items(data.archival_items, { transaction });
}
return periods;
}
@ -141,7 +133,7 @@ module.exports = class PeriodsDBApi {
const output = periods.get({ plain: true });
output.archival_items = await periods.getArchival_items({
output.archival_items_period = await periods.getArchival_items_period({
transaction,
});
@ -160,13 +152,7 @@ module.exports = class PeriodsDBApi {
const transaction = (options && options.transaction) || undefined;
let include = [
{
model: db.archival_items,
as: 'archival_items',
required: false,
},
];
let include = [];
if (filter) {
if (filter.id) {
@ -238,38 +224,6 @@ module.exports = class PeriodsDBApi {
};
}
if (filter.archival_items) {
const searchTerms = filter.archival_items.split('|');
include = [
{
model: db.archival_items,
as: 'archival_items_filter',
required: searchTerms.length > 0,
where:
searchTerms.length > 0
? {
[Op.or]: [
{
id: {
[Op.in]: searchTerms.map((term) => Utils.uuid(term)),
},
},
{
id: {
[Op.or]: searchTerms.map((term) => ({
[Op.iLike]: `%${term}%`,
})),
},
},
],
}
: undefined,
},
...include,
];
}
if (filter.createdAtRange) {
const [start, end] = filter.createdAtRange;

54
backend/src/db/migrations/1760709105145.js Normal file
View File

@ -0,0 +1,54 @@
module.exports = {
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async up(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.addColumn(
'archival_items',
'periodId',
{
type: Sequelize.DataTypes.UUID,
references: {
model: 'periods',
key: 'id',
},
},
{ transaction },
);
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
/**
* @param {QueryInterface} queryInterface
* @param {Sequelize} Sequelize
* @returns {Promise<void>}
*/
async down(queryInterface, Sequelize) {
/**
* @type {Transaction}
*/
const transaction = await queryInterface.sequelize.transaction();
try {
await queryInterface.removeColumn('archival_items', 'periodId', {
transaction,
});
await transaction.commit();
} catch (err) {
await transaction.rollback();
throw err;
}
},
};

8
backend/src/db/models/archival_items.js
View File

@ -65,6 +65,14 @@ module.exports = function (sequelize, DataTypes) {
//end loop
db.archival_items.belongsTo(db.periods, {
as: 'period',
foreignKey: {
name: 'periodId',
},
constraints: false,
});
db.archival_items.hasMany(db.file, {
as: 'media',
foreignKey: 'belongsToId',

26
backend/src/db/models/periods.js
View File

@ -40,26 +40,16 @@ module.exports = function (sequelize, DataTypes) {
);
periods.associate = (db) => {
db.periods.belongsToMany(db.archival_items, {
as: 'archival_items',
foreignKey: {
name: 'periods_archival_itemsId',
},
constraints: false,
through: 'periodsArchival_itemsArchival_items',
});
db.periods.belongsToMany(db.archival_items, {
as: 'archival_items_filter',
foreignKey: {
name: 'periods_archival_itemsId',
},
constraints: false,
through: 'periodsArchival_itemsArchival_items',
});
/// loop through entities and it's fields, and if ref === current e[name] and create relation has many on parent entity
db.periods.hasMany(db.archival_items, {
as: 'archival_items_period',
foreignKey: {
name: 'periodId',
},
constraints: false,
});
//end loop
db.periods.belongsTo(db.users, {

11
frontend/src/components/Archival_items/CardArchival_items.tsx
View File

@ -137,6 +137,17 @@ const CardArchival_items = ({
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Period
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{dataFormatter.periodsOneListFormatter(item.period)}
</div>
</dd>
</div>
</dl>
</li>
))}

7
frontend/src/components/Archival_items/ListArchival_items.tsx
View File

@ -97,6 +97,13 @@ const ListArchival_items = ({
.join(', ')}
</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Period</p>
<p className={'line-clamp-2'}>
{dataFormatter.periodsOneListFormatter(item.period)}
</p>
</div>
</Link>
<ListActionsPopover
onDelete={onDelete}

20
frontend/src/components/Archival_items/configureArchival_itemsCols.tsx
View File

@ -115,6 +115,26 @@ export const loadColumns = async (
),
},
{
field: 'period',
headerName: 'Period',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: hasUpdatePermission,
sortable: false,
type: 'singleSelect',
getOptionValue: (value: any) => value?.id,
getOptionLabel: (value: any) => value?.label,
valueOptions: await callOptionsApi('periods'),
valueGetter: (params: GridValueGetterParams) =>
params?.value?.id ?? params?.value,
},
{
field: 'actions',
type: 'actions',

13
frontend/src/components/Periods/CardPeriods.tsx
View File

@ -83,19 +83,6 @@ const CardPeriods = ({
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Archival Items
</dt>
<dd className='flex items-start gap-x-2'>
<div className='font-medium line-clamp-4'>
{dataFormatter
.archival_itemsManyListFormatter(item.archival_items)
.join(', ')}
</div>
</dd>
</div>
<div className='flex justify-between gap-x-4 py-3'>
<dt className=' text-gray-500 dark:text-dark-600'>
Period From

11
frontend/src/components/Periods/ListPeriods.tsx
View File

@ -56,17 +56,6 @@ const ListPeriods = ({
<p className={'line-clamp-2'}>{item.name}</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>
Archival Items
</p>
<p className={'line-clamp-2'}>
{dataFormatter
.archival_itemsManyListFormatter(item.archival_items)
.join(', ')}
</p>
</div>
<div className={'flex-1 px-3'}>
<p className={'text-xs text-gray-500 '}>Period From</p>
<p className={'line-clamp-2'}>

19
frontend/src/components/Periods/configurePeriodsCols.tsx
View File

@ -50,25 +50,6 @@ export const loadColumns = async (
editable: hasUpdatePermission,
},
{
field: 'archival_items',
headerName: 'Archival Items',
flex: 1,
minWidth: 120,
filterable: false,
headerClassName: 'datagrid--header',
cellClassName: 'datagrid--cell',
editable: false,
sortable: false,
type: 'singleSelect',
valueFormatter: ({ value }) =>
dataFormatter.archival_itemsManyListFormatter(value).join(', '),
renderEditCell: (params) => (
<DataGridMultiSelect {...params} entityName={'archival_items'} />
),
},
{
field: 'period_from',
headerName: 'Period From',

8
frontend/src/helpers/dataFormatter.js
View File

@ -39,21 +39,21 @@ export default {
});
},
archival_itemsManyListFormatter(val) {
periodsManyListFormatter(val) {
if (!val || !val.length) return [];
return val.map((item) => item.id);
},
archival_itemsOneListFormatter(val) {
periodsOneListFormatter(val) {
if (!val) return '';
return val.id;
},
archival_itemsManyListFormatterEdit(val) {
periodsManyListFormatterEdit(val) {
if (!val || !val.length) return [];
return val.map((item) => {
return { id: item.id, label: item.id };
});
},
archival_itemsOneListFormatterEdit(val) {
periodsOneListFormatterEdit(val) {
if (!val) return '';
return { label: val.id, id: val.id };
},

13
frontend/src/pages/archival_items/[archival_itemsId].tsx
View File

@ -45,6 +45,8 @@ const EditArchival_items = () => {
isPublished: false,
tags: [],
period: null,
};
const [initialValues, setInitialValues] = useState(initVals);
@ -142,6 +144,17 @@ const EditArchival_items = () => {
></Field>
</FormField>
<FormField label='Period' labelFor='period'>
<Field
name='period'
id='period'
component={SelectField}
options={initialValues.period}
itemRef={'periods'}
showField={'id'}
></Field>
</FormField>
<BaseDivider />
<BaseButtons>
<BaseButton type='submit' color='info' label='Submit' />

13
frontend/src/pages/archival_items/archival_items-edit.tsx
View File

@ -45,6 +45,8 @@ const EditArchival_itemsPage = () => {
isPublished: false,
tags: [],
period: null,
};
const [initialValues, setInitialValues] = useState(initVals);
@ -140,6 +142,17 @@ const EditArchival_itemsPage = () => {
></Field>
</FormField>
<FormField label='Period' labelFor='period'>
<Field
name='period'
id='period'
component={SelectField}
options={initialValues.period}
itemRef={'periods'}
showField={'id'}
></Field>
</FormField>
<BaseDivider />
<BaseButtons>
<BaseButton type='submit' color='info' label='Submit' />

2
frontend/src/pages/archival_items/archival_items-list.tsx
View File

@ -35,6 +35,8 @@ const Archival_itemsTablesPage = () => {
{ label: 'Label', title: 'label' },
{ label: 'Description', title: 'description' },
{ label: 'Period', title: 'period' },
{ label: 'Tags', title: 'tags' },
]);

12
frontend/src/pages/archival_items/archival_items-new.tsx
View File

@ -42,6 +42,8 @@ const initialValues = {
isPublished: false,
tags: [],
period: '',
};
const Archival_itemsNew = () => {
@ -113,6 +115,16 @@ const Archival_itemsNew = () => {
></Field>
</FormField>
<FormField label='Period' labelFor='period'>
<Field
name='period'
id='period'
component={SelectField}
options={[]}
itemRef={'periods'}
></Field>
</FormField>
<BaseDivider />
<BaseButtons>
<BaseButton type='submit' color='info' label='Submit' />

2
frontend/src/pages/archival_items/archival_items-table.tsx
View File

@ -35,6 +35,8 @@ const Archival_itemsTablesPage = () => {
{ label: 'Label', title: 'label' },
{ label: 'Description', title: 'description' },
{ label: 'Period', title: 'period' },
{ label: 'Tags', title: 'tags' },
]);

6
frontend/src/pages/archival_items/archival_items-view.tsx
View File

@ -123,6 +123,12 @@ const Archival_itemsView = () => {
</CardBox>
</>
<div className={'mb-4'}>
<p className={'block font-bold mb-2'}>Period</p>
<p>{archival_items?.period?.id ?? 'No data'}</p>
</div>
<BaseDivider />
<BaseButton

13
frontend/src/pages/periods/[periodsId].tsx
View File

@ -38,8 +38,6 @@ const EditPeriods = () => {
const initVals = {
name: '',
archival_items: [],
period_from: new Date(),
period_to: new Date(),
@ -99,17 +97,6 @@ const EditPeriods = () => {
<Field name='name' placeholder='Name' />
</FormField>
<FormField label='Archival Items' labelFor='archival_items'>
<Field
name='archival_items'
id='archival_items'
component={SelectFieldMany}
options={initialValues.archival_items}
itemRef={'archival_items'}
showField={'id'}
></Field>
</FormField>
<FormField label='Period From'>
<DatePicker
dateFormat='yyyy-MM-dd hh:mm'

13
frontend/src/pages/periods/periods-edit.tsx
View File

@ -38,8 +38,6 @@ const EditPeriodsPage = () => {
const initVals = {
name: '',
archival_items: [],
period_from: new Date(),
period_to: new Date(),
@ -97,17 +95,6 @@ const EditPeriodsPage = () => {
<Field name='name' placeholder='Name' />
</FormField>
<FormField label='Archival Items' labelFor='archival_items'>
<Field
name='archival_items'
id='archival_items'
component={SelectFieldMany}
options={initialValues.archival_items}
itemRef={'archival_items'}
showField={'id'}
></Field>
</FormField>
<FormField label='Period From'>
<DatePicker
dateFormat='yyyy-MM-dd hh:mm'

2
frontend/src/pages/periods/periods-list.tsx
View File

@ -33,8 +33,6 @@ const PeriodsTablesPage = () => {
{ label: 'Period From', title: 'period_from', date: 'true' },
{ label: 'Period To', title: 'period_to', date: 'true' },
{ label: 'Archival Items', title: 'archival_items' },
]);
const hasCreatePermission =

12
frontend/src/pages/periods/periods-new.tsx
View File

@ -35,8 +35,6 @@ import moment from 'moment';
const initialValues = {
name: '',
archival_items: [],
period_from: '',
period_to: '',
@ -73,16 +71,6 @@ const PeriodsNew = () => {
<Field name='name' placeholder='Name' />
</FormField>
<FormField label='Archival Items' labelFor='archival_items'>
<Field
name='archival_items'
id='archival_items'
itemRef={'archival_items'}
options={[]}
component={SelectFieldMany}
></Field>
</FormField>
<FormField label='Period From'>
<Field
type='datetime-local'

2
frontend/src/pages/periods/periods-table.tsx
View File

@ -33,8 +33,6 @@ const PeriodsTablesPage = () => {
{ label: 'Period From', title: 'period_from', date: 'true' },
{ label: 'Period To', title: 'period_to', date: 'true' },
{ label: 'Archival Items', title: 'archival_items' },
]);
const hasCreatePermission =

94
frontend/src/pages/periods/periods-view.tsx
View File

@ -59,53 +59,6 @@ const PeriodsView = () => {
<p>{periods?.name}</p>
</div>
<>
<p className={'block font-bold mb-2'}>Archival Items</p>
<CardBox
className='mb-6 border border-gray-300 rounded overflow-hidden'
hasTable
>
<div className='overflow-x-auto'>
<table>
<thead>
<tr>
<th>Label</th>
<th>Description</th>
<th>Is Published</th>
</tr>
</thead>
<tbody>
{periods.archival_items &&
Array.isArray(periods.archival_items) &&
periods.archival_items.map((item: any) => (
<tr
key={item.id}
onClick={() =>
router.push(
`/archival_items/archival_items-view/?id=${item.id}`,
)
}
>
<td data-label='label'>{item.label}</td>
<td data-label='description'>{item.description}</td>
<td data-label='isPublished'>
{dataFormatter.booleanFormatter(item.isPublished)}
</td>
</tr>
))}
</tbody>
</table>
</div>
{!periods?.archival_items?.length && (
<div className={'text-center py-4'}>No data</div>
)}
</CardBox>
</>
<FormField label='Period From'>
{periods.period_from ? (
<DatePicker
@ -144,6 +97,53 @@ const PeriodsView = () => {
)}
</FormField>
<>
<p className={'block font-bold mb-2'}>Archival_items Period</p>
<CardBox
className='mb-6 border border-gray-300 rounded overflow-hidden'
hasTable
>
<div className='overflow-x-auto'>
<table>
<thead>
<tr>
<th>Label</th>
<th>Description</th>
<th>Is Published</th>
</tr>
</thead>
<tbody>
{periods.archival_items_period &&
Array.isArray(periods.archival_items_period) &&
periods.archival_items_period.map((item: any) => (
<tr
key={item.id}
onClick={() =>
router.push(
`/archival_items/archival_items-view/?id=${item.id}`,
)
}
>
<td data-label='label'>{item.label}</td>
<td data-label='description'>{item.description}</td>
<td data-label='isPublished'>
{dataFormatter.booleanFormatter(item.isPublished)}
</td>
</tr>
))}
</tbody>
</table>
</div>
{!periods?.archival_items_period?.length && (
<div className={'text-center py-4'}>No data</div>
)}
</CardBox>
</>
<BaseDivider />
<BaseButton