Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
59 changes: 30 additions & 29 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"lodash": "^4.18.1",
"moment": "^2.29.4",
"plotly.js": "^2.25.2",
"query-string": "^6.13.1",
"query-string": "^9.5.0",
"raf": "^3.4.1",
"react": "^18.2.0",
"react-colorful": "^5.6.1",
Expand Down
4 changes: 2 additions & 2 deletions src/containers/Simularium/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class App extends React.Component<AppProps, AppState> {
const fileName = parsed[URL_PARAM_KEY_FILE_NAME];
const userTrajectoryUrl = parsed[URL_PARAM_KEY_USER_URL];

const loadNetworkedFile = (fileName: string | string[]) => {
const loadNetworkedFile = (fileName: string | (string | null)[]) => {
const networkedFile = find(TRAJECTORIES, { id: fileName });
if (networkedFile) {
const fileData = networkedFile as TrajectoryDisplayData;
Expand All @@ -132,7 +132,7 @@ class App extends React.Component<AppProps, AppState> {
};

const loadUserTrajectoryUrl = (
userTrajectoryUrl: string | string[]
userTrajectoryUrl: string | (string | null)[]
) => {
const verifiedUrl = urlCheck(userTrajectoryUrl);
const fileId = getFileIdFromUrl(verifiedUrl, parsed.id);
Expand Down
4 changes: 2 additions & 2 deletions src/util/userUrlHandling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const isGoogleDriveUrl = (url: string) => /google.com/g.test(url);

export const getGoogleDriveFileId = (
googleDriveUrl: string,
id?: string | string[] | null
id?: string | (string | null)[] | null
): string | undefined => {
// already checked it was a google url before entering this function.
if (id && isString(id)) {
Expand Down Expand Up @@ -62,7 +62,7 @@ export const getGoogleDriveFileId = (

export const getFileIdFromUrl = (
url: string,
idParam?: string | string[] | null
idParam?: string | (string | null)[] | null
) => {
if (isGoogleDriveUrl(url)) {
return getGoogleDriveFileId(url, idParam);
Expand Down
Loading