Add publish bills functionality

client-sdk/src/services/BillService.ts

@@ -89,4 +89,22 @@ export class BillService {
             },
         });
     }
+    /**
+     * Publish xml
+     * Publish bill XML
+     * @param id
+     * @returns any Successful response
+     * @throws ApiError
+     */
+    public static billControllerPublishXml(
+        id: number,
+    ): CancelablePromise<any> {
+        return __request(OpenAPI, {
+            method: 'POST',
+            url: '/api/bills/{id}/xml',
+            path: {
+                'id': id,
+            },
+        });
+    }
 }

client/src/features/Bills/CreateBillButton.tsx

@@ -25,7 +25,7 @@ const CreateBillButton: FC<Props> = ({ onSubmit }) => {
             >
                 <PlusOutlined /> {t('Create New Bill')}
             </Button>
-            <Modal title={t('Add new Entry')} isOpen={isOpen} onClose={onClose}>
+            <Modal title={t('Create New Bill')} isOpen={isOpen} onClose={onClose}>
                 <div>
                     <CreateBillForm onSubmit={onClose} onCancel={onClose} />
                 </div>
@@ -34,4 +34,4 @@ const CreateBillButton: FC<Props> = ({ onSubmit }) => {
     );
 };
 
-export default CreateBillButton;
+export default CreateBillButton;

client/src/features/Bills/useBillPage.ts

@@ -1,5 +1,5 @@
 import { notification } from 'antd';
-import { BillDocumentService, DocumentService } from 'client-sdk';
+import { BillDocumentService, DocumentService, BillService } from 'client-sdk';
 import { LawEditor, getTitle } from 'law-document';
 import { useCallback, useEffect, useState } from 'react';
 import { useNavigate, useParams } from 'react-router';
@@ -146,6 +146,26 @@ const useBillPage = (disableActions = false, billPage = '/bill') => {
 
     useEffect(loadDocument, [loadDocument]);
 
+    const publishBill = useCallback(() => {
+        if (!bill || !bill.id || !selected) {
+            return;
+        }
+
+        log('publish bill document', { bill, selected });
+
+        BillService.billControllerPublishXml(bill.id)
+            .then((billItem) => {
+                notification.success({ message: t('Bill published'), description: `${selected} ${bill.title}` });
+                log('published bill', { billItem });
+                setError(false);
+            })
+            .catch((error) => {
+                log('Error publishing bill');
+                setError(true);
+                console.error(error);
+            });
+    }, [bill, selected, t]);
+
     return {
         bill,
         openDocument,
@@ -158,10 +178,11 @@ const useBillPage = (disableActions = false, billPage = '/bill') => {
         slate,
         originalDocument,
         loadDocument,
+        publishBill,
         hasBillLoadingError: hasBillError,
         hasDocumentLoadingError: hasError,
         importError,
     };
 };
 
-export default useBillPage;
+export default useBillPage;

client/src/pages/BillPage.tsx

@@ -31,6 +31,7 @@ const BillPage: FC = () => {
         xml,
         originalDocument,
         saveDocument,
+        publishBill,
         hasBillLoadingError,
         hasDocumentLoadingError,
         isBillDocument,
@@ -80,6 +81,7 @@ const BillPage: FC = () => {
                                     originalDocument={originalDocument!}
                                     xml={xml!}
                                     saveDocument={saveDocument}
+                                    publishBill={publishBill}
                                     readOnly={!isBillDocument}
                                     bill={bill}
                                     t={t}
@@ -98,4 +100,4 @@ const BillPage: FC = () => {
     );
 };
 
-export default BillPage;
+export default BillPage;

law-document-editor/src/Editor/Editor.tsx

@@ -28,13 +28,14 @@ interface Props {
     xml: string;
     readOnly?: boolean;
     saveDocument?: (editor: LawEditor) => void;
+    publishBill?: () => void;
     bill?: Bill;
     navigationBlocker: NavigationBlocker;
     t: Translator;
 }
 
 export const Editor: FC<Props> = (props) => {
-    const { slate, originalDocument, xml, readOnly, saveDocument, bill, navigationBlocker, t } = props;
+    const { slate, originalDocument, xml, readOnly, saveDocument, publishBill, bill, navigationBlocker, t } = props;
     const hasHighlight = useEditorConfig(state => state.highlightStructure);
     const editor = useMemo(() => createEditor(), []);
     const { handleChange, handleSave } = useEditorNavigationBlock(editor, navigationBlocker, saveDocument);
@@ -71,7 +72,7 @@ export const Editor: FC<Props> = (props) => {
                         </div>
                     </Col>
                     <Col span={12}>
-                        { readOnly ? null : <Toolbar saveDocument={handleSave} bill={bill} t={t} navigationBlocker={navigationBlocker} /> }
+                        { readOnly ? null : <Toolbar saveDocument={handleSave} publishBill={publishBill} bill={bill} t={t} navigationBlocker={navigationBlocker} /> }
                         <EditorSidePanel
                             t={t}
                             readOnly={readOnly}
@@ -83,4 +84,4 @@ export const Editor: FC<Props> = (props) => {
             </div>
         </Slate>
     );
-};
+};

law-document-editor/src/Editor/Toolbar/AddEntryModal.tsx

@@ -17,4 +17,4 @@ export const AddEntryModal: FC<Props> = ({ isOpen, onClose, t }) => {
             </div>
         </Modal>
     );
-};
+};

law-document-editor/src/Editor/Toolbar/Toolbar.tsx

@@ -9,12 +9,13 @@ import { Translator } from '../../translations';
 
 interface Props {
     saveDocument?: (editor: LawEditor) => void;
+    publishBill?: (editor: LawEditor) => void;
     bill?: Bill;
     t: Translator;
     navigationBlocker: NavigationBlocker;
 }
 
-export const Toolbar: FC<Props> = ({ saveDocument, bill, t, navigationBlocker }) => {
+export const Toolbar: FC<Props> = ({ saveDocument, publishBill, bill, t, navigationBlocker }) => {
     const {
         setAutoNumberIncrements,
         setHighlightStructure,
@@ -34,6 +35,7 @@ export const Toolbar: FC<Props> = ({ saveDocument, bill, t, navigationBlocker })
             </Checkbox>
             {saveDocument && <Button type={isNavigationBlocked ? 'primary' : 'default'} disabled={!isNavigationBlocked} onClick={() => saveDocument(slate)}>{t('Save')}</Button>}
             {bill && <Button onClick={() => goTo(`/bill/${bill.id}`)}>{t('Open Bill Preview')}</Button>}
+            {publishBill && <Button onClick={() => publishBill(slate) } disabled={isNavigationBlocked}>{t('Publish Bill')}</Button>}
         </Space>
     );
-};
+};

law-document-editor/src/Editor/useEditorNaviationBlock.ts

@@ -43,4 +43,4 @@ export const useEditorNavigationBlock = (editor: LawEditor, navigationBlocker: N
         handleChange,
         handleSave,
     };
-};
+};

law-document/src/slate/config/translations.ts

@@ -77,7 +77,7 @@ export const translations: { [key: string]: { [key: string]: string } } = {
         'Documents in the Bill': 'Skjöl í frumvarpi',
         'Add document to bill and start editing': 'Bæta við skjali í frumvarp og byrja að breyta',
         'Remove document from bill and delete changes': 'Fjarlægja skjal úr frumvarpi og eyða breytingum',
-        'Create New Bill': 'Búa til nýtt frumvarp',
+        'Create New Bill': 'Stofna nýtt frumvarp',
         'Delete Bill Document': 'Eyða skjali',
         'Are you sure you want to permanently and irreversibly delete this document?': 'Ertu viss um að þú viljir eyða þessu skjali varanlega og óafturkræft?',
         'Yes, delete!': 'Já, eyða!',
@@ -92,5 +92,7 @@ export const translations: { [key: string]: { [key: string]: string } } = {
         'Open Bill Preview': 'Opna frumvarpsyfirlit',
         'This bill is still empty!': 'Þetta frumvarp er enn tómt!',
         'Tip: Start editing this bill by adding a document to it.': 'Ábending: Byrjaðu á að breyta þessu frumvarpi með því að bæta við skjali í það.',
+        'Publish Bill': 'Birta frumvarp',
+        'Bill published': 'Frumvarp hefur verið birt',
     },
-};
+};

server/src/controllers/BillController.ts

@@ -1,9 +1,10 @@
 import passport from 'koa-passport';
-import { Body, Get, JsonController, Param, Post, Put, UseBefore } from 'routing-controllers';
+import { Body, Get, JsonController, Param, Post, Put, UseBefore, ContentType, HttpError } from 'routing-controllers';
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
 import { exportBillXml } from 'law-document';
 import Bill from '../entities/Bill';
 import BillDocument from '../entities/BillDocument';
+import { postBillForValidation, postBillForPublishing } from '../integration/lagasafnApi';
 
 @JsonController()
 @OpenAPI({
@@ -39,6 +40,45 @@ class BillController {
         return Bill.save(bill);
     }
 
+    @Post('/bills/:id/xml')
+    @ContentType('text/xml')
+    @OpenAPI({
+        description: 'Publish bill XML',
+    })
+    async publishXml(
+        @Param('id') id: number,
+    ) {
+        const bills = await Bill.find({ where: { id } });
+
+        if ( bills.length < 1 || ! bills[0]?.documents ) {
+            throw new HttpError( 404, 'Unable to find bill documents');
+        }
+
+        const billsXml: string[] = [];
+
+        bills[0].documents.forEach( async bill => {
+            const documents = await BillDocument.find({
+                where: { id: bill.id },
+                select: ['content']
+            });
+
+            const billXml = exportBillXml(bill.title, documents);
+            billsXml.push( billXml );
+
+            try {
+                // First, validate XML.
+                await postBillForValidation( billXml );
+
+                // Second, publish the XML.
+                await postBillForPublishing( billXml );
+            } catch( error: any ) {
+                throw new HttpError( 400, <string>error?.message );
+            }
+        } );
+
+        return billsXml;
+    }
+
     @Put('/bills/:id')
     @ResponseSchema(Bill)
     update(
@@ -49,4 +89,4 @@ class BillController {
     }
 }
 
-export default BillController;
+export default BillController;

server/src/index.ts

@@ -20,4 +20,4 @@ void (async () => {
         console.log('Generating Client SDK...');
         exec('npm run build:sdk');
     }
-})();
+})();

server/src/integration/lagasafnApi/index.ts

@@ -1,10 +1,34 @@
-import axios from 'axios';
+import axios, { AxiosRequestConfig } from 'axios';
 import { lagasafnApi } from '../../config/lagasafnApi';
 
+const config: AxiosRequestConfig = {
+    headers: {
+        'Content-Type': 'application/xml',
+    },
+};
+
 export const postBillForValidation = async (billXml: string) => {
     try {
-        await axios.post(lagasafnApi.url, billXml);
-    } catch (error) {
+        await axios.post(
+            lagasafnApi.url + '/api/bill/document/validate',
+            billXml,
+            config
+        );
+    } catch (error: any) {
+        // Do not interrupt processing in case of external service failure
+        console.log('Request to lagasafn failed', error);
+    }
+};
+
+export const postBillForPublishing = async (billXml: string) => {
+    try {
+        await axios.post(
+            lagasafnApi.url + '/api/bill/document/publish',
+            billXml,
+            config
+        );
+    } catch (error: any) {
+        // Do not interrupt processing in case of external service failure
         console.log('Request to lagasafn failed', error);
     }
-};
+};

server/src/services/DocumentService.test.ts

@@ -13,10 +13,8 @@ describe('DocumentService', () => {
         const identifier = '2023.65';
         xmlContent = '<xml></xml>';
 
-        const [doc1, doc2] = await Promise.all([
-            findOrImportDocument(identifier),
-            findOrImportDocument(identifier),
-        ]);
+        const doc1 = await findOrImportDocument(identifier);
+        const doc2 = await findOrImportDocument(identifier);
 
         expect(doc1).toEqual(doc2);
     });