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

Update jupyter-apis frontend - General to KF 1.7 #230

Closed
71 of 75 tasks
wg102 opened this issue May 25, 2023 · 1 comment
Closed
71 of 75 tasks

Update jupyter-apis frontend - General to KF 1.7 #230

wg102 opened this issue May 25, 2023 · 1 comment
Assignees

Comments

@wg102
Copy link
Contributor

wg102 commented May 25, 2023

Epic: StatCan/aaw#1632

Update the frontend notebook-page for jupyter to match upstream while making sure to not remove our custom code.

Jupyter General

jupyter/ : we have none of these, The readme might be interesting.

  • .gitignore
  • Dockerfile
  • README.md
  • Makefile

jupyter/frontend

  • .browserslistrc
  • .editorconfig
  • .eslintrc.json New file
  • .gitignore
  • .prettierrc
  • angular.json Lots of changes, mostly new scripts and linting patterns
  • cypress.config.ts NEw FILE. I added it.
  • Cypress.json : Upstream does not have it. I kept it. We will determine when dealing with cypress
  • karma.conf.js New file section IN the file
  • package.json Lots of changes.
    - ng2-ace-editor to monaco-editor
    - new angular-eslint
    - removed codelyzer
    - removed cypress
    - removed protractor
    - removed tslint
  • package-lock.json : This is self generated when running the code.
  • README.md New content about Running integration tests
  • tsconfig.app.json
  • tsconfig.json : Their configuration is older than ours. Keeping ours.
  • tsconfig.spec.json

Notes:

  • eslintrc is new, will need to make sure our code passes linting.

jupyter/frontend

  • cypress.config.ts NEw FILE. I added it.
  • Cypress.json : Upstream does not have it. I kept it. We will determine when dealing with cypress
  • proxy.config.js : This files is ours as far as I can see. It's to test the eng vs fr
  • tslint.json: Our file, not sure if still worth it.
  • yarn.lock : Our file, not sure yet

jupyter/frontend/scripts

  • check-format-error.js

SRC

jupyter/frontend/src

  • favicon.ico
  • index.html
  • kubeflow.css
  • main.ts
  • polyfills.ts Linting one space removed
  • proxy.conf.json
  • proxy.conf.rok.json
  • styles.scss New class
  • test.ts

SRC Assets

jupyter/frontend/src/assets

  • .gitkeep This file is just empty... What's the use?

jupyter/frontend/src/assets/logos

We do not use the same images as them. I consider these done, but I just kept our assets

  • group-one-icon.svg
  • group-two-icon.svg
  • group-two-logo.svg
  • jupyterlab-logo.svg
  • group-one-logo.svg
  • jupyter-icon.svg

SRC Environments

jupyter/frontend/src/environments

Similarly to the comment above, these include alll our svgs.

  • environment.prod.ts
  • environment.ts
  • environment.rok.ts
  • environment.rok.prod.ts

SRC App

jupyter/frontend/src/app

  • app-routing.module. New page NotebookPageComponent was added to route. Will need jupyter pages added in the other ticket (already a part of the ticket)
  • app.component.html
  • app.component.scss
  • app.component.spec.ts Test Removed upstream
  • app.component.ts
  • app.module.ts Removed HttpClient upstream. Made sure to keep kubecost. Renames form to newform (part of other ticket.)

SRC App types

jupyter/frontend/src/app/types

  • affinity.ts
  • allocationcost.ts: I think this is our file
  • condition.ts New file
  • config.ts : Kept ours. We have many more options
  • configuration.ts New file use int notebook page
  • environmentVariablesGroup.ts New file used in notebook page
  • event.ts New file used in notebook page
  • gpu.ts
  • index.ts allocationcost is ours
  • notebook.ts Some new property but mostly merge conflicts
  • poddefault.ts A lot more information
  • responses.ts Pvc vs volume naming. And many different fields. This will need to be decided and hangled.
  • toleration.ts

notes

  • config.ts I kept our code, we have many more options and settings than upstream does.

jupyter/frontend/src/app/types/volume

  • enums.ts
  • index.ts
  • interfaces.ts Pvc vs volume naming. And many different fields. This will need to be decided and hangled.

SRC App Shared

jupyter/frontend/src/app/shared/utils

  • yaml.ts
  • error.ts New File

jupyter/frontend/src/app/shared/utils/volumes

  • index.ts
  • panel.ts removed useless code
  • forms.ts

SRC App services

jupyter/frontend/src/app/services

  • actions.service.spec.ts New file
  • actions.service.ts New file
  • backend.service.spec.ts Lots of nes
  • backend.service.ts This file has a LOT of differences I am expecting issues from it PVC Response object vs VolumeResponseObject...
  • config.ts New file might need to check i18n

Notes

jupyter/frontend/src/app/services

  • kubecost.service.specs.ts Our kubecost
  • kubecost.service.ts Our Kubecost
  • config.ts New file might need to check i18n
@wg102 wg102 self-assigned this May 25, 2023
This was referenced May 30, 2023
@wg102
Copy link
Contributor Author

wg102 commented May 30, 2023

Code merged

@wg102 wg102 closed this as completed May 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant