diff --git a/database/addAssetGroup.d.ts b/database/addAssetGroup.d.ts index 3069b70..343f292 100644 --- a/database/addAssetGroup.d.ts +++ b/database/addAssetGroup.d.ts @@ -1,3 +1,3 @@ import sqlite from 'better-sqlite3'; import type { AssetGroup } from '../types/recordTypes.js'; -export declare function addAssetGroup(group: AssetGroup, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): number; +export declare function addAssetGroup(group: Partial, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): number; diff --git a/database/addAssetGroup.ts b/database/addAssetGroup.ts index f32f7b2..9198709 100644 --- a/database/addAssetGroup.ts +++ b/database/addAssetGroup.ts @@ -4,7 +4,7 @@ import { databasePath } from '../helpers/functions.database.js' import type { AssetGroup } from '../types/recordTypes.js' export function addAssetGroup( - group: AssetGroup, + group: Partial, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database ): number { diff --git a/database/addAssetGroupMember.d.ts b/database/addAssetGroupMember.d.ts new file mode 100644 index 0000000..97bd433 --- /dev/null +++ b/database/addAssetGroupMember.d.ts @@ -0,0 +1 @@ +export declare function addAssetGroupMember(groupId: number | string, assetId: number | string, sessionUser: EmileUser): boolean; diff --git a/database/addAssetGroupMember.js b/database/addAssetGroupMember.js new file mode 100644 index 0000000..4a93738 --- /dev/null +++ b/database/addAssetGroupMember.js @@ -0,0 +1,27 @@ +import sqlite from 'better-sqlite3'; +import { databasePath } from '../helpers/functions.database.js'; +export function addAssetGroupMember(groupId, assetId, sessionUser) { + const emileDB = sqlite(databasePath); + const rightNowMillis = Date.now(); + let result = emileDB + .prepare(`update AssetGroupMembers + set recordDelete_userName = null, + recordDelete_timeMillis = null, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is not null + and groupId = ? + and assetId = ?`) + .run(sessionUser.userName, rightNowMillis, groupId, assetId); + if (result.changes === 0) { + result = emileDB + .prepare(`insert into AssetGroupMembers ( + groupId, assetId, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)`) + .run(groupId, assetId, sessionUser.userName, rightNowMillis, sessionUser.userName, rightNowMillis); + } + emileDB.close(); + return result.changes > 0; +} diff --git a/database/addAssetGroupMember.ts b/database/addAssetGroupMember.ts new file mode 100644 index 0000000..9540677 --- /dev/null +++ b/database/addAssetGroupMember.ts @@ -0,0 +1,49 @@ +import sqlite from 'better-sqlite3' + +import { databasePath } from '../helpers/functions.database.js' + +export function addAssetGroupMember( + groupId: number | string, + assetId: number | string, + sessionUser: EmileUser +): boolean { + const emileDB = sqlite(databasePath) + + const rightNowMillis = Date.now() + + let result = emileDB + .prepare( + `update AssetGroupMembers + set recordDelete_userName = null, + recordDelete_timeMillis = null, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is not null + and groupId = ? + and assetId = ?` + ) + .run(sessionUser.userName, rightNowMillis, groupId, assetId) + + if (result.changes === 0) { + result = emileDB + .prepare( + `insert into AssetGroupMembers ( + groupId, assetId, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)` + ) + .run( + groupId, + assetId, + sessionUser.userName, + rightNowMillis, + sessionUser.userName, + rightNowMillis + ) + } + + emileDB.close() + + return result.changes > 0 +} diff --git a/database/addEnergyAccumulationBehaviour.d.ts b/database/addEnergyAccumulationBehaviour.d.ts index 2babd53..697bf23 100644 --- a/database/addEnergyAccumulationBehaviour.d.ts +++ b/database/addEnergyAccumulationBehaviour.d.ts @@ -1,3 +1,3 @@ import sqlite from 'better-sqlite3'; import type { EnergyAccumulationBehaviour } from '../types/recordTypes.js'; -export declare function addEnergyAccumulationBehaviour(accumulationBehaviour: EnergyAccumulationBehaviour, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): number; +export declare function addEnergyAccumulationBehaviour(accumulationBehaviour: Partial, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): number; diff --git a/database/addEnergyAccumulationBehaviour.ts b/database/addEnergyAccumulationBehaviour.ts index 1a0d14f..98b52c7 100644 --- a/database/addEnergyAccumulationBehaviour.ts +++ b/database/addEnergyAccumulationBehaviour.ts @@ -4,7 +4,7 @@ import { databasePath } from '../helpers/functions.database.js' import type { EnergyAccumulationBehaviour } from '../types/recordTypes.js' export function addEnergyAccumulationBehaviour( - accumulationBehaviour: EnergyAccumulationBehaviour, + accumulationBehaviour: Partial, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database ): number { diff --git a/database/addEnergyCommodity.d.ts b/database/addEnergyCommodity.d.ts index 2092ff6..0b3bd4d 100644 --- a/database/addEnergyCommodity.d.ts +++ b/database/addEnergyCommodity.d.ts @@ -1,3 +1,3 @@ import sqlite from 'better-sqlite3'; import type { EnergyCommodity } from '../types/recordTypes.js'; -export declare function addEnergyCommodity(commodity: EnergyCommodity, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): number; +export declare function addEnergyCommodity(commodity: Partial, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): number; diff --git a/database/addEnergyCommodity.ts b/database/addEnergyCommodity.ts index 6992737..d8ac8f8 100644 --- a/database/addEnergyCommodity.ts +++ b/database/addEnergyCommodity.ts @@ -4,7 +4,7 @@ import { databasePath } from '../helpers/functions.database.js' import type { EnergyCommodity } from '../types/recordTypes.js' export function addEnergyCommodity( - commodity: EnergyCommodity, + commodity: Partial, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database ): number { diff --git a/database/addEnergyDataType.d.ts b/database/addEnergyDataType.d.ts index 1d4609a..6e6ea81 100644 --- a/database/addEnergyDataType.d.ts +++ b/database/addEnergyDataType.d.ts @@ -1,3 +1,3 @@ import sqlite from 'better-sqlite3'; import type { EnergyDataType } from '../types/recordTypes.js'; -export declare function addEnergyDataType(energyDataType: EnergyDataType, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): number; +export declare function addEnergyDataType(energyDataType: Partial, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): number; diff --git a/database/addEnergyDataType.ts b/database/addEnergyDataType.ts index 6512798..b732ea6 100644 --- a/database/addEnergyDataType.ts +++ b/database/addEnergyDataType.ts @@ -4,7 +4,7 @@ import { databasePath } from '../helpers/functions.database.js' import type { EnergyDataType } from '../types/recordTypes.js' export function addEnergyDataType( - energyDataType: EnergyDataType, + energyDataType: Partial, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database ): number { diff --git a/database/addEnergyReadingType.d.ts b/database/addEnergyReadingType.d.ts index acbfb7f..5630eb9 100644 --- a/database/addEnergyReadingType.d.ts +++ b/database/addEnergyReadingType.d.ts @@ -1,3 +1,3 @@ import sqlite from 'better-sqlite3'; import type { EnergyReadingType } from '../types/recordTypes.js'; -export declare function addEnergyReadingType(readingType: EnergyReadingType, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): number; +export declare function addEnergyReadingType(readingType: Partial, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): number; diff --git a/database/addEnergyReadingType.ts b/database/addEnergyReadingType.ts index 7e5b8d6..b5d1497 100644 --- a/database/addEnergyReadingType.ts +++ b/database/addEnergyReadingType.ts @@ -4,7 +4,7 @@ import { databasePath } from '../helpers/functions.database.js' import type { EnergyReadingType } from '../types/recordTypes.js' export function addEnergyReadingType( - readingType: EnergyReadingType, + readingType: Partial, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database ): number { diff --git a/database/addEnergyServiceCategory.d.ts b/database/addEnergyServiceCategory.d.ts index 28b44ae..9beb79c 100644 --- a/database/addEnergyServiceCategory.d.ts +++ b/database/addEnergyServiceCategory.d.ts @@ -1,3 +1,3 @@ import sqlite from 'better-sqlite3'; import type { EnergyServiceCategory } from '../types/recordTypes.js'; -export declare function addEnergyServiceCategory(serviceCategory: EnergyServiceCategory, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): number; +export declare function addEnergyServiceCategory(serviceCategory: Partial, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): number; diff --git a/database/addEnergyServiceCategory.ts b/database/addEnergyServiceCategory.ts index 6d48d0d..2aacf24 100644 --- a/database/addEnergyServiceCategory.ts +++ b/database/addEnergyServiceCategory.ts @@ -4,7 +4,7 @@ import { databasePath } from '../helpers/functions.database.js' import type { EnergyServiceCategory } from '../types/recordTypes.js' export function addEnergyServiceCategory( - serviceCategory: EnergyServiceCategory, + serviceCategory: Partial, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database ): number { diff --git a/database/addEnergyUnit.d.ts b/database/addEnergyUnit.d.ts index 33edf0f..d108738 100644 --- a/database/addEnergyUnit.d.ts +++ b/database/addEnergyUnit.d.ts @@ -1,3 +1,3 @@ import sqlite from 'better-sqlite3'; import type { EnergyUnit } from '../types/recordTypes.js'; -export declare function addEnergyUnit(unit: EnergyUnit, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): number; +export declare function addEnergyUnit(unit: Partial, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database): number; diff --git a/database/addEnergyUnit.ts b/database/addEnergyUnit.ts index 027b571..a72e399 100644 --- a/database/addEnergyUnit.ts +++ b/database/addEnergyUnit.ts @@ -4,7 +4,7 @@ import { databasePath } from '../helpers/functions.database.js' import type { EnergyUnit } from '../types/recordTypes.js' export function addEnergyUnit( - unit: EnergyUnit, + unit: Partial, sessionUser: EmileUser, connectedEmileDB?: sqlite.Database ): number { diff --git a/database/deleteAssetGroupMember.d.ts b/database/deleteAssetGroupMember.d.ts new file mode 100644 index 0000000..67d5de5 --- /dev/null +++ b/database/deleteAssetGroupMember.d.ts @@ -0,0 +1 @@ +export declare function deleteAssetGroupMember(groupId: number | string, assetId: number | string, sessionUser: EmileUser): boolean; diff --git a/database/deleteAssetGroupMember.js b/database/deleteAssetGroupMember.js new file mode 100644 index 0000000..ded2418 --- /dev/null +++ b/database/deleteAssetGroupMember.js @@ -0,0 +1,15 @@ +import sqlite from 'better-sqlite3'; +import { databasePath } from '../helpers/functions.database.js'; +export function deleteAssetGroupMember(groupId, assetId, sessionUser) { + const emileDB = sqlite(databasePath); + const result = emileDB + .prepare(`update AssetGroupMembers + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and groupId = ? + and assetId = ?`) + .run(sessionUser.userName, Date.now(), groupId, assetId); + emileDB.close(); + return result.changes > 0; +} diff --git a/database/deleteAssetGroupMember.ts b/database/deleteAssetGroupMember.ts new file mode 100644 index 0000000..c18e016 --- /dev/null +++ b/database/deleteAssetGroupMember.ts @@ -0,0 +1,26 @@ +import sqlite from 'better-sqlite3' + +import { databasePath } from '../helpers/functions.database.js' + +export function deleteAssetGroupMember( + groupId: number | string, + assetId: number | string, + sessionUser: EmileUser +): boolean { + const emileDB = sqlite(databasePath) + + const result = emileDB + .prepare( + `update AssetGroupMembers + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and groupId = ? + and assetId = ?` + ) + .run(sessionUser.userName, Date.now(), groupId, assetId) + + emileDB.close() + + return result.changes > 0 +} diff --git a/handlers/assets-post/doAddAssetGroupMember.d.ts b/handlers/assets-post/doAddAssetGroupMember.d.ts new file mode 100644 index 0000000..d34b4be --- /dev/null +++ b/handlers/assets-post/doAddAssetGroupMember.d.ts @@ -0,0 +1,3 @@ +import type { Request, Response } from 'express'; +export declare function handler(request: Request, response: Response): void; +export default handler; diff --git a/handlers/assets-post/doAddAssetGroupMember.js b/handlers/assets-post/doAddAssetGroupMember.js new file mode 100644 index 0000000..67694ba --- /dev/null +++ b/handlers/assets-post/doAddAssetGroupMember.js @@ -0,0 +1,13 @@ +import { addAssetGroupMember } from '../../database/addAssetGroupMember.js'; +import { getAssets } from '../../database/getAssets.js'; +export function handler(request, response) { + const success = addAssetGroupMember(request.body.groupId, request.body.assetId, request.session.user); + const groupMembers = getAssets({ + groupId: request.body.groupId + }); + response.json({ + success, + groupMembers + }); +} +export default handler; diff --git a/handlers/assets-post/doAddAssetGroupMember.ts b/handlers/assets-post/doAddAssetGroupMember.ts new file mode 100644 index 0000000..7abf3df --- /dev/null +++ b/handlers/assets-post/doAddAssetGroupMember.ts @@ -0,0 +1,23 @@ +import type { Request, Response } from 'express' + +import { addAssetGroupMember } from '../../database/addAssetGroupMember.js' +import { getAssets } from '../../database/getAssets.js' + +export function handler(request: Request, response: Response): void { + const success = addAssetGroupMember( + request.body.groupId, + request.body.assetId, + request.session.user as EmileUser + ) + + const groupMembers = getAssets({ + groupId: request.body.groupId + }) + + response.json({ + success, + groupMembers + }) +} + +export default handler diff --git a/handlers/assets-post/doDeleteAssetGroupMember.d.ts b/handlers/assets-post/doDeleteAssetGroupMember.d.ts new file mode 100644 index 0000000..d34b4be --- /dev/null +++ b/handlers/assets-post/doDeleteAssetGroupMember.d.ts @@ -0,0 +1,3 @@ +import type { Request, Response } from 'express'; +export declare function handler(request: Request, response: Response): void; +export default handler; diff --git a/handlers/assets-post/doDeleteAssetGroupMember.js b/handlers/assets-post/doDeleteAssetGroupMember.js new file mode 100644 index 0000000..0348ff5 --- /dev/null +++ b/handlers/assets-post/doDeleteAssetGroupMember.js @@ -0,0 +1,13 @@ +import { deleteAssetGroupMember } from '../../database/deleteAssetGroupMember.js'; +import { getAssets } from '../../database/getAssets.js'; +export function handler(request, response) { + const success = deleteAssetGroupMember(request.body.groupId, request.body.assetId, request.session.user); + const groupMembers = getAssets({ + groupId: request.body.groupId + }); + response.json({ + success, + groupMembers + }); +} +export default handler; diff --git a/handlers/assets-post/doDeleteAssetGroupMember.ts b/handlers/assets-post/doDeleteAssetGroupMember.ts new file mode 100644 index 0000000..143ff3e --- /dev/null +++ b/handlers/assets-post/doDeleteAssetGroupMember.ts @@ -0,0 +1,23 @@ +import type { Request, Response } from 'express' + +import { deleteAssetGroupMember } from '../../database/deleteAssetGroupMember.js' +import { getAssets } from '../../database/getAssets.js' + +export function handler(request: Request, response: Response): void { + const success = deleteAssetGroupMember( + request.body.groupId, + request.body.assetId, + request.session.user as EmileUser + ) + + const groupMembers = getAssets({ + groupId: request.body.groupId + }) + + response.json({ + success, + groupMembers + }) +} + +export default handler diff --git a/public-typescript/assetGroups.d.ts b/public-typescript/assetGroups.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/public-typescript/assetGroups.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/public-typescript/assetGroups.js b/public-typescript/assetGroups.js new file mode 100644 index 0000000..fe4aa41 --- /dev/null +++ b/public-typescript/assetGroups.js @@ -0,0 +1,334 @@ +"use strict"; +// eslint-disable-next-line eslint-comments/disable-enable-pair +/* eslint-disable @typescript-eslint/indent */ +Object.defineProperty(exports, "__esModule", { value: true }); +; +(() => { + var _a; + const Emile = exports.Emile; + const assetGroupFilterElement = document.querySelector('#filter--assetGroups'); + function deleteGroupMember(clickEvent) { + var _a, _b; + const rowElement = clickEvent.currentTarget.closest('tr'); + const groupId = (_a = rowElement.dataset.groupId) !== null && _a !== void 0 ? _a : ''; + const assetId = (_b = rowElement.dataset.assetId) !== null && _b !== void 0 ? _b : ''; + function doDelete() { + cityssm.postJSON(Emile.urlPrefix + '/assets/doDeleteAssetGroupMember', { + groupId, + assetId + }, (rawResponseJSON) => { + var _a; + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + renderAssetGroupMembers(groupId, responseJSON.groupMembers); + } + else { + bulmaJS.alert({ + title: 'Error Deleting Group Member', + message: (_a = responseJSON.errorMessage) !== null && _a !== void 0 ? _a : 'Please try again.', + contextualColorName: 'danger' + }); + } + }); + } + bulmaJS.confirm({ + title: 'Delete Group Member', + message: 'Are you sure you want to remove this asset from this group?', + contextualColorName: 'warning', + okButton: { + text: 'Yes, Remove Member from Group', + callbackFunction: doDelete + } + }); + } + function renderAssetGroupMembers(groupId, groupMembers) { + var _a, _b, _c, _d, _e, _f; + const tbodyElement = document.querySelector('.modal #tbody--groupMembers'); + tbodyElement.innerHTML = ''; + for (const groupMember of groupMembers) { + const rowElement = document.createElement('tr'); + rowElement.dataset.groupId = groupId; + rowElement.dataset.assetId = groupMember.assetId.toString(); + rowElement.innerHTML = ` + + + ${Emile.canUpdate + ? `` + : ''} + `; + rowElement.querySelector('[data-field="category"]').textContent = (_a = groupMember.category) !== null && _a !== void 0 ? _a : ''; + rowElement.querySelector('[data-field="assetName"]').textContent = (_b = groupMember.assetName) !== null && _b !== void 0 ? _b : ''; + (_c = rowElement + .querySelector('.is-delete-button')) === null || _c === void 0 ? void 0 : _c.addEventListener('click', deleteGroupMember); + tbodyElement.append(rowElement); + } + if (Emile.canUpdate) { + const groupMemberSelectElement = document.querySelector('.modal #groupMemberAdd--assetId'); + groupMemberSelectElement.innerHTML = + ''; + for (const asset of Emile.assets) { + const assetInGroup = groupMembers.some((possibleAsset) => { + return possibleAsset.assetId === asset.assetId; + }); + if (assetInGroup) { + continue; + } + const optionElement = document.createElement('option'); + optionElement.value = asset.assetId.toString(); + optionElement.textContent = asset.assetName; + // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion + let optgroupElement = groupMemberSelectElement.querySelector(`optgroup[data-category-id="${(_d = asset.categoryId) !== null && _d !== void 0 ? _d : ''}"]`); + if (optgroupElement === null) { + optgroupElement = document.createElement('optgroup'); + optgroupElement.dataset.categoryId = (_e = asset.categoryId) === null || _e === void 0 ? void 0 : _e.toString(); + optgroupElement.label = (_f = asset.category) !== null && _f !== void 0 ? _f : ''; + groupMemberSelectElement.append(optgroupElement); + } + optgroupElement.append(optionElement); + } + } + } + function populateAssetGroupModal(modalElement, groupId) { + cityssm.postJSON(Emile.urlPrefix + '/assets/doGetAssetGroup', { + groupId + }, (rawResponseJSON) => { + var _a, _b, _c; + const responseJSON = rawResponseJSON; + if (!responseJSON.success) { + bulmaJS.alert({ + title: 'Error Loading Asset Group Details', + message: 'Please refresh the page and try again.', + contextualColorName: 'danger' + }); + return; + } + ; + modalElement.querySelector('#assetGroupView--groupId').value = (_b = (_a = responseJSON.assetGroup.groupId) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : ''; + modalElement.querySelector('.modal-card-head [data-field="groupName"]').textContent = responseJSON.assetGroup.groupName; + modalElement.querySelector('#assetGroupView--groupName').value = responseJSON.assetGroup.groupName; + modalElement.querySelector('#assetGroupView--isShared').value = responseJSON.assetGroup.isShared ? '1' : '0'; + modalElement.querySelector('#assetGroupView--groupDescription').value = responseJSON.assetGroup.groupDescription; + renderAssetGroupMembers(groupId, (_c = responseJSON.assetGroup.groupMembers) !== null && _c !== void 0 ? _c : []); + }); + } + function updateAssetGroup(formEvent) { + formEvent.preventDefault(); + cityssm.postJSON(Emile.urlPrefix + '/assets/doUpdateAssetGroup', formEvent.currentTarget, (rawResponseJSON) => { + var _a; + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + Emile.assetGroups = responseJSON.assetGroups; + bulmaJS.alert({ + message: 'Asset group updated successfully.', + contextualColorName: 'success' + }); + renderAssetGroups(); + } + else { + bulmaJS.alert({ + title: 'Error Updating Asset Group', + message: (_a = responseJSON.errorMessage) !== null && _a !== void 0 ? _a : 'Please try again.', + contextualColorName: 'danger' + }); + } + }); + } + function addAssetGroupMember(formEvent) { + formEvent.preventDefault(); + const formElement = formEvent.currentTarget; + cityssm.postJSON(Emile.urlPrefix + '/assets/doAddAssetGroupMember', formElement, (rawResponseJSON) => { + var _a; + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + renderAssetGroupMembers(formElement.querySelector('[name="groupId"]') + .value, responseJSON.groupMembers); + formElement.reset(); + } + else { + bulmaJS.alert({ + title: 'Error Adding Group Member', + message: (_a = responseJSON.errorMessage) !== null && _a !== void 0 ? _a : 'Please try again.', + contextualColorName: 'danger' + }); + } + }); + } + function openGroupByGroupId(groupId) { + let assetGroupCloseModalFunction; + function deleteAssetGroup(clickEvent) { + clickEvent.preventDefault(); + function doDelete() { + cityssm.postJSON(Emile.urlPrefix + '/assets/doDeleteAssetGroup', { + groupId + }, (rawResponseJSON) => { + var _a; + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + Emile.assetGroups = responseJSON.assetGroups; + renderAssetGroups(); + assetGroupCloseModalFunction(); + } + else { + bulmaJS.alert({ + title: 'Error Deleting Asset Group', + message: (_a = responseJSON.errorMessage) !== null && _a !== void 0 ? _a : '', + contextualColorName: 'danger' + }); + } + }); + } + bulmaJS.confirm({ + title: 'Delete Asset Group', + message: 'Are you sure you want to delete this group?', + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Asset Group', + callbackFunction: doDelete + } + }); + } + cityssm.openHtmlModal('assetGroup-view', { + onshow(modalElement) { + var _a; + populateAssetGroupModal(modalElement, groupId); + if (Emile.canUpdate) { + ; + modalElement.querySelector('#form--assetGroupView fieldset').disabled = false; + modalElement.querySelector('#groupMemberAdd--groupId').value = groupId; + } + else { + (_a = modalElement.querySelector('#tbody--groupMemberAdd')) === null || _a === void 0 ? void 0 : _a.remove(); + } + }, + onshown(modalElement, closeModalFunction) { + var _a, _b, _c; + bulmaJS.toggleHtmlClipped(); + bulmaJS.init(modalElement); + if (Emile.canUpdate) { + assetGroupCloseModalFunction = closeModalFunction; + (_a = modalElement + .querySelector('#form--assetGroupView')) === null || _a === void 0 ? void 0 : _a.addEventListener('submit', updateAssetGroup); + (_b = modalElement + .querySelector('.is-delete-button')) === null || _b === void 0 ? void 0 : _b.addEventListener('click', deleteAssetGroup); + (_c = modalElement + .querySelector('#form--groupMemberAdd')) === null || _c === void 0 ? void 0 : _c.addEventListener('submit', addAssetGroupMember); + } + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + } + }); + } + function openGroupByClick(clickEvent) { + var _a, _b; + clickEvent.preventDefault(); + const groupId = (_b = (_a = clickEvent.currentTarget.closest('tr')) === null || _a === void 0 ? void 0 : _a.dataset.groupId) !== null && _b !== void 0 ? _b : ''; + openGroupByGroupId(groupId); + } + function renderAssetGroups() { + var _a, _b, _c; + ; + document.querySelector('#count--assetGroups').textContent = Emile.assetGroups.length.toString(); + const containerElement = document.querySelector('#container--assetGroups'); + if (Emile.assetGroups.length === 0) { + containerElement.innerHTML = `
+

+ No Asset Groups Found
+ Grouping together assets can assist with reporting on multiple assets. +

+
`; + return; + } + const searchPieces = assetGroupFilterElement.value + .trim() + .toLowerCase() + .split(' '); + const tableElement = document.createElement('table'); + tableElement.className = 'table is-fullwidth is-striped has-sticky-header'; + tableElement.innerHTML = ` + Group + Members + Shared + + `; + // eslint-disable-next-line no-labels + assetGroupLoop: for (const assetGroup of Emile.assetGroups) { + const searchText = assetGroup.groupName.toLowerCase() + + ' ' + + ((_a = assetGroup.groupDescription) !== null && _a !== void 0 ? _a : '').toLowerCase(); + for (const searchPiece of searchPieces) { + if (!searchText.includes(searchPiece)) { + // eslint-disable-next-line no-labels + continue assetGroupLoop; + } + } + const rowElement = document.createElement('tr'); + rowElement.dataset.groupId = assetGroup.groupId.toString(); + rowElement.innerHTML = ` +
+ + + + ${(_b = assetGroup.groupMemberCount) !== null && _b !== void 0 ? _b : 0} + + + ${assetGroup.isShared ? 'Shared Group' : 'Private'} + `; + const groupNameElement = rowElement.querySelector('[data-field="groupName"]'); + groupNameElement.textContent = assetGroup.groupName; + groupNameElement.addEventListener('click', openGroupByClick); + tableElement.querySelector('tbody').append(rowElement); + rowElement.querySelector('[data-field="groupDescription"]').textContent = (_c = assetGroup.groupDescription) !== null && _c !== void 0 ? _c : ''; + } + if (tableElement.querySelectorAll('tbody tr').length === 0) { + containerElement.innerHTML = `
+

+ There are no groups that meet your search criteria.
+ Try to be less specific in your search. +

+
`; + } + else { + containerElement.innerHTML = ''; + containerElement.append(tableElement); + } + } + (_a = document + .querySelector('#button--addAssetGroup')) === null || _a === void 0 ? void 0 : _a.addEventListener('click', () => { + let addAssetGroupCloseModalFunction; + function doAddAssetGroup(formEvent) { + formEvent.preventDefault(); + cityssm.postJSON(Emile.urlPrefix + '/assets/doAddAssetGroup', formEvent.currentTarget, (rawResponseJSON) => { + const responseJSON = rawResponseJSON; + if (responseJSON.success) { + Emile.assetGroups = responseJSON.assetGroups; + renderAssetGroups(); + addAssetGroupCloseModalFunction(); + openGroupByGroupId(responseJSON.groupId.toString()); + } + }); + } + cityssm.openHtmlModal('assetGroup-add', { + onshown(modalElement, closeModalFunction) { + var _a; + addAssetGroupCloseModalFunction = closeModalFunction; + bulmaJS.toggleHtmlClipped(); + modalElement.querySelector('#assetGroupAdd--groupName').focus(); + (_a = modalElement + .querySelector('form')) === null || _a === void 0 ? void 0 : _a.addEventListener('submit', doAddAssetGroup); + }, + onremoved() { + bulmaJS.toggleHtmlClipped(); + } + }); + }); + /* + * Initialize + */ + // Asset Groups + assetGroupFilterElement.addEventListener('keyup', renderAssetGroups); + renderAssetGroups(); +})(); diff --git a/public-typescript/assetGroups.ts b/public-typescript/assetGroups.ts new file mode 100644 index 0000000..92108f8 --- /dev/null +++ b/public-typescript/assetGroups.ts @@ -0,0 +1,540 @@ +// eslint-disable-next-line eslint-comments/disable-enable-pair +/* eslint-disable @typescript-eslint/indent */ + +// eslint-disable-next-line eslint-comments/disable-enable-pair +/* eslint-disable unicorn/prefer-module */ + +// eslint-disable-next-line n/no-missing-import +import type { BulmaJS } from '@cityssm/bulma-js/types.js' +import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' + +import type { Asset, AssetGroup } from '../types/recordTypes.js' + +import type { Emile as EmileGlobal } from './globalTypes.js' + +declare const bulmaJS: BulmaJS +declare const cityssm: cityssmGlobal + +interface ErrorResponse { + success: false + errorMessage?: string +} + +;(() => { + const Emile = exports.Emile as EmileGlobal + + /* + * Asset Groups + */ + + type GroupMembersResponseJSON = + | { + success: true + groupMembers: Asset[] + } + | { + success: false + errorMessage?: string + } + + const assetGroupFilterElement = document.querySelector( + '#filter--assetGroups' + ) as HTMLInputElement + + function deleteGroupMember(clickEvent: Event): void { + const rowElement = (clickEvent.currentTarget as HTMLElement).closest( + 'tr' + ) as HTMLTableRowElement + + const groupId = rowElement.dataset.groupId ?? '' + const assetId = rowElement.dataset.assetId ?? '' + + function doDelete(): void { + cityssm.postJSON( + Emile.urlPrefix + '/assets/doDeleteAssetGroupMember', + { + groupId, + assetId + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as GroupMembersResponseJSON + + if (responseJSON.success) { + renderAssetGroupMembers(groupId, responseJSON.groupMembers) + } else { + bulmaJS.alert({ + title: 'Error Deleting Group Member', + message: responseJSON.errorMessage ?? 'Please try again.', + contextualColorName: 'danger' + }) + } + } + ) + } + + bulmaJS.confirm({ + title: 'Delete Group Member', + message: 'Are you sure you want to remove this asset from this group?', + contextualColorName: 'warning', + okButton: { + text: 'Yes, Remove Member from Group', + callbackFunction: doDelete + } + }) + } + + function renderAssetGroupMembers( + groupId: string, + groupMembers: Asset[] + ): void { + const tbodyElement = document.querySelector( + '.modal #tbody--groupMembers' + ) as HTMLTableSectionElement + + tbodyElement.innerHTML = '' + + for (const groupMember of groupMembers) { + const rowElement = document.createElement('tr') + rowElement.dataset.groupId = groupId + rowElement.dataset.assetId = groupMember.assetId.toString() + + rowElement.innerHTML = ` + + + ${ + Emile.canUpdate + ? `` + : '' + } + ` + ;( + rowElement.querySelector('[data-field="category"]') as HTMLElement + ).textContent = groupMember.category ?? '' + ;( + rowElement.querySelector('[data-field="assetName"]') as HTMLElement + ).textContent = groupMember.assetName ?? '' + + rowElement + .querySelector('.is-delete-button') + ?.addEventListener('click', deleteGroupMember) + + tbodyElement.append(rowElement) + } + + if (Emile.canUpdate) { + const groupMemberSelectElement = document.querySelector( + '.modal #groupMemberAdd--assetId' + ) as HTMLSelectElement + + groupMemberSelectElement.innerHTML = + '' + + for (const asset of Emile.assets) { + const assetInGroup = groupMembers.some((possibleAsset) => { + return possibleAsset.assetId === asset.assetId + }) + + if (assetInGroup) { + continue + } + + const optionElement = document.createElement('option') + optionElement.value = asset.assetId.toString() + optionElement.textContent = asset.assetName + + // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion + let optgroupElement = groupMemberSelectElement.querySelector( + `optgroup[data-category-id="${asset.categoryId ?? ''}"]` + ) as HTMLOptGroupElement | null + + if (optgroupElement === null) { + optgroupElement = document.createElement('optgroup') + optgroupElement.dataset.categoryId = asset.categoryId?.toString() + optgroupElement.label = asset.category ?? '' + groupMemberSelectElement.append(optgroupElement) + } + + optgroupElement.append(optionElement) + } + } + } + + function populateAssetGroupModal( + modalElement: HTMLElement, + groupId: string + ): void { + cityssm.postJSON( + Emile.urlPrefix + '/assets/doGetAssetGroup', + { + groupId + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as + | { + success: true + assetGroup: AssetGroup + } + | ErrorResponse + + if (!responseJSON.success) { + bulmaJS.alert({ + title: 'Error Loading Asset Group Details', + message: 'Please refresh the page and try again.', + contextualColorName: 'danger' + }) + return + } + + ;( + modalElement.querySelector( + '#assetGroupView--groupId' + ) as HTMLInputElement + ).value = responseJSON.assetGroup.groupId?.toString() ?? '' + ;( + modalElement.querySelector( + '.modal-card-head [data-field="groupName"]' + ) as HTMLElement + ).textContent = responseJSON.assetGroup.groupName + ;( + modalElement.querySelector( + '#assetGroupView--groupName' + ) as HTMLInputElement + ).value = responseJSON.assetGroup.groupName + ;( + modalElement.querySelector( + '#assetGroupView--isShared' + ) as HTMLSelectElement + ).value = responseJSON.assetGroup.isShared ? '1' : '0' + ;( + modalElement.querySelector( + '#assetGroupView--groupDescription' + ) as HTMLTextAreaElement + ).value = responseJSON.assetGroup.groupDescription + + renderAssetGroupMembers( + groupId, + responseJSON.assetGroup.groupMembers ?? [] + ) + } + ) + } + + function updateAssetGroup(formEvent: Event): void { + formEvent.preventDefault() + + cityssm.postJSON( + Emile.urlPrefix + '/assets/doUpdateAssetGroup', + formEvent.currentTarget, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as + | { + success: true + assetGroups: AssetGroup[] + } + | ErrorResponse + + if (responseJSON.success) { + Emile.assetGroups = responseJSON.assetGroups + + bulmaJS.alert({ + message: 'Asset group updated successfully.', + contextualColorName: 'success' + }) + + renderAssetGroups() + } else { + bulmaJS.alert({ + title: 'Error Updating Asset Group', + message: responseJSON.errorMessage ?? 'Please try again.', + contextualColorName: 'danger' + }) + } + } + ) + } + + function addAssetGroupMember(formEvent: Event): void { + formEvent.preventDefault() + + const formElement = formEvent.currentTarget as HTMLFormElement + + cityssm.postJSON( + Emile.urlPrefix + '/assets/doAddAssetGroupMember', + formElement, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as GroupMembersResponseJSON + + if (responseJSON.success) { + renderAssetGroupMembers( + (formElement.querySelector('[name="groupId"]') as HTMLInputElement) + .value, + responseJSON.groupMembers + ) + formElement.reset() + } else { + bulmaJS.alert({ + title: 'Error Adding Group Member', + message: responseJSON.errorMessage ?? 'Please try again.', + contextualColorName: 'danger' + }) + } + } + ) + } + + function openGroupByGroupId(groupId: string): void { + let assetGroupCloseModalFunction: () => void + + function deleteAssetGroup(clickEvent: Event): void { + clickEvent.preventDefault() + + function doDelete(): void { + cityssm.postJSON( + Emile.urlPrefix + '/assets/doDeleteAssetGroup', + { + groupId + }, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as + | { + success: true + assetGroups: AssetGroup[] + } + | ErrorResponse + + if (responseJSON.success) { + Emile.assetGroups = responseJSON.assetGroups + renderAssetGroups() + assetGroupCloseModalFunction() + } else { + bulmaJS.alert({ + title: 'Error Deleting Asset Group', + message: responseJSON.errorMessage ?? '', + contextualColorName: 'danger' + }) + } + } + ) + } + + bulmaJS.confirm({ + title: 'Delete Asset Group', + message: 'Are you sure you want to delete this group?', + contextualColorName: 'warning', + okButton: { + text: 'Yes, Delete Asset Group', + callbackFunction: doDelete + } + }) + } + + cityssm.openHtmlModal('assetGroup-view', { + onshow(modalElement) { + populateAssetGroupModal(modalElement, groupId) + + if (Emile.canUpdate) { + ;( + modalElement.querySelector( + '#form--assetGroupView fieldset' + ) as HTMLFieldSetElement + ).disabled = false + ;( + modalElement.querySelector( + '#groupMemberAdd--groupId' + ) as HTMLInputElement + ).value = groupId + } else { + modalElement.querySelector('#tbody--groupMemberAdd')?.remove() + } + }, + onshown(modalElement, closeModalFunction) { + bulmaJS.toggleHtmlClipped() + bulmaJS.init(modalElement) + + if (Emile.canUpdate) { + assetGroupCloseModalFunction = closeModalFunction + + modalElement + .querySelector('#form--assetGroupView') + ?.addEventListener('submit', updateAssetGroup) + + modalElement + .querySelector('.is-delete-button') + ?.addEventListener('click', deleteAssetGroup) + + modalElement + .querySelector('#form--groupMemberAdd') + ?.addEventListener('submit', addAssetGroupMember) + } + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + } + }) + } + + function openGroupByClick(clickEvent: MouseEvent): void { + clickEvent.preventDefault() + + const groupId = + (clickEvent.currentTarget as HTMLElement).closest('tr')?.dataset + .groupId ?? '' + + openGroupByGroupId(groupId) + } + + function renderAssetGroups(): void { + ;( + document.querySelector('#count--assetGroups') as HTMLElement + ).textContent = Emile.assetGroups.length.toString() + + const containerElement = document.querySelector( + '#container--assetGroups' + ) as HTMLElement + + if (Emile.assetGroups.length === 0) { + containerElement.innerHTML = `
+

+ No Asset Groups Found
+ Grouping together assets can assist with reporting on multiple assets. +

+
` + + return + } + + const searchPieces = assetGroupFilterElement.value + .trim() + .toLowerCase() + .split(' ') + + const tableElement = document.createElement('table') + tableElement.className = 'table is-fullwidth is-striped has-sticky-header' + tableElement.innerHTML = ` + Group + Members + Shared + + ` + + // eslint-disable-next-line no-labels + assetGroupLoop: for (const assetGroup of Emile.assetGroups) { + const searchText = + assetGroup.groupName.toLowerCase() + + ' ' + + (assetGroup.groupDescription ?? '').toLowerCase() + + for (const searchPiece of searchPieces) { + if (!searchText.includes(searchPiece)) { + // eslint-disable-next-line no-labels + continue assetGroupLoop + } + } + + const rowElement = document.createElement('tr') + rowElement.dataset.groupId = assetGroup.groupId.toString() + + rowElement.innerHTML = ` +
+ + + + ${assetGroup.groupMemberCount ?? 0} + + + ${assetGroup.isShared ? 'Shared Group' : 'Private'} + ` + + const groupNameElement = rowElement.querySelector( + '[data-field="groupName"]' + ) as HTMLAnchorElement + + groupNameElement.textContent = assetGroup.groupName + + groupNameElement.addEventListener('click', openGroupByClick) + ;(tableElement.querySelector('tbody') as HTMLTableSectionElement).append( + rowElement + ) + ;( + rowElement.querySelector( + '[data-field="groupDescription"]' + ) as HTMLElement + ).textContent = assetGroup.groupDescription ?? '' + } + + if (tableElement.querySelectorAll('tbody tr').length === 0) { + containerElement.innerHTML = `
+

+ There are no groups that meet your search criteria.
+ Try to be less specific in your search. +

+
` + } else { + containerElement.innerHTML = '' + containerElement.append(tableElement) + } + } + + document + .querySelector('#button--addAssetGroup') + ?.addEventListener('click', () => { + let addAssetGroupCloseModalFunction: () => void + + function doAddAssetGroup(formEvent: SubmitEvent): void { + formEvent.preventDefault() + + cityssm.postJSON( + Emile.urlPrefix + '/assets/doAddAssetGroup', + formEvent.currentTarget, + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as + | { + success: true + groupId: number + assetGroups: AssetGroup[] + } + | ErrorResponse + + if (responseJSON.success) { + Emile.assetGroups = responseJSON.assetGroups + renderAssetGroups() + addAssetGroupCloseModalFunction() + + openGroupByGroupId(responseJSON.groupId.toString()) + } + } + ) + } + + cityssm.openHtmlModal('assetGroup-add', { + onshown(modalElement, closeModalFunction) { + addAssetGroupCloseModalFunction = closeModalFunction + + bulmaJS.toggleHtmlClipped() + ;( + modalElement.querySelector( + '#assetGroupAdd--groupName' + ) as HTMLInputElement + ).focus() + + modalElement + .querySelector('form') + ?.addEventListener('submit', doAddAssetGroup) + }, + onremoved() { + bulmaJS.toggleHtmlClipped() + } + }) + }) + + /* + * Initialize + */ + + // Asset Groups + assetGroupFilterElement.addEventListener('keyup', renderAssetGroups) + renderAssetGroups() +})() diff --git a/public-typescript/assets.js b/public-typescript/assets.js index 1d9f757..4387fed 100644 --- a/public-typescript/assets.js +++ b/public-typescript/assets.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); ; (() => { - var _a, _b; + var _a; const Emile = exports.Emile; const assetAliasTypes = exports.assetAliasTypes; const assetCategoryFilterElement = document.querySelector('#filter--categoryId'); @@ -354,225 +354,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); } }); }); - /* - * Asset Groups - */ - const assetGroupFilterElement = document.querySelector('#filter--assetGroups'); - function populateAssetGroupModal(modalElement, groupId) { - cityssm.postJSON(Emile.urlPrefix + '/assets/doGetAssetGroup', { - groupId - }, (rawResponseJSON) => { - var _a, _b; - const responseJSON = rawResponseJSON; - if (!responseJSON.success) { - bulmaJS.alert({ - title: 'Error Loading Asset Group Details', - message: 'Please refresh the page and try again.', - contextualColorName: 'danger' - }); - return; - } - ; - modalElement.querySelector('#assetGroupView--groupId').value = (_b = (_a = responseJSON.assetGroup.groupId) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : ''; - modalElement.querySelector('.modal-card-head [data-field="groupName"]').textContent = responseJSON.assetGroup.groupName; - modalElement.querySelector('#assetGroupView--groupName').value = responseJSON.assetGroup.groupName; - modalElement.querySelector('#assetGroupView--isShared').value = responseJSON.assetGroup.isShared ? '1' : '0'; - modalElement.querySelector('#assetGroupView--groupDescription').value = responseJSON.assetGroup.groupDescription; - }); - } - function updateAssetGroup(formEvent) { - formEvent.preventDefault(); - cityssm.postJSON(Emile.urlPrefix + '/assets/doUpdateAssetGroup', formEvent.currentTarget, (rawResponseJSON) => { - var _a; - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - Emile.assetGroups = responseJSON.assetGroups; - bulmaJS.alert({ - message: 'Asset group updated successfully.', - contextualColorName: 'success' - }); - renderAssets(); - } - else { - bulmaJS.alert({ - title: 'Error Updating Asset Group', - message: (_a = responseJSON.errorMessage) !== null && _a !== void 0 ? _a : 'Please try again.', - contextualColorName: 'danger' - }); - } - }); - } - function openGroupByGroupId(groupId) { - let assetGroupCloseModalFunction; - function deleteAssetGroup(clickEvent) { - clickEvent.preventDefault(); - function doDelete() { - cityssm.postJSON(Emile.urlPrefix + '/assets/doDeleteAssetGroup', { - groupId - }, (rawResponseJSON) => { - var _a; - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - Emile.assetGroups = responseJSON.assetGroups; - renderAssetGroups(); - assetGroupCloseModalFunction(); - } - else { - bulmaJS.alert({ - title: 'Error Deleting Asset Group', - message: (_a = responseJSON.errorMessage) !== null && _a !== void 0 ? _a : '', - contextualColorName: 'danger' - }); - } - }); - } - bulmaJS.confirm({ - title: 'Delete Asset Group', - message: 'Are you sure you want to delete this group?', - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Asset Group', - callbackFunction: doDelete - } - }); - } - cityssm.openHtmlModal('assetGroup-view', { - onshow(modalElement) { - populateAssetGroupModal(modalElement, groupId); - if (Emile.canUpdate) { - ; - modalElement.querySelector('#form--assetGroupView fieldset').disabled = false; - } - }, - onshown(modalElement, closeModalFunction) { - var _a, _b; - bulmaJS.toggleHtmlClipped(); - bulmaJS.init(modalElement); - if (Emile.canUpdate) { - assetGroupCloseModalFunction = closeModalFunction; - (_a = modalElement - .querySelector('#form--assetGroupView')) === null || _a === void 0 ? void 0 : _a.addEventListener('submit', updateAssetGroup); - (_b = modalElement - .querySelector('.is-delete-button')) === null || _b === void 0 ? void 0 : _b.addEventListener('click', deleteAssetGroup); - } - }, - onremoved() { - bulmaJS.toggleHtmlClipped(); - } - }); - } - function openGroupByClick(clickEvent) { - var _a, _b; - clickEvent.preventDefault(); - const groupId = (_b = (_a = clickEvent.currentTarget.closest('tr')) === null || _a === void 0 ? void 0 : _a.dataset.groupId) !== null && _b !== void 0 ? _b : ''; - openGroupByGroupId(groupId); - } - function renderAssetGroups() { - var _a, _b, _c, _d, _e; - ; - document.querySelector('#count--assetGroups').textContent = Emile.assetGroups.length.toString(); - const containerElement = document.querySelector('#container--assetGroups'); - if (Emile.assetGroups.length === 0) { - containerElement.innerHTML = `
-

- No Asset Groups Found
- Grouping together assets can assist with reporting on multiple assets. -

-
`; - return; - } - const searchPieces = assetGroupFilterElement.value - .trim() - .toLowerCase() - .split(' '); - const tableElement = document.createElement('table'); - tableElement.className = 'table is-fullwidth is-striped has-sticky-header'; - tableElement.innerHTML = ` - Group - - - Number of Assets - - - `; - // eslint-disable-next-line no-labels - assetGroupLoop: for (const assetGroup of Emile.assetGroups) { - const searchText = assetGroup.groupName.toLowerCase() + - ' ' + - ((_a = assetGroup.groupDescription) !== null && _a !== void 0 ? _a : '').toLowerCase(); - for (const searchPiece of searchPieces) { - if (!searchText.includes(searchPiece)) { - // eslint-disable-next-line no-labels - continue assetGroupLoop; - } - } - const rowElement = document.createElement('tr'); - rowElement.dataset.groupId = (_c = (_b = assetGroup.groupId) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : ''; - rowElement.innerHTML = ` -
- - - - ${(_d = assetGroup.groupMemberCount) !== null && _d !== void 0 ? _d : 0} - `; - const groupNameElement = rowElement.querySelector('[data-field="groupName"]'); - groupNameElement.textContent = assetGroup.groupName; - groupNameElement.addEventListener('click', openGroupByClick); - tableElement.querySelector('tbody').append(rowElement); - rowElement.querySelector('[data-field="groupDescription"]').textContent = (_e = assetGroup.groupDescription) !== null && _e !== void 0 ? _e : ''; - } - if (tableElement.querySelectorAll('tbody tr').length === 0) { - containerElement.innerHTML = `
-

- There are no groups that meet your search criteria.
- Try to be less specific in your search. -

-
`; - } - else { - containerElement.innerHTML = ''; - containerElement.append(tableElement); - } - } - (_b = document - .querySelector('#button--addAssetGroup')) === null || _b === void 0 ? void 0 : _b.addEventListener('click', () => { - let addAssetGroupCloseModalFunction; - function doAddAssetGroup(formEvent) { - formEvent.preventDefault(); - cityssm.postJSON(Emile.urlPrefix + '/assets/doAddAssetGroup', formEvent.currentTarget, (rawResponseJSON) => { - const responseJSON = rawResponseJSON; - if (responseJSON.success) { - Emile.assetGroups = responseJSON.assetGroups; - renderAssetGroups(); - addAssetGroupCloseModalFunction(); - openGroupByGroupId(responseJSON.groupId.toString()); - } - }); - } - cityssm.openHtmlModal('assetGroup-add', { - onshown(modalElement, closeModalFunction) { - var _a; - addAssetGroupCloseModalFunction = closeModalFunction; - bulmaJS.toggleHtmlClipped(); - modalElement.querySelector('#assetGroupAdd--groupName').focus(); - (_a = modalElement - .querySelector('form')) === null || _a === void 0 ? void 0 : _a.addEventListener('submit', doAddAssetGroup); - }, - onremoved() { - bulmaJS.toggleHtmlClipped(); - } - }); - }); /* * Initialize */ - // Initialize tabs - bulmaJS.init(); - // Assets assetFilterElement.addEventListener('keyup', renderAssets); assetCategoryFilterElement.addEventListener('change', renderAssets); renderAssets(); - // Asset Groups - assetGroupFilterElement.addEventListener('keyup', renderAssetGroups); - renderAssetGroups(); })(); diff --git a/public-typescript/assets.ts b/public-typescript/assets.ts index 6dda7a2..1848b02 100644 --- a/public-typescript/assets.ts +++ b/public-typescript/assets.ts @@ -8,12 +8,7 @@ import type { BulmaJS } from '@cityssm/bulma-js/types.js' import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types.js' -import type { - Asset, - AssetAlias, - AssetAliasType, - AssetGroup -} from '../types/recordTypes.js' +import type { Asset, AssetAlias, AssetAliasType } from '../types/recordTypes.js' import type { Emile as EmileGlobal } from './globalTypes.js' @@ -569,351 +564,11 @@ interface ErrorResponse { }) }) - /* - * Asset Groups - */ - - const assetGroupFilterElement = document.querySelector( - '#filter--assetGroups' - ) as HTMLInputElement - - function populateAssetGroupModal( - modalElement: HTMLElement, - groupId: string - ): void { - cityssm.postJSON( - Emile.urlPrefix + '/assets/doGetAssetGroup', - { - groupId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as - | { - success: true - assetGroup: AssetGroup - } - | ErrorResponse - - if (!responseJSON.success) { - bulmaJS.alert({ - title: 'Error Loading Asset Group Details', - message: 'Please refresh the page and try again.', - contextualColorName: 'danger' - }) - return - } - - ;( - modalElement.querySelector( - '#assetGroupView--groupId' - ) as HTMLInputElement - ).value = responseJSON.assetGroup.groupId?.toString() ?? '' - ;( - modalElement.querySelector( - '.modal-card-head [data-field="groupName"]' - ) as HTMLElement - ).textContent = responseJSON.assetGroup.groupName - ;( - modalElement.querySelector( - '#assetGroupView--groupName' - ) as HTMLInputElement - ).value = responseJSON.assetGroup.groupName - ;( - modalElement.querySelector( - '#assetGroupView--isShared' - ) as HTMLSelectElement - ).value = responseJSON.assetGroup.isShared ? '1' : '0' - ;( - modalElement.querySelector( - '#assetGroupView--groupDescription' - ) as HTMLTextAreaElement - ).value = responseJSON.assetGroup.groupDescription - } - ) - } - - function updateAssetGroup(formEvent: Event): void { - formEvent.preventDefault() - - cityssm.postJSON( - Emile.urlPrefix + '/assets/doUpdateAssetGroup', - formEvent.currentTarget, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as - | { - success: true - assetGroups: AssetGroup[] - } - | ErrorResponse - - if (responseJSON.success) { - Emile.assetGroups = responseJSON.assetGroups - - bulmaJS.alert({ - message: 'Asset group updated successfully.', - contextualColorName: 'success' - }) - - renderAssets() - } else { - bulmaJS.alert({ - title: 'Error Updating Asset Group', - message: responseJSON.errorMessage ?? 'Please try again.', - contextualColorName: 'danger' - }) - } - } - ) - } - - function openGroupByGroupId(groupId: string): void { - let assetGroupCloseModalFunction: () => void - - function deleteAssetGroup(clickEvent: Event): void { - clickEvent.preventDefault() - - function doDelete(): void { - cityssm.postJSON( - Emile.urlPrefix + '/assets/doDeleteAssetGroup', - { - groupId - }, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as - | { - success: true - assetGroups: AssetGroup[] - } - | ErrorResponse - - if (responseJSON.success) { - Emile.assetGroups = responseJSON.assetGroups - renderAssetGroups() - assetGroupCloseModalFunction() - } else { - bulmaJS.alert({ - title: 'Error Deleting Asset Group', - message: responseJSON.errorMessage ?? '', - contextualColorName: 'danger' - }) - } - } - ) - } - - bulmaJS.confirm({ - title: 'Delete Asset Group', - message: 'Are you sure you want to delete this group?', - contextualColorName: 'warning', - okButton: { - text: 'Yes, Delete Asset Group', - callbackFunction: doDelete - } - }) - } - - cityssm.openHtmlModal('assetGroup-view', { - onshow(modalElement) { - populateAssetGroupModal(modalElement, groupId) - - if (Emile.canUpdate) { - ;( - modalElement.querySelector( - '#form--assetGroupView fieldset' - ) as HTMLFieldSetElement - ).disabled = false - } - }, - onshown(modalElement, closeModalFunction) { - bulmaJS.toggleHtmlClipped() - bulmaJS.init(modalElement) - - if (Emile.canUpdate) { - assetGroupCloseModalFunction = closeModalFunction - - modalElement - .querySelector('#form--assetGroupView') - ?.addEventListener('submit', updateAssetGroup) - - modalElement - .querySelector('.is-delete-button') - ?.addEventListener('click', deleteAssetGroup) - } - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - } - }) - } - - function openGroupByClick(clickEvent: MouseEvent): void { - clickEvent.preventDefault() - - const groupId = - (clickEvent.currentTarget as HTMLElement).closest('tr')?.dataset - .groupId ?? '' - - openGroupByGroupId(groupId) - } - - function renderAssetGroups(): void { - ;( - document.querySelector('#count--assetGroups') as HTMLElement - ).textContent = Emile.assetGroups.length.toString() - - const containerElement = document.querySelector( - '#container--assetGroups' - ) as HTMLElement - - if (Emile.assetGroups.length === 0) { - containerElement.innerHTML = `
-

- No Asset Groups Found
- Grouping together assets can assist with reporting on multiple assets. -

-
` - - return - } - - const searchPieces = assetGroupFilterElement.value - .trim() - .toLowerCase() - .split(' ') - - const tableElement = document.createElement('table') - tableElement.className = 'table is-fullwidth is-striped has-sticky-header' - tableElement.innerHTML = ` - Group - - - Number of Assets - - - ` - - // eslint-disable-next-line no-labels - assetGroupLoop: for (const assetGroup of Emile.assetGroups) { - const searchText = - assetGroup.groupName.toLowerCase() + - ' ' + - (assetGroup.groupDescription ?? '').toLowerCase() - - for (const searchPiece of searchPieces) { - if (!searchText.includes(searchPiece)) { - // eslint-disable-next-line no-labels - continue assetGroupLoop - } - } - - const rowElement = document.createElement('tr') - rowElement.dataset.groupId = assetGroup.groupId?.toString() ?? '' - - rowElement.innerHTML = ` -
- - - - ${ - assetGroup.groupMemberCount ?? 0 - } - ` - - const groupNameElement = rowElement.querySelector( - '[data-field="groupName"]' - ) as HTMLAnchorElement - - groupNameElement.textContent = assetGroup.groupName - - groupNameElement.addEventListener('click', openGroupByClick) - ;(tableElement.querySelector('tbody') as HTMLTableSectionElement).append( - rowElement - ) - ;( - rowElement.querySelector( - '[data-field="groupDescription"]' - ) as HTMLElement - ).textContent = assetGroup.groupDescription ?? '' - } - - if (tableElement.querySelectorAll('tbody tr').length === 0) { - containerElement.innerHTML = `
-

- There are no groups that meet your search criteria.
- Try to be less specific in your search. -

-
` - } else { - containerElement.innerHTML = '' - containerElement.append(tableElement) - } - } - - document - .querySelector('#button--addAssetGroup') - ?.addEventListener('click', () => { - let addAssetGroupCloseModalFunction: () => void - - function doAddAssetGroup(formEvent: SubmitEvent): void { - formEvent.preventDefault() - - cityssm.postJSON( - Emile.urlPrefix + '/assets/doAddAssetGroup', - formEvent.currentTarget, - (rawResponseJSON) => { - const responseJSON = rawResponseJSON as - | { - success: true - groupId: number - assetGroups: AssetGroup[] - } - | ErrorResponse - - if (responseJSON.success) { - Emile.assetGroups = responseJSON.assetGroups - renderAssetGroups() - addAssetGroupCloseModalFunction() - - openGroupByGroupId(responseJSON.groupId.toString()) - } - } - ) - } - - cityssm.openHtmlModal('assetGroup-add', { - onshown(modalElement, closeModalFunction) { - addAssetGroupCloseModalFunction = closeModalFunction - - bulmaJS.toggleHtmlClipped() - ;( - modalElement.querySelector( - '#assetGroupAdd--groupName' - ) as HTMLInputElement - ).focus() - - modalElement - .querySelector('form') - ?.addEventListener('submit', doAddAssetGroup) - }, - onremoved() { - bulmaJS.toggleHtmlClipped() - } - }) - }) - /* * Initialize */ - // Initialize tabs - bulmaJS.init() - - // Assets assetFilterElement.addEventListener('keyup', renderAssets) assetCategoryFilterElement.addEventListener('change', renderAssets) renderAssets() - - // Asset Groups - assetGroupFilterElement.addEventListener('keyup', renderAssetGroups) - renderAssetGroups() })() diff --git a/public/html/assetGroup-view.html b/public/html/assetGroup-view.html index dd5e17d..8df9e0e 100644 --- a/public/html/assetGroup-view.html +++ b/public/html/assetGroup-view.html @@ -128,7 +128,50 @@

- +
diff --git a/public/javascripts/assetGroups.min.js b/public/javascripts/assetGroups.min.js new file mode 100644 index 0000000..cbfe829 --- /dev/null +++ b/public/javascripts/assetGroups.min.js @@ -0,0 +1 @@ +"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{var e;const t=exports.Emile,s=document.querySelector("#filter--assetGroups");function r(e){var s,r;const a=e.currentTarget.closest("tr"),n=null!==(s=a.dataset.groupId)&&void 0!==s?s:"",u=null!==(r=a.dataset.assetId)&&void 0!==r?r:"";bulmaJS.confirm({title:"Delete Group Member",message:"Are you sure you want to remove this asset from this group?",contextualColorName:"warning",okButton:{text:"Yes, Remove Member from Group",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/assets/doDeleteAssetGroupMember",{groupId:n,assetId:u},e=>{var t;const s=e;s.success?o(n,s.groupMembers):bulmaJS.alert({title:"Error Deleting Group Member",message:null!==(t=s.errorMessage)&&void 0!==t?t:"Please try again.",contextualColorName:"danger"})})}}})}function o(e,s){var o,a,n,u,l,d;const i=document.querySelector(".modal #tbody--groupMembers");i.innerHTML="";for(const u of s){const s=document.createElement("tr");s.dataset.groupId=e,s.dataset.assetId=u.assetId.toString(),s.innerHTML=`\n \n \n ${t.canUpdate?'':""}\n `,s.querySelector('[data-field="category"]').textContent=null!==(o=u.category)&&void 0!==o?o:"",s.querySelector('[data-field="assetName"]').textContent=null!==(a=u.assetName)&&void 0!==a?a:"",null===(n=s.querySelector(".is-delete-button"))||void 0===n||n.addEventListener("click",r),i.append(s)}if(t.canUpdate){const e=document.querySelector(".modal #groupMemberAdd--assetId");e.innerHTML='';for(const r of t.assets){if(s.some(e=>e.assetId===r.assetId))continue;const t=document.createElement("option");t.value=r.assetId.toString(),t.textContent=r.assetName;let o=e.querySelector(`optgroup[data-category-id="${null!==(u=r.categoryId)&&void 0!==u?u:""}"]`);null===o&&((o=document.createElement("optgroup")).dataset.categoryId=null===(l=r.categoryId)||void 0===l?void 0:l.toString(),o.label=null!==(d=r.category)&&void 0!==d?d:"",e.append(o)),o.append(t)}}}function a(e){e.preventDefault(),cityssm.postJSON(t.urlPrefix+"/assets/doUpdateAssetGroup",e.currentTarget,e=>{var s;const r=e;r.success?(t.assetGroups=r.assetGroups,bulmaJS.alert({message:"Asset group updated successfully.",contextualColorName:"success"}),d()):bulmaJS.alert({title:"Error Updating Asset Group",message:null!==(s=r.errorMessage)&&void 0!==s?s:"Please try again.",contextualColorName:"danger"})})}function n(e){e.preventDefault();const s=e.currentTarget;cityssm.postJSON(t.urlPrefix+"/assets/doAddAssetGroupMember",s,e=>{var t;const r=e;r.success?(o(s.querySelector('[name="groupId"]').value,r.groupMembers),s.reset()):bulmaJS.alert({title:"Error Adding Group Member",message:null!==(t=r.errorMessage)&&void 0!==t?t:"Please try again.",contextualColorName:"danger"})})}function u(e){let s;function r(r){r.preventDefault(),bulmaJS.confirm({title:"Delete Asset Group",message:"Are you sure you want to delete this group?",contextualColorName:"warning",okButton:{text:"Yes, Delete Asset Group",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/assets/doDeleteAssetGroup",{groupId:e},e=>{var r;const o=e;o.success?(t.assetGroups=o.assetGroups,d(),s()):bulmaJS.alert({title:"Error Deleting Asset Group",message:null!==(r=o.errorMessage)&&void 0!==r?r:"",contextualColorName:"danger"})})}}})}cityssm.openHtmlModal("assetGroup-view",{onshow(s){var r;!function(e,s){cityssm.postJSON(t.urlPrefix+"/assets/doGetAssetGroup",{groupId:s},t=>{var r,a,n;const u=t;u.success?(e.querySelector("#assetGroupView--groupId").value=null!==(a=null===(r=u.assetGroup.groupId)||void 0===r?void 0:r.toString())&&void 0!==a?a:"",e.querySelector('.modal-card-head [data-field="groupName"]').textContent=u.assetGroup.groupName,e.querySelector("#assetGroupView--groupName").value=u.assetGroup.groupName,e.querySelector("#assetGroupView--isShared").value=u.assetGroup.isShared?"1":"0",e.querySelector("#assetGroupView--groupDescription").value=u.assetGroup.groupDescription,o(s,null!==(n=u.assetGroup.groupMembers)&&void 0!==n?n:[])):bulmaJS.alert({title:"Error Loading Asset Group Details",message:"Please refresh the page and try again.",contextualColorName:"danger"})})}(s,e),t.canUpdate?(s.querySelector("#form--assetGroupView fieldset").disabled=!1,s.querySelector("#groupMemberAdd--groupId").value=e):null===(r=s.querySelector("#tbody--groupMemberAdd"))||void 0===r||r.remove()},onshown(e,o){var u,l,d;bulmaJS.toggleHtmlClipped(),bulmaJS.init(e),t.canUpdate&&(s=o,null===(u=e.querySelector("#form--assetGroupView"))||void 0===u||u.addEventListener("submit",a),null===(l=e.querySelector(".is-delete-button"))||void 0===l||l.addEventListener("click",r),null===(d=e.querySelector("#form--groupMemberAdd"))||void 0===d||d.addEventListener("submit",n))},onremoved(){bulmaJS.toggleHtmlClipped()}})}function l(e){var t,s;e.preventDefault(),u(null!==(s=null===(t=e.currentTarget.closest("tr"))||void 0===t?void 0:t.dataset.groupId)&&void 0!==s?s:"")}function d(){var e,r,o;document.querySelector("#count--assetGroups").textContent=t.assetGroups.length.toString();const a=document.querySelector("#container--assetGroups");if(0===t.assetGroups.length)return void(a.innerHTML='
\n

\n No Asset Groups Found
\n Grouping together assets can assist with reporting on multiple assets.\n

\n
');const n=s.value.trim().toLowerCase().split(" "),u=document.createElement("table");u.className="table is-fullwidth is-striped has-sticky-header",u.innerHTML='\n Group\n Members\n Shared\n \n ';e:for(const s of t.assetGroups){const t=s.groupName.toLowerCase()+" "+(null!==(e=s.groupDescription)&&void 0!==e?e:"").toLowerCase();for(const e of n)if(!t.includes(e))continue e;const a=document.createElement("tr");a.dataset.groupId=s.groupId.toString(),a.innerHTML=`\n
\n \n \n \n ${null!==(r=s.groupMemberCount)&&void 0!==r?r:0}\n \n \n ${s.isShared?"Shared Group":"Private"}\n `;const d=a.querySelector('[data-field="groupName"]');d.textContent=s.groupName,d.addEventListener("click",l),u.querySelector("tbody").append(a),a.querySelector('[data-field="groupDescription"]').textContent=null!==(o=s.groupDescription)&&void 0!==o?o:""}0===u.querySelectorAll("tbody tr").length?a.innerHTML='
\n

\n There are no groups that meet your search criteria.
\n Try to be less specific in your search. \n

\n
':(a.innerHTML="",a.append(u))}null===(e=document.querySelector("#button--addAssetGroup"))||void 0===e||e.addEventListener("click",()=>{let e;function s(s){s.preventDefault(),cityssm.postJSON(t.urlPrefix+"/assets/doAddAssetGroup",s.currentTarget,s=>{const r=s;r.success&&(t.assetGroups=r.assetGroups,d(),e(),u(r.groupId.toString()))})}cityssm.openHtmlModal("assetGroup-add",{onshown(t,r){var o;e=r,bulmaJS.toggleHtmlClipped(),t.querySelector("#assetGroupAdd--groupName").focus(),null===(o=t.querySelector("form"))||void 0===o||o.addEventListener("submit",s)},onremoved(){bulmaJS.toggleHtmlClipped()}})}),s.addEventListener("keyup",d),d()})(); \ No newline at end of file diff --git a/public/javascripts/assets.min.js b/public/javascripts/assets.min.js index bd37a03..e916dbf 100644 --- a/public/javascripts/assets.min.js +++ b/public/javascripts/assets.min.js @@ -1 +1 @@ -"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{var e,t;const s=exports.Emile,a=exports.assetAliasTypes,o=document.querySelector("#filter--categoryId"),r=document.querySelector("#filter--assets");function n(e){const t=e.currentTarget.closest("tr"),a=t.dataset.aliasId,o=t.dataset.assetId;bulmaJS.confirm({title:"Delete Asset Alias",message:"Are you sure you want to remove this asset alias?",contextualColorName:"warning",okButton:{text:"Yes, Remove Alias",callbackFunction:function(){cityssm.postJSON(s.urlPrefix+"/assets/doDeleteAssetAlias",{aliasId:a,assetId:o},e=>{var t;const s=e;s.success?l(s.assetAliases):bulmaJS.alert({title:"Error Deleting Alias",message:null!==(t=s.errorMessage)&&void 0!==t?t:"Please try again.",contextualColorName:"danger"})})}}})}function l(e){var t,a,o;const r=document.querySelector(".modal #tbody--assetAliases");r.innerHTML="";for(const l of e){const e=document.createElement("tr");e.dataset.aliasId=l.aliasId.toString(),e.dataset.assetId=l.assetId.toString(),e.innerHTML=`\n \n \n ${s.canUpdate?'':""}\n `,e.querySelector('[data-field="aliasType"]').textContent=null!==(t=l.aliasType)&&void 0!==t?t:"",e.querySelector('[data-field="assetAlias"]').textContent=null!==(a=l.assetAlias)&&void 0!==a?a:"",null===(o=e.querySelector(".is-delete-button"))||void 0===o||o.addEventListener("click",n),r.append(e)}}function i(e){e.preventDefault(),cityssm.postJSON(s.urlPrefix+"/assets/doUpdateAsset",e.currentTarget,e=>{var t;const a=e;a.success?(s.assets=a.assets,bulmaJS.alert({message:"Asset updated successfully.",contextualColorName:"success"}),p()):bulmaJS.alert({title:"Error Updating Asset",message:null!==(t=a.errorMessage)&&void 0!==t?t:"Please try again.",contextualColorName:"danger"})})}function d(e){e.preventDefault();const t=e.currentTarget;cityssm.postJSON(s.urlPrefix+"/assets/doAddAssetAlias",t,e=>{var s;const a=e;a.success?(l(a.assetAliases),t.reset()):bulmaJS.alert({title:"Error Adding Alias",message:null!==(s=a.errorMessage)&&void 0!==s?s:"Please try again.",contextualColorName:"danger"})})}function u(e){let t;function o(a){a.preventDefault(),bulmaJS.confirm({title:"Delete Asset",message:"Are you sure you want to delete this asset?",contextualColorName:"warning",okButton:{text:"Yes, Delete Asset",callbackFunction:function(){cityssm.postJSON(s.urlPrefix+"/assets/doDeleteAsset",{assetId:e},e=>{var a;const o=e;o.success?(s.assets=o.assets,p(),t()):bulmaJS.alert({title:"Error Deleting Asset",message:null!==(a=o.errorMessage)&&void 0!==a?a:"",contextualColorName:"danger"})})}}})}cityssm.openHtmlModal("asset-view",{onshow(t){var o;if(function(e,t){cityssm.postJSON(s.urlPrefix+"/assets/doGetAsset",{assetId:t},t=>{var a,o,r,n,i,d,u,c,p,m,g,v;const y=t;if(!y.success)return void bulmaJS.alert({title:"Error Loading Asset Details",message:"Please refresh the page and try again.",contextualColorName:"danger"});e.querySelector("#assetView--assetId").value=null!==(o=null===(a=y.asset.assetId)||void 0===a?void 0:a.toString())&&void 0!==o?o:"",e.querySelector('.modal-card-head [data-field="assetName"]').textContent=y.asset.assetName;const f=e.querySelector("#assetView--categoryId");let S=!1;if(s.canUpdate)for(const e of s.assetCategories){const t=document.createElement("option");t.value=null!==(n=null===(r=e.categoryId)||void 0===r?void 0:r.toString())&&void 0!==n?n:"",t.textContent=e.category,e.categoryId===y.asset.categoryId&&(t.selected=!0,S=!0),f.append(t)}if(!S){const e=document.createElement("option");e.value=null!==(d=null===(i=y.asset.categoryId)||void 0===i?void 0:i.toString())&&void 0!==d?d:"",e.textContent=null!==(u=y.asset.category)&&void 0!==u?u:"",e.selected=!0,f.append(e)}e.querySelector("#assetView--assetName").value=y.asset.assetName,e.querySelector("#assetView--latitude").value=null!==(p=null===(c=y.asset.latitude)||void 0===c?void 0:c.toFixed(6))&&void 0!==p?p:"",e.querySelector("#assetView--longitude").value=null!==(g=null===(m=y.asset.longitude)||void 0===m?void 0:m.toFixed(6))&&void 0!==g?g:"",l(null!==(v=y.asset.assetAliases)&&void 0!==v?v:[])})}(t,e),s.canUpdate){t.querySelector("#form--assetView fieldset").disabled=!1,t.querySelector("#assetAliasAdd--assetId").value=e;const s=t.querySelector("#assetAliasAdd--aliasTypeId");for(const e of a){const t=document.createElement("option");t.value=e.aliasTypeId.toString(),t.textContent=e.aliasType,s.append(t)}}else null===(o=t.querySelector("#tbody--assetAliasAdd"))||void 0===o||o.remove()},onshown(e,s){var a,r,n;bulmaJS.toggleHtmlClipped(),bulmaJS.init(e),t=s,null===(a=e.querySelector("#form--assetView"))||void 0===a||a.addEventListener("submit",i),null===(r=e.querySelector(".is-delete-button"))||void 0===r||r.addEventListener("click",o),null===(n=e.querySelector("#form--assetAliasAdd"))||void 0===n||n.addEventListener("submit",d)},onremoved(){bulmaJS.toggleHtmlClipped()}})}function c(e){var t,s;e.preventDefault(),u(null!==(s=null===(t=e.currentTarget.closest("tr"))||void 0===t?void 0:t.dataset.assetId)&&void 0!==s?s:"")}function p(){var e,t,a,n,l,i,d,u,p,m;document.querySelector("#count--assets").textContent=s.assets.length.toString();const g=document.querySelector("#container--assets");if(0===s.assets.length)return void(g.innerHTML='
\n

\n No Assets Found
\n Get started by adding some assets that will be reported on.\n

\n
');const v=r.value.trim().toLowerCase().split(" "),y=document.createElement("table");y.className="table is-fullwidth is-striped has-sticky-header",y.innerHTML='\n \n Category\n Asset\n \n \n Map\n \n \n ';e:for(const r of s.assets){if(""!==o.value&&o.value!==(null===(e=r.categoryId)||void 0===e?void 0:e.toString()))continue;const g=r.assetName.toLowerCase()+" "+(null!==(t=r.category)&&void 0!==t?t:"").toLowerCase();for(const e of v)if(!g.includes(e))continue e;const f=document.createElement("tr");f.dataset.assetId=null!==(n=null===(a=r.assetId)||void 0===a?void 0:a.toString())&&void 0!==n?n:"",f.innerHTML=`\n \n \n \n \n \n ${""===(null!==(i=r.latitude)&&void 0!==i?i:"")||""===(null!==(d=r.longitude)&&void 0!==d?d:"")?"":`\n \n ${null!==(u=r.latitude)&&void 0!==u?u:0}, ${null!==(p=r.longitude)&&void 0!==p?p:0}\n `}\n `,f.querySelector('[data-field="category"]').textContent=null!==(m=r.category)&&void 0!==m?m:"";const S=f.querySelector('[data-field="assetName"]');S.textContent=r.assetName,S.addEventListener("click",c),y.querySelector("tbody").append(f)}0===y.querySelectorAll("tbody tr").length?g.innerHTML='
\n

\n There are no assets that meet your search criteria.
\n Try to be less specific in your search. \n

\n
':(g.innerHTML="",g.append(y))}null===(e=document.querySelector("#button--addAsset"))||void 0===e||e.addEventListener("click",()=>{let e;function t(t){t.preventDefault(),cityssm.postJSON(s.urlPrefix+"/assets/doAddAsset",t.currentTarget,t=>{const a=t;a.success&&(s.assets=a.assets,p(),e(),u(a.assetId.toString()))})}cityssm.openHtmlModal("asset-add",{onshow(e){var t,a;const o=e.querySelector("#assetAdd--categoryId");for(const e of s.assetCategories){const s=document.createElement("option");s.value=null!==(a=null===(t=e.categoryId)||void 0===t?void 0:t.toString())&&void 0!==a?a:"",s.textContent=e.category,o.append(s)}},onshown(s,a){var o;e=a,bulmaJS.toggleHtmlClipped(),s.querySelector("#assetAdd--categoryId").focus(),null===(o=s.querySelector("form"))||void 0===o||o.addEventListener("submit",t)},onremoved(){bulmaJS.toggleHtmlClipped()}})});const m=document.querySelector("#filter--assetGroups");function g(e){e.preventDefault(),cityssm.postJSON(s.urlPrefix+"/assets/doUpdateAssetGroup",e.currentTarget,e=>{var t;const a=e;a.success?(s.assetGroups=a.assetGroups,bulmaJS.alert({message:"Asset group updated successfully.",contextualColorName:"success"}),p()):bulmaJS.alert({title:"Error Updating Asset Group",message:null!==(t=a.errorMessage)&&void 0!==t?t:"Please try again.",contextualColorName:"danger"})})}function v(e){let t;function a(a){a.preventDefault(),bulmaJS.confirm({title:"Delete Asset Group",message:"Are you sure you want to delete this group?",contextualColorName:"warning",okButton:{text:"Yes, Delete Asset Group",callbackFunction:function(){cityssm.postJSON(s.urlPrefix+"/assets/doDeleteAssetGroup",{groupId:e},e=>{var a;const o=e;o.success?(s.assetGroups=o.assetGroups,f(),t()):bulmaJS.alert({title:"Error Deleting Asset Group",message:null!==(a=o.errorMessage)&&void 0!==a?a:"",contextualColorName:"danger"})})}}})}cityssm.openHtmlModal("assetGroup-view",{onshow(t){!function(e,t){cityssm.postJSON(s.urlPrefix+"/assets/doGetAssetGroup",{groupId:t},t=>{var s,a;const o=t;o.success?(e.querySelector("#assetGroupView--groupId").value=null!==(a=null===(s=o.assetGroup.groupId)||void 0===s?void 0:s.toString())&&void 0!==a?a:"",e.querySelector('.modal-card-head [data-field="groupName"]').textContent=o.assetGroup.groupName,e.querySelector("#assetGroupView--groupName").value=o.assetGroup.groupName,e.querySelector("#assetGroupView--isShared").value=o.assetGroup.isShared?"1":"0",e.querySelector("#assetGroupView--groupDescription").value=o.assetGroup.groupDescription):bulmaJS.alert({title:"Error Loading Asset Group Details",message:"Please refresh the page and try again.",contextualColorName:"danger"})})}(t,e),s.canUpdate&&(t.querySelector("#form--assetGroupView fieldset").disabled=!1)},onshown(e,o){var r,n;bulmaJS.toggleHtmlClipped(),bulmaJS.init(e),s.canUpdate&&(t=o,null===(r=e.querySelector("#form--assetGroupView"))||void 0===r||r.addEventListener("submit",g),null===(n=e.querySelector(".is-delete-button"))||void 0===n||n.addEventListener("click",a))},onremoved(){bulmaJS.toggleHtmlClipped()}})}function y(e){var t,s;e.preventDefault(),v(null!==(s=null===(t=e.currentTarget.closest("tr"))||void 0===t?void 0:t.dataset.groupId)&&void 0!==s?s:"")}function f(){var e,t,a,o,r;document.querySelector("#count--assetGroups").textContent=s.assetGroups.length.toString();const n=document.querySelector("#container--assetGroups");if(0===s.assetGroups.length)return void(n.innerHTML='
\n

\n No Asset Groups Found
\n Grouping together assets can assist with reporting on multiple assets.\n

\n
');const l=m.value.trim().toLowerCase().split(" "),i=document.createElement("table");i.className="table is-fullwidth is-striped has-sticky-header",i.innerHTML='\n Group\n \n \n Number of Assets\n \n \n ';e:for(const n of s.assetGroups){const s=n.groupName.toLowerCase()+" "+(null!==(e=n.groupDescription)&&void 0!==e?e:"").toLowerCase();for(const e of l)if(!s.includes(e))continue e;const d=document.createElement("tr");d.dataset.groupId=null!==(a=null===(t=n.groupId)||void 0===t?void 0:t.toString())&&void 0!==a?a:"",d.innerHTML=`\n
\n \n \n \n ${null!==(o=n.groupMemberCount)&&void 0!==o?o:0}\n `;const u=d.querySelector('[data-field="groupName"]');u.textContent=n.groupName,u.addEventListener("click",y),i.querySelector("tbody").append(d),d.querySelector('[data-field="groupDescription"]').textContent=null!==(r=n.groupDescription)&&void 0!==r?r:""}0===i.querySelectorAll("tbody tr").length?n.innerHTML='
\n

\n There are no groups that meet your search criteria.
\n Try to be less specific in your search. \n

\n
':(n.innerHTML="",n.append(i))}null===(t=document.querySelector("#button--addAssetGroup"))||void 0===t||t.addEventListener("click",()=>{let e;function t(t){t.preventDefault(),cityssm.postJSON(s.urlPrefix+"/assets/doAddAssetGroup",t.currentTarget,t=>{const a=t;a.success&&(s.assetGroups=a.assetGroups,f(),e(),v(a.groupId.toString()))})}cityssm.openHtmlModal("assetGroup-add",{onshown(s,a){var o;e=a,bulmaJS.toggleHtmlClipped(),s.querySelector("#assetGroupAdd--groupName").focus(),null===(o=s.querySelector("form"))||void 0===o||o.addEventListener("submit",t)},onremoved(){bulmaJS.toggleHtmlClipped()}})}),bulmaJS.init(),r.addEventListener("keyup",p),o.addEventListener("change",p),p(),m.addEventListener("keyup",f),f()})(); \ No newline at end of file +"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{var e;const t=exports.Emile,s=exports.assetAliasTypes,a=document.querySelector("#filter--categoryId"),o=document.querySelector("#filter--assets");function n(e){const s=e.currentTarget.closest("tr"),a=s.dataset.aliasId,o=s.dataset.assetId;bulmaJS.confirm({title:"Delete Asset Alias",message:"Are you sure you want to remove this asset alias?",contextualColorName:"warning",okButton:{text:"Yes, Remove Alias",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/assets/doDeleteAssetAlias",{aliasId:a,assetId:o},e=>{var t;const s=e;s.success?l(s.assetAliases):bulmaJS.alert({title:"Error Deleting Alias",message:null!==(t=s.errorMessage)&&void 0!==t?t:"Please try again.",contextualColorName:"danger"})})}}})}function l(e){var s,a,o;const l=document.querySelector(".modal #tbody--assetAliases");l.innerHTML="";for(const r of e){const e=document.createElement("tr");e.dataset.aliasId=r.aliasId.toString(),e.dataset.assetId=r.assetId.toString(),e.innerHTML=`\n \n \n ${t.canUpdate?'':""}\n `,e.querySelector('[data-field="aliasType"]').textContent=null!==(s=r.aliasType)&&void 0!==s?s:"",e.querySelector('[data-field="assetAlias"]').textContent=null!==(a=r.assetAlias)&&void 0!==a?a:"",null===(o=e.querySelector(".is-delete-button"))||void 0===o||o.addEventListener("click",n),l.append(e)}}function r(e){e.preventDefault(),cityssm.postJSON(t.urlPrefix+"/assets/doUpdateAsset",e.currentTarget,e=>{var s;const a=e;a.success?(t.assets=a.assets,bulmaJS.alert({message:"Asset updated successfully.",contextualColorName:"success"}),u()):bulmaJS.alert({title:"Error Updating Asset",message:null!==(s=a.errorMessage)&&void 0!==s?s:"Please try again.",contextualColorName:"danger"})})}function i(e){e.preventDefault();const s=e.currentTarget;cityssm.postJSON(t.urlPrefix+"/assets/doAddAssetAlias",s,e=>{var t;const a=e;a.success?(l(a.assetAliases),s.reset()):bulmaJS.alert({title:"Error Adding Alias",message:null!==(t=a.errorMessage)&&void 0!==t?t:"Please try again.",contextualColorName:"danger"})})}function d(e){let a;function o(s){s.preventDefault(),bulmaJS.confirm({title:"Delete Asset",message:"Are you sure you want to delete this asset?",contextualColorName:"warning",okButton:{text:"Yes, Delete Asset",callbackFunction:function(){cityssm.postJSON(t.urlPrefix+"/assets/doDeleteAsset",{assetId:e},e=>{var s;const o=e;o.success?(t.assets=o.assets,u(),a()):bulmaJS.alert({title:"Error Deleting Asset",message:null!==(s=o.errorMessage)&&void 0!==s?s:"",contextualColorName:"danger"})})}}})}cityssm.openHtmlModal("asset-view",{onshow(a){var o;if(function(e,s){cityssm.postJSON(t.urlPrefix+"/assets/doGetAsset",{assetId:s},s=>{var a,o,n,r,i,d,c,u,m,v,g,y;const p=s;if(!p.success)return void bulmaJS.alert({title:"Error Loading Asset Details",message:"Please refresh the page and try again.",contextualColorName:"danger"});e.querySelector("#assetView--assetId").value=null!==(o=null===(a=p.asset.assetId)||void 0===a?void 0:a.toString())&&void 0!==o?o:"",e.querySelector('.modal-card-head [data-field="assetName"]').textContent=p.asset.assetName;const f=e.querySelector("#assetView--categoryId");let S=!1;if(t.canUpdate)for(const e of t.assetCategories){const t=document.createElement("option");t.value=null!==(r=null===(n=e.categoryId)||void 0===n?void 0:n.toString())&&void 0!==r?r:"",t.textContent=e.category,e.categoryId===p.asset.categoryId&&(t.selected=!0,S=!0),f.append(t)}if(!S){const e=document.createElement("option");e.value=null!==(d=null===(i=p.asset.categoryId)||void 0===i?void 0:i.toString())&&void 0!==d?d:"",e.textContent=null!==(c=p.asset.category)&&void 0!==c?c:"",e.selected=!0,f.append(e)}e.querySelector("#assetView--assetName").value=p.asset.assetName,e.querySelector("#assetView--latitude").value=null!==(m=null===(u=p.asset.latitude)||void 0===u?void 0:u.toFixed(6))&&void 0!==m?m:"",e.querySelector("#assetView--longitude").value=null!==(g=null===(v=p.asset.longitude)||void 0===v?void 0:v.toFixed(6))&&void 0!==g?g:"",l(null!==(y=p.asset.assetAliases)&&void 0!==y?y:[])})}(a,e),t.canUpdate){a.querySelector("#form--assetView fieldset").disabled=!1,a.querySelector("#assetAliasAdd--assetId").value=e;const t=a.querySelector("#assetAliasAdd--aliasTypeId");for(const e of s){const s=document.createElement("option");s.value=e.aliasTypeId.toString(),s.textContent=e.aliasType,t.append(s)}}else null===(o=a.querySelector("#tbody--assetAliasAdd"))||void 0===o||o.remove()},onshown(e,t){var s,n,l;bulmaJS.toggleHtmlClipped(),bulmaJS.init(e),a=t,null===(s=e.querySelector("#form--assetView"))||void 0===s||s.addEventListener("submit",r),null===(n=e.querySelector(".is-delete-button"))||void 0===n||n.addEventListener("click",o),null===(l=e.querySelector("#form--assetAliasAdd"))||void 0===l||l.addEventListener("submit",i)},onremoved(){bulmaJS.toggleHtmlClipped()}})}function c(e){var t,s;e.preventDefault(),d(null!==(s=null===(t=e.currentTarget.closest("tr"))||void 0===t?void 0:t.dataset.assetId)&&void 0!==s?s:"")}function u(){var e,s,n,l,r,i,d,u,m,v;document.querySelector("#count--assets").textContent=t.assets.length.toString();const g=document.querySelector("#container--assets");if(0===t.assets.length)return void(g.innerHTML='
\n

\n No Assets Found
\n Get started by adding some assets that will be reported on.\n

\n
');const y=o.value.trim().toLowerCase().split(" "),p=document.createElement("table");p.className="table is-fullwidth is-striped has-sticky-header",p.innerHTML='\n \n Category\n Asset\n \n \n Map\n \n \n ';e:for(const o of t.assets){if(""!==a.value&&a.value!==(null===(e=o.categoryId)||void 0===e?void 0:e.toString()))continue;const g=o.assetName.toLowerCase()+" "+(null!==(s=o.category)&&void 0!==s?s:"").toLowerCase();for(const e of y)if(!g.includes(e))continue e;const f=document.createElement("tr");f.dataset.assetId=null!==(l=null===(n=o.assetId)||void 0===n?void 0:n.toString())&&void 0!==l?l:"",f.innerHTML=`\n \n \n \n \n \n ${""===(null!==(i=o.latitude)&&void 0!==i?i:"")||""===(null!==(d=o.longitude)&&void 0!==d?d:"")?"":`\n \n ${null!==(u=o.latitude)&&void 0!==u?u:0}, ${null!==(m=o.longitude)&&void 0!==m?m:0}\n `}\n `,f.querySelector('[data-field="category"]').textContent=null!==(v=o.category)&&void 0!==v?v:"";const S=f.querySelector('[data-field="assetName"]');S.textContent=o.assetName,S.addEventListener("click",c),p.querySelector("tbody").append(f)}0===p.querySelectorAll("tbody tr").length?g.innerHTML='
\n

\n There are no assets that meet your search criteria.
\n Try to be less specific in your search. \n

\n
':(g.innerHTML="",g.append(p))}null===(e=document.querySelector("#button--addAsset"))||void 0===e||e.addEventListener("click",()=>{let e;function s(s){s.preventDefault(),cityssm.postJSON(t.urlPrefix+"/assets/doAddAsset",s.currentTarget,s=>{const a=s;a.success&&(t.assets=a.assets,u(),e(),d(a.assetId.toString()))})}cityssm.openHtmlModal("asset-add",{onshow(e){var s,a;const o=e.querySelector("#assetAdd--categoryId");for(const e of t.assetCategories){const t=document.createElement("option");t.value=null!==(a=null===(s=e.categoryId)||void 0===s?void 0:s.toString())&&void 0!==a?a:"",t.textContent=e.category,o.append(t)}},onshown(t,a){var o;e=a,bulmaJS.toggleHtmlClipped(),t.querySelector("#assetAdd--categoryId").focus(),null===(o=t.querySelector("form"))||void 0===o||o.addEventListener("submit",s)},onremoved(){bulmaJS.toggleHtmlClipped()}})}),o.addEventListener("keyup",u),a.addEventListener("change",u),u()})(); \ No newline at end of file diff --git a/routes/assets.js b/routes/assets.js index 9e1951f..f250b12 100644 --- a/routes/assets.js +++ b/routes/assets.js @@ -3,9 +3,11 @@ import handler_assets from '../handlers/assets-get/assets.js'; import handler_doAddAsset from '../handlers/assets-post/doAddAsset.js'; import handler_doAddAssetAlias from '../handlers/assets-post/doAddAssetAlias.js'; import handler_doAddAssetGroup from '../handlers/assets-post/doAddAssetGroup.js'; +import handler_doAddAssetGroupMember from '../handlers/assets-post/doAddAssetGroupMember.js'; import handler_doDeleteAsset from '../handlers/assets-post/doDeleteAsset.js'; import handler_doDeleteAssetAlias from '../handlers/assets-post/doDeleteAssetAlias.js'; import handler_doDeleteAssetGroup from '../handlers/assets-post/doDeleteAssetGroup.js'; +import handler_doDeleteAssetGroupMember from '../handlers/assets-post/doDeleteAssetGroupMember.js'; import handler_doGetAsset from '../handlers/assets-post/doGetAsset.js'; import handler_doGetAssetGroup from '../handlers/assets-post/doGetAssetGroup.js'; import handler_doUpdateAsset from '../handlers/assets-post/doUpdateAsset.js'; @@ -22,5 +24,7 @@ router.post('/doDeleteAssetAlias', updatePostHandler, handler_doDeleteAssetAlias router.post('/doAddAssetGroup', updatePostHandler, handler_doAddAssetGroup); router.post('/doGetAssetGroup', handler_doGetAssetGroup); router.post('/doUpdateAssetGroup', updatePostHandler, handler_doUpdateAssetGroup); +router.post('/doAddAssetGroupMember', updatePostHandler, handler_doAddAssetGroupMember); +router.post('/doDeleteAssetGroupMember', updatePostHandler, handler_doDeleteAssetGroupMember); router.post('/doDeleteAssetGroup', updatePostHandler, handler_doDeleteAssetGroup); export default router; diff --git a/routes/assets.ts b/routes/assets.ts index 7dcf335..3f2a957 100644 --- a/routes/assets.ts +++ b/routes/assets.ts @@ -4,9 +4,11 @@ import handler_assets from '../handlers/assets-get/assets.js' import handler_doAddAsset from '../handlers/assets-post/doAddAsset.js' import handler_doAddAssetAlias from '../handlers/assets-post/doAddAssetAlias.js' import handler_doAddAssetGroup from '../handlers/assets-post/doAddAssetGroup.js' +import handler_doAddAssetGroupMember from '../handlers/assets-post/doAddAssetGroupMember.js' import handler_doDeleteAsset from '../handlers/assets-post/doDeleteAsset.js' import handler_doDeleteAssetAlias from '../handlers/assets-post/doDeleteAssetAlias.js' import handler_doDeleteAssetGroup from '../handlers/assets-post/doDeleteAssetGroup.js' +import handler_doDeleteAssetGroupMember from '../handlers/assets-post/doDeleteAssetGroupMember.js' import handler_doGetAsset from '../handlers/assets-post/doGetAsset.js' import handler_doGetAssetGroup from '../handlers/assets-post/doGetAssetGroup.js' import handler_doUpdateAsset from '../handlers/assets-post/doUpdateAsset.js' @@ -49,6 +51,18 @@ router.post( handler_doUpdateAssetGroup ) +router.post( + '/doAddAssetGroupMember', + updatePostHandler, + handler_doAddAssetGroupMember +) + +router.post( + '/doDeleteAssetGroupMember', + updatePostHandler, + handler_doDeleteAssetGroupMember +) + router.post( '/doDeleteAssetGroup', updatePostHandler, diff --git a/tsconfig.client.json b/tsconfig.client.json index a2ee61e..f32a1f9 100644 --- a/tsconfig.client.json +++ b/tsconfig.client.json @@ -11,12 +11,6 @@ "skipLibCheck": true, "strictNullChecks": true }, - "files": [ - "public-typescript/main.ts", - "public-typescript/dashboard.ts", - "public-typescript/assets.ts", - "public-typescript/data.ts" - ], "include": ["public-typescript/*"], "exclude": ["data/*", "database/*", "helpers/*", "parsers/*"], "compileOnSave": true, diff --git a/views/assets.ejs b/views/assets.ejs index 0e31e30..c58c8eb 100644 --- a/views/assets.ejs +++ b/views/assets.ejs @@ -1,21 +1,23 @@ <%- include('_header'); -%> -

- Assets -

+

Assets

  • - + Assets -
  • - + Asset Groups - @@ -33,9 +35,9 @@
@@ -46,7 +48,13 @@
- + @@ -55,7 +63,11 @@
- + @@ -63,14 +75,18 @@
<% if (user.canUpdate) { %> -
- -
+
+ +
<% } %>
@@ -83,7 +99,13 @@
- + @@ -91,16 +113,20 @@
<% if (user.canUpdate) { %> -
-
- -
+
+
+
+
<% } %>
@@ -115,7 +141,10 @@ exports.Emile.assetGroups = <%- JSON.stringify(assetGroups) %>; exports.Emile.assetCategories = <%- JSON.stringify(assetCategories) %>; exports.assetAliasTypes = <%- JSON.stringify(assetAliasTypes) %>; + + bulmaJS.init() + -<%- include('_footerB'); -%> \ No newline at end of file +<%- include('_footerB'); -%>