Skip to content

Note Widget Fixes #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prestoncraw merged 3 commits into from
Aug 7, 2026
+118 −25
Merged

Note Widget Fixes #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
022fb35
Add ability to delete notes
prestoncraw Aug 6, 2026
4415d6a
Move from GetAll to utilize pagination
prestoncraw Aug 6, 2026
97af751
address comments
prestoncraw Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 26 additions & 8 deletions TSX/Widget/NoteWindow/NoteTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import React from 'react';
import moment from 'moment';
import { OpenXDA } from '@gpa-gemstone/application-typings';
import { ReactIcons } from '@gpa-gemstone/gpa-symbols';
import { Modal } from '@gpa-gemstone/react-interactive';
import { Modal, Warning } from '@gpa-gemstone/react-interactive';
import { ToolTip } from '@gpa-gemstone/react-forms';
import { Column, Table } from '@gpa-gemstone/react-table';
import NoteOptions from './NoteOptions';
Expand All @@ -38,17 +38,21 @@ interface IProps {
Ascending: boolean,
AllowCreate: boolean,
AllowUpdate: boolean,
AllowDelete: boolean,
NewNote: OpenXDA.Types.Note,
SetNewNote: (note: OpenXDA.Types.Note) => void,
EditNote: OpenXDA.Types.Note,
SetEditNote: (note: OpenXDA.Types.Note) => void,
ShowEdit: boolean,
DeleteNote: OpenXDA.Types.Note | null,
Hover: 'none' | 'add' | 'clear',
SetHover: (hover: 'none' | 'add' | 'clear') => void,
OnSort: (data: { colField?: keyof OpenXDA.Types.Note }) => void,
OnAdd: (note: OpenXDA.Types.Note) => void,
OnEdit: (note: OpenXDA.Types.Note) => void,
OnSaveEdit: (confirm: boolean) => void
OnSaveEdit: (confirm: boolean) => void,
OnDelete: (note: OpenXDA.Types.Note) => void,
OnConfirmDelete: (confirm: boolean) => void
}

const NoteTable = (props: IProps) => {
Expand Down Expand Up @@ -166,16 +170,23 @@ const NoteTable = (props: IProps) => {
:
<></>
}
{props.AllowUpdate ?
{props.AllowUpdate || props.AllowDelete ?
<Column<OpenXDA.Types.Note>
Key='buttons'
HeaderStyle={{ width: 'auto' }}
RowStyle={{ width: 'auto' }}
Content={(row) =>
<button className='btn btn-sm' onClick={() => props.OnEdit(row.item)}>
<ReactIcons.Pencil />
</button>
}
Content={(row) => <>
{props.AllowUpdate ?
<button className='btn btn-sm' onClick={() => props.OnEdit(row.item)}>
<ReactIcons.Pencil />
</button>
: null}
{props.AllowDelete ?
<button className='btn btn-sm' onClick={() => props.OnDelete(row.item)}>
<ReactIcons.TrashCan Color='var(--danger)' />
</button>
: null}
</>}
>
&nbsp;
</Column>
Expand All @@ -200,6 +211,13 @@ const NoteTable = (props: IProps) => {
NoteApplications={props.NoteApplications}
/>
</Modal>
<Warning
Show={props.DeleteNote != null}
Title='Delete Note'
ShowCancel={true}
CallBack={props.OnConfirmDelete}
Message='Are you sure you want to delete this note?'
/>
</div>
</div>
);
Expand Down
109 changes: 92 additions & 17 deletions TSX/Widget/NoteWindow/NoteWindow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ import React from 'react';
import moment from 'moment';
import { Application, OpenXDA } from '@gpa-gemstone/application-typings';
import { ReactIcons } from '@gpa-gemstone/gpa-symbols';
import { ReadWriteControllerFunctions_Gemstone } from '@gpa-gemstone/common-pages';
import { Gemstone, ReadWriteControllerFunctions_Gemstone } from '@gpa-gemstone/common-pages';
import { Alert } from '@gpa-gemstone/react-interactive';
import { MultiCheckBoxSelect, Select } from '@gpa-gemstone/react-forms';
import { Paging } from '@gpa-gemstone/react-table';
import { EventWidget } from '../../global';
import NoteTable from './NoteTable';

Expand Down Expand Up @@ -76,14 +77,19 @@ const NoteWidget: EventWidget.IWidget<ISetting> = {
const [noteStatus, setNoteStatus] = React.useState<Application.Types.Status>('uninitiated');
const [sortField, setSortField] = React.useState<keyof OpenXDA.Types.Note>('Timestamp');
const [ascending, setAscending] = React.useState<boolean>(true);
const [activePage, setActivePage] = React.useState<number>(0);
const [pageCount, setPageCount] = React.useState<number>(0);
const [pageInfoStatus, setPageInfoStatus] = React.useState<Application.Types.Status>('uninitiated');
const [refreshToken, setRefreshToken] = React.useState<number>(0);
const [newNote, setNewNote] = React.useState<OpenXDA.Types.Note>(createBlankNote(defaultNoteType, defaultNoteApp, -1, []));
const [editNote, setEditNote] = React.useState<OpenXDA.Types.Note>(createBlankNote(defaultNoteType, defaultNoteApp, -1, []));
const [showEdit, setShowEdit] = React.useState<boolean>(false);
const [deleteNote, setDeleteNote] = React.useState<OpenXDA.Types.Note | null>(null);
const [hover, setHover] = React.useState<'none' | 'add' | 'clear'>('none');

const canCreate = props.WidgetAuthorization.Notes.Create;
const canUpdate = props.WidgetAuthorization.Notes.Update;
const canDelete = props.WidgetAuthorization.Notes.Delete;

const controllers = React.useMemo(() => ({
Event: new ReadWriteControllerFunctions_Gemstone<OpenXDA.Types.Note>(`${props.HomePath}api/OpenXDA/Note/Event`),
Expand All @@ -95,9 +101,11 @@ const NoteWidget: EventWidget.IWidget<ISetting> = {
const activeRecordName = noteType.Name as NoteRecordName;
const activeReferenceID = getReferenceID(activeRecordName, ids);
const activeTags = React.useMemo(() => noteTags.filter((tag) => selectedTags.indexOf(tag.ID) >= 0), [noteTags, selectedTags]);
const filteredNotes = React.useMemo(() =>
selectedTags.length === 0 ? [] : notes.filter((note) => selectedTags.indexOf(note.NoteTagID) >= 0),
[notes, selectedTags]);
const noteFilters = React.useMemo<Gemstone.Types.ISearchFilter<OpenXDA.Types.Note>[]>(() => selectedTags.length === 0 ? [] : [{
FieldName: 'NoteTagID',
SearchParameter: selectedTags.map((tagID) => tagID),
Operator: 'IN'
}], [selectedTags]);
const metadataLoading = statusIsLoading(idStatus, noteTypeStatus, noteTagStatus, noteAppStatus);
const metadataError = statusIsError(idStatus, noteTypeStatus, noteTagStatus, noteAppStatus);

Expand Down Expand Up @@ -187,30 +195,61 @@ const NoteWidget: EventWidget.IWidget<ISetting> = {
setNewNote((note) => ensureNoteDefaults(note, noteType, noteApp, activeReferenceID, activeTags));
}, [noteType, noteApp, activeReferenceID, activeTags]);

React.useEffect(() => {
setActivePage(0);
}, [activeRecordName, activeReferenceID]);

React.useEffect(() => {
if (metadataLoading || metadataError) {
setPageCount(0);
setPageInfoStatus('idle');
return;
}
Comment thread
Copilot marked this conversation as resolved.

if (!isSupportedNoteType(noteType.Name) || activeReferenceID <= 0 || selectedTags.length === 0) {
setPageCount(0);
setPageInfoStatus('idle');
return;
}

setPageInfoStatus('loading');
const handle = controllers[activeRecordName].GetPageInfo(noteFilters, activeReferenceID);

handle.done((data) => {
setPageCount(data.PageCount);
setActivePage((current) => data.PageCount === 0 ? 0 : Math.min(current, data.PageCount - 1));
setPageInfoStatus('idle');
}).fail(() => setPageInfoStatus('error'));

return () => { if (handle?.abort != null) handle.abort(); };
}, [activeRecordName, activeReferenceID, controllers, metadataError, metadataLoading, noteFilters, noteType.Name, refreshToken, selectedTags.length]);

React.useEffect(() => {
if (metadataLoading || metadataError) {
setNotes([]);
setNoteStatus('idle');
return;
}

if (!isSupportedNoteType(noteType.Name) || activeReferenceID <= 0) {
if (!isSupportedNoteType(noteType.Name) || activeReferenceID <= 0 || selectedTags.length === 0) {
setNotes([]);
setNoteStatus('idle');
return;
}

setNoteStatus('loading');
const handle = getNotes(controllers[activeRecordName], sortField, ascending, activeReferenceID);
const handle = getNotes(controllers[activeRecordName], activePage, sortField, ascending, noteFilters, activeReferenceID);

handle.done((data) => {
setNotes(data);
setNoteStatus('idle');
}).fail(() => setNoteStatus('error'));

return () => { if (handle?.abort != null) handle.abort(); };
}, [activeRecordName, activeReferenceID, ascending, controllers, metadataError, metadataLoading, noteType.Name, props.EventID, refreshToken, sortField]);
}, [activePage, activeRecordName, activeReferenceID, ascending, controllers, metadataError, metadataLoading, noteFilters, noteType.Name, props.EventID, refreshToken, selectedTags.length, sortField]);

const handleTagChange = (_: any, changed: { Value: number | string, Label: string | JSX.Element, Selected: boolean }[]): void => {
setActivePage(0);
setSelectedTags((current) => {
const updated = current.filter((id) => changed.findIndex((option) => parseInt(option.Value.toString(), 10) === id) < 0);
updated.push(...changed
Expand Down Expand Up @@ -269,6 +308,26 @@ const NoteWidget: EventWidget.IWidget<ISetting> = {
}).fail(() => setNoteStatus('error'));
};

const handleDelete = (record: OpenXDA.Types.Note): void => {
if (!canDelete)
return;

setDeleteNote(record);
};

const handleConfirmDelete = (confirm: boolean): void => {
const record = deleteNote;
setDeleteNote(null);

if (!confirm || !canDelete || record == null)
return;

setNoteStatus('loading');
removeNote(controllers[activeRecordName], record).done(() => {
setRefreshToken((token) => token + 1);
}).fail(() => setNoteStatus('error'));
};

const createActionNote = (record: OpenXDA.Types.Note): OpenXDA.Types.Note => {
return {
...record,
Expand Down Expand Up @@ -308,40 +367,52 @@ const NoteWidget: EventWidget.IWidget<ISetting> = {
/>
</div>
</div>
{metadataError || noteStatus === 'error' ?
{metadataError || noteStatus === 'error' || pageInfoStatus === 'error' ?
<Alert Class='alert-danger'>
An error occurred while fetching note data.
</Alert>
: null}
{metadataLoading || noteStatus === 'loading' ?
: null}
{metadataLoading || noteStatus === 'loading' || pageInfoStatus === 'loading' ?
<div className='d-flex align-items-center justify-content-center' style={{ height: 250 }}>
<ReactIcons.SpiningIcon Size={'50%'} />
</div>
: selectedTags.length === 0 ?
<div className={'alert alert-warning'}>
<p>At least 1 Type needs to be selected.</p>
</div>
:
<div className={'alert alert-warning'}>
<p>At least 1 Type needs to be selected.</p>
</div>
:
<>
<NoteTable
Notes={filteredNotes}
Notes={notes}
NoteTags={activeTags}
NoteApplications={[noteApp]}
SortField={sortField}
Ascending={ascending}
AllowCreate={canCreate}
AllowUpdate={canUpdate}
AllowDelete={canDelete}
NewNote={newNote}
SetNewNote={setNewNote}
EditNote={editNote}
SetEditNote={setEditNote}
ShowEdit={showEdit}
DeleteNote={deleteNote}
Hover={hover}
SetHover={setHover}
OnSort={handleSort}
OnAdd={handleAdd}
OnEdit={handleEdit}
OnSaveEdit={handleSaveEdit}
OnDelete={handleDelete}
OnConfirmDelete={handleConfirmDelete}
/>
<div className='row justify-content-center'>
<div className='col-12'>
<Paging Current={activePage + 1} Total={pageCount} SetPage={(page) => setActivePage(page - 1)} />

</div>
</div>
</>
}
</div>
</div>
Expand Down Expand Up @@ -382,8 +453,8 @@ const getReferenceID = (noteType: NoteRecordName, ids: INoteIDs): number => {
return ids.LocationID;
};

const getNotes = (controller: NoteController, sortField: keyof OpenXDA.Types.Note, ascending: boolean, referenceTableID: number): JQuery.jqXHR<OpenXDA.Types.Note[]> => {
return controller.GetAll(sortField, ascending, [], referenceTableID);
const getNotes = (controller: NoteController, page: number, sortField: keyof OpenXDA.Types.Note, ascending: boolean, filters: Gemstone.Types.ISearchFilter<OpenXDA.Types.Note>[], referenceTableID: number): JQuery.jqXHR<OpenXDA.Types.Note[]> => {
return controller.SearchPage(page, sortField, ascending, filters, referenceTableID);
};

const addNote = (controller: NoteController, record: OpenXDA.Types.Note): JQuery.jqXHR<OpenXDA.Types.Note> => {
Expand All @@ -394,6 +465,10 @@ const updateNote = (controller: NoteController, record: OpenXDA.Types.Note): JQu
return controller.Update(record);
};

const removeNote = (controller: NoteController, record: OpenXDA.Types.Note): JQuery.jqXHR<OpenXDA.Types.Note> => {
return controller.Delete(record);
};

const getNoteTypes = (homePath: string): JQuery.jqXHR<OpenXDA.Types.NoteType[]> => {
return $.ajax({
type: 'GET',
Expand Down