Skip to content

Commit

Permalink
dependencies: update axios
Browse files Browse the repository at this point in the history
* closes #278
  • Loading branch information
anikachurilova committed Oct 8, 2024
1 parent cb10bb7 commit 91a4774
Show file tree
Hide file tree
Showing 7 changed files with 2,495 additions and 2,182 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/js-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ jobs:

strategy:
matrix:
node-version: [14.x, 16.x]
node-version: [18.x]

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Setup Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: 14
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'

- name: Install and Build
Expand Down
4,601 changes: 2,452 additions & 2,149 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 2 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"peerDependencies": {
"@babel/runtime": "^7.9.0",
"axios": "^0.21.0",
"axios": "^1.7.7",
"lodash": "^4.17.0",
"qs": "^6.8.0",
"react": "^16.13.0",
Expand All @@ -42,12 +42,11 @@
"@rollup/plugin-babel": "^5.2.0",
"@rollup/plugin-commonjs": "^15.1.0",
"@rollup/plugin-node-resolve": "^9.0.0",
"axios": "^0.21.0",
"axios": "^1.7.7",
"axios-mock-adapter": "^1.18.0",
"coveralls": "^3.0.0",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.15.0",
"enzyme-to-json": "^3.6.0",
"expect": "^26.5.0",
"json": "^10.0.0",
"lodash": "^4.17.0",
Expand Down Expand Up @@ -107,10 +106,5 @@
},
"engines": {
"node": ">=14.0.0"
},
"jest": {
"snapshotSerializers": [
"enzyme-to-json/serializer"
]
}
}
16 changes: 8 additions & 8 deletions src/lib/components/ResultsGrid/ResultsGrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ import { Card, Image } from "semantic-ui-react";
import { AppContext } from "../ReactSearchKit";
import { ShouldRender } from "../ShouldRender";

function ResultsGrid({ loading, totalResults, results, resultsPerRow, overridableId, onResultsRendered }) {

function ResultsGrid({
loading,
totalResults,
results,
resultsPerRow,
overridableId,
onResultsRendered,
}) {
useEffect(() => {
if (onResultsRendered) {
onResultsRendered();
}

return () => {
if (onResultsRendered) {
onResultsRendered = null;
}
};
}, [onResultsRendered]);

return (
Expand Down
14 changes: 7 additions & 7 deletions src/lib/components/ResultsList/ResultsList.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ import { Item } from "semantic-ui-react";
import { AppContext } from "../ReactSearchKit";
import { ShouldRender } from "../ShouldRender";

function ResultsList({ loading, totalResults, results, overridableId, onResultsRendered }) {
function ResultsList({
loading,
totalResults,
results,
overridableId,
onResultsRendered,
}) {
useEffect(() => {
if (onResultsRendered) {
onResultsRendered();
}

return () => {
if (onResultsRendered) {
onResultsRendered = null;
}
};
}, [onResultsRendered]);

return (
Expand Down
24 changes: 20 additions & 4 deletions src/lib/components/ResultsMultiLayout/ResultsMultiLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,20 @@ import { ResultsGrid } from "../ResultsGrid";
import { ResultsList } from "../ResultsList";
import { ShouldRender } from "../ShouldRender";

function ResultsMultiLayout({ loading, totalResults, currentLayout, overridableId, onResultsRendered }) {
function ResultsMultiLayout({
loading,
totalResults,
currentLayout,
overridableId,
onResultsRendered,
}) {
return (
<ShouldRender condition={currentLayout != null && !loading && totalResults > 0}>
<Element layout={currentLayout} overridableId={overridableId} onResultsRendered={onResultsRendered} />
<Element
layout={currentLayout}
overridableId={overridableId}
onResultsRendered={onResultsRendered}
/>
</ShouldRender>
);
}
Expand Down Expand Up @@ -46,9 +56,15 @@ const Element = ({ layout, overridableId, onResultsRendered }) => {
onResultsRendered={onResultsRendered}
>
{layout === "list" ? (
<ResultsList overridableId={overridableId} onResultsRendered={onResultsRendered}/>
<ResultsList
overridableId={overridableId}
onResultsRendered={onResultsRendered}
/>
) : (
<ResultsGrid overridableId={overridableId} onResultsRendered={onResultsRendered}/>
<ResultsGrid
overridableId={overridableId}
onResultsRendered={onResultsRendered}
/>
)}
</Overridable>
);
Expand Down

0 comments on commit 91a4774

Please sign in to comment.