Skip to content

Commit

Permalink
Update to model-catalog v1.7 (#531)
Browse files Browse the repository at this point in the history
* Hotfix: removing duplicate

* Solving more Issues (#418)

* Added category to full text search

* Fixed models compare

* Show fixed parameter on execution

* Added link on sample resources

* Added GA and small fixes (#419)

* handle 404

* Loading inputs from firebase instead of model catalog

* Allow removing fixed values on setups

* Added google analytics

* New remote sensing page

* Get rid of a Typescript error

* Added HAND executions for Ethiopia

* Enabling model register (#431)

* Fixed duplicated variable

* Google Analitics and UI changes (#420)

* Hotfix: removing duplicate

* Solving more Issues (#418)

* Added category to full text search

* Fixed models compare

* Show fixed parameter on execution

* Added link on sample resources

* Added GA and small fixes (#419)

* handle 404

* Loading inputs from firebase instead of model catalog

* Allow removing fixed values on setups

* Added google analytics

* New remote sensing page

* Hotfix: typo and size of video

* Hotfix: typo

* Hotfix: Do no show setups for main regions

* Updating emulators page (#429)

* Emulators update (#430)

* Fixed link on emulators

* Enable model creation

* Model/Version edition and Data transformation  (#437)

* Fixed data transformation edition,

* Data transformations on input selection

* Data transformations fix

* Parameter types

* Support for Model and softwareVersion creation and edition

* PUT models temporal fix

* Enviroments fix (#438)

* yarn.lock

* Diferent config file and example

* removing old code

* Updated npm -> yarn and changes on the config file

* build-dev

* Compare and model creation (#444)

* Icon for models compare a change the way the URL is created

* model edit button and author order hack

* Fixing model creation

* Compare (#445)

Adding all the enviroments logic and travis update

* Ui fixes (#446)

* loading description for setups

* new tree and edit fixes

* UI fixes (#447)

* fixed tree on models compare

* Fixed edit-tree interactions

* Fixed cancel on model creation

* hotfix

* Gql merge (#451)

* Fixed duplicated variable

* Google Analitics and UI changes (#420)

* Hotfix: removing duplicate

* Solving more Issues (#418)

* Added category to full text search

* Fixed models compare

* Show fixed parameter on execution

* Added link on sample resources

* Added GA and small fixes (#419)

* handle 404

* Loading inputs from firebase instead of model catalog

* Allow removing fixed values on setups

* Added google analytics

* New remote sensing page

* Hotfix: typo and size of video

* Hotfix: typo

* Hotfix: Do no show setups for main regions

* Updating emulators page (#429)

* Emulators update (#430)

* Fixed link on emulators

* Changes for graphql

* Added emulator-tabs using graphql

* Added emulator-tabs using graphql

* Adding initial support for GraphQL : Emulators

* yarn.lock

* Diferent config file and example

* removing old code

* Updated npm -> yarn and changes on the config file

* build-dev

* GraphQL conversion continued + Refactoring

* Bug fixes and initial region integration

* Get region browsing to work. Add/Delete TODO

* Refactoring task/thread editors out of problem-statement ui

* deletion query fix

* Improvements to adding thread/task + New table for execution summary

* Work with new GraphQL schema

* Changes for Backward compatibility

* Style fixes

* Refactoring Dataset to Dataslice + Dataset

* Env2 (#439)

* Model/Version edition and Data transformation  (#437)

* Fixed data transformation edition,

* Data transformations on input selection

* Data transformations fix

* Parameter types

* Support for Model and softwareVersion creation and edition

* PUT models temporal fix

* Enviroments fix (#438)

* yarn.lock

* Diferent config file and example

* removing old code

* Updated npm -> yarn and changes on the config file

* build-dev

* Env fix (#440)

* change script build

* Webpack build script

* travis node

* Fix: build location

* Fix: change build directory name

* Added different keys

* added code url + added Hernan to contributors

* Updates for changes to backend

* Bugfixes with emulator

* Fix for event-based task status

* DEV AUTH DOMAIN

* Pass variable through webpack

* Update README.md

* Deleting old stuff

* Fix for model query for region

* fix: add yarn.lock

netlify requires it

* Initial: Adding permissions + minor updates

* Check Permissions within the thread

* Initial permissions + Some fixes for ensemble manager interface

Co-authored-by: Varun Ratnakar <[email protected]>
Co-authored-by: Maximiliano Osorio <[email protected]>

* Hotfix (#456)

Hotfix: input files on model view.

* added standard variables to numerical index (#458)

* Gqlmerge (#459)

* Initial: Adding permissions + minor updates

* Check Permissions within the thread

* Initial permissions + Some fixes for ensemble manager interface

* Efficient Loading of executions in threads

* Bugfixes

* Simple permissions UI

* Bugfix

* Emulator Search Draft

* Load executions as well as total in emulator search

* Next/Previous for runs in emulator page

Co-authored-by: Varun Ratnakar <[email protected]>
Co-authored-by: Maximiliano Osorio <[email protected]>

* Fix for emulator search for non-logins

* bugfix

* Load Variable Information from Backend

* V1.6 (#465)

* Fixed #432

* Partial fix for #461

* basic 1.6

* Hotfix: editable categories

* Fix: GeoShape fail on PUT

* Added month as time interval. Added logo to models.

* Fix caching models from model catalog to graphql

* Storing software image in cache too

* tabs on emulators page

* Fixed search models by index

* Added * to indicatos on task form

* Formative evaluation (#488)

* fix #469

* Fix #487

* Fix #485

* Allow selection of multiple numerical index

* Fix: #477

* Hackish fix #472

* Hide the Save Results button

* Fix for execution subscriptions

* check

* small bugfix + re-enable analysis report subscriptions for now

* Changed analysis reports to non-subscription calls, so they don't mess with the use models

* Better fix for #466

* Default value as placeholder & model-indicator fixes

* Fix for empty run screen sometimes

* bugfix

* Added a missing file

* Do no show empty model type

* Search index on lower case

* Fix for dataset selection

* Removing requirement for datasets

* Put a check for start date being before end date

* Fix for model selection based on subregion/region

* Decoupling Reports-Analysis state from Modeling state

* Support for legacy results where some flags are missing

* Fix for Tabs not being selected properly

* Add loading dots

* compiling in production mode for dev too to reduce file size

* Dont fetch execution summary with main thread

* compiling in production mode

* rollback

* Reset executions/summaries on thread change

* Removing sort by execution start time, to speed up queries

* Move to next section on select & continue

* Show indicators while adding task/thread

* Fix #495

* Fix #505

* Some issues (#509)

* Fix #500

* Optiona fix for: #502

* Fix: #455

* Fix: #507

* Fix: #506

* Small bugfix for runs tab sometimes not shown as done even though all runs are finished

* Added run prefix

* Autoselect dataset if some of their resources has been selected

* Hide extra outputs as default

* Added hover to model preview title

* Improvement in re-editing threads

* Fix the waiting status

* Fix logs display dos newline

* Add format while caching new models

* Not querying fixed values for now, to make querying faster

* Dont show fixed values in list of values

* Open results in new window

* Responsive UI

* Edit setup fixes and improvements  (#520)

* Setup new template
* Fix: #510
* Fix #480 , #479 & #481
* Update to v1.7
* Fixes for parameters and inputs
* do no show loading when no versions
* Show new config even when there's any config
* Not lazy creation
* Fixed loading forever when no setups
* Now parameters and inputs can be removed

* Fix lazy edition

* Issues (#521)

* Added unit UI
* fixed lazy save on configs

* Added message when positions are wrong

* Added PIHM as label on indices

* Enabled duplication for configuration and setups

* Updated version number

* Fixed: activate edit by url

* Visual changes to model and editable type

* urlify for citations

* Fix #524

* Fix #525

* Fix: #526

* Fix error on config/setup creation

* Updated ontology and partial fix for #527

* Added types for: #527

* New attributes added to model view and config/setup

* New properties to model compare and changed order of input files

* Added source code and interventions.

* Added variables and processes to models

* Fixed return value of get all models

* Added input / output model variables to models view

* Added QUIC Fire URB images

* Small fixes

* Fixed small issues

* Fixed model types and added variables to comparison

* show grant

* Added units to variables

* Added more main regions

* Added API link

* wildfire assets, notification for categories

* Added rules for variable units

* Fix uniq condition

* Added description to variables for #530

Co-authored-by: Varun Ratnakar <[email protected]>
Co-authored-by: Maximiliano Osorio <[email protected]>
  • Loading branch information
3 people authored Mar 23, 2021
1 parent bc9835b commit 7a43d9b
Show file tree
Hide file tree
Showing 219 changed files with 21,830 additions and 17,316 deletions.
28 changes: 8 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,26 @@
language: generic
language: node_js
node_js:
- stable
addons:
ssh_known_hosts:
- mint.isi.edu
- 54.148.90.74
env:
matrix:
- DOCKER_COMPOSE_VERSION=1.23.2
global:
secure: ure2FGCq/RxlDEnbE4J4MVrynahBbNhdD4PH4MHEI4PvUbbMemR3vsW7gZU7YYkyA9hxCst+XI1jcjg8VArSVLiWDOnuY2ZI+gnHmQPJicDTJEcWvjCxO+3yj2nGxxlqDylqneppld7KctMkhjERvbzFOckDRCaCCsfiW6Qx2Px+vuGn5jp3hT2UzP0y+nWUUcgjjW6/+EO9YPBgrK6P75N93OMNbqT+Mpo0m+gZrT5cRkByF6kriSafj6O0dX/tNL0P6oDYG0yo95dJhKZ0GBb8kEvAK+YkZft66YGrtGWU+4WiPZ9cHAtfEOz7ABGf4vYrgCHoUZptVNX/vvq+PuNVtRHCMYhXv4r3LXlwtZUPCOP7LRwMD4MT6rTi39OJKjdvT+4/kwOQNY5J5045YD2+NZOzea4wN/Fd7Fu3zFMfoYFeZ211qqWmw4vKbUcmiwos0NM+yMl9ocZYWhLD0We3knPLO6ohf05iB2duUFxlr7VTyhFP9xFVNZAvBX9Rd7/FTDruorVN6r+OnpvLI1HjoKR7WVGC4P9+TQwmFfAeNYxg6zeN3XrrLWh/cUd7hxBsGeZM9bHq8eq1ecJ/grB7mBQCOXM2ZWEHumtfKUikaJYuHXOgQnW2LuaqdoMoLLGNEqyKisANLmu1023HNaLxhpdDX2zJn7vYW574pvo=
services:
- docker
before_install:
- openssl aes-256-cbc -K $encrypted_b70b0c1c34e1_key -iv $encrypted_b70b0c1c34e1_iv
-in google-api-key.ts.enc -out src/config/google-api-key.ts -d
- sudo rm /usr/local/bin/docker-compose
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname
-s`-`uname -m` > docker-compose
- chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin
- docker-compose build
- docker-compose up -d prod
- docker cp $(docker-compose ps -q prod):/usr/share/nginx/html/ $TRAVIS_BUILD_DIR/mint-ui-lit/
install: yarn
cache: yarn
script: yarn build
before_deploy:
- echo $key_pass | gpg --passphrase-fd 0 id_travis_rsa.gpg
- eval "$(ssh-agent -s)"
- chmod 600 id_travis_rsa
- ssh-add id_travis_rsa
- mv build mint-ui-lit
deploy:
- provider: script
skip_cleanup: true
script: bash scripts/deploy.sh $TRAVIS_BUILD_DIR/mint-ui-lit mintui_$TRAVIS_BRANCH
on:
all_branches: true
condition: "$TRAVIS_BRANCH =~ ^(master|dev|mint-demo|demo)$"
condition: "$TRAVIS_BRANCH =~ ^(master|dev|enviroments)$"
- provider: script
skip_cleanup: true
script: bash scripts/deploy.sh $TRAVIS_BUILD_DIR/mint-ui-lit mintui_$TRAVIS_TAG
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ VOLUME /home/node/app

FROM nginx:1.13.0-alpine
WORKDIR /usr/share/nginx/html
COPY --from=build-env /home/node/app/build/es6/ ./
COPY --from=build-env /home/node/app/build/ ./
RUN sed -i "s/es6\///g" index.html

EXPOSE 80
31 changes: 25 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,36 @@ You can see that the actual version is v0.0.1

## INSTALL
```
npm install
yarn install
```

## TEST
You will need to set the configuration for firebase through enviroment variables:
```
export FIREBASE_API_KEY=
export FIREBASE_AUTH_DOMAIN=
export FIREBASE_DATABASE_URL=
export FIREBASE_PROJECT_ID=
export FIREBASE_STORAGE_BUCKET=
export FIREBASE_MESSAGING_SENDER_ID=
export FIREBASE_APP_ID=
export GOOGLE_MAPS_API_KEY=
```

If you want to add new variables, please check `webpack/base.config.ts`

## BUILDING

To create the production build use:
```
yarn create-build
```

Open file (Create if not already there) src/config/google-api-key.ts and write:
You can start the development server with:
```
export const GOOGLE_API_KEY = "your_google_api_key";
yarn start
```

Then run this;
Or build the development version with:
```
npm start
yarn create-build-dev
```
2 changes: 0 additions & 2 deletions google-api-key.ts.enc

This file was deleted.

45 changes: 27 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,38 @@
{
"name": "mint-ui-lit",
"version": "5.0.1",
"version": "6.0.0",
"description": "MINT UI",
"author": "Varun Ratnakar",
"contributors": [
"Hernan Vargas"
],
"license": "MIT",
"private": true,
"scripts": {
"gulp": "gulp -f gulp/config.ts --cwd .",
"start": "cross-env BROWSERSLIST=\"edge > 12\" webpack-dev-server --config webpack/dev.config.ts --hot --color --compress --overlay --history-api-fallback --open",
"start": "cross-env BROWSERSLIST=\"edge > 12\" webpack-dev-server --config webpack/dev.config.ts --hot --color --compress --overlay --history-api-fallback",
"build:static": "cross-env STATIC=true npm run gulp build:es6",
"create-build": "webpack --config webpack/prod.config.ts",
"build": "npm run gulp build:es6",
"create-build-dev": "webpack --config webpack/dev.config.ts",
"build": "ts-node webpack/build.ts",
"serve": "prpl-server --root build/ ",
"lint": "npm run gulp lint"
},
"dependencies": {
"@babel/runtime-corejs2": "^7.3.1",
"@mintproject/modelcatalog_client": "^5.0.0",
"@apollo/client": "^3.1.3",
"@babel/polyfill": "^7.10.4",
"@babel/runtime-corejs2": "^7.11.2",
"@mintproject/modelcatalog_client": "^7.0.2",
"@polymer/app-layout": "^3.0.2",
"@polymer/polymer": "^3.1.0",
"@types/codemirror": "^0.0.78",
"@webcomponents/webcomponentsjs": "^2.2.7",
"codemirror": "^5.49.0",
"codemirror-spell-checker": "^1.1.2",
"crypto-js": "^4.0.0",
"easymde": "^2.8.0",
"firebase": "^7.7.0",
"graphql": "^15.3.0",
"lit-element": "^2.2.1",
"marked": "^0.7.0",
"moment": "^2.24.0",
Expand All @@ -36,18 +44,21 @@
"redux": "^4.0.0",
"redux-thunk": "^2.3.0",
"reselect": "^4.0.0",
"subscriptions-transport-ws": "^0.9.18",
"ts-md5": "^1.2.6",
"tslib": "^1.9.3",
"weightless": "0.0.37"
"weightless": "^0.0.37"
},
"devDependencies": {
"@babel/core": "^7.2.2",
"@babel/plugin-proposal-class-properties": "^7.3.0",
"@babel/plugin-proposal-decorators": "^7.3.0",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-transform-runtime": "^7.2.0",
"@babel/preset-env": "^7.3.1",
"@babel/preset-typescript": "^7.1.0",
"@babel/core": "^7.11.4",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-proposal-decorators": "^7.10.5",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-runtime": "^7.11.0",
"@babel/plugin-transform-typescript": "^7.11.0",
"@babel/preset-env": "^7.11.0",
"@babel/preset-flow": "^7.10.4",
"@babel/preset-typescript": "^7.10.4",
"@piuccio/ejs-compiled-loader": "^3.0.0",
"@skatejs/ssr": "^0.19.11",
"@types/clean-webpack-plugin": "0.1.2",
Expand All @@ -68,10 +79,11 @@
"@types/webpack": "^4.4.24",
"@types/webpack-merge": "^4.1.3",
"babel-jest": "^24.1.0",
"babel-loader": "^8.0.5",
"babel-loader": "^8.1.0",
"babel-plugin-template-html-minifier": "^2.2.0",
"clean-webpack-plugin": "^1.0.1",
"copy-webpack-plugin": "^4.6.0",
"core-js": "^2.6.5",
"cross-env": "^5.2.0",
"css-loader": "^2.1.0",
"ejs": "^2.6.1",
Expand Down Expand Up @@ -101,16 +113,13 @@
"terser-webpack-plugin": "^1.2.2",
"ts-node": "^8.0.2",
"tslint": "^5.12.1",
"typescript": "^3.3.3",
"typescript": "^4.0.2",
"webpack": "^4.39.1",
"webpack-cli": "^3.2.3",
"webpack-dev-server": "^3.1.14",
"webpack-merge": "^4.2.1",
"workbox-webpack-plugin": "^3.6.3"
},
"resolutions": {
"babel-core": "^7.0.0-bridge.0"
},
"engines": {
"node": ">=8.3"
}
Expand Down
1 change: 1 addition & 0 deletions scripts/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ if [ "$#" -ne 2 ]; then
fi
echo "Tag: $TRAVIS_TAG"
echo "Branch: $TRAVIS_BRANCH"
echo "Moving from $SOURCE_DIR to $DEST_DIR"
rsync -r --delete-after $SOURCE_DIR [email protected]:$DEST_DIR
rsync -r --delete-after $SOURCE_DIR [email protected]:$DEST_DIR
exit $?
Loading

0 comments on commit 7a43d9b

Please sign in to comment.