Skip to content

Enabling key config switch for systems #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
spusala-sap wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Enabling key config switch for systems #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion webapp/i18n/i18n_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ creationDate=Creation Date
workflowType=Workflow Type
taskType=Task Type
approvers=Approver(s)
app
decision=Decision
actionType={0}
accept=Accept
Expand Down
15 changes: 1 addition & 14 deletions webapp/resources/fragments/systems/SwitchSystemKeyConfig.fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
width="100%"
class="sapUiContentPadding">
<MessageStrip
text="{i18n>connnectSystemMessageStrip}"
text="{i18n>connnectSystemNeedsApprovalMessage}"
showIcon="true"
showCloseButton="false"
class="sapUiMediumMarginBottom">
Expand All @@ -26,19 +26,6 @@
class="sapUiSmallMarginBegin sapUiSmallMarginTop" />
<Label text="{switchKeyConfigModel>/connectedKeyConfig/id}"
class="sapUiSmallMarginBegin" />
<VBox class="sapUiSmallMarginBegin sapUiSmallMarginTop sapUiSmallMarginBottom">
<Label text="{i18n>description}:" />
<TextArea value="{switchKeyConfigModel>/connectedKeyConfig/description}"
width="95%"
editable="false">
<customData>
<core:CustomData
key="testId"
value="switchKeyConfig-descriptionText"
writeToDom="true" />
</customData>
</TextArea>
</VBox>
</VBox>
<HBox justifyContent="Center" alignContent="Center"
class="sapUiSmallMarginTop sapUiSmallMarginBottom">
Expand Down
5 changes: 2 additions & 3 deletions webapp/resources/fragments/systems/SystemsTable.fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,16 +172,15 @@
visible="{= ${oneWay>status} !== 'FAILED'}">
<menu>
<Menu class="sapUiSizeCompact">
<!-- @Todo TEMP: Revert after demo -->
<!-- <MenuItem text="{i18n>switchKeyConfiguration}"
<MenuItem text="{i18n>switchKeyConfiguration}"
press="onSwitchKeyConfigPress">
<customData>
<core:CustomData
key="testId"
value="systemsTable-switchKeyConfigMenuItem"
writeToDom="true" />
</customData>
</MenuItem> -->
</MenuItem>
<MenuItem
press="onSystemsTableDisconnectPress"
visible="{= !!${oneWay>keyConfigurationID} &amp;&amp; ${oneWay>status} !== 'FAILED'}"
Expand Down
10 changes: 4 additions & 6 deletions webapp/view/systems/Details.view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@
<m:OverflowToolbar style="Clear"
visible="{= ${roleBasedAccess>/systems/canManage}}">
<m:ToolbarSpacer />
<!-- @Todo TEMP: Revert after demo -->
<!-- <ObjectPageHeaderActionButton text="{i18n>switchKeyConfiguration}"
visible="{= !!${oneWay>/selectedSystem/keyConfigurationID} &amp;&amp;
${oneWay>/selectedSystem/status} !== 'FAILED'}"
press="onSwitchKeyConfigPress"
hideText="false" /> -->
<ObjectPageHeaderActionButton text="{i18n>switchKeyConfiguration}"
visible="{= !!${oneWay>/selectedSystem/keyConfigurationID} &amp;&amp; ${oneWay>/selectedSystem/status} !== 'FAILED'}"
press="onSwitchKeyConfigPress"
hideText="false" />
<ObjectPageHeaderActionButton text="{i18n>cancel}"
visible="{= !!${oneWay>/selectedSystem/canCancel} &amp;&amp; ${oneWay>/selectedSystem/status} === 'FAILED'}"
press="onSystemCancelPress"
Expand Down