Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/BlueBrain/nexus-web into…
Browse files Browse the repository at this point in the history
… migration-merge

# Conflicts:
#	src/shared/containers/DataTableContainer.tsx
#	src/subapps/studioLegacy/containers/StudioContainer.tsx
#	src/subapps/studioLegacy/containers/WorkspaceMenuContainer.tsx
  • Loading branch information
danburonline committed Feb 28, 2024
2 parents a97cd4c + bcffe91 commit 9e13658
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/subapps/studioLegacy/containers/StudioContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as React from 'react';
import { Resource } from '@bbp/nexus-sdk/es';
import { useNexusContext, AccessControl } from '@bbp/react-nexus';
import { Empty, message } from 'antd';
import { omitBy } from 'lodash';
import { useHistory } from 'react-router';
import omitBy from 'lodash/omitBy';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
import PromisePool from '@supercharge/promise-pool';
import { ItemType } from 'antd/lib/menu/hooks/useItems';
import { useQuery } from 'react-query';
import { find, orderBy } from 'lodash';
import { find, omitBy, orderBy } from 'lodash';
import useNotification from '../../../shared/hooks/useNotification';
import EditTableForm from '../../../shared/components/EditTableForm';
import DashboardEditorContainer from './DashBoardEditor/DashboardEditorContainer';
Expand Down

0 comments on commit 9e13658

Please sign in to comment.