Skip to content

Commit

Permalink
emberjs update prd (#2813)
Browse files Browse the repository at this point in the history
* ember up wip

* wip

* ansiparse up

* ansiparse up

* onclicks

* dbg out

* wip

* intercom out

* dist

* spin

* dbg

* percy out, build history

* tests

* edu, payment, search

* tciyaml

* escape changed, ie disabled

* deprecated uglify out

* installation check

* dbg

* dbg

* dbg - reloading repos

* pshr test

* lint + fixes (#2812)

* lint+ bugfixes (#2811)

* Revert "merge master"

This reverts commit 7052db7, reversing
changes made to 5e10205.

* merge from master (#2815)

* Maintenance project Q1 (#2777)

* New user journey dev (#2766)

* New payment details implementation

* Fix tests

* Antifraud for v1 plans

* Adjust tests

* fix for lack of first_sync for assembla

* added hosted billing help

* Add the new macOS information section in select-plan and modify billing scss styles

* Adjust manual and github plans view

* Fix local registration checkbox

* ui updates

* redirection attempt, wizard fix, trial plan desc

* ui updates

* sync subscriptions on first_syn

* redirect from ghapp installation to firstsync

* style fixes,profile menu update,fix for company

* tests update

* ui updates

* ui updates

* redirection updates, typos fixed

* ui updates - plan, wizard, activation

* coupon

* installation redirections, email banner update

* random ui updates

* lint

* total price hide

* empty invoices field, installation_id fix

* radio color,mail banner, double badge

* ui fixes - review 03.28

* sync popup improvement

* activation button fix

* lint

* scan feature flag (#2776)

* Ga email subs (#2775)

* New payment details implementation

* Fix tests

* Antifraud for v1 plans

* Adjust tests

* fix for lack of first_sync for assembla

* added hosted billing help

* Add the new macOS information section in select-plan and modify billing scss styles

* Adjust manual and github plans view

* Fix local registration checkbox

* ui updates

* redirection attempt, wizard fix, trial plan desc

* ui updates

* sync subscriptions on first_syn

* redirect from ghapp installation to firstsync

* style fixes,profile menu update,fix for company

* tests update

* ui updates

* ui updates

* redirection updates, typos fixed

* ui updates - plan, wizard, activation

* coupon

* installation redirections, email banner update

* random ui updates

* lint

* total price hide

* empty invoices field, installation_id fix

* radio color,mail banner, double badge

* ui fixes - review 03.28

* sync popup improvement

* activation button fix

* lint

* managing email subscriptions for whole org

* test/lint fixes

* removed resubscribe list

* removed test

* cc owner name split (#2773)

* New payment details implementation

* Fix tests

* Antifraud for v1 plans

* Adjust tests

* fix for lack of first_sync for assembla

* added hosted billing help

* Add the new macOS information section in select-plan and modify billing scss styles

* Adjust manual and github plans view

* Fix local registration checkbox

* ui updates

* redirection attempt, wizard fix, trial plan desc

* ui updates

* sync subscriptions on first_syn

* redirect from ghapp installation to firstsync

* style fixes,profile menu update,fix for company

* tests update

* ui updates

* ui updates

* redirection updates, typos fixed

* ui updates - plan, wizard, activation

* coupon

* installation redirections, email banner update

* random ui updates

* lint

* total price hide

* empty invoices field, installation_id fix

* radio color,mail banner, double badge

* ui fixes - review 03.28

* sync popup improvement

* activation button fix

* lint

* name owner split to first/last

* first<=>last name for payment

* merge fix

* Travis VCS Proxy changes (#2653)

* Implement integration with Travis VCS Proxy

* Change VCS proxy provider URL to ENV var

* Add server type icons

* Adjust commit sha for travisproxy

* VCS Proxy Organization change

* added missing pr def in tproxy

* fixing the feature

comment out test which nobody cares

get repo

item repo not via get

be more sophisticated

this.item.repo

another approach

handle null

done it right

* skip prod failing tests

* Update build-header.js

---------

Co-authored-by: Stanislav Kolotinskiy <stanislav@assembla.com>
Co-authored-by: gabriel-arc <gabriel@travis-ci.org>
Co-authored-by: Maciej Kempin <maciej.kempin@gmail.com>
Co-authored-by: Maciej Kempin <makemp@users.noreply.github.com>

* userroles prd (#2774)

* New payment details implementation

* Fix tests

* Antifraud for v1 plans

* Adjust tests

* fix for lack of first_sync for assembla

* added hosted billing help

* Add the new macOS information section in select-plan and modify billing scss styles

* Adjust manual and github plans view

* Fix local registration checkbox

* ui updates

* redirection attempt, wizard fix, trial plan desc

* ui updates

* sync subscriptions on first_syn

* redirect from ghapp installation to firstsync

* style fixes,profile menu update,fix for company

* tests update

* ui updates

* ui updates

* redirection updates, typos fixed

* ui updates - plan, wizard, activation

* coupon

* installation redirections, email banner update

* random ui updates

* lint

* total price hide

* empty invoices field, installation_id fix

* radio color,mail banner, double badge

* ui fixes - review 03.28

* sync popup improvement

* activation button fix

* lint

* user roles wip

* logs, settings, caches

* fixed the condition for settings

* perm fixes/test fixes

* usage banner fix, settings from profile access check

* tests

* selected plan up

* lint

* lint

* activate update

* added missing check

* Maintenance project Q2 (#2787)

* Added log limit using env var (#2781)

* Fixed log limit

* Fixed style check

* Small fix

* One more fix

* Api key regenerate (#2782)

* Implement access token regenerate and remove

* Fix

* [BSFY-259] Assembla portfolio update (#2784)

* Use portfolio in assembla links

* Change to env var for portfolio endpoint

* Fix

* Fix

* Pass credit card fingerprint on payment details update (#2783)

* Fix tests

* Fix tests

* Implment manual cancellation UI

* Fix tests

* Change to flash for cancelation request confirmation

* Fix lint

* Fix test

* Show expired status if valid to date is in the past

* Update

* Prd ruby upgrade + urm + q2 (#2806)

* New payment details implementation

* Fix tests

* Antifraud for v1 plans

* Adjust tests

* fix for lack of first_sync for assembla

* added hosted billing help

* Add the new macOS information section in select-plan and modify billing scss styles

* Adjust manual and github plans view

* Fix local registration checkbox

* ui updates

* redirection attempt, wizard fix, trial plan desc

* ui updates

* sync subscriptions on first_syn

* redirect from ghapp installation to firstsync

* style fixes,profile menu update,fix for company

* tests update

* ui updates

* ui updates

* redirection updates, typos fixed

* ui updates - plan, wizard, activation

* coupon

* installation redirections, email banner update

* random ui updates

* lint

* total price hide

* empty invoices field, installation_id fix

* radio color,mail banner, double badge

* ui fixes - review 03.28

* sync popup improvement

* activation button fix

* lint

* user roles wip

* logs, settings, caches

* fixed the condition for settings

* perm fixes/test fixes

* usage banner fix, settings from profile access check

* tests

* PRD Travis ASM Handshake

* PRD New User Journey

* selected plan up

* lint

* lint

* activate update

* ruby up

* some rubocop reverts

* w/a for stripe issue with font

* Q2+Q1 merge

* Added log limit using env var (#2781)
* Api key regenerate (#2782)
* [BSFY-259] Assembla portfolio update (#2784)
* Pass credit card fingerprint on payment details update (#2783)
* scan feature flag (#2776)
* email subscriptions (#2775)

* log limit env

* removed org admin reqs for some menus

* typo fix

* fixed config escaping

* added configurable temporary banner

* lint

* test fix

* Fix UI overflow issue

* Fix updatePlan and buyAddon task execution

* Fix ember power select
  • Loading branch information
gbarc-dt authored Apr 23, 2024
1 parent ee53906 commit bfd57bc
Show file tree
Hide file tree
Showing 480 changed files with 43,261 additions and 30,572 deletions.
8 changes: 7 additions & 1 deletion .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,11 @@

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
}
8 changes: 8 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
/vendor/
/public/
/server/
# temporary
/app/routes/repo/not-active.js
/app/components/forms/form-select.js

# compiled output
/dist/
Expand All @@ -15,8 +18,13 @@
# misc
/coverage/
!.*
.*/
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
153 changes: 98 additions & 55 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,40 @@

module.exports = {
root: true,
parser: '@babel/eslint-parser',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module'
ecmaVersion: 'latest',
sourceType: 'module',
requireConfigFile: false,
// allowImportExportEverywhere: true,
babelOptions: {
plugins: [
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
],
},
ecmaFeatures: {
modules: true,
},
},
plugins: [
'ember'
],
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: {
browser: true,
es6: true
es2021: true,
},
rules: {
// Don't allow unused vars, but allow unused arguments
'no-unused-vars': ['error', { 'vars': 'all', 'args': 'none', 'ignoreRestSiblings': false }],
'no-unused-vars': [
'error',
{ vars: 'all', args: 'none', ignoreRestSiblings: false },
],

// TODO: Remove this to ensure we handle errors properly in UI
'no-empty': ['error', { 'allowEmptyCatch': true }],
'no-empty': ['error', { allowEmptyCatch: true }],

// enforce spacing inside array brackets
'array-bracket-spacing': [2, 'never'],
Expand All @@ -35,7 +48,7 @@ module.exports = {
'brace-style': [2, '1tbs', { allowSingleLine: true }],

// require camel case names
'camelcase': [2, { properties: 'never' }],
camelcase: [2, { properties: 'never' }],

// enforce spacing before and after comma
'comma-spacing': [2, { before: false, after: true }],
Expand Down Expand Up @@ -68,21 +81,24 @@ module.exports = {

// this option sets a specific tab width for your code
// http://eslint.org/docs/rules/indent
'indent': [2, 2, { SwitchCase: 1, VariableDeclarator: 1}],
indent: [2, 2, { SwitchCase: 1, VariableDeclarator: 1 }],

// enforces spacing between keys and values in object literal properties
'key-spacing': [2, { beforeColon: false, afterColon: true }],

// require a space before & after certain keywords
'keyword-spacing': [2, {
before: true,
after: true,
overrides: {
return: { after: true },
throw: { after: true },
case: { after: true }
}
}],
'keyword-spacing': [
2,
{
before: true,
after: true,
overrides: {
return: { after: true },
throw: { after: true },
case: { after: true },
},
},
],

// disallow mixed 'LF' and 'CRLF' as linebreaks
'linebreak-style': 0,
Expand All @@ -95,18 +111,26 @@ module.exports = {

// specify the maximum length of a line in your program
// http://eslint.org/docs/rules/max-len
'max-len': [2, 150, 2, {
ignoreUrls: true,
ignoreComments: false
}],
'max-len': [
2,
150,
2,
{
ignoreUrls: true,
ignoreComments: false,
},
],

// specify the max number of lines in a file
// http://eslint.org/docs/rules/max-lines
'max-lines': [0, {
max: 300,
skipBlankLines: true,
skipComments: true
}],
'max-lines': [
0,
{
max: 300,
skipBlankLines: true,
skipComments: true,
},
],

// specify the maximum depth callbacks can be nested
'max-nested-callbacks': 0,
Expand Down Expand Up @@ -188,6 +212,7 @@ module.exports = {
// disallow use of the Object constructor
'no-new-object': 2,

'no-prototype-builtins': 0,
// disallow use of unary operators, ++ and --
'no-plusplus': 0,

Expand Down Expand Up @@ -230,10 +255,13 @@ module.exports = {
// enforce line breaks between braces
// http://eslint.org/docs/rules/object-curly-newline
// TODO: enable once https://github.com/eslint/eslint/issues/6488 is resolved
'object-curly-newline': [0, {
ObjectExpression: { minProperties: 0, multiline: true },
ObjectPattern: { minProperties: 0, multiline: true }
}],
'object-curly-newline': [
0,
{
ObjectExpression: { minProperties: 0, multiline: true },
ObjectPattern: { minProperties: 0, multiline: true },
},
],

// TODO: Rule not found
// enforce "same line" or "multiple line" on object properties.
Expand Down Expand Up @@ -301,59 +329,74 @@ module.exports = {
'space-unary-ops': 0,

// require or disallow a space immediately following the // or /* in a comment
'spaced-comment': [2, 'always', {
exceptions: ['-', '+'],
markers: ['=', '!'] // space here to support sprockets directives
}],
'spaced-comment': [
2,
'always',
{
exceptions: ['-', '+'],
markers: ['=', '!'], // space here to support sprockets directives
},
],

// require or disallow the Unicode Byte Order Mark
// http://eslint.org/docs/rules/unicode-bom
'unicode-bom': [2, 'never'],

// require regex literals to be wrapped in parentheses
'wrap-regex': 0
'wrap-regex': 0,
},
overrides: [
// node files
{
files: [
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/*/index.js',
'server/**/*.js'
'./.eslintrc.js',
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./lib/*/index.js',
'./server/**/*.js',
],
parserOptions: {
sourceType: 'script'
sourceType: 'script',
},
env: {
browser: false,
node: true
}
node: true,
},
},

// test files
{
files: ['tests/**/*.js'],
excludedFiles: ['tests/dummy/**/*.js'],
env: {
embertest: true
embertest: true,
},
globals: {
triggerCopySuccess: true,
triggerCopyError: true,
signInUser: true,
withFeature: true,
percySnapshot: true,
waitForElement: true
waitForElement: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
rules: {
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off',
'max-len': 0,
'no-useless-escape': 0,
}
}
]
},
},
{
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
],
};
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
/node_modules/

# misc
/.env
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
Expand All @@ -23,7 +24,13 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# broccoli-debug
/DEBUG/

# vs code JavaScript config file
jsconfig.json
Expand Down
25 changes: 25 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.lint-todo/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
12 changes: 12 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
'use strict';

module.exports = {
overrides: [
{
files: '*.{js,ts}',
options: {
singleQuote: true,
},
},
],
};
8 changes: 8 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# unconventional files
/blueprints/*/files/

# compiled output
/dist/

# addons
/.node_modules.ember-try/
5 changes: 5 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
};
2 changes: 1 addition & 1 deletion .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';

module.exports = {
extends: 'recommended'
extends: 'recommended',
};
Loading

0 comments on commit bfd57bc

Please sign in to comment.