Commit 9dd5759f authored by Muhammad Umair Khan's avatar Muhammad Umair Khan
Browse files

Update service-mgmt MEP filtering and admin console components

parent 88132cee

go-apps/meep-app-enablement/server/service-mgmt/service-mgmt.go

+4 −4
Original line number Diff line number Diff line
@@ -1253,9 +1253,9 @@ func getServices(w http.ResponseWriter, r *http.Request, appId string) { 


	var key string

	if appId == "" {

		key = baseKeyAnyMep + "app:*:svc:*"

		key = baseKey + "app:*:svc:*"

	} else {

		key = baseKeyAnyMep + "app:" + appId + ":svc:*"

		key = baseKey + "app:" + appId + ":svc:*"

	}



	err = rc.ForEachJSONEntry(key, populateServiceInfoList, sInfoList)
@@ -1290,9 +1290,9 @@ func getService(w http.ResponseWriter, r *http.Request, appId string, serviceId 


	var key string

	if appId == "" {

		key = baseKeyAnyMep + "app:*:svc:" + serviceId

		key = baseKey + "app:*:svc:" + serviceId

	} else {

		key = baseKeyAnyMep + "app:" + appId + ":svc:" + serviceId

		key = baseKey + "app:" + appId + ":svc:" + serviceId

	}



	err := rc.ForEachJSONEntry(key, populateServiceInfoList, &sInfoList)

js-apps/meep-admin-console/package-lock.json

+454 −14

File changed.

Preview size limit exceeded, changes collapsed.

js-apps/meep-admin-console/package.json

+4 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ 
    "test:verbose": "jest --verbose true",

    "test:coverage": "jest --verbose true --coverage --colors",

    "build": "webpack",

    "build:dev": "webpack-dev-server --https true --port 8092 --host 10.3.16.69 --env.MEEP_HOST=10.3.16.69"

    "build:dev": "webpack-dev-server --https true --port 8092 --host 10.3.16.69 --env.MEEP_HOST=10.3.16.69",

    "postinstall": "find node_modules/@rmwc -type f -name \"*.js\" -exec sed -i 's/\\bcomponentWillReceiveProps\\b/UNSAFE_componentWillReceiveProps/g' {} + && find node_modules/@rmwc -type f -name \"*.js\" -exec sed -i 's/\\bcomponentWillMount\\b/UNSAFE_componentWillMount/g' {} +"

  },

  "author": "",

  "license": "ISC",
@@ -31,6 +32,8 @@ 
    "html-loader": "^0.5.5",

    "html-webpack-plugin": "^3.2.0",

    "jest": "^24.1.0",

    "patch-package": "^8.0.1",

    "postinstall-postinstall": "^2.1.0",

    "regenerator-runtime": "^0.13.1",

    "sass": "^1.32.13",

    "sass-loader": "^10.1.1",

js-apps/meep-admin-console/src/js/components/dialogs/id-sign-in-oauth-dialog.js

+33 −25
Original line number Diff line number Diff line
@@ -62,9 +62,13 @@ class IDSignInOAuthDialog extends Component { 
            </div>

          </GridCell>



          <GridCell span={12}>

            <form onSubmit={(e) => { e.preventDefault(); if (!isLoginDisabled) this.props.onLocalSignIn(this.state.username, this.state.password); }}>

              <Grid>

                <GridCell span={12}>

                  <TextField

                    label="Username"

                    autoComplete="username"

                    value={this.state.username}

                    onChange={e => this.setState({ username: e.target.value })}

                    style={{ width: '100%', marginBottom: 10 }}
@@ -74,6 +78,7 @@ class IDSignInOAuthDialog extends Component { 
                  <TextField

                    label="Password"

                    type="password"

                    autoComplete="current-password"

                    value={this.state.password}

                    onChange={e => this.setState({ password: e.target.value })}

                    style={{ width: '100%', marginBottom: 10 }}
@@ -82,14 +87,17 @@ class IDSignInOAuthDialog extends Component { 
                <GridCell span={12}>

                  <Button

                    unelevated

                    type="submit"

                    style={{ width: '100%', height: '48px', backgroundColor: isLoginDisabled ? '#ccc' : '#37474F' }}

                    disabled={isLoginDisabled}

              onClick={() => this.props.onLocalSignIn(this.state.username, this.state.password)}

                  >

                    SIGN IN

                  </Button>

                </GridCell>

              </Grid>

            </form>

          </GridCell>

        </Grid>

        <span style={styles.text}>

          Authenticating with an external provider will:

          <ul>

js-apps/meep-admin-console/src/js/components/meep-top-bar.js

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ class MeepTopBar extends Component { 
    /* eslint-enable */

  }



  componentWillMount() {

  UNSAFE_componentWillMount() {

    this.props.changeUserMenuDisplay(false);

  }