From 0def9aed9b2d1f099d06c2b8ceabdfd413567f8b Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Thu, 12 Sep 2024 09:40:24 +0300
Subject: [PATCH] UI: Refactoring resources-library improvement readonly

---
 .../resources-library-table-config.resolve.ts        | 12 ++++++++----
 .../admin/resource/resources-library.component.ts    |  3 +--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts b/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts
index 74535ca413..66a704996b 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts
@@ -118,7 +118,7 @@ export class ResourcesLibraryTableConfigResolver implements Resolve<EntityTableC
     const authUser = getCurrentAuthUser(this.store);
     this.config.deleteEnabled = (resource) => this.isResourceEditable(resource, authUser.authority);
     this.config.entitySelectionEnabled = (resource) => this.isResourceEditable(resource, authUser.authority);
-    this.config.detailsReadonly = (resource) => !this.isResourceEditable(resource, authUser.authority, true);
+    this.config.detailsReadonly = (resource) => this.detailsReadonly(resource, authUser.authority);
     return this.config;
   }
 
@@ -149,10 +149,14 @@ export class ResourcesLibraryTableConfigResolver implements Resolve<EntityTableC
     return false;
   }
 
-  private isResourceEditable(resource: ResourceInfo, authority: Authority, isDetails = false): boolean {
-    if (isDetails && resource && resource.resourceType === ResourceType.LWM2M_MODEL) {
-      return false;
+  private detailsReadonly(resource: ResourceInfo, authority: Authority): boolean {
+    if (resource?.resourceType === ResourceType.LWM2M_MODEL) {
+      return true;
     }
+    return !this.isResourceEditable(resource, authority);
+  }
+
+  private isResourceEditable(resource: ResourceInfo, authority: Authority): boolean {
     if (authority === Authority.TENANT_ADMIN) {
       return resource && resource.tenantId && resource.tenantId.id !== NULL_UUID;
     } else {
diff --git a/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library.component.ts b/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library.component.ts
index e70c089d8e..de6a62e15c 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library.component.ts
@@ -87,8 +87,7 @@ export class ResourcesLibraryComponent extends EntityComponent<Resource> impleme
   }
 
   updateForm(entity: Resource): void {
-    const { resourceType, fileName, title, data } = entity;
-    this.entityForm.patchValue({ resourceType, fileName, title, data });
+    this.entityForm.patchValue(entity);
   }
 
   override updateFormState(): void {