() {
private static final long serialVersionUID = 1L;
@@ -359,42 +361,7 @@ public class RolloutListGrid extends AbstractSimpleGrid {
@Override
public String convertToPresentation(final RolloutStatus value,
final Class targetType, final Locale locale) {
- String result = null;
- switch (value) {
- case FINISHED:
- result = "" + FontAwesome.CHECK_CIRCLE.getHtml() + "
";
- break;
- case PAUSED:
- result = "" + FontAwesome.PAUSE.getHtml() + "
";
- break;
- case RUNNING:
- result = "";
- break;
- case READY:
- result = " "
- + FontAwesome.DOT_CIRCLE_O.getHtml() + "
";
- break;
- case STOPPED:
- result = "" + FontAwesome.STOP.getHtml() + "
";
- break;
- case CREATING:
- result = "";
- break;
- case STARTING:
- result = "";
- break;
- case ERROR_CREATING:
- result = "" + FontAwesome.EXCLAMATION_CIRCLE.getHtml()
- + "
";
- break;
- case ERROR_STARTING:
- result = "" + FontAwesome.EXCLAMATION_CIRCLE.getHtml()
- + "
";
- break;
- default:
- break;
- }
- return result;
+ return convertRolloutStatusToString(value);
}
@Override
@@ -409,6 +376,53 @@ public class RolloutListGrid extends AbstractSimpleGrid {
});
}
+ private String convertRolloutStatusToString(final RolloutStatus value) {
+ String result = null;
+ switch (value) {
+ case FINISHED:
+ result = HawkbitCommonUtil.getFormattedString(Integer.toString(FontAwesome.CHECK_CIRCLE.getCodepoint()),
+ value.name().toLowerCase(), "statusIconGreen", SPUIComponetIdProvider.ROLLOUT_STATUS_LABEL_ID);
+ break;
+ case PAUSED:
+ result = HawkbitCommonUtil.getFormattedString(Integer.toString(FontAwesome.PAUSE.getCodepoint()),
+ value.name().toLowerCase(), "statusIconBlue", SPUIComponetIdProvider.ROLLOUT_STATUS_LABEL_ID);
+ break;
+ case RUNNING:
+ result = HawkbitCommonUtil.getFormattedString(null, value.name().toLowerCase(), "yellowSpinner",
+ SPUIComponetIdProvider.ROLLOUT_STATUS_LABEL_ID);
+ break;
+ case READY:
+ result = HawkbitCommonUtil.getFormattedString(Integer.toString(FontAwesome.DOT_CIRCLE_O.getCodepoint()),
+ value.name().toLowerCase(), "statusIconLightBlue", SPUIComponetIdProvider.ROLLOUT_STATUS_LABEL_ID);
+ break;
+ case STOPPED:
+ result = HawkbitCommonUtil.getFormattedString(Integer.toString(FontAwesome.STOP.getCodepoint()),
+ value.name().toLowerCase(), "statusIconRed", SPUIComponetIdProvider.ROLLOUT_STATUS_LABEL_ID);
+ break;
+ case CREATING:
+ result = HawkbitCommonUtil.getFormattedString(null, value.name().toLowerCase(), "greySpinner",
+ SPUIComponetIdProvider.ROLLOUT_STATUS_LABEL_ID);
+ break;
+ case STARTING:
+ result = HawkbitCommonUtil.getFormattedString(null, value.name().toLowerCase(), "blueSpinner",
+ SPUIComponetIdProvider.ROLLOUT_STATUS_LABEL_ID);
+ break;
+ case ERROR_CREATING:
+ result = HawkbitCommonUtil.getFormattedString(
+ Integer.toString(FontAwesome.EXCLAMATION_CIRCLE.getCodepoint()), value.name().toLowerCase(),
+ "statusIconRed", SPUIComponetIdProvider.ROLLOUT_STATUS_LABEL_ID);
+ break;
+ case ERROR_STARTING:
+ result = HawkbitCommonUtil.getFormattedString(
+ Integer.toString(FontAwesome.EXCLAMATION_CIRCLE.getCodepoint()), value.name().toLowerCase(),
+ "statusIconRed", SPUIComponetIdProvider.ROLLOUT_STATUS_LABEL_ID);
+ break;
+ default:
+ break;
+ }
+ return result;
+ }
+
private void menuItemClicked(final ContextMenuItemClickEvent event) {
final ContextMenuItem item = (ContextMenuItem) event.getSource();
final ContextMenuData contextMenuData = (ContextMenuData) item.getData();
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
index 4627f1804..dd7ef4a28 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
@@ -48,6 +48,7 @@ import org.vaadin.addons.lazyquerycontainer.LazyQueryContainer;
import org.vaadin.addons.lazyquerycontainer.LazyQueryDefinition;
import org.vaadin.alump.distributionbar.DistributionBar;
+import com.google.common.base.Strings;
import com.vaadin.data.Container;
import com.vaadin.data.Item;
import com.vaadin.server.Sizeable.Unit;
@@ -1369,5 +1370,21 @@ public final class HawkbitCommonUtil {
}
return finalVal;
}
+
+ public static String getFormattedString(String value, String description, String style, String id) {
+ StringBuilder val = new StringBuilder();
+ if (!Strings.isNullOrEmpty(value)) {
+ val.append("value:").append(value).append(",");
+ }
+ if (!Strings.isNullOrEmpty(description)) {
+ val.append("description:").append(description).append(",");
+ }
+ if (!Strings.isNullOrEmpty(style)) {
+ val.append("style:").append(style).append(",");
+ }
+ val.append("id:").append(id);
+ return val.toString();
+ }
+
}
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java
index 56e76c123..84346149c 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java
@@ -827,6 +827,11 @@ public final class SPUIComponetIdProvider {
* Rollout status label id.
*/
public static final String ROLLOUT_STATUS_LABEL_ID = "rollout.status.id";
+
+ /**
+ * Rollout group status label id.
+ */
+ public static final String ROLLOUT_GROUP_STATUS_LABEL_ID = "rollout.group.status.id";
/**
* Rollout % or count option group id.
diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
index 1a5fedba4..87ea5b0b9 100644
--- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
+++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
@@ -276,4 +276,10 @@
.links {
padding-left: 22px;
}
+
+ .font-icon{
+ font-family:FontAwesome;
+ font-style:normal;
+ font-weight:normal;
+ }
}