MMS4 Support, Branding Service, Configuration File by Enquier · Pull Request #141 · Open-MBEE/exec-ve

Enquier · 2021-08-27T20:29:37Z

This update adds

A Config file at the root to enable easier microservice/deployment management
Token authentication and MMS4 support (in test)
Branding updates and services for adding banners and login messages.

Release/3.4.0

…3.5.0

Release 3.5.2

Release 3.5.4

lgtm-com · 2021-08-27T20:39:23Z

This pull request introduces 5 alerts and fixes 1 when merging 742072f into 1f70ad2 - view on LGTM.com

new alerts:

2 for Useless assignment to local variable
2 for Unused variable, import, function or class
1 for Useless conditional

fixed alerts:

1 for Unused variable, import, function or class

lgtm-com · 2021-09-01T18:43:50Z

This pull request introduces 4 alerts and fixes 1 when merging 87aa4a2 into 1f70ad2 - view on LGTM.com

new alerts:

2 for Useless assignment to local variable
1 for Useless conditional
1 for Unused variable, import, function or class

fixed alerts:

1 for Unused variable, import, function or class

…nto feature/mms4 # Conflicts: # Gruntfile.js # app/mms.html # src/directives/Utils.js # src/directives/mmsSpec.js # src/directives/mmsTranscludeArt.js # src/services/AuthorizationService.js # src/services/ElementService.js # src/services/ProjectService.js # src/services/URLService.js # src/services/ViewService.js

Enquier · 2021-09-08T16:16:15Z

I've now merged and incorporated the changes from the BA branch

lgtm-com · 2021-09-08T16:25:10Z

This pull request introduces 4 alerts and fixes 2 when merging 4fcfe2e into 1f70ad2 - view on LGTM.com

new alerts:

2 for Useless assignment to local variable
1 for Useless conditional
1 for Unused variable, import, function or class

fixed alerts:

1 for Unused variable, import, function or class
1 for Incomplete string escaping or encoding

…mms4 # Conflicts: # src/services/AuthorizationService.js

lgtm-com · 2021-09-08T19:13:27Z

This pull request introduces 4 alerts and fixes 1 when merging 148e657 into 9cccfc9 - view on LGTM.com

new alerts:

2 for Useless assignment to local variable
1 for Useless conditional
1 for Unused variable, import, function or class

fixed alerts:

1 for Unused variable, import, function or class

lgtm-com · 2021-09-21T18:18:40Z

This pull request introduces 4 alerts and fixes 1 when merging 13ed472 into 9cccfc9 - view on LGTM.com

new alerts:

2 for Useless assignment to local variable
1 for Useless conditional
1 for Unused variable, import, function or class

fixed alerts:

1 for Unused variable, import, function or class

lgtm-com · 2021-09-21T19:30:03Z

This pull request introduces 4 alerts and fixes 1 when merging 50e0f91 into 9cccfc9 - view on LGTM.com

new alerts:

2 for Useless assignment to local variable
1 for Useless conditional
1 for Unused variable, import, function or class

fixed alerts:

1 for Unused variable, import, function or class

Enquier · 2021-09-21T20:40:26Z

This is now tested and working to the same level as the BA branch. I also backed out most of the OMG specific changes

Enquier · 2021-09-21T20:45:55Z

There is an open issue which will throw errors on user lookup until Open-MBEE/exec-mms#173 is merged and deployed

lgtm-com · 2021-09-21T21:02:38Z

This pull request introduces 4 alerts and fixes 1 when merging c3c4848 into 9cccfc9 - view on LGTM.com

new alerts:

2 for Useless assignment to local variable
1 for Useless conditional
1 for Unused variable, import, function or class

fixed alerts:

1 for Unused variable, import, function or class

dlamoris

first pass, main thing is using the http interceptor instead of passing headers for each call, also with the ckeditor upgrade i don't remember if there's anything else we do, i think the config file was commented out because it depends on where ve actually gets deployed, stuff in there may be incorporated into the directive? guess we'll see

Gruntfile.js

app/config/config.example.js

dlamoris · 2021-09-23T22:16:21Z

app/js/mms/app.js

                controller: 'ToolbarCtrl'
+            },
+            'footer@': {
+                template: '<ve-footer mms-footer="footer" ng-if="ve_footer"></ve-footer>',


i think ve_footer gets set at rootscope? not sure if it's supposed to use env file or other stuff?

ve-footer is now a separate controller which is why it's set there

dlamoris · 2021-09-23T22:17:40Z

app/js/mms/app.js

        url: '/document/:documentId',
        resolve: {
-            documentOb: ['$stateParams', '$q', 'ElementService', 'ViewService', 'refOb', 'ticket', function($stateParams, $q, ElementService, ViewService, refOb, ticket) {
+            projectOb: ['$stateParams', 'ProjectService', 'token', function($stateParams, ProjectService, token) {


this would have just inherited from parent state, i don't think it's needed here, only needs to be redefined if it's to overwrite parent state's object

dlamoris · 2021-09-23T23:44:40Z

src/services/ProjectService.js

-    //     }
-    //     return deferred.promise;
-    // };
+    var getMetatypes = function(projectId, refId) {


none of these will work since there's no more pure elastic query for search

dlamoris · 2021-09-23T23:46:07Z

src/services/URLService.js

-        ticket = t;
-    };
-
-    var getAuthorizationHeaderValue = function() {


these were needed by the http interceptor

dlamoris · 2021-09-23T23:47:09Z

src/services/URLService.js

     * @param {string} site Site name (not title!).
     * @returns {string} The path for site dashboard.
     */
    var getSiteDashboardURL = function(site) {


this is no longer relevant

dlamoris · 2021-09-23T23:54:07Z

src/services/AuthorizationService.js

-            deferred.resolve(success.data.username);
+        URLService.setToken(token);
+        $http.get(URLService.getCheckTokenURL(),URLService.getRequestConfig()).then(function (success) {
+            deferred.resolve(success.data);


was whatever is calling this handling the changed data accordingly?

dlamoris · 2021-09-23T23:58:31Z

src/services/URLService.js


-    var getLogoutURL = function() {
-        return root + '/api/login/ticket/' + ticket;
+    var getCheckTokenURL = function(t) {


i think there's a bunch of duplicates of this now - i've seen checkLogin, checkToken, checkSession

Enquier · 2021-09-24T00:19:36Z

Thanks Doris. I think the interception differential was due to my older changes and me not being aware of it. I’ll make that change and look at the others on Monday

lgtm-com · 2021-09-30T15:27:55Z

This pull request introduces 4 alerts and fixes 1 when merging 48d44c0 into 9cccfc9 - view on LGTM.com

new alerts:

2 for Useless assignment to local variable
1 for Useless conditional
1 for Unused variable, import, function or class

fixed alerts:

1 for Unused variable, import, function or class

lgtm-com · 2021-09-30T22:03:48Z

This pull request introduces 6 alerts and fixes 1 when merging 8a7a778 into 9cccfc9 - view on LGTM.com

new alerts:

3 for Unused variable, import, function or class
2 for Useless assignment to local variable
1 for Useless conditional

fixed alerts:

1 for Unused variable, import, function or class

dlamoris · 2021-10-10T08:00:25Z

src/services/ConfigService.js

@@ -0,0 +1,16 @@
+'use strict';


I don't think this service is used anywhere

dlamoris · 2021-10-10T08:01:15Z

src/services/ElementService.js

                    elements: [postElem],
                    source: ApplicationService.getSource()
-                }, {timeout: 60000})
+                }, Object.assign({timeout: 60000}))


not sure why object.assign is added

Leftover from when I added headers at that point rather than in the interceptor

dlamoris · 2021-10-10T21:57:13Z

app/config/config.example.js

@@ -0,0 +1,40 @@
+(function (window) {


i tried deploying it, i think the window arg and 'this' at the end are messing it up (undefined), should be fine if they're just taken out

Will not work for me without those statements. Lets setup some time to talk about it

I have committed the necessary changes

dlamoris · 2021-10-10T22:18:51Z

this version is on https://opencae-uat.jpl.nasa.gov/mms4ve/mms.html currently, talking to cae-mms-uat-lb.jpl.nasa.gov

lgtm-com · 2021-10-11T17:37:35Z

This pull request introduces 6 alerts and fixes 1 when merging 09016a2 into 9cccfc9 - view on LGTM.com

new alerts:

3 for Unused variable, import, function or class
2 for Useless assignment to local variable
1 for Useless conditional

fixed alerts:

1 for Unused variable, import, function or class

lgtm-com · 2021-10-11T18:03:04Z

This pull request introduces 6 alerts and fixes 1 when merging 5ebb561 into 9cccfc9 - view on LGTM.com

new alerts:

3 for Unused variable, import, function or class
2 for Useless assignment to local variable
1 for Useless conditional

fixed alerts:

1 for Unused variable, import, function or class

Shakeh Brys and others added 28 commits September 21, 2018 18:51

release 3.4

582b9fd

update docs

45dc10a

Merge pull request Open-MBEE#93 from Open-MBEE/release/3.4.0

3784e42

Release/3.4.0

fix related docs in spec

681ff55

Merge branch 'hotfix/related'

df8fa1a

fix version

8c8f436

Merge branch 'master' into release/3.5.0

2ce182b

release 3.5

99a4b90

Merge branch 'release/3.5.0' of github.com:Open-MBEE/ve into release/…

8f02efc

…3.5.0

3.5.1 release

09a8677

Merge branch 'release/3.5.1'

ff66ead

Merge branch 'master' into release/3.5.2

6772d12

Merge pull request Open-MBEE#127 from Open-MBEE/release/3.5.2

9aefacc

Release 3.5.2

update version for master release

f711f88

Merge pull request #411 from CAE/release/internal-3.5.4

c816377

Release 3.5.4

reuse 3.5.4 release

78b2192

Merge branch 'release/3.5.4'

e2e68eb

Merge branch 'release/3.5.5'

4a69ac4

up version

6c129e0

Merge branch 'release/3.6.0'

5ad2d6b

release

903d5fa

Merge branch 'release/3.6.1'

1acf5f6

commit local changes

d58f266

check for _isAppendix in tree (ported from omg)

1f70ad2

Retooling for mms4

442311c

Merge branch 'develop' into feature/mms4

ebe4991

Add configuration file and system

2051107

Remove old config and add branding system to the config file

742072f

add new package-lock.

d45eb24

dlamoris changed the base branch from develop to ve_mms4_backport_os September 8, 2021 18:43

Merge commit '9cccfc950b52544892a73872db4bd9dec836c149' into feature/…

148e657

…mms4 # Conflicts: # src/services/AuthorizationService.js

Enquier added 2 commits September 21, 2021 12:10

Attempting to back out omg changes

e2fee1c

fix env.js

13ed472

Redoing env service in a more extnsible way

50e0f91

Fix URL service; add documentation for configuration service

c3bb89e

Add fixes to support refactoring of mms4 users endpoint

c3c4848

dlamoris requested changes Sep 24, 2021

View reviewed changes

Updates based on code review

48d44c0

Handle incomplete Users Controller in MMS4, remove Jobs

8a7a778

dlamoris reviewed Oct 10, 2021

View reviewed changes

Cleanup

09016a2

Fixing example config to work in both dev and prod

5ebb561

dlamoris merged commit ad627e1 into Open-MBEE:ve_mms4_backport_os Dec 13, 2021

Conversation

Enquier commented Aug 27, 2021

Uh oh!

lgtm-com bot commented Aug 27, 2021

Uh oh!

lgtm-com bot commented Sep 1, 2021

Uh oh!

Enquier commented Sep 8, 2021

Uh oh!

lgtm-com bot commented Sep 8, 2021

Uh oh!

lgtm-com bot commented Sep 8, 2021

Uh oh!

lgtm-com bot commented Sep 21, 2021

Uh oh!

lgtm-com bot commented Sep 21, 2021

Uh oh!

Enquier commented Sep 21, 2021

Uh oh!

Enquier commented Sep 21, 2021

Uh oh!

lgtm-com bot commented Sep 21, 2021

Uh oh!

dlamoris left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Enquier commented Sep 24, 2021

Uh oh!

lgtm-com bot commented Sep 30, 2021

Uh oh!

lgtm-com bot commented Sep 30, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dlamoris commented Oct 10, 2021

Uh oh!

lgtm-com bot commented Oct 11, 2021

Uh oh!

lgtm-com bot commented Oct 11, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants