Produced by Araxis Merge on 4/23/2019 12:14:44 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\AraxisMergeCompare\Pri_un\CCRS\CCRS-BUSRULES-v6.3\CCRS-BUSRULES-v6.3\adminapp\src | envConfig.js | Wed Mar 27 19:38:08 2019 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\CCRS\CCRS-BUSRULES-v6.3\CCRS-BUSRULES-v6.3\adminapp\src | envConfig.js | Wed Apr 17 16:55:24 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 13 | 344 |
| Changed | 12 | 32 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | /* exporte d version */ | |
| 2 | ||
| 3 | var versio n="3.6.3"; | |
| 4 | ||
| 5 | (function( ) { | |
| 6 | 'use s trict'; | |
| 7 | /* glo bal angula r, window */ | |
| 8 | ||
| 9 | angula r.module(' configApp' , []); | |
| 10 | ||
| 11 | functi on getEnvC onfig() { | |
| 12 | va r env = { | |
| 13 | idleWarn ingTimeout : 15*60, | |
| 14 | idleAfte rWarningTi meout: 60, | |
| 15 | displayS plashScree n: true | |
| 16 | }; | |
| 17 | ||
| 18 | va r location = window. location; | |
| 19 | va r host = l ocation.ho stname; | |
| 20 | ||
| 21 | va r isDev=tr ue; | |
| 22 | ||
| 23 | sw itch (host ) { | |
| 24 | ||
| 25 | case 'lo calhost': | |
| 26 | ||
| 27 | env. name='loca l'; | |
| 28 | env. authUrl = 'http://lo calhost:80 81/ccrsaut hserver'; | |
| 29 | env. backendUrl = 'http:/ /localhost :8080/'; | |
| 30 | env. displaySpl ashScreen = false; | |
| 31 | setR edirects(e nv, 'http: //localhos t:6080/bre ngine/'); | |
| 32 | brea k; | |
| 33 | ||
| 34 | case '19 2.168.220. 28': | |
| 35 | case 'cc rstestsvr0 3.favortec h.local': | |
| 36 | case ' SERVER .favortech .local': | |
| 37 | ||
| 38 | env. name='ftc' ; | |
| 39 | env. authUrl = 'http://19 2.168.220. 28:8089/cc rsauthserv er'; | |
| 40 | env.backen dUrl = 'ht tp:// SERVER .favortech .local:808 8/brengine /'; | |
| 41 | setR edirects(e nv, env.ba ckendUrl); | |
| 42 | ||
| 43 | brea k; | |
| 44 | ||
| 45 | case 'SE RVER.DOMAI N.EXT': | |
| 46 | ||
| 47 | env. name='va-d ev'; | |
| 48 | env.authUr l = 'http: // SERVER . DOMAIN . EXT :8080/ccrs authserver '; | |
| 49 | setR edirects(e nv, env.ba ckendUrl); | |
| 50 | ||
| 51 | brea k; | |
| 52 | case 'SE RVER.DOMAI N.EXT': | |
| 53 | env. name='va-s qa'; | |
| 54 | env.authUr l = 'https :// SERVER . DOMAIN . EXT : PORT /ccrsauths erver'; | |
| 55 | env.backen dUrl = 'ht tps:// SERVER . DOMAIN . EXT : PORT /brengine/ '; | |
| 56 | setR edirects(e nv, env.ba ckendUrl); | |
| 57 | ||
| 58 | break; | |
| 59 | case 'sqa. ccrs. DOMAIN . EXT ': | |
| 60 | env. name='va-s qa-iam'; | |
| 61 | env.authUr l = 'https :// SERVER . DOMAIN . EXT /ccrsauths erver'; | |
| 62 | env.backen dUrl = 'ht tps:// SERVER . DOMAIN . EXT /brengine/ '; | |
| 63 | setR edirects(e nv, env.ba ckendUrl); | |
| 64 | ||
| 65 | brea k; | |
| 66 | case 'SE RVER.DOMAI N.EXT': | |
| 67 | env. name='va-p pd'; | |
| 68 | env.authUr l = 'https :// SERVER . DOMAIN . EXT : PORT /ccrsauths erver'; | |
| 69 | env.backen dUrl = 'ht tps:// SERVER . DOMAIN . EXT : PORT /brengine/ '; | |
| 70 | setR edirects(e nv, env.ba ckendUrl); | |
| 71 | ||
| 72 | brea k; | |
| 73 | case 'prep rod.ccrs. DOMAIN . EXT ': | |
| 74 | env. name='va-p pd-iam'; | |
| 75 | env.authUr l = 'https :// SERVER . DOMAIN . EXT /ccrsauths erver'; | |
| 76 | env.backen dUrl = 'ht tps:// SERVER . DOMAIN . EXT /brengine/ '; | |
| 77 | setR edirects(e nv, env.ba ckendUrl); | |
| 78 | ||
| 79 | brea k; | |
| 80 | ||
| 81 | default: | |
| 82 | thro w('Unable to determi ne environ ment from the locati on: '+loca tion); | |
| 83 | } | |
| 84 | ||
| 85 | if (isDev) { | |
| 86 | override FromReques tUrl(env); | |
| 87 | } | |
| 88 | ||
| 89 | co nsole.log( 'Current e nvironment :', env); | |
| 90 | ||
| 91 | re turn env; | |
| 92 | } | |
| 93 | ||
| 94 | functi on setRedi rects(env, baseRedir ectdUrl) { | |
| 95 | en v.authRedi rectUrl = baseRedire ctdUrl + ' adminapp/s rc/auth.ht ml'; | |
| 96 | en v.refreshR edirectUrl = baseRed irectdUrl + 'adminap p/src/refr esh.html'; | |
| 97 | en v.logoutRe directUrl = baseRedi rectdUrl + 'adminapp /src/auth. html'; | |
| 98 | } | |
| 99 | ||
| 100 | functi on overrid eFromReque stUrl(env) { | |
| 101 | ||
| 102 | va r params=g etAllUrlPa rams(windo w.location .toString( )); | |
| 103 | ||
| 104 | fo r (var env Prop in en v) { | |
| 105 | if (env. hasOwnProp erty(envPr op) && env Prop in pa rams) { | |
| 106 | cons ole.log("O verriding "+envProp+ " from req uest"); | |
| 107 | env[ envProp]=p arams[envP rop]; | |
| 108 | } | |
| 109 | } | |
| 110 | ||
| 111 | ||
| 112 | } | |
| 113 | ||
| 114 | var co nfig=getEn vConfig(); | |
| 115 | ||
| 116 | angula r | |
| 117 | .m odule('con figApp') | |
| 118 | .c onstant('e nvConfig', config); | |
| 119 | ||
| 120 | // we use it to extract pa rameters f rom the re quest to o verride co nfig value s | |
| 121 | functi on getAllU rlParams(u rl) { | |
| 122 | ||
| 123 | // get query string fr om url (op tional) or window | |
| 124 | va r queryStr ing = url ? url.spli t('?')[1] : window.l ocation.se arch.slice (1); | |
| 125 | ||
| 126 | // we'll sto re the par ameters he re | |
| 127 | va r obj = {} ; | |
| 128 | ||
| 129 | // if query string exi sts | |
| 130 | if (queryStr ing) { | |
| 131 | ||
| 132 | // stuff after # i s not part of query string, so get rid o f it | |
| 133 | queryStr ing = quer yString.sp lit('#')[0 ]; | |
| 134 | ||
| 135 | // split our query string in to its com ponent par ts | |
| 136 | var arr = queryStr ing.split( '&'); | |
| 137 | ||
| 138 | for (var i = 0; i < arr.leng th; i++) { | |
| 139 | // s eparate th e keys and the value s | |
| 140 | var a = arr[i] .split('=' ); | |
| 141 | ||
| 142 | // i n case par ams look l ike: list[ ]=thing1&l ist[]=thin g2 | |
| 143 | var paramNum = undefined ; | |
| 144 | var paramName = a[0].rep lace(/\[\d *\]/, func tion(v) { | |
| 145 | paramNum = v.slice(1 , -1); | |
| 146 | return ''; | |
| 147 | }); | |
| 148 | ||
| 149 | // s et paramet er value ( use 'true' if empty) | |
| 150 | var paramValue = typeof( a[1]) === 'undefined ' ? true : a[1]; | |
| 151 | ||
| 152 | if ( isNumber(p aramValue) ) { | |
| 153 | paramValue =parseInt( paramValue ); | |
| 154 | } | |
| 155 | ||
| 156 | // i f paramete r name alr eady exist s | |
| 157 | if ( obj[paramN ame]) { | |
| 158 | // convert value to array (if still stri ng) | |
| 159 | if (typeof obj[param Name] === 'string') { | |
| 160 | obj[pa ramName] = [obj[para mName]]; | |
| 161 | } | |
| 162 | // if no a rray index number sp ecified... | |
| 163 | if (typeof paramNum === 'undef ined') { | |
| 164 | // put the value on the en d of the a rray | |
| 165 | obj[pa ramName].p ush(paramV alue); | |
| 166 | } | |
| 167 | // if arra y index nu mber speci fied... | |
| 168 | else { | |
| 169 | // put the value at that i ndex numbe r | |
| 170 | obj[pa ramName][p aramNum] = paramValu e; | |
| 171 | } | |
| 172 | } | |
| 173 | // i f param na me doesn't exist yet , set it | |
| 174 | else { | |
| 175 | obj[paramN ame] = par amValue; | |
| 176 | } | |
| 177 | } | |
| 178 | } | |
| 179 | ||
| 180 | re turn obj; | |
| 181 | } | |
| 182 | ||
| 183 | functi on isNumbe r(s) { | |
| 184 | re turn /^\d+ $/.test(s) ; | |
| 185 | } | |
| 186 | ||
| 187 | ||
| 188 | })(); |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.