Skip to content

Commit

Permalink
Merge branch 'fusion-react-18-vite' into fix/dynamic-base-url
Browse files Browse the repository at this point in the history
  • Loading branch information
bilalesi authored Oct 24, 2023
2 parents 232589a + 144164a commit 96ea7f8
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 5 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/migrate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Migration
on:
push:
branches:
- fusion-react-18-vite

jobs:
publish-preview:
if: github.event_name == 'push'
runs-on: ubuntu-latest
timeout-minutes: 40
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Build
run: |
docker build -t bluebrain/nexus-web:migrate .
- name: Publish To DockerHub
run: |
echo ${{ secrets.DOCKER_PASS }} | docker login --username ${{ secrets.DOCKER_USER }} --password-stdin
docker push bluebrain/nexus-web:migrate
1 change: 0 additions & 1 deletion .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
push:
branches:
- develop
- fusion-react-18-vite

jobs:
publish-preview:
Expand Down
2 changes: 1 addition & 1 deletion src/entry.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useRef } from 'react';
import React, { useRef } from 'react';
import { ConnectedRouter } from 'connected-react-router';
import { QueryClient, QueryClientProvider } from 'react-query';
import { NexusProvider } from '@bbp/react-nexus';
Expand Down
6 changes: 3 additions & 3 deletions src/shared/organisms/DataPanel/DataPanel.spec.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { vi } from 'vitest';
import { vi as jest } from 'vitest';
import { createNexusClient } from '@bbp/nexus-sdk';
import { downloadArchive } from './DataPanel';
import { ParsedNexusUrl } from 'shared/utils/nexusParse';
import { ParsedNexusUrl } from '../../../shared/utils/nexusParse';
import {
getMockDistribution,
getMockResource,
resourceWithDistributionArray,
resourceWithoutDistrition,
} from 'shared/utils/__mocks__/data_panel_download_resource';
} from '../../../shared/utils/__mocks__/data_panel_download_resource';

const mockNexus = createNexusClient({
uri: 'https://localhost',
Expand Down

0 comments on commit 96ea7f8

Please sign in to comment.