Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ export default class SoftwareSolutionObjectPage extends BaseController {
);

this.filterVersionsTable();
this.filterActiveTechnologiesTable();
this.filterBusinessCasesList();
const companyConfig =
await this.getOwnerComponent().getCompanyConfiguration();
Expand Down Expand Up @@ -235,6 +236,28 @@ export default class SoftwareSolutionObjectPage extends BaseController {
} else binding.refresh();
}

private filterActiveTechnologiesTable() {
const table = this.getView().byId(
TableKeys.ACTIVE_TECHNOLOGIES_TABLE_ID,
) as Table;
const binding = table.getBinding("items") as ODataListBinding;

const activeVersion_ID = this.getView()
.getBindingContext()
.getProperty("activeVersion/ID");

const filter = new Filter(
"softwareVersion_ID",
FilterOperator.EQ,
activeVersion_ID,
);

binding.filter(filter);
if (binding.isSuspended()) {
binding.resume();
} else binding.refresh();
}

private filterVersionsTable() {
const table = this.getView().byId(TableKeys.VERSIONS_TABLE_ID) as Table;
const binding = table.getBinding("items") as ODataListBinding;
Expand Down
4 changes: 2 additions & 2 deletions app/solutioncentral/webapp/model/formatter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ export default {
if (!object) return 0;

if (table && table === TableKeys.ACTIVE_TECHNOLOGIES_TABLE_ID) {
return (object.technologies as Record<string, unknown>[]).length;
return (object.technologies as Record<string, unknown>[])?.length;
}

return object.length as number;
return object?.length as number;
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

<content>
<m:HBox items="{path: 'solutionTags', templateShareable: true}" class="sapUiSmallMarginBegin" alignItems="Center" visible="{= ${IsActiveEntity} ? true : false}" >
<m:GenericTag text="{tag/name}" class="sapUiTinyMarginEnd" status="" StatusIconHidden="true"/>
<m:GenericTag text="{tag/name}" class="sapUiTinyMarginEnd"/>
</m:HBox>
</content>
</ObjectPageDynamicHeaderTitle>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
mode="None"
growing="true"
backgroundDesign="Transparent"
items="{path: 'activeVersion/technologies', parameters: { $expand: 'softwareVersion'}}">
items="{path: '/SoftwareTechnology', suspended: true, parameters: { $expand: 'softwareVersion'}}">
<dependents>
<plugins:ColumnResizer />
<columnmenu:Menu id="activeTechnologiesQuickMenu"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Label text="{i18n>label.description}:" />
<ExpandableText class="sapUiTinyMarginBottom" text="{description}"
overflowMode="InPlace" />
<HBox justifyContent="Begin" alignItems="Center">
<HBox justifyContent="Start" alignItems="Center">
<Label text="Provided value:" class="sapUiSmallMarginEnd" />
<RatingIndicator editable="false" iconSize="18px" maxValue="5" value="{rating_code}" />
</HBox>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@
</MultiComboBox>

<Label text="{i18n>column.businessCriticality}" />
<ComboBox showSecondaryValues="true" forceSelection="false" required="false" selectedKey="{businessCriticality_code}"
<ComboBox showSecondaryValues="true" required="false" selectedKey="{businessCriticality_code}"
items="{path: '/BusinessCriticalityLevel', sorter: [{ path: 'sortOrder', descending: false }]}">
<core:ListItem key="{code}" text="{name}" additionalText="{descr}"/>
</ComboBox>

<Label text="{i18n>column.riskLevel}" />
<ComboBox showSecondaryValues="true" forceSelection="false" required="false" selectedKey="{riskLevel_code}"
<ComboBox showSecondaryValues="true" required="false" selectedKey="{riskLevel_code}"
items="{path: '/RiskLevel', sorter: [{ path: 'sortOrder', descending: false }]}">
<core:ListItem key="{code}" text="{name}" additionalText="{descr}"/>
</ComboBox>
Expand Down