Skip to content

Commit

Permalink
Merge branch 'main' into width-information
Browse files Browse the repository at this point in the history
  • Loading branch information
danielzhe committed Sep 19, 2024
2 parents 03943dc + e21bbd8 commit 2dd775d
Show file tree
Hide file tree
Showing 110 changed files with 2,621 additions and 1,139 deletions.
2 changes: 1 addition & 1 deletion .ci/jenkins/Jenkinsfile.daily-dev-publish
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pipeline {
}

options {
timeout(time: 240, unit: 'MINUTES')
timeout(time: 360, unit: 'MINUTES')
}

parameters {
Expand Down
85 changes: 46 additions & 39 deletions .github/actions/setup-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,45 +91,52 @@ runs:
with:
python-version: 3.12

- name: Setup docker (macOS only)
if: runner.os == 'macOS'
shell: bash
env:
HOMEBREW_NO_INSTALL_FROM_API:
run: |
echo "STEP: Setup docker (macOS only)"
LIMA_VERSION=v0.23.2
curl -fsSL "https://github.com/lima-vm/lima/releases/download/${LIMA_VERSION}/lima-${LIMA_VERSION:1}-$(uname -s)-$(uname -m).tar.gz" | tar Cxzvm /usr/local
COLIMA_VERSION=v0.7.5
curl -LO https://github.com/abiosoft/colima/releases/download/${COLIMA_VERSION}/colima-$(uname)-$(uname -m)
install colima-$(uname)-$(uname -m) /usr/local/bin/colima
brew install docker docker-compose docker-Buildx qemu 2>&1 | tee install.log
mkdir -p ~/.docker/cli-plugins
ln -sfn "$(brew --prefix)/opt/docker-compose/bin/docker-compose" ~/.docker/cli-plugins/docker-compose
ln -sfn $(brew --prefix)/opt/docker-buildx/bin/docker-buildx ~/.docker/cli-plugins/docker-buildx
if grep -q "qemu 8.1.0 is already installed" install.log
then
echo "Detected broken QEMU bottle installed by brew, removing and reinstalling."
brew reinstall qemu
fi
colima start --memory 4 --network-address --verbose
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
echo "version<<$EOF" >> "$GITHUB_OUTPUT"
docker version >> "$GITHUB_OUTPUT"
echo "$EOF" >> "$GITHUB_OUTPUT"
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
echo "version<<$EOF" >> "$GITHUB_OUTPUT"
docker compose version >> "$GITHUB_OUTPUT"
echo "$EOF" >> "$GITHUB_OUTPUT"
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
echo "version<<$EOF" >> "$GITHUB_OUTPUT"
colima version >> "$GITHUB_OUTPUT"
echo "$EOF" >> "$GITHUB_OUTPUT"
# TODO: Fix Colima/QEMU installation to build container images again
#
# - name: Setup docker (macOS only)
# if: runner.os == 'macOS'
# shell: bash
# env:
# HOMEBREW_NO_INSTALL_FROM_API:
# run: |
# echo "STEP: Setup docker (macOS only)"

# LIMA_VERSION=v0.23.2
# curl -fsSL "https://github.com/lima-vm/lima/releases/download/${LIMA_VERSION}/lima-${LIMA_VERSION:1}-$(uname -s)-$(uname -m).tar.gz" | tar Cxzvm /usr/local
# COLIMA_VERSION=v0.7.5
# curl -LO https://github.com/abiosoft/colima/releases/download/${COLIMA_VERSION}/colima-$(uname)-$(uname -m)
# install colima-$(uname)-$(uname -m) /usr/local/bin/colima

# brew update --preinstall
# brew install docker docker-compose docker-Buildx qemu 2>&1 | tee install.log
# mkdir -p ~/.docker/cli-plugins
# ln -sfn "$(brew --prefix)/opt/docker-compose/bin/docker-compose" ~/.docker/cli-plugins/docker-compose
# ln -sfn $(brew --prefix)/opt/docker-buildx/bin/docker-buildx ~/.docker/cli-plugins/docker-buildx
# if grep -q "qemu 8.1.0 is already installed" install.log
# then
# echo "Detected broken QEMU bottle installed by brew, removing and reinstalling."
# brew reinstall qemu
# fi

# CPU_COUNT=$(sysctl -n hw.ncpu)
# MEMORY=$(sysctl hw.memsize | awk '{print $2/1024/1024/1024}')
# COLIMA_ARGS="--cpu $CPU_COUNT --memory $MEMORY"
# colima start $COLIMA_ARGS --network-address --verbose

# EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
# echo "version<<$EOF" >> "$GITHUB_OUTPUT"
# docker version >> "$GITHUB_OUTPUT"
# echo "$EOF" >> "$GITHUB_OUTPUT"

# EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
# echo "version<<$EOF" >> "$GITHUB_OUTPUT"
# docker compose version >> "$GITHUB_OUTPUT"
# echo "$EOF" >> "$GITHUB_OUTPUT"

# EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
# echo "version<<$EOF" >> "$GITHUB_OUTPUT"
# colima version >> "$GITHUB_OUTPUT"
# echo "$EOF" >> "$GITHUB_OUTPUT"

- name: "Setup Helm (Ubuntu)"
if: runner.os == 'Linux'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
KIE_TOOLS_BUILD__runLinters: "true"
KIE_TOOLS_BUILD__runTests: "true"
KIE_TOOLS_BUILD__runEndToEndTests: ${{ runner.os == 'Linux' }}
KIE_TOOLS_BUILD__buildContainerImages: ${{ runner.os != 'Windows' }}
KIE_TOOLS_BUILD__buildContainerImages: ${{ runner.os == 'Linux' }}
KIE_TOOLS_BUILD__buildExamples: "true"
KIE_TOOLS_BUILD__ignoreTestFailures: ${{ !github.event.pull_request }}
KIE_TOOLS_BUILD__ignoreEndToEndTestFailures: ${{ !github.event.pull_request }}
Expand All @@ -131,7 +131,7 @@ jobs:
if: steps.setup_build_mode.outputs.mode == 'partial'
shell: bash
env:
KIE_TOOLS_BUILD__buildContainerImages: ${{ runner.os != 'Windows' }}
KIE_TOOLS_BUILD__buildContainerImages: ${{ runner.os == 'Linux' }}
KIE_TOOLS_BUILD__buildExamples: "true"
run: |
eval "pnpm ${{ steps.setup_build_mode.outputs.upstreamPnpmFilterString }} build:dev"
Expand All @@ -144,7 +144,7 @@ jobs:
KIE_TOOLS_BUILD__runLinters: "true"
KIE_TOOLS_BUILD__runTests: "true"
KIE_TOOLS_BUILD__runEndToEndTests: ${{ runner.os == 'Linux' }}
KIE_TOOLS_BUILD__buildContainerImages: ${{ runner.os != 'Windows' }}
KIE_TOOLS_BUILD__buildContainerImages: ${{ runner.os == 'Linux' }}
KIE_TOOLS_BUILD__buildExamples: "true"
DISPLAY: ":99.0"
START_SERVER_AND_TEST_INSECURE: "true"
Expand Down
16 changes: 8 additions & 8 deletions examples/jbpm-compact-architecture-example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This example also demonstrates how to configure the whole _Kogito_ environment u
enable simplifying the communication among _Kogito_ services removing the need of events (Kafka/HTTP) between them. This can
be achieved using the following _Quarkus_ addons:

- `kogito-addons-quarkus-data-index-persistence-postgresql`: enables the _Kogito Runtime_ persisting directly into the
- `kogito-addons-quarkus-data-index-postgresql`: enables the _Kogito Runtime_ persisting directly into the
_Data-Index_ database.
- `kogito-addons-quarkus-jobs`: enables collocating the _Jobs Service_ inside the _Kogito Runtime_.

Expand Down Expand Up @@ -321,7 +321,8 @@ Candidate Jon Snow don't meet the requirements for the position but we'll keep i

### Using Keycloak as Authentication Server

In this Quickstart we'll be using [Keycloak](https://www.keycloak.org/) as _Authentication Server_. It will be started as a part of the project _Infrastructure Services_, you can check the configuration on the project [docker-compose.yml](docker-compose/docker-compose.yml) in [docker-compose](docker-compose) folder.
In this Quickstart we'll be using [Keycloak](https://www.keycloak.org/) as _Authentication Server_ for _Kogito Task Console_. It will be started
as a part of the project _Infrastructure Services_, you can check the configuration on the project [docker-compose.yml](docker-compose/docker-compose.yml) in [docker-compose](docker-compose) folder.

It will install the _Kogito Realm_ that comes with a predefined set of users:

Expand All @@ -333,7 +334,7 @@ It will install the _Kogito Realm_ that comes with a predefined set of users:

Once Keycloak is started, you should be able to access your _Keycloak Server_ at [localhost:8480/auth](http://localhost:8480/auth) with _admin_ user.

> **_NOTE:_** This example uses keycloak authentication to enable security only in the consoles not in runtime.
> **_NOTE:_** This example uses keycloak authentication to enable security only in the _Kogito Task Console_ not for the Kogito Runtime.
### Using the Kogito Runtime Consoles to interact with the Hiring Process

Expand Down Expand Up @@ -370,10 +371,8 @@ In this guide we'll see how to use the _Kogito Management Console_ to view the s
Which indicates that a new process instance with id **064a6372-b5bb-4eff-a059-d7b24d4ac64a** has been started.
2. Now let's check the process instance state with the _Kogito Management Console_. To do so, in your browser navigate
to http://localhost:8280 and log in using any of the users specified in the [Using Keycloak as Authentication Server](#using-keycloak-as-authentication-server).
Once you are logged in, you should be redirected to the **Process Instances** page where you should be able to see
the started process instance in active state.
to http://localhost:8280 and you'll be redirected to the **Process Instances** page in the _Kogito Management Console_.
There where you should be able to see the started process instance in active state.
<div style="text-align:center;">
<figure>
Expand All @@ -382,7 +381,8 @@ In this guide we'll see how to use the _Kogito Management Console_ to view the s
</figure>
</div>
3. Click on the instance **id** to navigate into the _Process Details_ page. In there you'll be able to see different panels displaying relevant information about the instance state, such as the _Diagram_, _Timeline_, _Details_, _Variables_, _Jobs_...
3. Click on the instance **id** to navigate into the _Process Details_ page. In there you'll be able to see different panels
displaying relevant information about the instance state, such as the _Diagram_, _Timeline_, _Details_, _Variables_, _Jobs_...
<div style="text-align:center">
<figure>
Expand Down
6 changes: 0 additions & 6 deletions examples/jbpm-compact-architecture-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,6 @@
<artifactId>kogito-addons-quarkus-data-index-postgresql</artifactId>
</dependency>

<!-- Data Index Persistence -->
<dependency>
<groupId>org.kie</groupId>
<artifactId>kogito-addons-quarkus-data-index-persistence-postgresql</artifactId>
</dependency>

<!-- Jobs Service -->
<dependency>
<groupId>org.kie</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class ChromeResourceContentService implements ResourceContentService {
normalizedPosixPathRelativeToTheWorkspaceRoot: string,
opts?: ResourceContentOptions
): Promise<ResourceContent | undefined> {
opts = opts ?? { type: ContentType.TEXT };
opts = opts ?? { type: "text" };
return fetchFile(
this.octokit,
this.repoInfo.owner,
Expand Down
2 changes: 1 addition & 1 deletion packages/chrome-extension/src/app/github/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function fetchFile(
ref: ref,
path: path,
})
.then((res) => (contentType === ContentType.BINARY ? (res.data as any).content : atob((res.data as any).content)))
.then((res) => (contentType === "binary" ? (res.data as any).content : atob((res.data as any).content)))
.catch((e) => {
console.debug(`Error fetching ${path} with Octokit. Fallback is 'raw.githubusercontent.com'.`);
return fetch(`https://raw.githubusercontent.com/${org}/${repo}/${ref}/${path}`).then((res) =>
Expand Down
2 changes: 1 addition & 1 deletion packages/cors-proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"cors": "^2.8.5",
"express": "^4.19.2",
"express": "^4.21.0",
"node-fetch": "^3.3.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/dashbuilder/appformer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<jboss.snapshots.repo.url
>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>

<version.org.infinispan.protostream>4.3.5.Final</version.org.infinispan.protostream>
<version.org.infinispan.protostream>4.6.2.Final</version.org.infinispan.protostream>

<!-- Newer version in kie-parent causes ServiceLoader error -->
<version.ch.qos.logback>1.3.12</version.ch.qos.logback>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ public static String objectId(Object o) {
* <li>the first letter of each component of the package name
* <li>a dot
* <li>the class name. If the class is an inner class, the name is of the form Outer$Inner
* <ol>
* <p>
* </ol>
* For classes in the default package, items 1 and 2 are omitted.
* @param c the class whose name to abbreviate. Can be null, but will result in a null return value.
* @return the abbreviated FQCN as described, or null if the input is null.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ PlaceRequest addParameter(final String name,
void setUpdateLocationBar(boolean updateLocationBar);

/**
* Invokes {@link #toString()} but exported to JavaScript so it can be invoked from different scripts.
* Invokes toString() but exported to JavaScript so it can be invoked from different scripts.
*/
default String asString() {
return this.toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@
import jsinterop.annotations.JsIgnore;
import jsinterop.annotations.JsType;
import org.jboss.errai.common.client.dom.HTMLElement;
import org.uberfire.mvp.PlaceRequest;

/**
* A custom {@link PanelDefinition} that is associated with a HasWidgets
* or HTMLElement container. See {@link PlaceManager#goTo(PlaceRequest, HasWidgets)}
* and {@link PlaceManager#goTo(PlaceRequest, HTMLElement)}
* or HTMLElement container. See PlaceManager#goTo(PlaceRequest, HasWidgets)
* and PlaceManager#goTo(PlaceRequest, HTMLElement)
*/
@JsType
public interface CustomPanelDefinition extends PanelDefinition {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ public interface PanelDefinition {
* Specifies content that should be put in this panel's main display area when it is materialized. The content to
* add is specified by a PartDefinition, at the core of which is a {@link PlaceRequest} that identifies a
* WorkbenchActivity (either a screen or an editor).
* <p>
* If the given part already belongs to an existing panel, it will be removed from that panel by a call to
* removePart(part).
* @param part The Part to add. Must not be null. The part's place must specify a WorkbenchActivity bean.
Expand All @@ -70,9 +69,8 @@ public interface PanelDefinition {

/**
* Specifies content that should be put in this panel's main display area when it is materialized.
* <p>
* This is a convenience method equivalent to
* <tt>addPart(new&nbsp;PartDefinitionImpl(DefaultPlaceRequest.parse(partSpec)))</tt>.
* <code>addPart(new&nbsp;PartDefinitionImpl(DefaultPlaceRequest.parse(partSpec)))</code>.
* @param partSpec An PlaceRequest ID with optional parameters, encoded as specified in
* {@link DefaultPlaceRequest#parse(CharSequence)}. Must not be null. The place ID must specify a
* WorkbenchActivity bean (either a screen or an editor).
Expand Down Expand Up @@ -183,7 +181,7 @@ public void appendChild(

/**
* Set the height of this panel in pixels using a primitive int to make this method exportable to JS.
* @param width The width to set.
* @param height The height to set.
*/
default void setHeight(int height) {
setHeight(Integer.valueOf(height));
Expand Down Expand Up @@ -315,7 +313,7 @@ default int getMinWidthAsInt() {
void setContextDisplayMode(final ContextDisplayMode contextDisplayMode);

/**
* Invokes {@link #toString()} but exported to JavaScript so it can be invoked from different scripts.
* Invokes toString() but exported to JavaScript so it can be invoked from different scripts.
*/
default String asString() {
return this.toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public interface PartDefinition {
void setContextDisplayMode(final ContextDisplayMode contextDisplayMode);

/**
* Invokes {@link #toString()} but exported to JavaScript so it can be invoked from different scripts.
* Invokes toString() but exported to JavaScript so it can be invoked from different scripts.
*/
default String asString() {
return this.toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/**
* Specifies an UberFire workbench panel within a templated perspective.
* <p>
* <h3>Prerequisites</h3>
* <strong>Prerequisites</strong>
* This annotation can only be used within a class annotated with {@link WorkbenchPerspective}, and it must target a
* field that implements the GWT HasWidgets interface. Further, the class this annotation is used in must not have a
* method annotated with {@link Perspective}. See {@link WorkbenchPerspective} for details.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@
* programmatically build a {@link PerspectiveDefinition} object, or declare panel structure and content using Errai UI
* templates. Note that you cannot mix the two approaches.
* <p>
* <h3>Programmatic Perspective Definition</h3>
* <strong>Programmatic Perspective Definition</strong>
* To define the perspective layout programmatically, create a zero-argument method annotated with {@code @Perspective}
* that returns a {@link PerspectiveDefinition}.
* <p>
* <h3>Templated Perspective Definition</h3>
* <strong>Templated Perspective Definition</strong>
* To declare perspective layout using templates, make the class an Errai UI templated component, and then add the
* {@link WorkbenchPanel} annotation to one or more of its {@code @DataField} widgets. This designates them as panel
* containers and allows you to specify which parts should be added to them when the perspective launches.
* <p>
* <h3>Perspective Lifecycle</h3>
* <strong>Perspective Lifecycle</strong>
* WorkbenchPerspectives receive the standard set of lifecycle calls for a Workbench component:
* <ul>
* <li>{@code @OnStartup}</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,10 @@
* In this latter case the {@code @WorkbenchPopup} need not extend
* {@code com.google.gwt.user.client.ui.PopupPanel}.
* </p>
* <p>
* WorkbechPopups can receive the following life-cycle calls:
* <ul>
* <li>{@code @OnOpen}</li>
* </p>
* </ul>
*/
@Inherited
@Retention(RetentionPolicy.RUNTIME)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
/**
* Base class for modal popup implementations. Setting the following properties by default:
* <ul>
* <li>setBackdrop( {@link BackdropType#STATIC} );</li>
* <li>setBackdrop( BackdropType#STATIC );</li>
* <li>setKeyboard( true );</li>
* <li>setAnimation( true );</li>
* <li>setDynamicSafe( true );</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public TitledTextCell() {
/**
* Constructs a TextCell that uses the provided {@link SafeHtmlRenderer} to
* render its text.
* @param renderer a {@link SafeHtmlRenderer SafeHtmlRenderer<String>} instance
* @param renderer a {@link SafeHtmlRenderer} instance
*/
public TitledTextCell(final SafeHtmlRenderer<TitledText> renderer) {
super(renderer);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ void resizeTabContent() {
* Adds a new tab to this panel that doesn't have any contents itself, but can contain multiple items that appear in
* a dropdown menu when the tab is clicked. This dropdown menu is initially empty. Items can be added and removed
* using the {@link DropDownTab#addItem(String, Widget)} and
* {@link DropDownTab#removeItem(String, Widget)} methods.
* DropDownTab#removeItem(String, Widget) methods.
* @param label The text that should appear on the dropdown tab.
* @return the container for the items that appear when the tab is clicked.
*/
Expand All @@ -298,7 +298,7 @@ public DropDownTab addDropdownTab(String label) {
/**
* Adds a pre-made dropdown tab to this tab panel. This can be used for re-attaching a dropdown tab that was
* previously added with {@link #addDropdownTab(String)} and then removed.
* @param tab the tab to add back
* @param contents contents
*/
public void addDropdownTab(DropDownTab contents) {
AnchorListItem tab = contents.owningTab;
Expand Down
Loading

0 comments on commit 2dd775d

Please sign in to comment.