Skip to content
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.

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

Remove redundant loader #142

Merged
merged 4 commits into from
Feb 1, 2021
Merged

Remove redundant loader #142

merged 4 commits into from
Feb 1, 2021

Conversation

akurinnoy
Copy link
Contributor

What does this PR do?

This PR removes redundant loader that hides the IDE iframe while IDE is loading.

What issues does this PR fix or reference?

eclipse-che/che#18734

@akurinnoy akurinnoy self-assigned this Jan 22, 2021
@che-bot
Copy link
Contributor

che-bot commented Jan 22, 2021

❌ E2E dashboard-next tests failed ❗

See Details

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

  • Use comment "[dashboard-next-ci-test]" to rerun the 'dashboard-next' e2e tests

@github-actions

This comment has been minimized.

@github-actions
Copy link

Docker image build succeeded: docker.io/maxura/che-server:che-dashboard-pull-142

@Ohrimenko1988
Copy link
Contributor

[dashboard-next-ci-test]

@che-bot
Copy link
Contributor

che-bot commented Jan 25, 2021

❌ E2E dashboard-next tests failed ❗

See Details

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

  • Use comment "[dashboard-next-ci-test]" to rerun the 'dashboard-next' e2e tests

@Ohrimenko1988
Copy link
Contributor

[dashboard-next-ci-test]

@che-bot
Copy link
Contributor

che-bot commented Jan 25, 2021

✅ E2E dashboard-next tests succeed 🎉

See Details

  • Jenkins job

  • logs and configs

  • Che dashboard-next image:docker.io/maxura/che-dashboard:142

  • Che server image: docker.io/maxura/che-server:142

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

  • Use comment "[dashboard-next-ci-test]" to rerun the 'dashboard-next' e2e tests

@github-actions

This comment has been minimized.

@github-actions
Copy link

Docker image build succeeded: docker.io/maxura/che-server:che-dashboard-pull-142

@che-bot
Copy link
Contributor

che-bot commented Jan 26, 2021

✅ E2E dashboard-next tests succeed 🎉

See Details

  • Jenkins job

  • logs and configs

  • Che dashboard-next image:docker.io/maxura/che-dashboard:142

  • Che server image: docker.io/maxura/che-server:142

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

  • Use comment "[dashboard-next-ci-test]" to rerun the 'dashboard-next' e2e tests

Copy link
Contributor

@JPinkney JPinkney left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just have a few minor comments. I tried on che.openshift.io and everything is working perfectly but when I tried locally with my own che instance I got:

Refused to frame 'https://keycloak-eclipse-che.apps-crc.testing/' because an ancestor violates the following Content Security Policy directive: "frame-ancestors 'self'".

when the workspace is trying to open. If I click away and then re-open the workspace it works though.

workspace-issue

Also, I'm not sure if it's related to this PR but the workspace logs no longer reset after a workspace has been stopped then restarted again

src/containers/__tests__/IdeLoader.spec.tsx Outdated Show resolved Hide resolved
webpack.config.common.js Outdated Show resolved Hide resolved
webpack.config.common.js Outdated Show resolved Hide resolved
Copy link
Contributor

@olexii4 olexii4 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@che-bot
Copy link
Contributor

che-bot commented Jan 28, 2021

✅ E2E dashboard-next tests succeed 🎉

See Details

  • Jenkins job

  • logs and configs

  • Che dashboard-next image:docker.io/maxura/che-dashboard:142

  • Che server image: docker.io/maxura/che-server:142

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

  • Use comment "[dashboard-next-ci-test]" to rerun the 'dashboard-next' e2e tests

@github-actions

This comment has been minimized.

@github-actions
Copy link

Docker image build succeeded: docker.io/maxura/che-server:che-dashboard-pull-142

@github-actions
Copy link

Code coverage diff between base branch:master and head branch: redundant-loader-2

File % Stmts % Branch % Funcs % Lines
total 51.49 51.7 35.81 36.12 50.94 51.09 51.42 51.6
src/containers/IdeLoader.tsx 68.06 67.32 68.32 66.04 74.07 74.07 67.83 67.11
src/pages/IdeLoader/index.tsx 47.27 62.96 33.71 44.62 36.84 50 48.6 63.75
src/store/Environment/index.ts 0 0 0 0
src/store/Environment/selectors.ts 100 100 100 100

@github-actions
Copy link

Docker image build succeeded: docker.io/maxura/che-server:che-dashboard-pull-142

@che-bot
Copy link
Contributor

che-bot commented Jan 28, 2021

✅ E2E dashboard-next tests succeed 🎉

See Details

  • Jenkins job

  • logs and configs

  • Che dashboard-next image:docker.io/maxura/che-dashboard:142

  • Che server image: docker.io/maxura/che-server:142

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

  • Use comment "[dashboard-next-ci-test]" to rerun the 'dashboard-next' e2e tests

@akurinnoy
Copy link
Contributor Author

@JPinkney

I tried on che.openshift.io and everything is working perfectly but when I tried locally with my own che instance I got:

Refused to frame 'https://keycloak-eclipse-che.apps-crc.testing/' because an ancestor violates the following Content Security Policy directive: "frame-ancestors 'self'".

when the workspace is trying to open. If I click away and then re-open the workspace it works though.

You need to completely close your browser and try it again. I hope it will help.

Also, I'm not sure if it's related to this PR but the workspace logs no longer reset after a workspace has been stopped then restarted again

I see the same with current master branch, so I filed an issue.

added detection of working environment as well

Signed-off-by: Oleksii Kurinnyi <okurinny@redhat.com>
Signed-off-by: Oleksii Kurinnyi <okurinny@redhat.com>
@github-actions
Copy link

Code coverage diff between base branch:master and head branch: redundant-loader-2

File % Stmts % Branch % Funcs % Lines
total 51.32 51.63 35.76 36.09 50.78 50.88 51.25 51.53
src/containers/IdeLoader.tsx 68.06 67.52 68.32 65.74 74.07 74.07 67.83 67.31
src/pages/IdeLoader/index.tsx 47.27 62.96 33.71 44.62 36.84 50 48.6 63.75
src/services/storageTypes.ts 75 75.44 61.11 61.11 87.5 87.5 75 75.44
src/services/keycloak/setup.ts 11.71 0 0 10.19
src/store/Environment/index.ts 25 0 0 25
src/store/Environment/selectors.ts 100 100 100 100

@github-actions
Copy link

Docker image build succeeded: docker.io/maxura/che-server:che-dashboard-pull-142

@che-bot
Copy link
Contributor

che-bot commented Jan 29, 2021

❌ E2E dashboard-next tests failed ❗

See Details

Tested with Eclipse Che Multiuser User on K8S (minikube v1.1.1)

  • Use comment "[dashboard-next-ci-test]" to rerun the 'dashboard-next' e2e tests

@Ohrimenko1988
Copy link
Contributor

[dashboard-next-ci-test]

Copy link
Member

@sleshchenko sleshchenko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not review code carefully but docker.io/maxura/che-server:che-dashboard-pull-142 seems to work as expected.
I even tried IntelijEditor

intelij-java-web-vertx.devfile.yaml
apiVersion: 1.0.0
metadata:
  name: intelij-java-web-vertx
projects:
  - name: vertx-http-example
    source:
      location: 'https://github.com/openshift-vertx-examples/vertx-http-example.git'
      type: git
      branch: master
components:
  - id: che-incubator/intellij-community/latest
    type: cheEditor
  - mountSources: true
    endpoints:
      - name: 8080-tcp
        port: 8080
      - attributes:
          public: 'false'
        name: debug
        port: 5005
    memoryLimit: 512Mi
    type: dockerimage
    volumes:
      - name: m2
        containerPath: /home/user/.m2
    alias: maven
    image: 'quay.io/eclipse/che-java8-maven:nightly'
    env:
      - value: ''
        name: MAVEN_CONFIG
      - value: '-XX:MaxRAMPercentage=50.0 -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xms20m -Djava.security.egd=file:/dev/./urandom -Duser.home=/home/user'
        name: JAVA_OPTS
      - value: $(JAVA_OPTS)
        name: MAVEN_OPTS
commands:
  - name: maven build
    actions:
      - workdir: '${CHE_PROJECTS_ROOT}/vertx-http-example'
        type: exec
        command: 'mvn -Duser.home=${HOME} clean install'
        component: maven
  - name: run app
    actions:
      - workdir: '${CHE_PROJECTS_ROOT}/vertx-http-example'
        type: exec
        command: |
          JDBC_URL=jdbc:h2:/tmp/db \
          java -jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 \
          ./target/*.jar
        component: maven
  - name: stop app
    actions:
      - type: exec
        command: echo 'Stopping the application...' && kill $(pidof java) && echo 'The application has been successfully stopped'
        component: maven
  - name: Debug remote java application
    actions:
      - referenceContent: |
          {
          "version": "0.2.0",
          "configurations": [
            {
              "type": "java",
              "name": "Debug (Attach) - Remote",
              "request": "attach",
              "hostName": "localhost",
              "port": 5005
            }]
          }
        type: vscode-launch

@Ohrimenko1988
Copy link
Contributor

[dashboard-next-ci-test]

@akurinnoy akurinnoy merged commit 655309f into master Feb 1, 2021
@akurinnoy akurinnoy deleted the redundant-loader-2 branch February 1, 2021 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants