Skip to content

Commit

Permalink
Merge branch 'main' into enh/clickable-checkbox-labels
Browse files Browse the repository at this point in the history
  • Loading branch information
samadpls authored Mar 20, 2024
2 parents c7df893 + 8a0cf12 commit 4f4dc7b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
- uses: actions/stale@v9
with:
stale-issue-message: |
We want to keep our issues up to date and active. This issue hasn't seen any activity in the last 75 days.
Expand Down
5 changes: 1 addition & 4 deletions .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,5 @@
"singleQuote": true,
"printWidth": 100,
"trailingComma": "es5",
"plugins": ["prettier-plugin-tailwindcss"],
"corePlugins": {
"preflight": false
}
"plugins": ["prettier-plugin-tailwindcss"]
}
4 changes: 2 additions & 2 deletions src/components/QueryForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ function QueryForm({
/>
</div>
)}
<div className={isFederationAPI && 'row-start-2'}>
<div className={isFederationAPI ? 'row-start-2' : ''}>
<ContinuousField
helperText={minAgeExceedsMaxAge ? '' : minAgeHelperText}
label="Minimum age"
onFieldChange={updateContinuousQueryParams}
/>
</div>
<div className={isFederationAPI && 'row-start-2'}>
<div className={isFederationAPI ? 'row-start-2' : ''}>
<ContinuousField
helperText={minAgeExceedsMaxAge ? '' : maxAgeHelperText}
label="Maximum age"
Expand Down
6 changes: 4 additions & 2 deletions src/utils/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ export const nodesURL: string = baseAPIURL.endsWith('/')
? `${baseAPIURL}nodes/`
: `${baseAPIURL}/nodes/`;

export const isFederationAPI: string =
import.meta.env.NB_IS_FEDERATION_API === undefined ? true : import.meta.env.NB_IS_FEDERATION_API;
export const isFederationAPI: boolean =
import.meta.env.NB_IS_FEDERATION_API === undefined
? true
: import.meta.env.NB_IS_FEDERATION_API === 'true';

export const sexes: { [key: string]: string } = {
male: 'snomed:248153007',
Expand Down

0 comments on commit 4f4dc7b

Please sign in to comment.