@bjsdistribution/dms-client-return 0.0.94-prod → 0.0.95-prod

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (138) hide show
  1. package/dist/assets/icons/ArrowDownIcon.d.ts +6 -0
  2. package/dist/assets/icons/DeliverProductIcon.d.ts +3 -0
  3. package/dist/assets/icons/ReturnProductIcon.d.ts +3 -0
  4. package/dist/common/checkbox/index.d.ts +2 -0
  5. package/dist/common/modals/order-action-modal/OrderActionModal.d.ts +3 -1
  6. package/dist/components/order-view/details-filters/left-side-filters/dropdowns/DropDowns.d.ts +1 -0
  7. package/dist/components/order-view/details-filters/left-side-filters/dropdowns/MenuDropDown.d.ts +2 -2
  8. package/dist/components/order-view/flags-action-modal/Actions.d.ts +6 -2
  9. package/dist/components/order-view/flags-action-modal/Dropdowns.d.ts +1 -0
  10. package/dist/components/order-view/flags-action-modal/Header.d.ts +1 -1
  11. package/dist/components/order-view/notification/FlagTemplate.d.ts +1 -1
  12. package/dist/components/order-view/notification/OrderTemplate.d.ts +1 -1
  13. package/dist/components/order-view/notification/Tabs.d.ts +1 -1
  14. package/dist/components/order-view/order-actions/actions/cancel-order/CancelOrderTable.d.ts +5 -0
  15. package/dist/components/order-view/order-actions/actions/cancel-order/index.d.ts +7 -1
  16. package/dist/components/order-view/order-actions/actions/change-customer-account/ChangeCustomerAccModal.d.ts +4 -1
  17. package/dist/components/order-view/order-actions/actions/charge-log/index.d.ts +11 -0
  18. package/dist/components/order-view/order-actions/actions/create-task-reminder/CreateReminderModal.d.ts +1 -13
  19. package/dist/components/order-view/order-actions/actions/create-task-reminder/TaskModal.d.ts +5 -1
  20. package/dist/components/order-view/order-actions/actions/create-task-reminder/index.d.ts +6 -2
  21. package/dist/components/order-view/order-actions/actions/hold-order/HoldOrderModal.d.ts +6 -1
  22. package/dist/components/order-view/order-actions/actions/log-service-refusal/DeliveryPoint.d.ts +5 -1
  23. package/dist/components/order-view/order-actions/actions/log-service-refusal/Notes.d.ts +5 -3
  24. package/dist/components/order-view/order-actions/actions/log-service-refusal/OrderServices.d.ts +5 -1
  25. package/dist/components/order-view/order-actions/actions/log-service-refusal/index.d.ts +1 -1
  26. package/dist/components/order-view/order-actions/actions/uncancel-order/UncancelOrder.d.ts +7 -1
  27. package/dist/components/order-view/order-actions/actions/uncancel-order/UncancelOrderTable.d.ts +5 -0
  28. package/dist/components/order-view/order-actions/actions/unhold-order/UnholdOrder.d.ts +6 -1
  29. package/dist/components/order-view/order-actions/store.d.ts +10 -8
  30. package/dist/components/order-view/order-actions/types.d.ts +38 -60
  31. package/dist/components/order-view/order-actions/utils.d.ts +2 -1
  32. package/dist/components/order-view/store.d.ts +48 -3
  33. package/dist/components/order-view/types.d.ts +11 -0
  34. package/dist/components/order-view/utils.d.ts +1 -0
  35. package/dist/components/order-view/view-reminder/ViewReminder.d.ts +5 -1
  36. package/dist/components/order-view/view-reminder/reminder-styles.d.ts +3 -1
  37. package/dist/components/store.d.ts +2 -1
  38. package/dist/dms-client-return.cjs.development.js +4812 -3095
  39. package/dist/dms-client-return.cjs.development.js.map +1 -1
  40. package/dist/dms-client-return.cjs.production.min.js +1 -1
  41. package/dist/dms-client-return.cjs.production.min.js.map +1 -1
  42. package/dist/dms-client-return.esm.js +4815 -3098
  43. package/dist/dms-client-return.esm.js.map +1 -1
  44. package/package.json +2 -2
  45. package/src/assets/icons/ArrowDownIcon.tsx +28 -0
  46. package/src/assets/icons/DeliverProductIcon.tsx +42 -0
  47. package/src/assets/icons/ReturnProductIcon.tsx +23 -0
  48. package/src/common/checkbox/index.tsx +60 -17
  49. package/src/common/modals/order-action-modal/OrderActionModal.tsx +13 -7
  50. package/src/common/radio-group/RadioButtonGroup.tsx +3 -4
  51. package/src/components/order-daily-overview/header-filters/SelectionFilter.tsx +29 -26
  52. package/src/components/order-daily-overview/header-filters/filterStore.ts +6 -8
  53. package/src/components/order-daily-overview/index.tsx +20 -7
  54. package/src/components/order-daily-overview/return-after-table/ReturnAfterTable.tsx +2 -2
  55. package/src/components/order-daily-overview/return-after-table/table/OrderTable.tsx +19 -19
  56. package/src/components/order-daily-overview/return-after-table/table-filters/ReturnFilterStore.ts +11 -9
  57. package/src/components/order-daily-overview/return-after-table/table-filters/ReturnOrderFilter.tsx +19 -4
  58. package/src/components/order-daily-overview/return-order-table/return-orders-filters/ReturnOrderTable.tsx +41 -59
  59. package/src/components/order-daily-overview/table/ReturnTable.tsx +1 -30
  60. package/src/components/order-view/details-filters/left-side-filters/dropdowns/DropDowns.tsx +52 -2
  61. package/src/components/order-view/details-filters/left-side-filters/dropdowns/MenuDropDown.tsx +37 -43
  62. package/src/components/order-view/details-filters/left-side-filters/dropdowns/OptionsDropDown.tsx +75 -44
  63. package/src/components/order-view/fakedata.ts +7 -6
  64. package/src/components/order-view/flags-action-modal/Actions.tsx +51 -25
  65. package/src/components/order-view/flags-action-modal/DetailSection.tsx +5 -5
  66. package/src/components/order-view/flags-action-modal/Dropdowns.tsx +75 -89
  67. package/src/components/order-view/flags-action-modal/Header.tsx +32 -23
  68. package/src/components/order-view/flags-action-modal/TextSection.tsx +9 -6
  69. package/src/components/order-view/flags-action-modal/index.tsx +54 -67
  70. package/src/components/order-view/general-information/dropdowns/Print.tsx +136 -70
  71. package/src/components/order-view/generic-table/AuditLogs.tsx +5 -4
  72. package/src/components/order-view/index.tsx +9 -42
  73. package/src/components/order-view/modalsPopup/CreateReturnModal.tsx +20 -18
  74. package/src/components/order-view/modalsPopup/ModalManager.tsx +4 -10
  75. package/src/components/order-view/notes/logs/index.tsx +1 -1
  76. package/src/components/order-view/notes/order-dropdown/NewReturnDropdown.tsx +5 -7
  77. package/src/components/order-view/notification/FlagTemplate.tsx +8 -8
  78. package/src/components/order-view/notification/OrderTemplate.tsx +169 -175
  79. package/src/components/order-view/notification/ReminderTemplate.tsx +23 -14
  80. package/src/components/order-view/notification/Tabs.tsx +15 -14
  81. package/src/components/order-view/notification/index.tsx +164 -92
  82. package/src/components/order-view/order-actions/actions/add-resources/index.tsx +19 -29
  83. package/src/components/order-view/order-actions/actions/cancel-order/CancelOrderTable.tsx +345 -0
  84. package/src/components/order-view/order-actions/actions/cancel-order/index.tsx +146 -71
  85. package/src/components/order-view/order-actions/actions/change-customer-account/ChangeCustomerAccModal.tsx +95 -32
  86. package/src/components/order-view/order-actions/actions/charge-log/index.tsx +395 -0
  87. package/src/components/order-view/order-actions/actions/clear-booking-status/ClearBookingStatus.tsx +1 -1
  88. package/src/components/order-view/order-actions/actions/confirm-order/customer-info/ActionDropdown.tsx +34 -17
  89. package/src/components/order-view/order-actions/actions/confirm-order/customer-info/ContactMobile.tsx +2 -3
  90. package/src/components/order-view/order-actions/actions/confirm-order/customer-info/ContactPhone.tsx +2 -3
  91. package/src/components/order-view/order-actions/actions/confirm-order/customer-info/ContactWork.tsx +2 -3
  92. package/src/components/order-view/order-actions/actions/confirm-order/customer-info/DeliveryDate.tsx +39 -25
  93. package/src/components/order-view/order-actions/actions/confirm-order/customer-info/EmailAddress.tsx +1 -1
  94. package/src/components/order-view/order-actions/actions/confirm-order/customer-info/TimedServiceDropdown.tsx +4 -2
  95. package/src/components/order-view/order-actions/actions/confirm-order/customer-info/index.tsx +1 -1
  96. package/src/components/order-view/order-actions/actions/confirm-order/index.tsx +254 -66
  97. package/src/components/order-view/order-actions/actions/confirm-order/slot-and-instructions/index.tsx +1 -1
  98. package/src/components/order-view/order-actions/actions/confirm-order/tables/NotesTable.tsx +13 -9
  99. package/src/components/order-view/order-actions/actions/confirm-order/tables/ProductTable.tsx +1 -1
  100. package/src/components/order-view/order-actions/actions/create-task-reminder/CreateReminderModal.tsx +213 -117
  101. package/src/components/order-view/order-actions/actions/create-task-reminder/CreateTaskModal.tsx +97 -152
  102. package/src/components/order-view/order-actions/actions/create-task-reminder/TaskModal.tsx +30 -87
  103. package/src/components/order-view/order-actions/actions/create-task-reminder/index.tsx +77 -83
  104. package/src/components/order-view/order-actions/actions/hold-order/HoldOrderModal.tsx +57 -65
  105. package/src/components/order-view/order-actions/actions/log-service-refusal/DeliveryPoint.tsx +10 -16
  106. package/src/components/order-view/order-actions/actions/log-service-refusal/Notes.tsx +21 -4
  107. package/src/components/order-view/order-actions/actions/log-service-refusal/OrderServices.tsx +39 -11
  108. package/src/components/order-view/order-actions/actions/log-service-refusal/index.tsx +79 -8
  109. package/src/components/order-view/order-actions/actions/send-email/SendEmailModal.tsx +114 -17
  110. package/src/components/order-view/order-actions/actions/send-sms/SendSmsModal.tsx +115 -7
  111. package/src/components/order-view/order-actions/actions/split-order/index.tsx +14 -4
  112. package/src/components/order-view/order-actions/actions/uncancel-order/UncancelOrder.tsx +176 -87
  113. package/src/components/order-view/order-actions/actions/uncancel-order/UncancelOrderTable.tsx +352 -0
  114. package/src/components/order-view/order-actions/actions/unhold-order/UnholdOrder.tsx +35 -59
  115. package/src/components/order-view/order-actions/index.tsx +237 -22
  116. package/src/components/order-view/order-actions/store.ts +50 -48
  117. package/src/components/order-view/order-actions/types.ts +40 -65
  118. package/src/components/order-view/order-actions/utils.ts +15 -8
  119. package/src/components/order-view/order-details/expanded-content/customer-section/contact-info/ContactEmail.tsx +2 -1
  120. package/src/components/order-view/order-details/expanded-content/footer/index.tsx +80 -39
  121. package/src/components/order-view/order-details/expanded-content/orders-section/Carrier.tsx +10 -14
  122. package/src/components/order-view/order-details/expanded-content/orders-section/DeliveryDate.tsx +10 -1
  123. package/src/components/order-view/order-details/expanded-content/orders-section/ScheduleAfter.tsx +2 -1
  124. package/src/components/order-view/products-info/expanded-content/index.tsx +3 -2
  125. package/src/components/order-view/products-info/index.tsx +14 -11
  126. package/src/components/order-view/return-client-products/product-table/ReturnProductTable.tsx +26 -24
  127. package/src/components/order-view/store.ts +59 -2
  128. package/src/components/order-view/system-event-logs/columns/Date.tsx +4 -2
  129. package/src/components/order-view/system-event-logs/columns/Event.tsx +9 -9
  130. package/src/components/order-view/system-event-logs/columns/Note.tsx +1 -1
  131. package/src/components/order-view/system-event-logs/expanded-content/index.tsx +25 -25
  132. package/src/components/order-view/types.ts +13 -0
  133. package/src/components/order-view/utils.ts +4 -0
  134. package/src/components/order-view/view-reminder/AssigneeDropdown.tsx +183 -12
  135. package/src/components/order-view/view-reminder/ViewReminder.tsx +234 -143
  136. package/src/components/order-view/view-reminder/reminder-styles.tsx +14 -8
  137. package/src/components/store.ts +6 -0
  138. package/src/index.tsx +28 -18
@@ -1,11 +1,10 @@
1
- import React, { useState } from 'react';
1
+ import React, { useEffect, useState } from 'react';
2
2
  import {
3
- useCategoryData,
4
3
  useCreateReminderPayload,
5
- useDepartmentData,
6
- useTaskTypeExtended,
4
+ useDeptData,
5
+ useStaticData,
7
6
  } from '../../store';
8
- import { priorityData, transformOption } from '../../utils';
7
+ import { priorityData } from '../../utils';
9
8
  import {
10
9
  DoubleDropdownContainer,
11
10
  FormRow,
@@ -15,69 +14,81 @@ import {
15
14
  import { DatePickerWrap } from '../modalstyle';
16
15
  import RadioButtonGroup from '../../../../../common/radio-group/RadioButtonGroup';
17
16
  import styled from 'styled-components';
18
- import { TextArea } from '@bjsdistribution/dms-component-library';
19
- import { DatePicker, Select } from 'antd';
20
- import { StandardOptionsType } from '../../../../../common/radio-group/types';
17
+ import { TextArea, useAxios } from '@bjsdistribution/dms-component-library';
18
+ import { DatePicker, notification, Select } from 'antd';
21
19
  import dayjs from 'dayjs';
22
20
  import { isValid } from 'date-fns';
23
21
  import utc from 'dayjs/plugin/utc';
24
- import { useOrderId } from '../../../store';
22
+ import { ApiResponse } from '../../../types';
25
23
  dayjs.extend(utc);
26
24
  dayjs.extend(isValid);
27
25
 
28
26
  function CreateReminderModal() {
29
- const [CategoryData] = useCategoryData();
30
- const [SelectedPriority, setPriority] = useState(1);
31
- const [departmentData] = useDepartmentData();
32
- const [subCategoryOptions, setSubCategoryOptions] = useState([]);
33
- const [, setSelectedCategory] = useState(null);
34
- const [subCategory] = useTaskTypeExtended();
35
- const [createReminder, setPayload] = useCreateReminderPayload();
36
- const [displayDate, setDisplayDate] = useState<any | null>();
37
- const [orderId] = useOrderId();
38
-
39
- const handleSelectChange = () => console.log('testing log');
40
-
41
- //options for department
42
- const departmentOptions = departmentData.map((option: any) =>
43
- transformOption(option, 'name')
44
- );
45
-
46
- //options for priority
47
- const priorityOptions: StandardOptionsType[] = priorityData.map(
48
- (option: any) => ({
49
- label: option.name,
50
- value: option.id,
51
- color: option.color,
52
- })
53
- );
27
+ const [selectedPriority, setPriority] = useState(null);
28
+ const [reminderPayload, setReminderPayload] = useCreateReminderPayload();
29
+ const [displayDate, setDisplayDate] = useState<Date | null>();
30
+ const [staticData] = useStaticData();
31
+ const [departmentData, setDepartmentData] = useDeptData();
32
+ const [selectedDeptId, setSelectedDeptId] = useState<any | null>(null);
33
+ const [allUsers, setAllUsers] = useState<
34
+ {
35
+ fName: string;
36
+ lName: string;
37
+ id: string;
38
+ username: string;
39
+ deptId: number | null;
40
+ }[]
41
+ >([]);
42
+ const [, setFilteredUsers] = useState<typeof allUsers>([]);
54
43
 
55
- //subcategory change
56
- const handleDepartmentChange = (event: any) => {
57
- setPayload(prevState => ({
44
+ const handleSelectUser = (value: string[]) => {
45
+ setReminderPayload((prevState: any) => ({
58
46
  ...prevState,
59
- department_id: event,
47
+ assigned_to: value,
60
48
  }));
61
49
  };
62
50
 
63
- const handleDateChange = (date: any | null, dateString: any | null) => {
64
- if (dateString && date && isValid(date?.$d)) {
65
- setDisplayDate(date?.$d?.toISOString());
51
+ const deptData =
52
+ departmentData?.map((item: any) => ({
53
+ label: item?.label,
54
+ value: item?.value,
55
+ })) || [];
66
56
 
67
- const localDate = dayjs(dateString, 'DD/MM/YYYY HH:mm A');
57
+ const getPriorityOptions = (staticData: any) => {
58
+ return staticData?.[0]?.priorities?.map((option: any) => {
59
+ const colorMatch = priorityData?.find(p => p.id === option.id);
60
+ return {
61
+ label: option.name,
62
+ value: option.id,
63
+ color: colorMatch?.color || '#ccc',
64
+ };
65
+ });
66
+ };
67
+ const priorityOptions = getPriorityOptions(staticData);
68
68
 
69
- const formattedDateTime = localDate
70
- .format('YYYY-MM-DDTHH:mm:ss.SSS')
71
- .concat('Z');
69
+ //subcategory change
70
+ const handleDepartmentChange = (value: string, option: { label: string }) => {
71
+ setSelectedDeptId(value);
72
+ setReminderPayload((prevState: any) => ({
73
+ ...prevState,
74
+ department: option?.label,
75
+ assigned_to: null,
76
+ }));
77
+ };
72
78
 
73
- setPayload((prevState: any) => ({
79
+ const handleDateChange = (date: any | null) => {
80
+ if (date && isValid(date?.$d)) {
81
+ const formattedDateTime = dayjs(date).toISOString();
82
+ setDisplayDate(date?.$d?.toISOString());
83
+ setReminderPayload((prevState: any) => ({
74
84
  ...prevState,
75
- due: formattedDateTime,
85
+ due_datetime: formattedDateTime,
76
86
  }));
77
87
  } else {
78
- setPayload((prevState: any) => ({
88
+ setDisplayDate(null);
89
+ setReminderPayload((prevState: any) => ({
79
90
  ...prevState,
80
- due: undefined,
91
+ due_datetime: null,
81
92
  }));
82
93
  }
83
94
  };
@@ -86,110 +97,195 @@ function CreateReminderModal() {
86
97
  const handlePriorityChange = (event: any) => {
87
98
  const newValue = event.target.value;
88
99
  setPriority(newValue);
89
- setPayload(prevState => ({
100
+ setReminderPayload(prevState => ({
90
101
  ...prevState,
91
- task_priority_id: +newValue,
102
+ priority: +newValue,
92
103
  }));
93
104
  };
94
105
 
95
106
  //description change
96
107
  const handleChange = (event: any) => {
97
108
  const desc = event.target.value;
98
- setPayload(prevState => ({
109
+ setReminderPayload(prevState => ({
99
110
  ...prevState,
100
- details: desc,
101
- order_id: +orderId,
111
+ description: desc,
102
112
  }));
103
113
  };
104
114
 
105
- // Options for category types
106
- const categoryOptions = CategoryData.map((option: any) =>
107
- transformOption(option, 'category')
108
- );
115
+ // sso Data get
116
+ const { fetchData: getSSOData, data: fetchData } = useAxios<{
117
+ data: ApiResponse[];
118
+ }>({
119
+ endpoint: `/sso/departments/`,
120
+ method: 'GET',
121
+ });
109
122
 
110
- //handling dependent subcategory dropdown
111
- const handleCategoryChange = (value: any) => {
112
- setSelectedCategory(value);
113
- setPayload((prevstate: any) => ({
114
- ...prevstate,
115
- task_categories_id: value,
116
- }));
117
- const filteredSubCategories = subCategory
118
- .filter((subCat: any) => subCat.category_id == value)
119
- .map((subCat: any) => ({
120
- label: subCat.sub_category,
121
- value: subCat.id,
122
- }));
123
- setSubCategoryOptions(filteredSubCategories);
124
- };
123
+ useEffect(() => {
124
+ const fetchAllSSOData = async () => {
125
+ try {
126
+ getSSOData();
127
+ } catch (error) {
128
+ console.error('Error fetching SSO data:', error);
129
+ }
130
+ };
131
+ fetchAllSSOData();
132
+ }, []);
125
133
 
126
- //subcategory change
127
- const handleTypeChange = (event: any) => {
128
- setPayload(prevState => ({
134
+ const { fetchData: getUsersData } = useAxios<{ data: any }>({
135
+ endpoint: `/sso/users/`,
136
+ method: 'GET',
137
+ });
138
+
139
+ useEffect(() => {
140
+ const fetchAllPages = async () => {
141
+ try {
142
+ let page = 0;
143
+ let usersList: any[] = [];
144
+ let totalPages = 1;
145
+
146
+ while (page < totalPages) {
147
+ const res = (await getUsersData({
148
+ endPointQuery: `?page=${page}&limit=500`,
149
+ })) as { data: any };
150
+
151
+ const data = res?.data;
152
+
153
+ if (data) {
154
+ usersList = [...usersList, ...(data?.users || [])];
155
+ totalPages = data.pages || 1;
156
+ page += 1;
157
+ } else {
158
+ break;
159
+ }
160
+ }
161
+
162
+ setAllUsers(
163
+ usersList?.map(user => ({
164
+ id: user?.id,
165
+ username: user?.username,
166
+ deptId: user?.department_id,
167
+ fName: user?.first_names,
168
+ lName: user?.last_name,
169
+ // userId: user?.user_id,
170
+ }))
171
+ );
172
+ } catch (error) {
173
+ console.error('Error fetching paginated SSO data:', error);
174
+ }
175
+ };
176
+
177
+ fetchAllPages();
178
+ }, []);
179
+
180
+ useEffect(() => {
181
+ if (selectedDeptId !== null && allUsers?.length > 0) {
182
+ const matchedUsers = allUsers?.filter(
183
+ user => user?.deptId?.toString() === selectedDeptId?.toString()
184
+ );
185
+ setFilteredUsers(matchedUsers);
186
+ } else {
187
+ setFilteredUsers([]);
188
+ }
189
+ }, [selectedDeptId, allUsers]);
190
+
191
+ useEffect(() => {
192
+ if (fetchData && fetchData?.data) {
193
+ const deptList =
194
+ fetchData?.data?.map((item: any) => ({
195
+ label: item?.name,
196
+ value: item?.id,
197
+ })) || [];
198
+ setDepartmentData(deptList);
199
+ } else {
200
+ setDepartmentData([]);
201
+ }
202
+ }, [fetchData]);
203
+
204
+ const userOptions = allUsers?.map((user: any) => ({
205
+ label: `${user.fName} ${user.lName}`,
206
+ value: user.id,
207
+ }));
208
+
209
+ const handleAssignToMe = () => {
210
+ let storedUserID: string | null = null;
211
+
212
+ const storedUserJSON = localStorage.getItem('User_iD');
213
+ if (storedUserJSON) {
214
+ try {
215
+ const parsed = JSON.parse(storedUserJSON);
216
+ storedUserID = parsed.user_id || null;
217
+ } catch (e) {
218
+ console.error('Failed to parse stored user ID', e);
219
+ }
220
+ }
221
+
222
+ if (!storedUserID) return;
223
+ console.log(allUsers, 'allUsersallUsersallUsers');
224
+ const matchedUser: any = allUsers?.find(user => user?.id === storedUserID);
225
+
226
+ console.log(storedUserID, 'storedUserID');
227
+ console.log(matchedUser, 'matchedUser');
228
+
229
+ const deptMatched =
230
+ departmentData?.find((dept: any) => dept.value === matchedUser?.deptId)
231
+ ?.label || null;
232
+
233
+ if (!deptMatched) {
234
+ notification.info({
235
+ message: 'Info',
236
+ description: `Department is not assigned to the user`,
237
+ });
238
+ return;
239
+ }
240
+
241
+ setReminderPayload((prevState: any) => ({
129
242
  ...prevState,
130
- task_subcategories_id: event,
243
+ assigned_to: [matchedUser?.id],
244
+ department: deptMatched,
131
245
  }));
246
+
247
+ matchedUser && setSelectedDeptId(matchedUser?.department_id);
132
248
  };
133
249
 
134
250
  return (
135
251
  <Wrapper>
136
252
  <SplitContainer>
137
- <FormRow label="Assigned To">
253
+ <FormRow label="Department" required>
138
254
  <DoubleDropdownContainer>
139
255
  <StyledAntSelect
140
- options={[]}
141
- placeholder="IND"
142
- onChange={handleSelectChange}
143
- style={{ width: '8vw' }}
144
- />
145
- <StyledAntSelect
146
- options={departmentOptions}
256
+ options={deptData}
257
+ style={{ width: '10vw' }}
147
258
  placeholder="Select Department"
148
259
  onChange={handleDepartmentChange}
149
- style={{ width: '18vw' }}
150
- value={createReminder.department_id}
260
+ value={reminderPayload?.department || undefined}
261
+ showSearch
151
262
  />
152
263
  </DoubleDropdownContainer>
264
+ </FormRow>
265
+ <FormRow label="Assigned To" required>
153
266
  <StyledAntSelect
154
- options={[]}
267
+ options={userOptions}
155
268
  placeholder="Select User"
156
- onChange={handleSelectChange}
157
- style={{ width: '100%' }}
269
+ onChange={handleSelectUser}
270
+ style={{ width: 'max-content' }}
271
+ value={reminderPayload?.assigned_to || []}
272
+ showSearch
273
+ mode="multiple"
274
+ filterOption={(input: string, option?: { label: string }) =>
275
+ option?.label.toLowerCase().includes(input.toLowerCase())
276
+ }
158
277
  />
159
- <StyledLink>Assign to me</StyledLink>
160
278
  </FormRow>
161
279
 
162
- {(createReminder.department_id === 1 ||
163
- createReminder.department_id === 2) && (
164
- <>
165
- <FormRow label="Category">
166
- <StyledAntSelect
167
- style={{ minWidth: '20vw' }}
168
- options={categoryOptions}
169
- placeholder="Select Category"
170
- onChange={handleCategoryChange}
171
- value={createReminder.task_categories_id}
172
- />
173
- </FormRow>
174
- <FormRow label="Type">
175
- <StyledAntSelect
176
- options={subCategoryOptions}
177
- placeholder="Select Type"
178
- onChange={handleTypeChange}
179
- style={{ minWidth: '20vw' }}
180
- value={createReminder.task_subcategories_id}
181
- />
182
- </FormRow>
183
- </>
184
- )}
280
+ <StyledLink onClick={handleAssignToMe}>Assign to me</StyledLink>
185
281
 
186
- <FormRow label="Priority">
282
+ <FormRow label="Priority" required>
187
283
  <RadioButtonGroup
188
284
  heading=""
189
285
  options={priorityOptions}
190
286
  onChange={handlePriorityChange}
191
287
  direction="horizontal"
192
- selectedValue={SelectedPriority}
288
+ selectedValue={selectedPriority || 3}
193
289
  required={false}
194
290
  />
195
291
  </FormRow>
@@ -257,7 +353,7 @@ const Label = styled.label`
257
353
  font-weight: 500;
258
354
  `;
259
355
 
260
- export const StyledAntSelect = styled(Select)`
356
+ export const StyledAntSelect: any = styled(Select)`
261
357
  .ant-select-selector {
262
358
  width: 20vw;
263
359
  border-radius: 22px;