Merge pull request #47 from BIBSYSDEV/develop

bugfix Ncip server til prod

Author: gregorgabriel

cypress/integration/app.spec.js

@@ -27,13 +27,13 @@ context('start', () => {
 
   it('shows errormessage when parameters is missing', () => {
     cy.visit('?recordid=123');
-    cy.get('[data-testid="alert"]').should('exist').contains('URL must contain parameters: recordid and patrondid');
+    cy.get('[data-testid="alert"]').should('exist').contains('URL must contain parameters: recordid and patronid');
     cy.visit('?patronid=123');
-    cy.get('[data-testid="alert"]').should('exist').contains('URL must contain parameters: recordid and patrondid');
+    cy.get('[data-testid="alert"]').should('exist').contains('URL must contain parameters: recordid and patronid');
     cy.visit('?recordid=123&patronid=');
-    cy.get('[data-testid="alert"]').should('exist').contains('URL must contain parameters: recordid and patrondid');
+    cy.get('[data-testid="alert"]').should('exist').contains('URL must contain parameters: recordid and patronid');
     cy.visit('');
-    cy.get('[data-testid="alert"]').should('exist').contains('URL must contain parameters: recordid and patrondid');
+    cy.get('[data-testid="alert"]').should('exist').contains('URL must contain parameters: recordid and patronid');
   });
 
   it('metadata is cleaned up', () => {

package-lock.json

@@ -31,7 +31,7 @@
     "@cypress/instrument-cra": "^1.4.0",
     "@types/react": "^17.0.27",
     "@types/react-dom": "^17.0.9",
-    "@types/styled-components": "^5.1.14",
+    "@types/styled-components": "^5.1.15",
     "@types/yup": "^0.29.13",
     "axios-mock-adapter": "^1.20.0",
     "cypress": "^8.5.0",

package.json

@@ -79,7 +79,7 @@ const AppContent = () => {
       }
     };
     if (!recordId || !patronId) {
-      setAppError(new Error('URL must contain parameters: recordid and patrondid'));
+      setAppError(new Error('URL must contain parameters: recordid and patronid'));
     } else {
       fetchLibraryAccess().then();
       fetchMetadata().then();
@@ -94,7 +94,7 @@ const AppContent = () => {
         <StyledFullPageProgressWrapper>
           <CircularProgress />
         </StyledFullPageProgressWrapper>
-      ) : !libraryAccess?.isNcipLibrary ? (
+      ) : !libraryAccess?.ncip_server_url ? (
         <WarningBanner message="Sorry, this ILL feature is not available. Your library does not support the Norwegian NCIP profile." />
       ) : !isLoadingMetaData ? (
         fetchMetaDataError ? (
@@ -107,7 +107,12 @@ const AppContent = () => {
               </Typography>
               <MetadataHolder metaData={metaData} />
               {patronId && (
-                <OrderSchema metaData={metaData} patronId={patronId} readonly={libraryAccess.isAlmaLibrary} />
+                <OrderSchema
+                  metaData={metaData}
+                  patronId={patronId}
+                  ncip_server_url={libraryAccess.ncip_server_url}
+                  readonly={libraryAccess.isAlmaLibrary}
+                />
               )}
             </PageWrapper>
           )

src/AppContent.tsx

@@ -22,17 +22,17 @@ export const mockSRUResponse: SRUResponse = {
 
 export const mockedLibraryAccess: LibraryAccess = {
   isAlmaLibrary: false,
-  isNcipLibrary: true,
+  ncip_server_url: 'ncip_server_url',
 };
 
 export const mockedLibraryAccessNoNcip: LibraryAccess = {
   isAlmaLibrary: true,
-  isNcipLibrary: false,
+  ncip_server_url: '',
 };
 
 export const mockedLibraryAccessAlmaLibrary: LibraryAccess = {
   isAlmaLibrary: true,
-  isNcipLibrary: true,
+  ncip_server_url: 'ncip_server_url',
 };
 
 export const mockSRUResponseWithNoItems: SRUResponse = {
@@ -66,39 +66,34 @@ export const mockMetadata: MetaData = {
       available_for_loan: true,
       institution_code: 'NB_DEP',
       mms_id: '9288276ff6656',
-      ncip_server_url: 'http://www.example.com',
     },
     {
       display_name: 'NINA Biblioteket',
       library_code: '43424324',
       available_for_loan: false,
       institution_code: 'UIT',
       mms_id: '92882766626654',
-      ncip_server_url: 'https://www.example.com',
     },
     {
       display_name: 'NTNU Universitetsbiblioteket Gunnerusbiblioteket',
       library_code: '6456456',
       available_for_loan: true,
       institution_code: 'UIT',
       mms_id: '92882766626651',
-      ncip_server_url: 'https://www.example.com',
     },
     {
       display_name: 'UiT Norges arktiske universitet Narvikbiblioteket',
       library_code: '12344568',
       available_for_loan: false,
       institution_code: 'UIT',
       mms_id: '92882766626612',
-      ncip_server_url: 'https://www.example.com',
     },
     {
       display_name: 'Universitetsbiblioteket i Bergen Bibliotek for matematisk- naturvitenskapelige fag',
       library_code: '1234569',
       available_for_loan: true,
       institution_code: 'UIB',
       mms_id: '92882766626623',
-      ncip_server_url: 'https://www.example.com',
     },
 
     {
@@ -107,15 +102,13 @@ export const mockMetadata: MetaData = {
       available_for_loan: true,
       institution_code: 'UIB',
       mms_id: '9288276662662233',
-      ncip_server_url: 'https://www.example.com',
     },
     {
       display_name: 'Nasjonalbiblioteket Pliktavlevering',
       library_code: '0183334',
       available_for_loan: true,
       institution_code: 'UIB',
       mms_id: '92882766626623',
-      ncip_server_url: 'https://www.example.com',
     },
   ],
 };

src/api/mockdata.ts

@@ -55,21 +55,23 @@ const StyledTextFieldWrapper = styled.div`
 interface SchemaValues {
   patronId: string;
   selectedLibrary: string;
+  ncip_server_url: string;
 }
 
-const emptySchema: SchemaValues = { patronId: '', selectedLibrary: '' };
+const emptySchema: SchemaValues = { patronId: '', ncip_server_url: '', selectedLibrary: '' };
 
 interface OrderSchemaProps {
   metaData: MetaData;
   readonly: boolean;
   patronId: string;
+  ncip_server_url: string;
 }
 
 const createSuccessMessage = (metaData: MetaData, selectedLibrary: Library, patronId: string) => {
   return `The request for '${metaData.display_title}' was sent successfully to ${selectedLibrary.display_name} for ${patronId} `;
 };
 
-const OrderSchema: FC<OrderSchemaProps> = ({ metaData, patronId, readonly = false }) => {
+const OrderSchema: FC<OrderSchemaProps> = ({ metaData, patronId, ncip_server_url, readonly = false }) => {
   const [isPostingRequest, setIsPostingRequest] = useState(false);
   const [postRequestError, setPostRequestError] = useState<Error>();
   const history = useHistory();
@@ -91,7 +93,7 @@ const OrderSchema: FC<OrderSchemaProps> = ({ metaData, patronId, readonly = fals
       type: MediaTypes.Book,
       requestType: RequestTypes.Physical,
       comment: '',
-      ncipServerUrl: selectedLibrary.ncip_server_url,
+      ncipServerUrl: ncip_server_url,
     };
     try {
       setIsPostingRequest(true);

src/components/OrderSchema.tsx

@@ -18,7 +18,6 @@ export interface Library {
   institution_code: string;
   library_code: string;
   mms_id: string;
-  ncip_server_url: string;
 }
 
 export interface SRUResponse {
@@ -31,7 +30,7 @@ export interface SRUResponse {
 }
 
 export interface LibraryAccess {
-  isNcipLibrary: boolean;
+  ncip_server_url: string;
   isAlmaLibrary: boolean;
 }