Skip to content

feat: TTA-83 Improve Admins Validation in Frontend #918

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 13 commits into from
Aug 12, 2022
Merged

feat: TTA-83 Improve Admins Validation in Frontend #918

merged 13 commits into from
Aug 12, 2022

Conversation

reihtw
Copy link
Contributor

@reihtw reihtw commented Aug 12, 2022

No description provided.

jimmyjaramillo and others added 13 commits June 30, 2022 17:13
@jimmyjaramillo
fix: TTA-83 improve admin validation
55d9da6
@jimmyjaramillo
fix: TTA-83 improve admin validation
4250cbf
feat TTA-83: frontend admin validation
d0911f4
fix TTA-83: fixing conflicts
c695593
fix TTA-83: Returning to login functions to subscribe
3f691c4
fix TTA-83: Fixing login component tests
c56d61c
fix TTA-83: Sonarcloud fix
1ccac53
fix TTA-83: Adding legacy login
24d945e
fix TTA-83: fixing tests
b461870
@wilc0519 @jisazac
@rodolfoIOET @GuLozada99 @jimmyjaramillo @semantic-release-bot
Tta 83 solving conflicts (#912)
912fc06 
* Tta 50 error when editing an entry (#907)

* fix: TTA-50 Error when editing an entry

* fix: TTA-50 Error when editing an entry

* Tta 94 refactor endpoints to make it work on tt stage and tt prod (#903)

* Innecesary env files deleted

* New changes to env files

* Add 1 git-crypt collaborator

New collaborators:

	F295BDD1 Marco Aguirre <[email protected]>

* Add 1 git-crypt collaborator

New collaborators:

	1CC2872D Rodolfo Diaz <[email protected]>

* Add 2 git-crypt collaborators

New collaborators:

	1CC2872D Rodolfo Diaz <[email protected]>
	F295BDD1 Marco Aguirre <[email protected]>

* New keys and env variables added

* env files added & modified

* Make run now uses .dev.env

* Pipeline modified

* is the .env needed?

* using encrypted .stage.env

* load secrets

* adding env variables

* scopes cannot be empty

* use env

* using env var

* using env file

* adding mask

* using docker buildkit

* only on tags

* using buildkit directly

* using dash source

* docker buildkit

* missing folders added

* nginx fix

* fixing secrets

* problem with double qoutes

* fixing quotes in .stage.env

* fixing secrets

* loading to env

* quotes fixed

* replacing \r

* fixing trailing \n

* one line expose

* fixing endpoint url

* removing unnecessary jobs

* update creds

* adding with space at the end of the file

* primer commit

* cambios en users list components

* Se ajusta la variable isDevelopmentOrProd

* revision tests

* reportsUrl como variable global

Co-authored-by: Marco Aguirre <[email protected]>
Co-authored-by: Marco Aguirre <[email protected]>
Co-authored-by: Rodolfo IOET <[email protected]>
Co-authored-by: jisazac <[email protected]>
Co-authored-by: Juan Isaza <[email protected]>

* Set copy of package.json and npm install before copying all other project files (#906)

* Set copy of package.json and npm install before copying all other project files

* Fix error on COPY on Dockerfiles

Co-authored-by: Gustavo Lozada <[email protected]>

* feat: TTA-113 Set a new logo for TT - version 2 (#909)

Co-authored-by: Jimmy Jaramillo <[email protected]>

* chore(release): 1.74.0 [skip ci]nn

Co-authored-by: wilc0519 <[email protected]>
Co-authored-by: Juan Esteban Isaza Cadavid <[email protected]>
Co-authored-by: Marco Aguirre <[email protected]>
Co-authored-by: Marco Aguirre <[email protected]>
Co-authored-by: Rodolfo IOET <[email protected]>
Co-authored-by: jisazac <[email protected]>
Co-authored-by: Juan Isaza <[email protected]>
Co-authored-by: GuLozada99 <[email protected]>
Co-authored-by: Gustavo Lozada <[email protected]>
Co-authored-by: Jimmy Jaramillo <[email protected]>
Co-authored-by: Jimmy Jaramillo <[email protected]>
Co-authored-by: semantic-release-bot <[email protected]>
@wilc0519 @jisazac
@rodolfoIOET @GuLozada99 @jimmyjaramillo @semantic-release-bot
Update TTA 83 Branch (#913)
5348352 
* Tta 50 error when editing an entry (#907)

* fix: TTA-50 Error when editing an entry

* fix: TTA-50 Error when editing an entry

* Tta 94 refactor endpoints to make it work on tt stage and tt prod (#903)

* Innecesary env files deleted

* New changes to env files

* Add 1 git-crypt collaborator

New collaborators:

	F295BDD1 Marco Aguirre <[email protected]>

* Add 1 git-crypt collaborator

New collaborators:

	1CC2872D Rodolfo Diaz <[email protected]>

* Add 2 git-crypt collaborators

New collaborators:

	1CC2872D Rodolfo Diaz <[email protected]>
	F295BDD1 Marco Aguirre <[email protected]>

* New keys and env variables added

* env files added & modified

* Make run now uses .dev.env

* Pipeline modified

* is the .env needed?

* using encrypted .stage.env

* load secrets

* adding env variables

* scopes cannot be empty

* use env

* using env var

* using env file

* adding mask

* using docker buildkit

* only on tags

* using buildkit directly

* using dash source

* docker buildkit

* missing folders added

* nginx fix

* fixing secrets

* problem with double qoutes

* fixing quotes in .stage.env

* fixing secrets

* loading to env

* quotes fixed

* replacing \r

* fixing trailing \n

* one line expose

* fixing endpoint url

* removing unnecessary jobs

* update creds

* adding with space at the end of the file

* primer commit

* cambios en users list components

* Se ajusta la variable isDevelopmentOrProd

* revision tests

* reportsUrl como variable global

Co-authored-by: Marco Aguirre <[email protected]>
Co-authored-by: Marco Aguirre <[email protected]>
Co-authored-by: Rodolfo IOET <[email protected]>
Co-authored-by: jisazac <[email protected]>
Co-authored-by: Juan Isaza <[email protected]>

* Set copy of package.json and npm install before copying all other project files (#906)

* Set copy of package.json and npm install before copying all other project files

* Fix error on COPY on Dockerfiles

Co-authored-by: Gustavo Lozada <[email protected]>

* feat: TTA-113 Set a new logo for TT - version 2 (#909)

Co-authored-by: Jimmy Jaramillo <[email protected]>

* chore(release): 1.74.0 [skip ci]nn

Co-authored-by: wilc0519 <[email protected]>
Co-authored-by: Juan Esteban Isaza Cadavid <[email protected]>
Co-authored-by: Marco Aguirre <[email protected]>
Co-authored-by: Marco Aguirre <[email protected]>
Co-authored-by: Rodolfo IOET <[email protected]>
Co-authored-by: jisazac <[email protected]>
Co-authored-by: Juan Isaza <[email protected]>
Co-authored-by: GuLozada99 <[email protected]>
Co-authored-by: Gustavo Lozada <[email protected]>
Co-authored-by: Jimmy Jaramillo <[email protected]>
Co-authored-by: Jimmy Jaramillo <[email protected]>
Co-authored-by: semantic-release-bot <[email protected]>
@rodolfoIOET @wilc0519
@jisazac @GuLozada99 @jimmyjaramillo @semantic-release-bot
second try of merge from master (#914)
0602127 
* Tta 50 error when editing an entry (#907)

* fix: TTA-50 Error when editing an entry

* fix: TTA-50 Error when editing an entry

* Tta 94 refactor endpoints to make it work on tt stage and tt prod (#903)

* Innecesary env files deleted

* New changes to env files

* Add 1 git-crypt collaborator

New collaborators:

	F295BDD1 Marco Aguirre <[email protected]>

* Add 1 git-crypt collaborator

New collaborators:

	1CC2872D Rodolfo Diaz <[email protected]>

* Add 2 git-crypt collaborators

New collaborators:

	1CC2872D Rodolfo Diaz <[email protected]>
	F295BDD1 Marco Aguirre <[email protected]>

* New keys and env variables added

* env files added & modified

* Make run now uses .dev.env

* Pipeline modified

* is the .env needed?

* using encrypted .stage.env

* load secrets

* adding env variables

* scopes cannot be empty

* use env

* using env var

* using env file

* adding mask

* using docker buildkit

* only on tags

* using buildkit directly

* using dash source

* docker buildkit

* missing folders added

* nginx fix

* fixing secrets

* problem with double qoutes

* fixing quotes in .stage.env

* fixing secrets

* loading to env

* quotes fixed

* replacing \r

* fixing trailing \n

* one line expose

* fixing endpoint url

* removing unnecessary jobs

* update creds

* adding with space at the end of the file

* primer commit

* cambios en users list components

* Se ajusta la variable isDevelopmentOrProd

* revision tests

* reportsUrl como variable global

Co-authored-by: Marco Aguirre <[email protected]>
Co-authored-by: Marco Aguirre <[email protected]>
Co-authored-by: Rodolfo IOET <[email protected]>
Co-authored-by: jisazac <[email protected]>
Co-authored-by: Juan Isaza <[email protected]>

* Set copy of package.json and npm install before copying all other project files (#906)

* Set copy of package.json and npm install before copying all other project files

* Fix error on COPY on Dockerfiles

Co-authored-by: Gustavo Lozada <[email protected]>

* feat: TTA-113 Set a new logo for TT - version 2 (#909)

Co-authored-by: Jimmy Jaramillo <[email protected]>

* chore(release): 1.74.0 [skip ci]nn

Co-authored-by: wilc0519 <[email protected]>
Co-authored-by: Juan Esteban Isaza Cadavid <[email protected]>
Co-authored-by: Marco Aguirre <[email protected]>
Co-authored-by: Marco Aguirre <[email protected]>
Co-authored-by: jisazac <[email protected]>
Co-authored-by: Juan Isaza <[email protected]>
Co-authored-by: GuLozada99 <[email protected]>
Co-authored-by: Gustavo Lozada <[email protected]>
Co-authored-by: Jimmy Jaramillo <[email protected]>
Co-authored-by: Jimmy Jaramillo <[email protected]>
Co-authored-by: semantic-release-bot <[email protected]>
Updating TTA-83 branch
beb2798
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@github-actions
Copy link

[infrastructure/][stage] Terraform Plan 📖 success

Show Plan ```

terraform
module.ui.azurerm_app_service_plan.plan[0]: Refreshing state... [id=/subscriptions/ca70c44c-ad7a-4333-a22c-07ebc6a69224/resourceGroups/time-tracker-service-stage/providers/Microsoft.Web/serverfarms/time-tracker-ui-stage]
module.ui.azurerm_app_service.this: Refreshing state... [id=/subscriptions/ca70c44c-ad7a-4333-a22c-07ebc6a69224/resourceGroups/time-tracker-service-stage/providers/Microsoft.Web/sites/time-tracker-ui-stage]
module.ui.azurerm_dns_cname_record.this: Refreshing state... [id=/subscriptions/ca70c44c-ad7a-4333-a22c-07ebc6a69224/resourceGroups/time-tracker-service-stage/providers/Microsoft.Network/dnszones/timetrackerapp.stage.ioet.com/CNAME/ui]
module.ui.azurerm_app_service_custom_hostname_binding.this: Refreshing state... [id=/subscriptions/ca70c44c-ad7a-4333-a22c-07ebc6a69224/resourceGroups/time-tracker-service-stage/providers/Microsoft.Web/sites/time-tracker-ui-stage/hostNameBindings/ui.timetrackerapp.stage.ioet.com]
module.ui.azurerm_dns_txt_record.this: Refreshing state... [id=/subscriptions/ca70c44c-ad7a-4333-a22c-07ebc6a69224/resourceGroups/time-tracker-service-stage/providers/Microsoft.Network/dnszones/timetrackerapp.stage.ioet.com/TXT/asuid.ui.timetrackerapp.stage.ioet.com]
module.ui.azurerm_app_service_managed_certificate.this: Refreshing state... [id=/subscriptions/ca70c44c-ad7a-4333-a22c-07ebc6a69224/resourceGroups/time-tracker-service-stage/providers/Microsoft.Web/certificates/ui.timetrackerapp.stage.ioet.com]
module.ui.azurerm_app_service_certificate_binding.this: Refreshing state... [id=/subscriptions/ca70c44c-ad7a-4333-a22c-07ebc6a69224/resourceGroups/time-tracker-service-stage/providers/Microsoft.Web/sites/time-tracker-ui-stage/hostNameBindings/ui.timetrackerapp.stage.ioet.com|/subscriptions/ca70c44c-ad7a-4333-a22c-07ebc6a69224/resourceGroups/time-tracker-service-stage/providers/Microsoft.Web/certificates/ui.timetrackerapp.stage.ioet.com]

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
~ update in-place

Terraform will perform the following actions:

module.ui.azurerm_app_service.this will be updated in-place

~ resource "azurerm_app_service" "this" {
id = "/subscriptions/ca70c44c-ad7a-4333-a22c-07ebc6a69224/resourceGroups/time-tracker-service-stage/providers/Microsoft.Web/sites/time-tracker-ui-stage"
name = "time-tracker-ui-stage"
tags = {}
# (17 unchanged attributes hidden)

  ~ site_config {
      ~ linux_fx_version                     = (sensitive)
        # (29 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

    # (3 unchanged blocks hidden)
}

Plan: 0 to add, 1 to change, 0 to destroy.

─────────────────────────────────────────────────────────────────────────────

Note: You didn't use the -out option to save this plan, so Terraform can't
guarantee to take exactly these actions if you run "terraform apply" now.

</details>
*Pusher: @reihtw, Action: `pull_request`*

@github-actions
Copy link

[infrastructure/][prod] Terraform Plan 📖 success

Show Plan ```

terraform

</details>
*Pusher: @reihtw, Action: `pull_request`*

@reihtw reihtw merged commit 29d76ba into master Aug 12, 2022
@reihtw reihtw deleted the TTA-83-improve-admins-validation-in-frontend branch August 12, 2022 20:26
rodolfoIOET
rodolfoIOET reviewed Aug 12, 2022
View reviewed changes
Copy link
Contributor

@rodolfoIOET rodolfoIOET left a comment

Choose a reason for hiding this comment

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

ok

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@rodolfoIOET rodolfoIOET rodolfoIOET left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@reihtw @rodolfoIOET @jimmyjaramillo