@opencloning/opencloning-elabftw 1.7.3 → 1.8.1

package/CHANGELOG.md

@@ -1,5 +1,65 @@
 # @opencloning/opencloning-elabftw
 
+## 1.8.1
+
+### Patch Changes
+
+- Updated dependencies [[`8e841bd`](https://github.com/OpenCloning/OpenCloning_frontend/commit/8e841bdee4797df61bcf8d1972e3c3581d24fbfb)]:
+  - @opencloning/ui@1.8.1
+  - @opencloning/utils@1.8.1
+
+## 1.8.0
+
+### Patch Changes
+
+- [#694](https://github.com/OpenCloning/OpenCloning_frontend/pull/694) [`2ff9010`](https://github.com/OpenCloning/OpenCloning_frontend/commit/2ff90103c1d9e8e984533e51ecf4dc7978756a57) Thanks [@manulera](https://github.com/manulera)! - Drop close button on load history component
+
+- Updated dependencies [[`2ff9010`](https://github.com/OpenCloning/OpenCloning_frontend/commit/2ff90103c1d9e8e984533e51ecf4dc7978756a57), [`2ff9010`](https://github.com/OpenCloning/OpenCloning_frontend/commit/2ff90103c1d9e8e984533e51ecf4dc7978756a57)]:
+  - @opencloning/ui@1.8.0
+  - @opencloning/utils@1.8.0
+
+## 1.7.8
+
+### Patch Changes
+
+- [#693](https://github.com/manulera/OpenCloning_frontend/pull/693) [`e830407`](https://github.com/manulera/OpenCloning_frontend/commit/e830407749f4c016c0e7f7ce715f20fb36addebd) Thanks [@manulera](https://github.com/manulera)! - Use template as categoryKey when creating resource, for newer eLabFTW versions, see [this discussion](https://github.com/elabftw/elabftw/discussions/6764).
+
+- Updated dependencies []:
+  - @opencloning/ui@1.7.8
+  - @opencloning/utils@1.7.8
+
+## 1.7.7
+
+### Patch Changes
+
+- Updated dependencies [[`c5d9309`](https://github.com/manulera/OpenCloning_frontend/commit/c5d93099583fdfafafd40e9924d2216b596e0cec)]:
+  - @opencloning/utils@1.7.7
+  - @opencloning/ui@1.7.7
+
+## 1.7.6
+
+### Patch Changes
+
+- Updated dependencies [[`c81b179`](https://github.com/manulera/OpenCloning_frontend/commit/c81b179b4fece50271ea214cab1f8a356e36811f), [`c81b179`](https://github.com/manulera/OpenCloning_frontend/commit/c81b179b4fece50271ea214cab1f8a356e36811f)]:
+  - @opencloning/ui@1.7.6
+  - @opencloning/utils@1.7.6
+
+## 1.7.5
+
+### Patch Changes
+
+- Updated dependencies [[`034c738`](https://github.com/manulera/OpenCloning_frontend/commit/034c73840dc183b6b3584365c1db899d2f0c548b)]:
+  - @opencloning/ui@1.7.5
+  - @opencloning/utils@1.7.5
+
+## 1.7.4
+
+### Patch Changes
+
+- Updated dependencies [[`04703a9`](https://github.com/manulera/OpenCloning_frontend/commit/04703a9269a5d4cc4bdde478c1ec61e5c73b0d2a)]:
+  - @opencloning/utils@1.7.4
+  - @opencloning/ui@1.7.4
+
 ## 1.7.3
 
 ### Patch Changes

package/package.json

@@ -1,7 +1,7 @@
 {
   "license": "MIT",
   "name": "@opencloning/opencloning-elabftw",
-  "version": "1.7.3",
+  "version": "1.8.1",
   "type": "module",
   "main": "./src/index.js",
   "exports": {
@@ -9,15 +9,15 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/manulera/OpenCloning_frontend.git",
+    "url": "https://github.com/OpenCloning/OpenCloning_frontend.git",
     "directory": "packages/opencloning-elabftw"
   },
   "dependencies": {
-    "@mui/icons-material": "^5.15.17",
-    "@mui/material": "^5.15.17",
-    "@opencloning/ui": "1.7.3",
-    "@opencloning/utils": "1.7.3",
-    "axios": "^1.12.2"
+    "@mui/icons-material": "^5.18.0",
+    "@mui/material": "^5.18.0",
+    "@opencloning/ui": "1.8.1",
+    "@opencloning/utils": "1.8.1",
+    "axios": "^1.16.0"
   },
   "peerDependencies": {
     "react": "^18.3.1",

package/src/LoadHistoryComponent.cy.jsx

@@ -11,7 +11,6 @@ const TEST_FILE_CONTENT = JSON.stringify({ test: 'content' });
 
 describe('<LoadHistoryComponent />', () => {
   it('loads history file successfully when one file exists', () => {
-    const handleCloseSpy = cy.spy().as('handleCloseSpy');
     const loadDatabaseFileSpy = cy.spy().as('loadDatabaseFileSpy');
 
     // Stub API calls
@@ -42,7 +41,6 @@ describe('<LoadHistoryComponent />', () => {
 
     cy.mount(
       <LoadHistoryComponent
-        handleClose={handleCloseSpy}
         databaseId={DATABASE_ID}
         loadDatabaseFile={loadDatabaseFileSpy}
       />,
@@ -74,7 +72,6 @@ describe('<LoadHistoryComponent />', () => {
   });
 
   it('shows error when multiple history files found', () => {
-    const handleCloseSpy = cy.spy().as('handleCloseSpy');
     const loadDatabaseFileSpy = cy.spy().as('loadDatabaseFileSpy');
 
     cy.stub(eLabFTWHttpClient, 'get').callsFake(async (url) => {
@@ -101,7 +98,6 @@ describe('<LoadHistoryComponent />', () => {
 
     cy.mount(
       <LoadHistoryComponent
-        handleClose={handleCloseSpy}
         databaseId={DATABASE_ID}
         loadDatabaseFile={loadDatabaseFileSpy}
       />,
@@ -113,7 +109,6 @@ describe('<LoadHistoryComponent />', () => {
   });
 
   it('shows error when no history files found', () => {
-    const handleCloseSpy = cy.spy().as('handleCloseSpy');
     const loadDatabaseFileSpy = cy.spy().as('loadDatabaseFileSpy');
 
     cy.stub(eLabFTWHttpClient, 'get').callsFake(async (url) => {
@@ -135,7 +130,6 @@ describe('<LoadHistoryComponent />', () => {
 
     cy.mount(
       <LoadHistoryComponent
-        handleClose={handleCloseSpy}
         databaseId={DATABASE_ID}
         loadDatabaseFile={loadDatabaseFileSpy}
       />,
@@ -147,7 +141,6 @@ describe('<LoadHistoryComponent />', () => {
   });
 
   it('handles API error and allows retry', () => {
-    const handleCloseSpy = cy.spy().as('handleCloseSpy');
     const loadDatabaseFileSpy = cy.spy().as('loadDatabaseFileSpy');
 
     let callNumber = 0;
@@ -181,7 +174,6 @@ describe('<LoadHistoryComponent />', () => {
 
     cy.mount(
       <LoadHistoryComponent
-        handleClose={handleCloseSpy}
         databaseId={DATABASE_ID}
         loadDatabaseFile={loadDatabaseFileSpy}
       />,
@@ -208,28 +200,4 @@ describe('<LoadHistoryComponent />', () => {
     });
   });
 
-  it('close button works', () => {
-    const handleCloseSpy = cy.spy().as('handleCloseSpy');
-    const loadDatabaseFileSpy = cy.spy().as('loadDatabaseFileSpy');
-
-    cy.stub(eLabFTWHttpClient, 'get')
-      .withArgs(`/api/v2/items/${DATABASE_ID}`, { headers: { Authorization: 'test-read-key' } })
-      .resolves({
-        data: {
-          uploads: [],
-        },
-      });
-
-    cy.mount(
-      <LoadHistoryComponent
-        handleClose={handleCloseSpy}
-        databaseId={DATABASE_ID}
-        loadDatabaseFile={loadDatabaseFileSpy}
-      />,
-    );
-
-    cy.get('button').contains('Close').click();
-    cy.get('@handleCloseSpy').should('have.been.called');
-    cy.get('@loadDatabaseFileSpy').should('not.have.been.called');
-  });
 });

package/src/LoadHistoryComponent.jsx

@@ -1,10 +1,10 @@
-import { Button, CircularProgress } from '@mui/material';
+import { CircularProgress } from '@mui/material';
 import React from 'react';
 import { eLabFTWHttpClient, readHeaders } from './common';
 import RetryAlert from '@opencloning/ui/components/form/RetryAlert';
 import { getFileFromELabFTW } from './utils';
 
-function LoadHistoryComponent({ handleClose, databaseId, loadDatabaseFile }) {
+function LoadHistoryComponent({ databaseId, loadDatabaseFile }) {
   const url = `/api/v2/items/${databaseId}`;
   const [error, setError] = React.useState(null);
   const [loading, setLoading] = React.useState(false);
@@ -42,8 +42,6 @@ function LoadHistoryComponent({ handleClose, databaseId, loadDatabaseFile }) {
     <div>
       {loading && <CircularProgress />}
       {error && <RetryAlert onRetry={() => setRetry((prev) => prev + 1)}>{error}</RetryAlert>}
-      <Button onClick={handleClose}>Close</Button>
-
     </div>
   );
 }

package/src/eLabFTWInterface.js

@@ -24,7 +24,13 @@ const linkToParent = async (childId, parentId) => {
 
 const createResource = async (categoryId) => {
   const eLabFTWVersion = await getELabFTWVersion();
-  const categoryKey = eLabFTWVersion && eLabFTWVersion >= 50300 ? 'category' : 'category_id';
+  let categoryKey
+  // 0 is for development (nightly image)
+  if (eLabFTWVersion >= 50300 || eLabFTWVersion === 0) {
+    categoryKey = 'template';
+  } else {
+    categoryKey = 'category_id';
+  }
   const createdItemResponse = await eLabFTWHttpClient.post(
     '/api/v2/items',
     {