Skip to content
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.

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

🔖 Rc/1.0.3 #123

Closed
wants to merge 13 commits into from
Closed
24 changes: 17 additions & 7 deletions Jenkinsfile.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,29 @@ spec:
- name: docker
image: docker:18-git
tty: true
volumeMounts:
- mountPath: /var/run/docker.sock
name: docker-sock
env:
- name: DOCKER_HOST
value: tcp://localhost:2375
- name: HOME
value: /home/jenkins/agent
- name: helm
image: alpine/helm:3.1.0
command:
- cat
tty: true
- name: dind-daemon
image: docker:18.06-dind
securityContext:
privileged: true
runAsUser: 0
volumeMounts:
- name: docker-graph-storage
mountPath: /var/lib/docker
securityContext:
runAsUser: 1000
volumes:
- name: docker-sock
hostPath:
path: /var/run/docker.sock
type: File
- name: docker-graph-storage
emptyDir: {}
"""
}
}
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,9 @@ You can check out [the Next.js GitHub repository](https://github.com/vercel/next
The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/import?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.

Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.

## Acknowledgements

DMS development supported by:

[![Canarie logo](canarie-logo.png)](https://canarie.ca)
Binary file added canarie-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions components/NavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ const NavBar: React.ComponentType = () => {
<img
src={`${NEXT_PUBLIC_BASE_PATH}/static/dms_user_assets/${NEXT_PUBLIC_LOGO_FILENAME}`}
alt={NEXT_PUBLIC_LAB_NAME}
width={theme.dimensions.labIcon.width}
height={theme.dimensions.labIcon.height}
/>
) : (
<OvertureLogo width={theme.dimensions.labIcon.width} height={theme.dimensions.labIcon.height} />
<OvertureLogo height={theme.dimensions.labIcon.height} />
);

return (
<div
css={(theme: typeof defaultTheme) => css`
Expand Down
33 changes: 32 additions & 1 deletion components/pages/explorer/RepoTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
import { css } from '@emotion/core';
import dynamic from 'next/dynamic';
import urlJoin from 'url-join';
import { useTheme } from 'emotion-theming';

import { PageContentProps } from './index';
import StyledLink from '../../Link';
import defaultTheme from '../../theme';
import { getConfig } from '../../../global/config';

Expand Down Expand Up @@ -228,6 +230,7 @@ const getTableStyle = (theme: typeof defaultTheme) => css`
`;

const RepoTable = (props: PageContentProps) => {
const theme: typeof defaultTheme = useTheme();
const {
NEXT_PUBLIC_ARRANGER_API,
NEXT_PUBLIC_ARRANGER_PROJECT_ID,
Expand All @@ -241,10 +244,38 @@ const RepoTable = (props: PageContentProps) => {
const customExporters = [
{ label: 'File Table', fileName: `data-explorer-table-export.${today}.tsv` }, // exports a TSV with what is displayed on the table (columns selected, etc.)
{ label: 'File Manifest', fileName: `score-manifest.${today}.tsv`, columns: manifestColumns }, // exports a TSV with the manifest columns
{ label: () => (
<span
css={css`
border-top: 1px solid ${theme.colors.grey_3};
margin-top: -3px;
padding-top: 7px;
white-space: pre-line;
width: 140px;

a {
margin-left: 3px;
}
`}
>
To download files using a file manifest, please follow these
<StyledLink
css={css`
line-height: inherit;
`}
href="https://overture.bio/documentation/score/user-guide/download"
rel="noopener noreferrer"
target="_blank"
>
instructions
</StyledLink>
.
</span>
), },
];

return (
<div css={(theme) => getTableStyle(theme)}>
<div css={getTableStyle(theme)}>
<Table
{...props}
showFilterInput={false}
Expand Down
3 changes: 1 addition & 2 deletions components/theme/dimensions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ const dimensions = {
maxWidth: 270,
},
labIcon: {
height: 35,
width: 35,
height: 30,
},
};

Expand Down
4 changes: 2 additions & 2 deletions components/theme/icons/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { SerializedStyles } from '@emotion/core';

export type IconProps = {
fill?: string;
width: number;
height: number;
width?: number;
height?: number;
style?: SerializedStyles;
};
117 changes: 63 additions & 54 deletions package-lock.json

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

Loading