@7365admin1/layer-common 1.11.0 → 1.11.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.11.2
+
+### Patch Changes
+
+- ed37627: Update Fix for Bulletin Board issue
+
+## 1.11.1
+
+### Patch Changes
+
+- cce0f12: Update for release of Dashboard changes
+
 ## 1.11.0
 
 ### Minor Changes

package/components/BulletinBoardForm.vue

@@ -259,16 +259,17 @@ function validStartDateRule(value: string) {
     return true;
 }
 
-function validExpiryDateRule(value: string) {
+function validExpiryDateRule() {
     const noExpiration = bulletinForm.noExpiration
     if (noExpiration) return true;
     const startDateISO = bulletinForm.startDate;
-    if (!value) {
+    const endDateISO = bulletinForm.endDate;
+    if (!endDateISO) {
         return 'End Date is required';
     }
 
-    if (value && startDateISO) {
-        const expiry = new Date(value);
+    if (endDateISO && startDateISO) {
+        const expiry = new Date(endDateISO);
         const start = new Date(startDateISO as string);
         return expiry >= start || 'End date must be equal or later than start date';
     }

package/components/BulletinBoardManagement.vue

@@ -60,6 +60,7 @@
     </v-row>
 </template>
 <script setup lang="ts">
+import useBulletin from '../composables/useBulletin';
 import { APP_CONSTANTS } from '../constants/app';
 
 definePageMeta({
@@ -173,7 +174,7 @@ const {
     pending: getAnnouncementPending,
 } = await useLazyAsyncData(
     `get-all-announcements-${page.value}`,
-    () => getAll({ page: page.value, site: siteId, status: status.value, recipients: props.recipients }),
+    () => getAll({ page: page.value, site: siteId, status: status.value, recipients: props.recipients ?? "" }),
     {
         watch: [page, () => route.query],
     }

package/components/VehicleForm.vue

@@ -622,15 +622,16 @@ function validStartDateRule(value: string) {
   return true;
 }
 
-function validExpiryDateRule(value: string) {
+function validExpiryDateRule() {
   const startDateISO = vehicle.start;
+  const endDateISO = vehicle.end;
 
-  if (!value && startDateISO) {
+  if (!endDateISO && startDateISO) {
     return 'Expiry Date is required';
   }
 
-  if (value && startDateISO) {
-    const expiry = new Date(value);
+  if (endDateISO && startDateISO) {
+    const expiry = new Date(endDateISO);
     const start = new Date(startDateISO as string);
     return expiry > start || 'Expiry date must be later than start date';
   }

package/composables/useBulletin.ts

@@ -31,7 +31,7 @@ export default function(){
     type TGetAllParams = {
     page?: number; 
     limit?: number; 
-    sort?: 'asc' | 'desc'; 
+    order?: 'asc' | 'desc'; 
     site?: string;
     status?: TAnnouncementStatus;
     search?: string;
@@ -41,7 +41,7 @@ export default function(){
     async function getAll({
     page = 1,
     limit = 10,
-    sort = "asc",
+    order = "desc",
     site,
     status,
     search,
@@ -54,7 +54,7 @@ export default function(){
         query: {
           page,
           limit,
-          sort,
+          order,
           site,
           status,
           search,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.11.0",
+  "version": "1.11.2",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {

package/types/dashboard.d.ts

@@ -1,8 +1,6 @@
 declare type TDashboardValues = "today" | "thisWeek" | "thisMonth";
 
 
-declare type TPeriodState = Record<string, TDashboardValues>
-
 declare type TDashboardCardValue = {
   key: string;
   periodKey: keyof TPeriodState;