From cdb4289b75a55f55d4ec16ec241003ae4872d456 Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Sat, 17 Feb 2018 19:39:48 -0700 Subject: [PATCH 1/3] show github auth and local in correct auth config state s --- lib/login/addon/login/controller.js | 7 ++++++- lib/login/addon/login/template.hbs | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/login/addon/login/controller.js b/lib/login/addon/login/controller.js index 16440e6ae..3d45712de 100644 --- a/lib/login/addon/login/controller.js +++ b/lib/login/addon/login/controller.js @@ -15,7 +15,8 @@ export default Controller.extend({ modalService: service('modal'), isGithub : computed('access.providers', function() { - return get(this, 'access.providers').findBy('id', 'github'); + let gh = get(this, 'access.providers').findBy('id', 'github'); + return gh && get(gh, 'enabled'); }), isActiveDirectory : computed('access.provider', function() { return get(this, 'access.providers').findBy('id', 'activedirectory'); @@ -33,6 +34,10 @@ export default Controller.extend({ isCaas : computed('app.mode', function() { return get(this, 'app.mode') === 'caas' ? true : false; }), + + authCount : computed('access.providers', function() { + return get(this, 'access.providers.length') > 1; + }), promptPasswordReset: alias('resetPassword'), waiting : false, diff --git a/lib/login/addon/login/template.hbs b/lib/login/addon/login/template.hbs index feaebde84..18c3a3076 100644 --- a/lib/login/addon/login/template.hbs +++ b/lib/login/addon/login/template.hbs @@ -54,8 +54,8 @@ {{!-- {{#if (or isLocal isActiveDirectory isOpenLdap isAzureAd)}} --}} - {{#if (or isLocal)}} - {{login-user-pass action="authenticate" waiting=waiting}} + {{#if isLocal}} + {{login-user-pass action="authenticate" waiting=waiting shown=authCount}} {{/if}} From 7d39c33c373ff582e3aeb84d35753d68863328cd Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Sat, 17 Feb 2018 19:45:59 -0700 Subject: [PATCH 2/3] haha whoops now its fixed --- lib/login/addon/login/controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/login/addon/login/controller.js b/lib/login/addon/login/controller.js index 3d45712de..10767f58d 100644 --- a/lib/login/addon/login/controller.js +++ b/lib/login/addon/login/controller.js @@ -36,7 +36,7 @@ export default Controller.extend({ }), authCount : computed('access.providers', function() { - return get(this, 'access.providers.length') > 1; + return get(this, 'access.providers.length') === 1; }), promptPasswordReset: alias('resetPassword'), From a0cf2787294d8c2ad5d71bc67ab4c7316b07dcae Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Mon, 19 Feb 2018 12:23:49 -0700 Subject: [PATCH 3/3] more app chages --- app/catalog-tab/launch/route.js | 7 ++++--- .../addon/components/form-namespace/component.js | 7 +++++-- .../addon/components/new-catalog/component.js | 13 +++---------- .../addon/components/new-catalog/template.hbs | 2 +- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/app/catalog-tab/launch/route.js b/app/catalog-tab/launch/route.js index f9f28ff7c..28255d319 100644 --- a/app/catalog-tab/launch/route.js +++ b/app/catalog-tab/launch/route.js @@ -40,14 +40,15 @@ export default Route.extend({ if ( !results.namespace ) { let neuNSN = results.tpl.get('defaultName'); + let dupe = ''; - if (results.namespaces.findBy('id', neuNSN)){ - neuNSN = `${neuNSN}-1`; + if ( dupe = results.namespaces.findBy('id', neuNSN)){ + neuNSN = `${dupe.name}-${Math.random().toString(36).substring(7)}`; // generate a random 5 char string for the dupename } results.namespace = clusterStore.createRecord({ type: 'namespace', name: neuNSN, - id: neuNSN, + projectId: this.modelFor('authenticated.project').get('project.id'), answers: {}, }); } diff --git a/lib/shared/addon/components/form-namespace/component.js b/lib/shared/addon/components/form-namespace/component.js index 8bd84728e..a6d8744e9 100644 --- a/lib/shared/addon/components/form-namespace/component.js +++ b/lib/shared/addon/components/form-namespace/component.js @@ -38,15 +38,18 @@ export default Component.extend({ })); // TODO - // debugger; // Find a namespace if ( this.get('mode') === REUSE ) { let namespace = get(this,'namespace') || // Passed in all.findBy('isDefault', true) || // The default one all.objectAt(0); // Ok any one - if ( namespace ) { + if ( namespace && namespace.id) { this.set('reuseNamespaceId', get(namespace, 'id')); + } else if (namespace){ + this.set('createNamespace', namespace); + this.set('mode', CREATE); + return; } else { next(() => { this.set('mode', CREATE); diff --git a/lib/shared/addon/components/new-catalog/component.js b/lib/shared/addon/components/new-catalog/component.js index ca641099e..d04726c36 100644 --- a/lib/shared/addon/components/new-catalog/component.js +++ b/lib/shared/addon/components/new-catalog/component.js @@ -76,10 +76,9 @@ export default Component.extend(NewOrEdit, { } }, - didReceiveAttrs: function() { + init() { this._super(...arguments); set(this, 'selectedTemplateModel', null); - scheduleOnce('afterRender', () => { if ( get(this, 'selectedTemplateUrl') ) { this.templateChanged(); @@ -192,7 +191,8 @@ export default Component.extend(NewOrEdit, { set(this, 'readmeContent', null); } - this.updateReadme(); + // TODO 2.0 base64 encoded readmes cause issues + // this.updateReadme(); }), templateChanged: function() { @@ -254,12 +254,6 @@ export default Component.extend(NewOrEdit, { let namespace = get(this, 'namespaceResource'); if ( get(this, 'actuallySave') ) { - namespace.setProperties({ - // answers: get(this, 'answers'), - // externalId: get(this, 'newExternalId'), - externalId: get(this, 'selectedTemplateModel.externalId'), - }); - return true; } else { // TODO 2.0 this is part of the volumes stuff so we need to investigate if this still works @@ -283,7 +277,6 @@ export default Component.extend(NewOrEdit, { setProperties(app, { installNamespace: neu.name, - name: neu.name, externalId: get(this, 'selectedTemplateModel.externalId'), projectId: get(neu, 'projectId'), }); diff --git a/lib/shared/addon/components/new-catalog/template.hbs b/lib/shared/addon/components/new-catalog/template.hbs index 269a289af..0f54df78f 100644 --- a/lib/shared/addon/components/new-catalog/template.hbs +++ b/lib/shared/addon/components/new-catalog/template.hbs @@ -56,7 +56,7 @@

{{t 'newCatalog.newApp'}}

{{form-name-description - model=templateResource + model=catalogApp nameRequired=true descriptionShow=false }}