Skip to content

Refactor component handling and improve user input management #2525

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
merged 9 commits into from
Feb 24, 2025
Merged

Refactor component handling and improve user input management #2525

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4d3f082
enableSQL does not exist on config, and was moved to connection
worksofliam Feb 21, 2025
27aa437
Make sure component manager is checking the component if the stored s…
worksofliam Feb 21, 2025
827d05e
Disable the Go to File user input when busy
worksofliam Feb 21, 2025
069aaaa
If getMemberInfo component is not available, handle crash
worksofliam Feb 21, 2025
fa530e2
Merge branch 'master' into fixes/get_members
worksofliam Feb 21, 2025
9ce6d45
Fix to date types not being returned
worksofliam Feb 21, 2025
ea3ce68
Add timeouts to existing tests
worksofliam Feb 21, 2025
7279669
Add missing await to override state
worksofliam Feb 21, 2025
14b2b0c
Remove logic to handle busy state
worksofliam Feb 24, 2025
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
26 changes: 22 additions & 4 deletions src/api/components/getMemberInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,24 @@ export class GetMemberInfo implements IBMiComponent {
});
}

private static parseDateString(tsString: string|undefined): Date | undefined {
if (!tsString) {
return undefined;
}

const dateParts = tsString.split('-');
const timeParts = dateParts[3].split('.');

const year = parseInt(dateParts[0], 10);
const month = parseInt(dateParts[1], 10) - 1; // Months are zero-based in JavaScript
const day = parseInt(dateParts[2], 10);
const hours = parseInt(timeParts[0], 10);
const minutes = parseInt(timeParts[1], 10);
const seconds = parseInt(timeParts[2], 10);

return new Date(year, month, day, hours, minutes, seconds);
}

async getMemberInfo(connection: IBMi, library: string, sourceFile: string, member: string): Promise<IBMiMember | undefined> {
const config = connection.config!;
const tempLib = config.tempLibrary;
Expand All @@ -78,8 +96,8 @@ export class GetMemberInfo implements IBMiComponent {
name: result.MEMBER,
extension: result.EXTENSION,
text: result.DESCRIPTION,
created: new Date(result.CREATED ? Number(result.CREATED) : 0),
changed: new Date(result.CHANGED ? Number(result.CHANGED) : 0)
created: GetMemberInfo.parseDateString(String(result.CREATED)),
changed: GetMemberInfo.parseDateString(String(result.CHANGED))
} as IBMiMember
}
}
Expand Down Expand Up @@ -110,8 +128,8 @@ export class GetMemberInfo implements IBMiComponent {
name: result.MEMBER,
extension: result.EXTENSION,
text: result.DESCRIPTION,
created: new Date(result.CREATED ? Number(result.CREATED) : 0),
changed: new Date(result.CHANGED ? Number(result.CHANGED) : 0)
created: GetMemberInfo.parseDateString(String(result.CREATED)),
changed: GetMemberInfo.parseDateString(String(result.CHANGED))
} as IBMiMember
});
}
Expand Down
4 changes: 2 additions & 2 deletions src/api/tests/suites/components.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ describe('Component Tests', () => {
expect(memberInfoC?.library).toBe(tempLib);
expect(memberInfoC?.file).toBe(tempSPF);
expect(memberInfoC?.name).toBe(tempMbr);
expect(memberInfoC?.created).toBeTypeOf('number');
expect(memberInfoC?.changed).toBeTypeOf('number');
expect(memberInfoC?.created).toBeTypeOf('object');
expect(memberInfoC?.changed).toBeTypeOf('object');

// Cleanup...
await connection!.runCommand({
Expand Down