updates on auth for the login creds and data linkage and updates on the deliveries page and queries section and updates on the test files

tests/api/deliveryStatus.test.js

@@ -193,6 +193,16 @@ describe('deriveDeliveryStatus', () => {
     it('should still return picked for a Collected_By_Miler booking with no consignment', () => {
       expect(deriveDeliveryStatus({ status: 'Collected_By_Miler' })).toBe('picked');
     });
+
+    it('should keep Converted_To_Consignment as picked when joined consignment only has generic status: Active', () => {
+      const map = new Map([['40', { status: 'Active' }]]);
+      expect(deriveDeliveryStatus({ status: 'Converted_To_Consignment', consignmentid: 40 }, map)).toBe('picked');
+    });
+
+    it('should bump Converted_To_Consignment to active when joined consignment has consignmentstatus: Out_for_Delivery', () => {
+      const map = new Map([['40', { status: 'Active', consignmentstatus: 'Out_for_Delivery' }]]);
+      expect(deriveDeliveryStatus({ status: 'Converted_To_Consignment', consignmentid: 40 }, map)).toBe('active');
+    });
   });
 
   describe('mapBookingStatusToDeliveryStatus', () => {