From c81dc3e2c952a4913671192ba12819fae6309e17 Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Fri, 16 Jun 2023 15:53:27 +0200
Subject: [PATCH] Fix table flickering
---
.../search-table/search-table.component.html | 2 +-
.../search-table/search-table.component.ts | 4 ++--
.../domain-group.component.html | 4 ++--
.../group-resource-panel.component.html | 2 +-
.../edit-resource.component.html | 2 +-
.../subresource-panel.component.html | 2 +-
.../service-group-search.component.ts | 14 ++++++-------
.../main/resources/xjb/oasisCppa3Binding.xjb | 21 -------------------
.../src/main/webapp/WEB-INF/weblogic.xml | 2 +-
9 files changed, 16 insertions(+), 37 deletions(-)
diff --git a/smp-angular/src/app/common/search-table/search-table.component.html b/smp-angular/src/app/common/search-table/search-table.component.html
index 40f7043af..d0725332c 100644
--- a/smp-angular/src/app/common/search-table/search-table.component.html
+++ b/smp-angular/src/app/common/search-table/search-table.component.html
@@ -77,7 +77,7 @@
title="Expand/Collapse Row"
(click)="toggleExpandRow(row)">
- <mat-icon class="mat-icon-rtl-mirror">
+ <mat-icon >
{{expanded ? 'expand_more' : 'chevron_right'}}
</mat-icon>
</a>
diff --git a/smp-angular/src/app/common/search-table/search-table.component.ts b/smp-angular/src/app/common/search-table/search-table.component.ts
index 805af60d2..ead42b8c3 100644
--- a/smp-angular/src/app/common/search-table/search-table.component.ts
+++ b/smp-angular/src/app/common/search-table/search-table.component.ts
@@ -93,7 +93,7 @@ export class SearchTableComponent implements OnInit {
this.columnIndex = {
cellTemplate: this.rowIndex,
name: 'Index',
- width: 30,
+ width: 80,
maxWidth: 80,
sortable: false,
showInitially: false
@@ -110,7 +110,7 @@ export class SearchTableComponent implements OnInit {
this.columnExpandDetails = {
cellTemplate: this.rowExpand,
name: 'Upd.',
- width: 40,
+ width: 50,
maxWidth: 50,
sortable: false,
showInitially: false
diff --git a/smp-angular/src/app/edit/edit-domain/domain-group-panel/domain-group.component.html b/smp-angular/src/app/edit/edit-domain/domain-group-panel/domain-group.component.html
index a2121d539..00cfbd429 100644
--- a/smp-angular/src/app/edit/edit-domain/domain-group-panel/domain-group.component.html
+++ b/smp-angular/src/app/edit/edit-domain/domain-group-panel/domain-group.component.html
@@ -70,12 +70,12 @@
></tr>
<tr class="mat-row" *matNoDataRow>
- <td *ngIf="inputDomainMemberFilter.value;else noDataFound" class="mat-cell" colspan="2">No direct members
+ <td *ngIf="inputDomainMemberFilter.value;else noDataFound" class="mat-cell" colspan="2">No groups
matching the filter
"{{inputDomainMemberFilter.value}}"
</td>
<ng-template #noDataFound>
- <td class="mat-cell" colspan="2">No direct members for the domain</td>
+ <td class="mat-cell" colspan="2">The domain has no groups</td>
</ng-template>
</tr>
</table>
diff --git a/smp-angular/src/app/edit/edit-group/group-resource-panel/group-resource-panel.component.html b/smp-angular/src/app/edit/edit-group/group-resource-panel/group-resource-panel.component.html
index 350a9552e..1d1cf29fe 100644
--- a/smp-angular/src/app/edit/edit-group/group-resource-panel/group-resource-panel.component.html
+++ b/smp-angular/src/app/edit/edit-group/group-resource-panel/group-resource-panel.component.html
@@ -73,7 +73,7 @@
"{{inputDomainMemberFilter.value}}"
</td>
<ng-template #noDataFound>
- <td class="mat-cell" colspan="2">No direct members for the domain</td>
+ <td class="mat-cell" colspan="2">The group has no resources</td>
</ng-template>
</tr>
</table>
diff --git a/smp-angular/src/app/edit/edit-resources/edit-resource.component.html b/smp-angular/src/app/edit/edit-resources/edit-resource.component.html
index 0bf083435..ef6fa4020 100644
--- a/smp-angular/src/app/edit/edit-resources/edit-resource.component.html
+++ b/smp-angular/src/app/edit/edit-resources/edit-resource.component.html
@@ -126,7 +126,7 @@
"{{inputDomainMemberFilter.value}}"
</td>
<ng-template #noDataFound>
- <td class="mat-cell" colspan="2">No direct members for the domain</td>
+ <td class="mat-cell" colspan="2">the group has no resources</td>
</ng-template>
</tr>
</table>
diff --git a/smp-angular/src/app/edit/edit-resources/subresource-panel/subresource-panel.component.html b/smp-angular/src/app/edit/edit-resources/subresource-panel/subresource-panel.component.html
index 24595fbff..8a34e5433 100644
--- a/smp-angular/src/app/edit/edit-resources/subresource-panel/subresource-panel.component.html
+++ b/smp-angular/src/app/edit/edit-resources/subresource-panel/subresource-panel.component.html
@@ -65,7 +65,7 @@
"{{inputDomainMemberFilter.value}}"
</td>
<ng-template #noDataFound>
- <td class="mat-cell" colspan="2">No direct members for the domain</td>
+ <td class="mat-cell" colspan="2">The resource has no subresources</td>
</ng-template>
</tr>
</table>
diff --git a/smp-angular/src/app/service-group-search/service-group-search.component.ts b/smp-angular/src/app/service-group-search/service-group-search.component.ts
index f6f7e9c92..fc9a7a117 100644
--- a/smp-angular/src/app/service-group-search/service-group-search.component.ts
+++ b/smp-angular/src/app/service-group-search/service-group-search.component.ts
@@ -59,16 +59,16 @@ export class ServiceGroupSearchComponent implements OnInit, AfterViewInit, After
{
name: 'Sr. Cnt.',
prop: 'serviceMetadata.length',
- width: 90,
- maxWidth: 90,
+ width: 70,
+ maxWidth: 70,
resizable: 'false',
showInitially: true,
},
{
name: 'Domain',
prop: 'domainCode',
- width: 200,
- maxWidth: 200,
+ width: 180,
+ maxWidth: 180,
resizable: 'false',
showInitially: true,
},
@@ -83,15 +83,15 @@ export class ServiceGroupSearchComponent implements OnInit, AfterViewInit, After
{
name: 'Resource identifier',
prop: 'participantIdentifier',
- width: 500,
+ width: 450,
resizable: 'true',
showInitially: true,
},
{
cellTemplate: this.rowSMPUrlLinkAction,
name: 'Resource URL',
- width: 150,
- maxWidth: 150,
+ width: 120,
+ maxWidth: 120,
resizable: 'false',
showInitially: true,
},
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/main/resources/xjb/oasisCppa3Binding.xjb b/smp-resource-extensions/oasis-cppa3-spi/src/main/resources/xjb/oasisCppa3Binding.xjb
index 34d2621fd..c5b64fab5 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/main/resources/xjb/oasisCppa3Binding.xjb
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/main/resources/xjb/oasisCppa3Binding.xjb
@@ -9,15 +9,6 @@
</jaxb:schemaBindings>
</jaxb:bindings>
- <!-- rename the value element -->
- <!-- jaxb:bindings schemaLocation="../xsd/cppa3.xsd"
- node="//xs:complexType[@name='EDIINTChannelType']/xs:complexContent/xs:extension[@base='cppa:ChannelType']/xs:sequence/xs:element[@ref='cppa:ErrorHandling']">
- <jaxb:property name="ErrorHandling01"/>
- </jaxb:bindings -->
-
-
-
-
<jaxb:bindings schemaLocation="../xsd/cppa3.xsd" node="//xs:complexType[@name='EDIINTChannelType']/xs:complexContent/xs:extension[@base='cppa:ChannelType']">
<jaxb:bindings node="./xs:sequence/xs:element[@ref='cppa:ErrorHandling']">
<jaxb:property name="EdiIntErrorHandling"/>
@@ -71,22 +62,10 @@
</jaxb:bindings>
</jaxb:bindings>
-
<jaxb:bindings schemaLocation="../xsd/cppa3.xsd" node="//xs:element[@name='WSReliableMessagingBinding']/xs:complexType/xs:complexContent/xs:extension[@base='cppa:ReliableMessagingBindingType']">
<jaxb:bindings node="./xs:sequence/xs:element[@ref='cppa:ReceiptHandling']">
<jaxb:property name="RMReceiptHandling"/>
</jaxb:bindings>
</jaxb:bindings>
- <!-- jaxb:bindings schemaLocation="../xsd/cppa3.xsd"
- node="//xs:complexType[@name='EDIINTChannelType']/xs:complexContent/xs:extension[@base='cppa:ChannelType']/xs:sequence/xs:element[@ref='cppa:ErrorHandling']">
- <jaxb:property name="ErrorHandling01"/>
- </jaxb:bindings -->
-
- <!-- bindings >
- <bindings node="//xs:attributeGroup[@name='headerExtension']/xs:attribute[@ref='S11:mustUnderstand']">
- <property name="S11MustUnderstand"/>
- </bindings>
- </bindings -->
-
</jaxb:bindings>
diff --git a/smp-webapp/src/main/webapp/WEB-INF/weblogic.xml b/smp-webapp/src/main/webapp/WEB-INF/weblogic.xml
index b95125410..4d297cdda 100644
--- a/smp-webapp/src/main/webapp/WEB-INF/weblogic.xml
+++ b/smp-webapp/src/main/webapp/WEB-INF/weblogic.xml
@@ -28,7 +28,7 @@
<!-- used to switch off bean validation which resulted in failing Spring context to load -->
<package-name>javax.validation.*</package-name>
- <!-- use smp fasterxml because weblogic version is to old -->
+ <!-- use smp fasterxml because weblogic version is too old -->
<package-name>com.fasterxml.*</package-name>
</prefer-application-packages>
--
GitLab