Commit 8237cf4f7c45a4e6d56437edae97a39856de43e8
1 parent
885395f1
Fixed updated widget: Cleared creationTime
Showing
4 changed files
with
9 additions
and
5 deletions
... | ... | @@ -181,8 +181,9 @@ export class WidgetService { |
181 | 181 | public saveWidgetType(widgetInfo: WidgetInfo, |
182 | 182 | id: WidgetTypeId, |
183 | 183 | bundleAlias: string, |
184 | + createdTime: number, | |
184 | 185 | config?: RequestConfig): Observable<WidgetType> { |
185 | - const widgetTypeInstance = toWidgetType(widgetInfo, id, undefined, bundleAlias); | |
186 | + const widgetTypeInstance = toWidgetType(widgetInfo, id, undefined, bundleAlias, createdTime); | |
186 | 187 | return this.http.post<WidgetType>('/api/widgetType', widgetTypeInstance, |
187 | 188 | defaultHttpOptionsFromConfig(config)).pipe( |
188 | 189 | tap((savedWidgetType) => { | ... | ... |
... | ... | @@ -107,7 +107,7 @@ export class WidgetComponentService { |
107 | 107 | image: this.utils.editWidgetInfo.image, |
108 | 108 | description: this.utils.editWidgetInfo.description, |
109 | 109 | defaultConfig: this.utils.editWidgetInfo.defaultConfig |
110 | - }, new WidgetTypeId('1'), new TenantId( NULL_UUID ), 'customWidgetBundle' | |
110 | + }, new WidgetTypeId('1'), new TenantId( NULL_UUID ), 'customWidgetBundle', undefined | |
111 | 111 | ); |
112 | 112 | } |
113 | 113 | const initSubject = new ReplaySubject(); | ... | ... |
... | ... | @@ -446,7 +446,8 @@ export function toWidgetInfo(widgetTypeEntity: WidgetType): WidgetInfo { |
446 | 446 | }; |
447 | 447 | } |
448 | 448 | |
449 | -export function toWidgetType(widgetInfo: WidgetInfo, id: WidgetTypeId, tenantId: TenantId, bundleAlias: string): WidgetType { | |
449 | +export function toWidgetType(widgetInfo: WidgetInfo, id: WidgetTypeId, tenantId: TenantId, | |
450 | + bundleAlias: string, createdTime: number): WidgetType { | |
450 | 451 | const descriptor: WidgetTypeDescriptor = { |
451 | 452 | type: widgetInfo.type, |
452 | 453 | sizeX: widgetInfo.sizeX, |
... | ... | @@ -462,6 +463,7 @@ export function toWidgetType(widgetInfo: WidgetInfo, id: WidgetTypeId, tenantId: |
462 | 463 | return { |
463 | 464 | id, |
464 | 465 | tenantId, |
466 | + createdTime, | |
465 | 467 | bundleAlias, |
466 | 468 | alias: widgetInfo.alias, |
467 | 469 | name: widgetInfo.widgetName, | ... | ... |
... | ... | @@ -516,7 +516,8 @@ export class WidgetEditorComponent extends PageComponent implements OnInit, OnDe |
516 | 516 | |
517 | 517 | private commitSaveWidget() { |
518 | 518 | const id = (this.widgetType && this.widgetType.id) ? this.widgetType.id : undefined; |
519 | - this.widgetService.saveWidgetType(this.widget, id, this.widgetsBundle.alias).subscribe( | |
519 | + const createdTime = (this.widgetType && this.widgetType.createdTime) ? this.widgetType.createdTime : undefined; | |
520 | + this.widgetService.saveWidgetType(this.widget, id, this.widgetsBundle.alias, createdTime).subscribe( | |
520 | 521 | (widgetTypeInstance) => { |
521 | 522 | this.setWidgetType(widgetTypeInstance); |
522 | 523 | this.saveWidgetPending = false; |
... | ... | @@ -543,7 +544,7 @@ export class WidgetEditorComponent extends PageComponent implements OnInit, OnDe |
543 | 544 | config.title = this.widget.widgetName; |
544 | 545 | this.widget.defaultConfig = JSON.stringify(config); |
545 | 546 | this.isDirty = false; |
546 | - this.widgetService.saveWidgetType(this.widget, undefined, saveWidgetAsData.bundleAlias).subscribe( | |
547 | + this.widgetService.saveWidgetType(this.widget, undefined, saveWidgetAsData.bundleAlias, undefined).subscribe( | |
547 | 548 | (widgetTypeInstance) => { |
548 | 549 | this.router.navigateByUrl(`/widgets-bundles/${saveWidgetAsData.bundleId}/widgetTypes/${widgetTypeInstance.id.id}`); |
549 | 550 | } | ... | ... |