Browse Source

UI: Fixed show edge details panel

pull/8341/head
Vladyslav_Prykhodko 4 years ago
parent
commit
b81ae6cc1e
  1. 4
      ui-ngx/src/app/modules/home/pages/edge/edge.component.html
  2. 12
      ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts

4
ui-ngx/src/app/modules/home/pages/edge/edge.component.html

@ -46,7 +46,7 @@
[fxShow]="!hideDelete() && !isEdit"> [fxShow]="!hideDelete() && !isEdit">
{{'edge.delete' | translate }} {{'edge.delete' | translate }}
</button> </button>
<div fxLayout="row" fxLayout.xs="column"> <div fxLayout="row wrap" fxLayout.xs="column">
<button mat-raised-button color="primary" <button mat-raised-button color="primary"
[disabled]="(isLoading$ | async)" [disabled]="(isLoading$ | async)"
(click)="onEntityAction($event, 'openEdgeAssets')" (click)="onEntityAction($event, 'openEdgeAssets')"
@ -78,7 +78,7 @@
{{'edge.edge-rulechains' | translate }} {{'edge.edge-rulechains' | translate }}
</button> </button>
</div> </div>
<div fxLayout="row" fxLayout.xs="column"> <div fxLayout="row wrap" fxLayout.xs="column">
<button mat-raised-button <button mat-raised-button
ngxClipboard ngxClipboard
(cbOnSuccess)="onEdgeIdCopied($event)" (cbOnSuccess)="onEdgeIdCopied($event)"

12
ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts

@ -142,14 +142,10 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
); );
} else if (ruleChainScope === 'edges') { } else if (ruleChainScope === 'edges') {
columns.push( columns.push(
new EntityTableColumn<RuleChain>('root', 'rulechain.edge-template-root', '70px', new EntityTableColumn<RuleChain>('root', 'rulechain.edge-template-root', '100px',
entity => { entity => checkBoxCell(entity.root)),
return checkBoxCell(entity.root); new EntityTableColumn<RuleChain>('assignToEdge', 'rulechain.assign-to-edge', '100px',
}), entity => checkBoxCell(this.isAutoAssignToEdgeRuleChain(entity)))
new EntityTableColumn<RuleChain>('assignToEdge', 'rulechain.assign-to-edge', '70px',
entity => {
return checkBoxCell(this.isAutoAssignToEdgeRuleChain(entity));
})
); );
} }
return columns; return columns;

Loading…
Cancel
Save