Skip to content

Commit

Permalink
OpenConceptLab/ocl_issues#2023 | Matching component with row states a…
Browse files Browse the repository at this point in the history
…nd repo select
  • Loading branch information
snyaggarwal committed Jan 2, 2025
1 parent e2a1971 commit b50ab55
Show file tree
Hide file tree
Showing 13 changed files with 1,840 additions and 196 deletions.
5 changes: 4 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,10 @@
"sameas",
"nbsp",
"scroller",
"llm"
"llm",
"unmapped",
"unmap",
"mins"
],
"skipIfMatch": [
"http://[^s]*",
Expand Down
20 changes: 10 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"react-password-strength-bar": "^0.3.5",
"react-router-dom": "^5.3.4",
"react-virtuoso": "^4.12.3",
"react-window": "^1.8.10",
"react-window": "^1.8.11",
"stacktrace-js": "^2.0.2",
"xlsx": "^0.18.5"
},
Expand All @@ -51,7 +51,7 @@
"babel-eslint": "^10.1.0",
"babel-loader": "^8.4.1",
"copy-webpack-plugin": "^4.6.0",
"cross-fetch": "^3.1.8",
"cross-fetch": "^3.2.0",
"css-loader": "^0.28.8",
"eslint": "^4.19.1",
"eslint-config-airbnb": "^16.1.0",
Expand Down
2 changes: 2 additions & 0 deletions src/components/app/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import UserSettings from '../users/UserSettings';
import OrgHome from '../orgs/OrgHome';
import URLRegistry from '../url-registry/URLRegistry'
import RepoConceptsMatch from '../repos/RepoConceptsMatch'
import Matching from '../repos/Matching'

const AuthenticationRequiredRoute = ({component: Component, ...rest}) => (
<Route
Expand Down Expand Up @@ -94,6 +95,7 @@ const App = props => {
<SessionUserRoute exact path='/users/:user/edit' component={UserEdit} />
<AuthenticationRequiredRoute path='/users/:user/settings' component={UserSettings} />
<AuthenticationRequiredRoute path={`/users/:user/:tab(${orgTabsStr})?`} component={UserHome} />
<AuthenticationRequiredRoute exact path='/$term-match' component={Matching} />
<Route path={`/orgs/:org/:tab(${orgTabsStr})?`} component={OrgHome} />

<Route exact path='/403' component={Error403} />
Expand Down
25 changes: 25 additions & 0 deletions src/components/common/AutocompleteLoading.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import React from 'react';
import { Box, LinearProgress } from '@mui/material'
import { BLACK } from '../../common/colors'

const AutocompleteLoading = ({ text }) => {

return (
<React.Fragment>
<Box sx={{ width: '100%', margin: '20px 0', display: 'flex', alignItems: 'center', justifyContent: 'center', flexDirection: 'column' }}>
{
text &&
<div className='col-xs-12' style={{width: '100%', textAlign: 'center', marginBottom: '10px', color: BLACK}}>
Loading results for <b>{ text }</b>
</div>
}
<div className='col-xs-8'>
<LinearProgress />
</div>
</Box>

</React.Fragment>
)
}

export default AutocompleteLoading;
Loading

0 comments on commit b50ab55

Please sign in to comment.