@opencloning/opencloning-elabftw 2.0.0 → 2.1.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @opencloning/opencloning-elabftw
 
+## 2.1.1
+
+### Patch Changes
+
+- Updated dependencies [[`0b2a21d`](https://github.com/OpenCloning/OpenCloning_frontend/commit/0b2a21dde79f5539579bee39f0de49b01cd6c10c)]:
+  - @opencloning/utils@2.1.1
+  - @opencloning/ui@2.1.1
+
+## 2.1.0
+
+### Patch Changes
+
+- Updated dependencies [[`c8c46d4`](https://github.com/OpenCloning/OpenCloning_frontend/commit/c8c46d4dc36cb8741d1bd89816c7ca82b89996b3)]:
+  - @opencloning/ui@2.1.0
+  - @opencloning/utils@2.1.0
+
 ## 2.0.0
 
 ### Patch Changes

package/package.json

@@ -1,7 +1,7 @@
 {
   "license": "MIT",
   "name": "@opencloning/opencloning-elabftw",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "type": "module",
   "main": "./src/index.js",
   "exports": {
@@ -15,8 +15,8 @@
   "dependencies": {
     "@mui/icons-material": "^5.18.0",
     "@mui/material": "^5.18.0",
-    "@opencloning/ui": "2.0.0",
-    "@opencloning/utils": "2.0.0",
+    "@opencloning/ui": "2.1.1",
+    "@opencloning/utils": "2.1.1",
     "axios": "^1.20.0"
   },
   "peerDependencies": {

package/src/ELabFTWCategorySelect.cy.jsx

@@ -5,7 +5,7 @@ import { eLabFTWHttpClient } from './common';
 describe('<ELabFTWCategorySelect />', () => {
   it('Allows to retry if the request fails', () => {
     cy.stub(eLabFTWHttpClient, 'get').withArgs('/api/v2/info', { headers: { Authorization: 'test-read-key' } }).as('eLabFTWHttpClientSpy');
-    cy.mount(<ELabFTWCategorySelect fullWidth />);
+    cy.mount(<ELabFTWCategorySelect mode="resource_type" fullWidth />);
     cy.get('@eLabFTWHttpClientSpy.all').should('have.callCount', 1);
     cy.get('button').contains('Retry').click();
     cy.get('@eLabFTWHttpClientSpy.all').should('have.callCount', 2);
@@ -13,7 +13,7 @@ describe('<ELabFTWCategorySelect />', () => {
   it('shows the right options', () => {
     const setCategorySpy = cy.spy().as('setCategorySpy');
     cy.stub(eLabFTWHttpClient, 'get')
-      .withArgs('/api/v2/items_types', { headers: { Authorization: 'test-read-key' }, params: {} }).resolves({
+      .withArgs('/api/v2/teams/current/resources_categories', { headers: { Authorization: 'test-read-key' }, params: {} }).resolves({
         data: [
           { id: 1, title: 'Category 1' },
           { id: 2, title: 'Category 2' },
@@ -24,7 +24,7 @@ describe('<ELabFTWCategorySelect />', () => {
           elabftw_version_int: 50200,
         },
       });
-    cy.mount(<ELabFTWCategorySelect fullWidth setCategory={setCategorySpy} />);
+    cy.mount(<ELabFTWCategorySelect mode="resource_type" fullWidth setCategory={setCategorySpy} />);
     cy.get('.MuiAutocomplete-root').click();
     cy.get('li').contains('Category 1').should('exist');
     cy.get('li').contains('Category 2').should('exist');
@@ -32,10 +32,32 @@ describe('<ELabFTWCategorySelect />', () => {
     cy.get('@setCategorySpy').should('have.been.calledWith', { id: 1, title: 'Category 1' });
   });
 
-  it('shows empty options if no categories are found', () => {
-    cy.mount(<ELabFTWCategorySelect fullWidth />);
+  it('uses the items_types endpoint in template mode', () => {
+    const setCategorySpy = cy.spy().as('setCategorySpy');
     cy.stub(eLabFTWHttpClient, 'get')
       .withArgs('/api/v2/items_types', { headers: { Authorization: 'test-read-key' }, params: {} }).resolves({
+        data: [
+          { id: 1, title: 'Template 1' },
+          { id: 2, title: 'Template 2' },
+        ],
+      })
+      .withArgs('/api/v2/info', { headers: { Authorization: 'test-read-key' } }).resolves({
+        data: {
+          elabftw_version_int: 50300,
+        },
+      });
+    cy.mount(<ELabFTWCategorySelect mode="template" fullWidth setCategory={setCategorySpy} />);
+    cy.get('.MuiAutocomplete-root').click();
+    cy.get('li').contains('Template 1').should('exist');
+    cy.get('li').contains('Template 2').should('exist');
+    cy.get('li').contains('Template 1').click();
+    cy.get('@setCategorySpy').should('have.been.calledWith', { id: 1, title: 'Template 1' });
+  });
+
+  it('shows empty options if no categories are found', () => {
+    cy.mount(<ELabFTWCategorySelect mode="resource_type" fullWidth />);
+    cy.stub(eLabFTWHttpClient, 'get')
+      .withArgs('/api/v2/teams/current/resources_categories', { headers: { Authorization: 'test-read-key' }, params: {} }).resolves({
         data: [],
       })
       .withArgs('/api/v2/info', { headers: { Authorization: 'test-read-key' } }).resolves({
@@ -48,7 +70,7 @@ describe('<ELabFTWCategorySelect />', () => {
   });
 
   it('shows an error message if the request fails and can retry', () => {
-    cy.mount(<ELabFTWCategorySelect fullWidth />);
+    cy.mount(<ELabFTWCategorySelect mode="resource_type" fullWidth />);
     cy.stub(eLabFTWHttpClient, 'get')
       .withArgs('/api/v2/info', { headers: { Authorization: 'test-read-key' } })
       .resolves({
@@ -56,7 +78,7 @@ describe('<ELabFTWCategorySelect />', () => {
           elabftw_version_int: 50300,
         },
       }).as('eLabFTWHttpClientSpyInfo')
-      .withArgs('/api/v2/items_types', { headers: { Authorization: 'test-read-key' }, params: {} })
+      .withArgs('/api/v2/teams/current/resources_categories', { headers: { Authorization: 'test-read-key' }, params: {} })
       .rejects(new Error('Connection error')).as('eLabFTWHttpClientSpy');
     cy.get('.MuiAlert-message').should('contain', 'Could not retrieve categories');
     // Clicking the retry button makes the request again

package/src/GetPrimerComponent.cy.jsx

@@ -11,7 +11,7 @@ describe('<GetPrimerComponent />', () => {
 
     // Stub both endpoints in a single stub
     cy.stub(eLabFTWHttpClient, 'get').callsFake((url) => {
-      if (url === '/api/v2/items_types') {
+      if (url === '/api/v2/teams/current/resources_categories') {
         return Promise.resolve({
           data: [
             { id: PRIMER_CATEGORY_ID, title: 'Primers' },
@@ -42,7 +42,7 @@ describe('<GetPrimerComponent />', () => {
 
     // Stub both endpoints in a single stub
     cy.stub(eLabFTWHttpClient, 'get').callsFake((url, config) => {
-      if (url === '/api/v2/items_types') {
+      if (url === '/api/v2/teams/current/resources_categories') {
         return Promise.resolve({
           data: [{ id: PRIMER_CATEGORY_ID, title: 'Primers' }],
         });
@@ -89,7 +89,7 @@ describe('<GetPrimerComponent />', () => {
 
     // Stub both endpoints in a single stub
     cy.stub(eLabFTWHttpClient, 'get').callsFake((url, config) => {
-      if (url === '/api/v2/items_types') {
+      if (url === '/api/v2/teams/current/resources_categories') {
         return Promise.resolve({
           data: [{ id: PRIMER_CATEGORY_ID, title: 'Primers' }],
         });
@@ -137,7 +137,7 @@ describe('<GetPrimerComponent />', () => {
     const setErrorSpy = cy.spy().as('setErrorSpy');
 
     cy.stub(eLabFTWHttpClient, 'get').callsFake((url) => {
-      if (url === '/api/v2/items_types') {
+      if (url === '/api/v2/teams/current/resources_categories') {
         return Promise.resolve({
           data: [{ id: PRIMER_CATEGORY_ID, title: 'Primers' }],
         });
@@ -172,7 +172,7 @@ describe('<GetPrimerComponent />', () => {
 
     // Stub both endpoints in a single stub
     cy.stub(eLabFTWHttpClient, 'get').callsFake((url, config) => {
-      if (url === '/api/v2/items_types') {
+      if (url === '/api/v2/teams/current/resources_categories') {
         return Promise.resolve({
           data: [{ id: PRIMER_CATEGORY_ID, title: 'Primers' }],
         });
@@ -218,7 +218,7 @@ describe('<GetPrimerComponent />', () => {
     let firstCallCategory = true;
     let firstCallPrimer = true;
     cy.stub(eLabFTWHttpClient, 'get').callsFake((url, config) => {
-      if (url === '/api/v2/items_types') {
+      if (url === '/api/v2/teams/current/resources_categories') {
         if (firstCallCategory) {
           firstCallCategory = false;
           return Promise.reject(new Error('Network error'));

package/src/GetSequenceFileAndDatabaseIdComponent.cy.jsx

@@ -14,7 +14,7 @@ const OTHER_FILE_ID = newUniqueId();
 const TEST_FILE_CONTENT = 'test content';
 
 const commonStubHandler = (url, config) => {
-  if (url === '/api/v2/items_types') {
+  if (url === '/api/v2/teams/current/resources_categories') {
     return Promise.resolve({
       data: [
         { id: SEQUENCE_CATEGORY_ID, title: 'Sequences' },