Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ae822ba
Updates
labkey-martyp Nov 18, 2025
3b097ca
Fixes and feedback
labkey-martyp Nov 24, 2025
b11c72f
Merge remote-tracking branch 'ORIGIN/release25.7-SNAPSHOT' into 25.7_…
labkey-martyp Nov 25, 2025
26b56bf
lint and cleanup
labkey-martyp Dec 1, 2025
8d6d43e
Another typescript file and cleanup
labkey-martyp Dec 1, 2025
97ea8f1
lint
labkey-martyp Dec 1, 2025
7300709
typescript and lint
labkey-martyp Dec 1, 2025
fa5e714
Fix confirm onCancel
labkey-martyp Dec 3, 2025
8b9b0b3
Add eslint
labkey-martyp Dec 19, 2025
69ff896
lint and minor fixes
labkey-martyp Dec 19, 2025
5243cdd
revision overlap validation
labkey-martyp Dec 19, 2025
e0d860e
fix delete issue
labkey-martyp Dec 19, 2025
aef2017
remove arrows from number input
labkey-martyp Dec 19, 2025
29d2506
More feedback
labkey-martyp Dec 22, 2025
2f41213
Merge remote-tracking branch 'origin/release25.7-SNAPSHOT' into 25.7_…
labkey-martyp Dec 23, 2025
ff5234b
Merge remote-tracking branch 'ORIGIN/release25.7-SNAPSHOT' into 25.7_…
labkey-martyp Jan 5, 2026
4e65017
Permission fix
labkey-martyp Jan 8, 2026
b5191b2
fix clash with LK css
labkey-martyp Jan 21, 2026
f02ac26
Update ProjectsView.jsx
labkey-martyp Jan 28, 2026
5cd63c2
don't automatically select first timeline
labkey-martyp Jan 29, 2026
ec9cc17
Feedback updates
labkey-martyp Feb 19, 2026
3c0b1e2
Merge remote-tracking branch 'ORIGIN/release25.7-SNAPSHOT' into 25.7_…
labkey-martyp Feb 19, 2026
496d994
add these back
labkey-martyp Feb 19, 2026
50407d8
filter out available animals dead at day 0 and show status of animals
labkey-martyp Feb 22, 2026
6f31f64
Departure date
labkey-martyp Feb 22, 2026
088260d
Merge remote-tracking branch 'ORIGIN/release25.7-SNAPSHOT' into 25.7_…
labkey-martyp Feb 26, 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ snprc_ehr/.editorconfig
snprc_ehr/resources/referenceStudy/LoadTaqmanData
snprc_ehr/resources/referenceStudy/datasetImport/LoadTaqmanData
snprc_scheduler/.gradle
snprc_scheduler/resources/views/gen
snprc_scheduler/resources/web/gen
snprc_ehr/resources/credits
*/resources/credits/dependencies.txt
*/resources/credits/jars.txt
Expand Down
4 changes: 0 additions & 4 deletions snprc_scheduler/.babelrc

This file was deleted.

2 changes: 2 additions & 0 deletions snprc_scheduler/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import config from '@labkey/eslint-config';
export default config;
17 changes: 12 additions & 5 deletions snprc_scheduler/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,23 @@ module.exports = {
LABKEY: {},
},
moduleFileExtensions: [
"ts",
"tsx",
"jsx",
"js",
],
setupFilesAfterEnv: [
"<rootDir>/src/client/tests/setupTests.js"
],
testEnvironment: "jsdom",
testPathIgnorePatterns: [
"node_modules",
],
testRegex: "(\\.(test|spec))\\.(js|jsx)$",
testResultsProcessor: "jest-teamcity-reporter"
testRegex: "(\\.(test|spec))\\.(js|jsx|ts|tsx)$",
testResultsProcessor: "jest-teamcity-reporter",
transform: {
"^.+\\.(js|jsx|ts|tsx)$": [
'ts-jest',
{
tsconfig: 'node_modules/@labkey/build/webpack/tsconfig.test.json',
},
],
}
};
101 changes: 101 additions & 0 deletions snprc_scheduler/lint.diff.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
import { execa } from 'execa';

const fileExtensions = ['.tsx', '.ts']; // linted file types

// This is the difference from where the top of the git repo is and where this script is run from. Will
// need to be updated for other repos.
const repoPath = '';

// Default path to the directory to be checked for changes
let lintPath = 'src/';

// Default lint target (--fix changes to lint-fix)
let npmTarget = 'lint';

let currentBranch = false;

// Parameters all optional.
// --fix: this will perform eslint --fix instead of regular eslint
// --currentBranch: this will perform eslint on the files that have been changed in this branch compared
// to the master branch. Can be run with our without --fix. Will ignore any file paths passed in.
// File path: if wanting to do a lint-diff on a specific directory or file otherwise defaults to src/
if (process.argv.length > 2) {
for (let i=2; i<process.argv.length; i++) {
switch(process.argv[i]) {
case '--fix':
npmTarget = 'lint-fix';
break;
case '--currentBranch':
currentBranch = true;
break;
default:
lintPath = process.argv[i];
}
}
}

(async () => {
let files;
let stdout; // This is the supported way to pipe stdout to a local variable
if (currentBranch) {
// Get name of the current branch
({ stdout } = await execa('git', ['rev-parse', '--abbrev-ref', 'HEAD']));
if (!stdout) {
console.error('Error finding git branch name');
} else {
console.log('Checking for updated files in branch: ', stdout);
}

const branch = stdout;

// Diff current branch against develop to get changed file names
({stdout} = await execa('git', ['diff', 'develop...' + branch, '--name-only', '--diff-filter=AM', '--relative']));
if (!stdout) {
console.log('No changed files in branch ' + branch);
}

files = stdout;
} else {
// Diff uncommitted changes against committed to
({stdout} = await execa('git', ['diff', '--name-only', '--diff-filter=AM', '--relative', lintPath]));
if (!stdout) {
console.log('No changed files at ' + lintPath);
}

files = stdout;
}

if (files) {
let filtered = stdout.split('\n');

// Filter by file extension and file path
filtered = filtered.filter(file => {
file = file.trim();
const correctPath = file.startsWith(repoPath + 'src/');
const correctExt = fileExtensions.findIndex(ext => (file.endsWith(ext))) !== -1;
return correctPath && correctExt
});

if (filtered.length < 1) {
console.log('No changed files match the file extension.')
}
else {
// Remove file path relative to git repo
filtered = filtered.map(file => {
return file.substring(repoPath.length);
});

console.log('Linting files:\n', filtered);

// File paths need parens to resolve correctly
const param = "\"" + filtered.join("\" \"") + "\"";

try {
await execa('npm', ['run', npmTarget, param], {shell: true}).stdout.pipe(process.stdout);
}
catch (error) {
console.error("Lint error: ", error);
}
}
}
})();
Loading