Commit 0aae6c9e authored by Nikhil Doifode's avatar Nikhil Doifode
Browse files

Resolved PR comments and textfield outline issue

parent 5bf02191

.meepctl-repocfg.yaml

+2 −2
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ repo: 
    auth:

      # enable authentication & authorization

      enabled: true

      # Is platform [open|secure] for all github/gitlab users or only selected ones

      provider-mode: open

      # Session config

      session:

        # session encryption key k8s secret (data: encryption-key)
@@ -67,8 +69,6 @@ repo: 
        redirect-uri: https://my-platform-fqdn/auth/v1/authorize

        # OAuth k8s secret (data: client-id, secret)

        secret: meep-oauth-github

        # Is platform [open|secure] for all github users or only selected ones

        provider-mode: open

      # GitLab OAuth provider config

      gitlab:

        # enable GitLab OAuth

config/permissions-secure.yaml

+1 −1
Original line number Diff line number Diff line 
# Copyright (c) 2020  InterDigital Communications, Inc

# Copyright (c) 2021  InterDigital Communications, Inc

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

go-apps/meepctl/cmd/deploy.go

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ func deployRunScriptsAndGetFlags(targetName string, chart string, cobraCmd *cobr 
			tokenUrl := utils.RepoCfg.GetString("repo.deployment.auth.github.token-url")

			redirectUri := utils.RepoCfg.GetString("repo.deployment.auth.github.redirect-uri")

			secret := utils.RepoCfg.GetString("repo.deployment.auth.github.secret")

			providerMode := utils.RepoCfg.GetString("repo.deployment.auth.github.provider-mode")

			providerMode := utils.RepoCfg.GetString("repo.deployment.auth.provider-mode")

			flags = utils.HelmFlags(flags, "--set", "image.env.MEEP_OAUTH_GITHUB_ENABLED=true")

			flags = utils.HelmFlags(flags, "--set", "image.env.MEEP_OAUTH_GITHUB_AUTH_URL="+authUrl)

			flags = utils.HelmFlags(flags, "--set", "image.env.MEEP_OAUTH_GITHUB_TOKEN_URL="+tokenUrl)

js-apps/meep-frontend/src/js/components/dialogs/id-deploy-scenario-dialog.js

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ class IDDeployScenarioDialog extends Component { 
        cydata={MEEP_DLG_DEPLOY_SCENARIO}

      >

        <IDSelect

          isDialog={true}

          label={this.props.label || 'Scenario'}

          value={this.props.value}

          options={this.props.options}

js-apps/meep-frontend/src/js/components/dialogs/id-export-scenario-dialog.js

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ class IDExportScenarioDialog extends Component { 
        okDisabled={this.state.err}

      >

        <TextField

          outlined

          style={{ width: '100%' }}

          label={'Export filename'}

          invalid={this.state.err}