@licklist/design 0.78.4-dev.0 → 0.78.4-dev.1
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.
|
@@ -19,7 +19,7 @@ export interface EditEventFormValues extends IntervalInputValues {
|
|
|
19
19
|
saleDeadline: number | null;
|
|
20
20
|
integrationUrl: string | null;
|
|
21
21
|
recurrenceEndAt?: string;
|
|
22
|
-
duplicatedFromId?: number;
|
|
22
|
+
duplicatedFromId?: number | null;
|
|
23
23
|
editedProductSet?: ProductSetFormValues;
|
|
24
24
|
}
|
|
25
25
|
export interface EditEventFormProps extends HasPermissionProp {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EditEventForm.d.ts","sourceRoot":"","sources":["../../../../../src/events/edit-event-modal/component/EditEventForm/EditEventForm.tsx"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,EACN,MAAM,sDAAsD,CAAA;AAO7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAA;AAGtF,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAA;AAG3E,OAAO,EAAE,UAAU,EAAE,MAAM,6DAA6D,CAAA;AAExF,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAS5D,OAAO,EAAiB,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAGxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAA;AAIlF,MAAM,WAAW,mBAAoB,SAAQ,mBAAmB;IAC9D,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAA;IACjC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAA;IACzB,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAA;IAClC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAA;IACtB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"EditEventForm.d.ts","sourceRoot":"","sources":["../../../../../src/events/edit-event-modal/component/EditEventForm/EditEventForm.tsx"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,EACN,MAAM,sDAAsD,CAAA;AAO7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAA;AAGtF,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAA;AAG3E,OAAO,EAAE,UAAU,EAAE,MAAM,6DAA6D,CAAA;AAExF,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAS5D,OAAO,EAAiB,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAGxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAA;AAIlF,MAAM,WAAW,mBAAoB,SAAQ,mBAAmB;IAC9D,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAA;IACjC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAA;IACzB,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAA;IAClC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAA;IACtB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAChC,gBAAgB,CAAC,EAAE,oBAAoB,CAAA;CACxC;AAED,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,UAAU,EAAE,aAAa,EAAE,CAAA;IAC3B,KAAK,EAAE,MAAM,CAAA;IACb,kBAAkB,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;IACjD,YAAY,CAAC,EAAE,WAAW,CAAA;IAC1B,WAAW,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAA;IAClD,WAAW,CAAC,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;IACjC,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,gBAAgB,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAA;IACtD,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5C,4BAA4B,CAAC,EAAE,OAAO,CAAA;IACtC,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,UAAU,CAAA;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAC/B;AAOD,eAAO,MAAM,aAAa,8RAmBvB,kBAAkB,4CAqZpB,CAAA"}
|
package/package.json
CHANGED
|
@@ -50,7 +50,7 @@ export interface EditEventFormValues extends IntervalInputValues {
|
|
|
50
50
|
saleDeadline: number | null
|
|
51
51
|
integrationUrl: string | null
|
|
52
52
|
recurrenceEndAt?: string
|
|
53
|
-
duplicatedFromId?: number
|
|
53
|
+
duplicatedFromId?: number | null
|
|
54
54
|
editedProductSet?: ProductSetFormValues
|
|
55
55
|
}
|
|
56
56
|
|
|
@@ -208,7 +208,7 @@ export const EditEventForm = ({
|
|
|
208
208
|
)
|
|
209
209
|
const isChangedTime =
|
|
210
210
|
watchedValues?.start !==
|
|
211
|
-
|
|
211
|
+
toSimpleDateTime(defaultEventValues?.startAt || '') ||
|
|
212
212
|
watchedValues?.end !== toSimpleDateTime(defaultEventValues?.endAt || '')
|
|
213
213
|
const isSinglEventWithBooked = !rrule && isBooked && isChangedTime
|
|
214
214
|
|
|
@@ -221,18 +221,20 @@ export const EditEventForm = ({
|
|
|
221
221
|
onApprove={onApproveDialog}
|
|
222
222
|
onDecline={onDeclineDialog}
|
|
223
223
|
/>
|
|
224
|
-
{
|
|
225
|
-
|
|
224
|
+
{duplicatedInfo ? (
|
|
225
|
+
<div className='d-flex justify-content-between'>
|
|
226
226
|
<h5 className='edit-event-modal-title highlited-primary-title'>
|
|
227
227
|
{title}
|
|
228
228
|
</h5>
|
|
229
|
-
<Badge className='duplicate-badge' variant='success'>
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
229
|
+
<Badge className='duplicate-badge' variant='success'>
|
|
230
|
+
{duplicatedInfo}
|
|
231
|
+
</Badge>
|
|
232
|
+
</div>
|
|
233
|
+
) : (
|
|
234
|
+
<h5 className='edit-event-modal-title highlited-primary-title'>
|
|
235
|
+
{title}
|
|
236
|
+
</h5>
|
|
237
|
+
)}
|
|
236
238
|
|
|
237
239
|
<FormProvider {...form}>
|
|
238
240
|
<Modal.Body
|