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

Story #11851: clean code #1563

Merged
merged 5 commits into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,3 @@ api/api-collect/collect-internal/src/main/resources/ontology/
# Mongo workspace entry-point #
##########################################
tools/docker/mongo/mongo-entrypoint

##########################################
# Angular Package-lock files ###########
################################""

ui/ui-frontend-common/package-lock.json
ui/ui-frontend/package-lock.json
15 changes: 7 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,21 @@ in which you install Ansible 2.7.0:
#### Without VirtualEnv
* First remove older versions of Ansible before re-installing it:
`pip uninstall ansible`.
* Si une version d'ansible à été installée via `apt-get install`, il est nécessaire de la désinstaller : `apt-get remove ansible`
* Si une version d'ansible a été installée via `apt-get install`, il est nécessaire de la désinstaller : `apt-get remove ansible`

#### Common steps
* Install Ansible 2.7.0: `pip install ansible==2.7.0`
* Check the version of ansible: `ansible --version`

Il est possible que l'ajout du lien vers ansible dans le PATH et/ou qu'un redémarage soit nécessaire
Il est possible que l'ajout du lien vers ansible dans le PATH et/ou qu'un redémarrage soit nécessaire

## Configuration
- Clone project and change ownership: `sudo chown -R $USER vitam-ui/`
- Build project using the "right" profile (see [Maven profiles](#Maven-profiles) and [Build](#Build))

### For Vitam internal developers
- Build project using `vitam` profile (see [Build for Vitam developers
](#Build-for-Vitam-internal-developers))
- Set up environment variables : `SERVICE_NEXUS_URL` and `SERVICE_REPOSITORY_URL`
- Build project using `vitam` profile (see [Build for Vitam developers](#Build-for-Vitam-internal-developers))
- Copy files: `collect-external-client.conf`,`access-external-client.conf`, `ingest-external-client.conf`, `keystore_ihm-demo.p12` and `truststore_ihm-demo.jks` into `api/api-(iam|referential)/(iam|referential)-internal/src/main/config/dev-vitam/`
- Redirect `dev.vitamui.com` URL defined in code to `localhost` : add this line `127.0.0.1 dev.vitamui.com` to your `hosts` (`/etc/hosts`) file

Expand Down Expand Up @@ -221,8 +220,8 @@ To generate `index.pdf` and `index.html` from `swagger.json`:
mvn generate-resources -Pswagger-docs

# Run
Pour lancer [VITAM](tools/vitamui-conf-dev/README.md) en mode développement et permettre à VITAMUI d'accéder à ces APIs,
voir la [configuration](tools/vitamui-conf-dev/README.md) suivante.
Pour lancer [VITAM](docs/developeurs/vitamui-conf-dev/README.md) en mode développement et permettre à VITAMUI d'accéder à ces APIs,
voir la [configuration](docs/developeurs/vitamui-conf-dev/README.md) suivante.

## 1 - Démarrage du Mongo VitamUI
```
Expand All @@ -231,7 +230,7 @@ voir la [configuration](tools/vitamui-conf-dev/README.md) suivante.
│   │   ├── mongo: './restart_dev.sh'
```

## 2 - Démarrage du docker smpt4dev (facultatif)
## 2 - Démarrage du docker smtp4dev (facultatif)
```
├── tools
│   ├── docker
Expand Down Expand Up @@ -434,7 +433,7 @@ Une compilation avec `-Pwebpack` a été effectuée.
## 16 - Se connecter sur le portail via :
- https://dev.vitamui.com:4200

## 17 - Se connecter sur la page de réception des mails smpt4dev via :
## 17 - Se connecter sur la page de réception des mails smtp4dev via :
- http://localhost:3000/

## 18 - Lancer l'application 'starter-kit' contenant des exemples de composants graphiques du design system
Expand Down
3 changes: 3 additions & 0 deletions tools/docker/mongo/start_dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ if [ ! -z "$ADDITIONNAL_VITAMUI_CONFIG_FILE" ]; then
TEMPLATER_EXTRA_VARS="${TEMPLATER_EXTRA_VARS} --extra-vars \"@${ADDITIONNAL_VITAMUI_CONFIG_FILE}\""
fi

# Make sure mongo-entrypoint is created before being mounted by docker to prevent it to be owned by root (which would fail running ansible).
mkdir mongo-entrypoint

docker-compose -f ./mongo_dev.yml up -d

sleep 2
Expand Down
Loading