From 38ee5cf1d104a69a41e2e0de7e93c4d0e7a5cd5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Agneray?= <francois.agneray@lam.fr>
Date: Wed, 9 Nov 2022 09:57:16 +0100
Subject: [PATCH] Improvments renderers
---
.../components/json-renderer.component.html | 2 +-
.../shared-renderer/components/json-renderer.component.ts | 8 ++++++++
.../components/link-renderer.component.html | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/client/src/app/instance/search/shared-renderer/components/json-renderer.component.html b/client/src/app/instance/search/shared-renderer/components/json-renderer.component.html
index 35b91cce..61d540d9 100644
--- a/client/src/app/instance/search/shared-renderer/components/json-renderer.component.html
+++ b/client/src/app/instance/search/shared-renderer/components/json-renderer.component.html
@@ -1,4 +1,4 @@
-<a *ngIf="value" class="btn btn-outline-primary btn-sm" (click)="openModal(modal)">
+<a *ngIf="isEmpty()" class="btn btn-outline-primary btn-sm" (click)="openModal(modal)">
JSON
</a>
diff --git a/client/src/app/instance/search/shared-renderer/components/json-renderer.component.ts b/client/src/app/instance/search/shared-renderer/components/json-renderer.component.ts
index eb277caa..e4ebf97c 100644
--- a/client/src/app/instance/search/shared-renderer/components/json-renderer.component.ts
+++ b/client/src/app/instance/search/shared-renderer/components/json-renderer.component.ts
@@ -44,4 +44,12 @@ export class JsonRendererComponent extends AbstractRendererComponent {
Object.assign({}, { class: 'modal-fit-content' })
);
}
+
+ isEmpty() {
+ if (!this.value || Object.keys(this.value).length === 0) {
+ return false;
+ } else {
+ return true;
+ }
+ }
}
diff --git a/client/src/app/instance/search/shared-renderer/components/link-renderer.component.html b/client/src/app/instance/search/shared-renderer/components/link-renderer.component.html
index f14ec5ba..24be596b 100644
--- a/client/src/app/instance/search/shared-renderer/components/link-renderer.component.html
+++ b/client/src/app/instance/search/shared-renderer/components/link-renderer.component.html
@@ -1,5 +1,5 @@
<a *ngIf="value" [href]="getValue()" target="{{(getConfig().blank) ? '_blank' : '_self'}}"
- [ngClass]="{'btn btn-outline-primary btn-sm': (getConfig().display=='text-button' || getConfig().display=='icon-button')}">
+ [ngClass]="{'btn btn-outline-primary btn-sm btn-block': (getConfig().display=='text-button' || getConfig().display=='icon-button')}">
<span *ngIf="getConfig().display !== 'icon-button'">{{ getText() }}</span>
<span *ngIf="getConfig().display === 'icon-button'" class="{{getConfig().icon}}"></span>
</a>
--
GitLab