author int64 4.98k 943k | date stringdate 2017-04-15 16:45:02 2022-02-25 15:32:15 | timezone int64 -46,800 39.6k | hash stringlengths 40 40 | message stringlengths 8 468 | mods listlengths 1 16 | language stringclasses 9 values | license stringclasses 2 values | repo stringclasses 119 values | original_message stringlengths 12 491 | is_CCS int64 1 1 | commit_type stringclasses 129 values | commit_scope stringlengths 1 44 ⌀ |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
807,849 | 29.05.2018 14:12:22 | 25,200 | d82f1e9cf737e363b3a04c8052fd8246ca952e9e | deps: Prettier 1.13.2 | [
{
"change_type": "MODIFY",
"diff": "\"dev\": true\n},\n\"prettier\": {\n- \"version\": \"1.12.1\",\n- \"resolved\": \"https://registry.npmjs.org/prettier/-/prettier-1.12.1.tgz\",\n- \"integrity\": \"sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU=\",\n+ \"version\": \"1.13.2\",\n+ \"resolved\": \"https://registry.npmjs.org/prettier/-/prettier-1.13.2.tgz\",\n+ \"integrity\": \"sha512-D9oFKkJ7g76fRxkRh9MWBh4j2vbNGO4rtEUJbj46zId5wnm0dwHruoyg4Od9Zqh3WNl0jwxnWSlEGAnl+/thWA==\",\n\"dev\": true\n},\n\"pretty-format\": {\n",
"new_path": "package-lock.json",
"old_path": "package-lock.json"
},
{
"change_type": "MODIFY",
"diff": "\"normalize-newline\": \"^3.0.0\",\n\"normalize-path\": \"^2.1.1\",\n\"path-key\": \"^2.0.1\",\n- \"prettier\": \"^1.12.1\",\n+ \"prettier\": \"^1.13.2\",\n\"tempy\": \"^0.2.1\",\n\"touch\": \"^3.1.0\"\n},\n",
"new_path": "package.json",
"old_path": "package.json"
}
] | JavaScript | MIT License | lerna/lerna | deps: Prettier 1.13.2 | 1 | deps | null |
679,913 | 29.05.2018 14:36:38 | -3,600 | 94225989315c69bfe565748fcfe569270c4f153e | feat(atom): add INotify impl for History
add EVENT_UNDO/REDO/RECORD events
emit events from `undo()`, `redo()`, `record()` | [
{
"change_type": "MODIFY",
"diff": "@@ -50,7 +50,10 @@ export interface CursorOpts<T> {\nid?: string;\n}\n-export interface IHistory<T> extends IAtom<T> {\n+export interface IHistory<T> extends\n+ IAtom<T>,\n+ api.INotify {\n+\ncanUndo(): boolean;\ncanRedo(): boolean;\n",
"new_path": "packages/atom/src/api.ts",
"old_path": "packages/atom/src/api.ts"
},
{
"change_type": "MODIFY",
"diff": "-import { Predicate2, Watch } from \"@thi.ng/api/api\";\n+import { Event, Predicate2, Watch } from \"@thi.ng/api/api\";\n+import * as mixin from \"@thi.ng/api/mixins/inotify\";\nimport { equiv } from \"@thi.ng/equiv\";\nimport {\ngetIn,\n@@ -21,11 +22,18 @@ import { View } from \"./view\";\n* `IAtom` interface and so can be used directly in place and delegates\n* to wrapped atom/cursor. Value changes are only recorded in history if\n* `changed` predicate returns truthy value, or else by calling\n- * `record()` directly.\n+ * `record()` directly. This class too implements the @thi.ng/api\n+ * `INotify` interface to support event listeners for `undo()`, `redo()`\n+ * and `record()`.\n*/\n+@mixin.INotify\nexport class History<T> implements\nIHistory<T> {\n+ static readonly EVENT_UNDO = \"undo\";\n+ static readonly EVENT_REDO = \"redo\";\n+ static readonly EVENT_RECORD = \"record\";\n+\nstate: IAtom<T>;\nmaxLen: number;\nchanged: Predicate2<T>;\n@@ -67,11 +75,19 @@ export class History<T> implements\n* switch, first records the atom's current value into the future\n* stack (to enable `redo()` feature). Returns `undefined` if\n* there's no history.\n+ *\n+ * If undo was possible, the `History.EVENT_UNDO` event is emitted\n+ * after the restoration with the restored state provided as event\n+ * value. This allows for additional state handling to be executed,\n+ * e.g. application of the Command pattern. See `addListener()` for\n+ * registering event listeners.\n*/\nundo() {\nif (this.history.length) {\nthis.future.push(this.state.deref());\n- return this.state.reset(this.history.pop());\n+ const res = this.state.reset(this.history.pop());\n+ this.notify({ id: History.EVENT_UNDO, value: res });\n+ return res;\n}\n}\n@@ -81,11 +97,19 @@ export class History<T> implements\n* switch, first records the atom's current value into the history\n* stack (to enable `undo()` feature). Returns `undefined` if\n* there's no future (so sad!).\n+ *\n+ * If redo was possible, the `History.EVENT_REDO` event is emitted\n+ * after the restoration with the restored state provided as event\n+ * value. This allows for additional state handling to be executed,\n+ * e.g. application of the Command pattern. See `addListener()` for\n+ * registering event listeners.\n*/\nredo() {\nif (this.future.length) {\nthis.history.push(this.state.deref());\n- return this.state.reset(this.future.pop());\n+ const res = this.state.reset(this.future.pop());\n+ this.notify({ id: History.EVENT_REDO, value: res });\n+ return res;\n}\n}\n@@ -145,6 +169,9 @@ export class History<T> implements\n* If no `state` is given, uses the wrapped atom's current state\n* value.\n*\n+ * If recording succeeded, the `History.EVENT_RECORD` event is\n+ * emitted with the recorded state provided as event value.\n+ *\n* @param state\n*/\nrecord(state?: T) {\n@@ -159,9 +186,11 @@ export class History<T> implements\nstate = this.state.deref();\nif (!n || this.changed(history[n - 1], state)) {\nhistory.push(state);\n+ this.notify({ id: History.EVENT_RECORD, value: state });\n}\n} else {\nhistory.push(state);\n+ this.notify({ id: History.EVENT_RECORD, value: state });\n}\nthis.future.length = 0;\n}\n@@ -214,4 +243,15 @@ export class History<T> implements\ndelete this.state;\nreturn true;\n}\n+\n+ addListener(id: string, fn: (e: Event) => void, scope?: any): boolean {\n+ return false;\n+ }\n+\n+ removeListener(id: string, fn: (e: Event) => void, scope?: any): boolean {\n+ return false;\n+ }\n+\n+ notify(event: Event): void {\n+ }\n}\n",
"new_path": "packages/atom/src/history.ts",
"old_path": "packages/atom/src/history.ts"
}
] | TypeScript | Apache License 2.0 | thi-ng/umbrella | feat(atom): add INotify impl for History
- add EVENT_UNDO/REDO/RECORD events
- emit events from `undo()`, `redo()`, `record()` | 1 | feat | atom |
807,849 | 29.05.2018 14:48:39 | 25,200 | 15fd4d4cdeba6d1586866e7b17333ec4ebae5c63 | chore: Use correct LC_ALL value | [
{
"change_type": "MODIFY",
"diff": "\"scripts\": {\n\"ci\": \"npm test -- --ci --coverage --verbose && npm run integration -- --ci\",\n\"fix\": \"npm run lint -- --fix\",\n- \"integration\": \"cross-env LC_ALL=en-US NODE_ENV=test jest --config jest.integration.js\",\n+ \"integration\": \"cross-env LC_ALL=en_US.UTF-8 NODE_ENV=test jest --config jest.integration.js\",\n\"lint\": \"eslint . --ignore-path .gitignore --cache\",\n\"pretest\": \"npm run lint\",\n- \"test\": \"cross-env LC_ALL=en-US NODE_ENV=test jest\"\n+ \"test\": \"cross-env LC_ALL=en_US.UTF-8 NODE_ENV=test jest\"\n},\n\"repository\": {\n\"type\": \"git\",\n",
"new_path": "package.json",
"old_path": "package.json"
}
] | JavaScript | MIT License | lerna/lerna | chore: Use correct LC_ALL value | 1 | chore | null |
807,849 | 29.05.2018 15:24:31 | 25,200 | d6ca46d37e10da27dde7648dcd7994d8c5461906 | chore: Set 10s timeout for unit tests because CI is slowwww | [
{
"change_type": "MODIFY",
"diff": "@@ -6,5 +6,6 @@ module.exports = {\nmodulePathIgnorePatterns: [\"/__fixtures__/\"],\nroots: [\"<rootDir>/commands\", \"<rootDir>/core\", \"<rootDir>/utils\"],\nsetupFiles: [\"@lerna-test/silence-logging\", \"@lerna-test/set-npm-userconfig\"],\n+ setupTestFrameworkScriptFile: \"<rootDir>/setup-unit-test-timeout.js\",\ntestEnvironment: \"node\",\n};\n",
"new_path": "jest.config.js",
"old_path": "jest.config.js"
},
{
"change_type": "ADD",
"diff": "+\"use strict\";\n+\n+// allow 10s timeout in an attempt to lessen flakiness of unit tests...\n+jasmine.DEFAULT_TIMEOUT_INTERVAL = 10e3;\n",
"new_path": "setup-unit-test-timeout.js",
"old_path": null
}
] | JavaScript | MIT License | lerna/lerna | chore: Set 10s timeout for unit tests because CI is slowwww | 1 | chore | null |
807,849 | 29.05.2018 15:25:09 | 25,200 | 1116a4a08a2c32709f78f6201d9a499551da2266 | chore: Use exponential notation in integration test timeout setup | [
{
"change_type": "MODIFY",
"diff": "\"use strict\";\n-// allow CLI integration tests to run for awhile\n-jasmine.DEFAULT_TIMEOUT_INTERVAL = 300000;\n+// allow CLI integration tests to run for awhile (300s)\n+jasmine.DEFAULT_TIMEOUT_INTERVAL = 300e3;\n",
"new_path": "setup-integration-timeout.js",
"old_path": "setup-integration-timeout.js"
}
] | JavaScript | MIT License | lerna/lerna | chore: Use exponential notation in integration test timeout setup | 1 | chore | null |
217,922 | 29.05.2018 15:52:21 | -7,200 | e442cf9d7e23d74c43bd80e0f12882ba3a552338 | feat: tags button now present inside list panel header | [
{
"change_type": "MODIFY",
"diff": "(cbOnSuccess)=\"showCopiedNotification()\">\n<mat-icon>share</mat-icon>\n</button>\n- <!--<input type=\"text\" #uri readonly hidden value=\"{{getLink()}}\">-->\n+\n+ <button mat-icon-button matTooltip=\"{{'LIST_DETAILS.Tags_popup' | translate}}\"\n+ matTooltipPosition=\"above\"\n+ (click)=\"$event.stopPropagation();openTagsPopup()\" *ngIf=\"list.authorId === userUid\">\n+ <mat-icon>label_outline</mat-icon>\n+ </button>\n+\n<button mat-icon-button *ngIf=\"buttons\" routerLink=\"/list/{{list.$key}}\"\nmatTooltip=\"{{'LIST.BUTTONS.Open' | translate}}\" matTooltipPosition=\"above\"\n(click)=\"$event.stopPropagation()\">\n(cbOnSuccess)=\"showCopiedNotification()\">\n<mat-icon>share</mat-icon>\n</button>\n- <!--<input type=\"text\" #uri readonly hidden value=\"{{getLink()}}\">-->\n+\n+ <button mat-icon-button matTooltip=\"{{'LIST_DETAILS.Tags_popup' | translate}}\"\n+ matTooltipPosition=\"above\"\n+ (click)=\"openTagsPopup()\" *ngIf=\"list.authorId === userUid\">\n+ <mat-icon>label_outline</mat-icon>\n+ </button>\n+\n<button mat-icon-button *ngIf=\"buttons\" routerLink=\"/list/{{list.$key}}\"\nmatTooltip=\"{{'LIST.BUTTONS.Open' | translate}}\" matTooltipPosition=\"above\"\n(click)=\"$event.stopPropagation()\">\n",
"new_path": "src/app/modules/common-components/list-panel/list-panel.component.html",
"old_path": "src/app/modules/common-components/list-panel/list-panel.component.html"
},
{
"change_type": "MODIFY",
"diff": "@@ -15,10 +15,11 @@ import {ListTemplate} from '../../../core/database/list-template/list-template';\nimport {ListTemplateService} from '../../../core/database/list-template/list-template.service';\nimport {TemplatePopupComponent} from '../../../pages/template/template-popup/template-popup.component';\nimport {PermissionsPopupComponent} from '../permissions-popup/permissions-popup.component';\n-import {catchError, filter, first, mergeMap} from 'rxjs/operators';\n+import {catchError, filter, first, map, mergeMap} from 'rxjs/operators';\nimport {ListRow} from '../../../model/list/list-row';\nimport {LinkToolsService} from '../../../core/tools/link-tools.service';\nimport {ListTag} from '../../../model/list/list-tag.enum';\n+import {ListTagsPopupComponent} from '../../../pages/list/list-tags-popup/list-tags-popup.component';\n@Component({\nselector: 'app-list-panel',\n@@ -134,6 +135,19 @@ export class ListPanelComponent extends ComponentWithSubscriptions implements On\n});\n}\n+ public openTagsPopup(): void {\n+ this.dialog.open(ListTagsPopupComponent, {data: this.list}).afterClosed()\n+ .pipe(\n+ map(tags => {\n+ this.list.tags = tags;\n+ return this.list;\n+ }),\n+ mergeMap(list => {\n+ return this.listService.set(list.$key, list);\n+ })\n+ ).subscribe();\n+ }\n+\npublic forkList(): void {\nconst fork: List = this.list.clone();\n// Update the forks count.\n",
"new_path": "src/app/modules/common-components/list-panel/list-panel.component.ts",
"old_path": "src/app/modules/common-components/list-panel/list-panel.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat: tags button now present inside list panel header | 1 | feat | null |
217,922 | 29.05.2018 23:06:42 | -7,200 | e3b3459e53eeefce9ac8a4a6db78cd06c44eacce | fix: fixed an issue with pricing view not computing benefits properly | [
{
"change_type": "MODIFY",
"diff": "matTooltipPosition=\"above\">\nattach_money\n</mat-icon>\n- <mat-icon color=\"warn\" *ngIf=\"craftCost < (price.nq * amount.nq + price.hq * amount.hq)\"\n+ <mat-icon color=\"warn\" *ngIf=\"craftCost < (price.nq * amount.nq + price.hq * amount.hq) && !earning\"\nmatTooltip=\"{{'PRICING.Craft_cheaper'}}\" matTooltipPosition=\"above\">error_outline</mat-icon>\n</p>\n<div mat-line>\n<mat-form-field class=\"nofix price\">\n<span matPrefix>NQ </span>\n- <input matInput type=\"number\" [(ngModel)]=\"price.nq\" (ngModelChange)=\"savePrice()\">\n+ <input matInput type=\"number\" lang=\"en-150\" [(ngModel)]=\"price.nq\" (ngModelChange)=\"savePrice()\">\n</mat-form-field>\n<mat-form-field class=\"nofix amount\">\n<span matPrefix>x </span>\n- <input matInput type=\"number\" [(ngModel)]=\"amount.nq\" (ngModelChange)=\"saveAmount()\">\n+ <input matInput type=\"number\" lang=\"en-150\" [(ngModel)]=\"amount.nq\" (ngModelChange)=\"saveAmount()\">\n</mat-form-field>\n</div>\n<div mat-line *ngIf=\"!isCrystal()\">\n<mat-form-field class=\"nofix price\">\n<span matPrefix>HQ </span>\n- <input matInput type=\"number\" [(ngModel)]=\"price.hq\" (ngModelChange)=\"savePrice()\">\n+ <input matInput type=\"number\" lang=\"en-150\" [(ngModel)]=\"price.hq\" (ngModelChange)=\"savePrice()\">\n</mat-form-field>\n<mat-form-field class=\"nofix amount\">\n<span matPrefix>x </span>\n- <input matInput type=\"number\" [(ngModel)]=\"amount.hq\" (ngModelChange)=\"saveAmount()\">\n+ <input matInput type=\"number\" lang=\"en-150\" [(ngModel)]=\"amount.hq\" (ngModelChange)=\"saveAmount()\">\n</mat-form-field>\n</div>\n</div>\n",
"new_path": "src/app/modules/pricing/pricing-row/pricing-row.component.html",
"old_path": "src/app/modules/pricing/pricing-row/pricing-row.component.html"
},
{
"change_type": "MODIFY",
"diff": "@@ -21,6 +21,9 @@ export class PricingRowComponent implements OnInit {\n@Input()\ncraftCost: number;\n+ @Input()\n+ earning = false;\n+\nprice: Price;\namount: ItemAmount;\n",
"new_path": "src/app/modules/pricing/pricing-row/pricing-row.component.ts",
"old_path": "src/app/modules/pricing/pricing-row/pricing-row.component.ts"
},
{
"change_type": "MODIFY",
"diff": "<mat-card *ngIf=\"list\" [ngClass]=\"{'mobile':isMobile()}\">\n<mat-card-title>{{\"Earning\" | translate}}</mat-card-title>\n- <mat-card-subtitle>{{getTotalPrice(list.recipes).toLocaleString()}} gil</mat-card-subtitle>\n+ <mat-card-subtitle>{{getTotalEarnings(list.recipes).toLocaleString()}} gil</mat-card-subtitle>\n<mat-list dense>\n<app-pricing-row *ngFor=\"let item of list.recipes\" [item]=\"item\" [listId]=\"list.$key\"\n- [craftCost]=\"getCraftCost(item)\"></app-pricing-row>\n+ [craftCost]=\"getCraftCost(item)\" [earning]=\"true\"></app-pricing-row>\n</mat-list>\n</mat-card>\n",
"new_path": "src/app/modules/pricing/pricing/pricing.component.html",
"old_path": "src/app/modules/pricing/pricing/pricing.component.html"
},
{
"change_type": "MODIFY",
"diff": "@@ -73,6 +73,14 @@ export class PricingComponent {\nreturn total;\n}\n+ getTotalEarnings(rows: ListRow[]): number {\n+ return rows.reduce((total, row) => {\n+ const price = this.pricingService.getPrice(row);\n+ const amount = this.pricingService.getAmount(this.list.$key, row);\n+ return total + amount.nq * price.nq + amount.hq * price.hq;\n+ }, 0);\n+ }\n+\n/**\n* Gets the minimum crafting cost of a given item.\n* @param {ListRow} row\n@@ -113,6 +121,6 @@ export class PricingComponent {\n* @returns {number}\n*/\ngetBenefits(): number {\n- return this.getTotalPrice(this.list.recipes) - this.getSpendingTotal();\n+ return this.getTotalEarnings(this.list.recipes) - this.getSpendingTotal();\n}\n}\n",
"new_path": "src/app/modules/pricing/pricing/pricing.component.ts",
"old_path": "src/app/modules/pricing/pricing/pricing.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: fixed an issue with pricing view not computing benefits properly | 1 | fix | null |
217,922 | 29.05.2018 23:38:37 | -7,200 | 6865b778a83c597bd76581f5754ff9945058d20f | fix: fixed an issue with reduction details popup freezing the app
closes | [
{
"change_type": "MODIFY",
"diff": "@@ -12,6 +12,8 @@ export class BellNodesService {\n*/\nprivate nodes: any[] = (<any>window).gt.bell.nodes;\n+ private cache: { [index: number]: any[] } = {};\n+\nconstructor(private localizedDataService: LocalizedDataService, private i18n: TranslateService) {\n}\n@@ -27,6 +29,7 @@ export class BellNodesService {\n}\ngetNodesByItemId(id: number): any[] {\n+ if (this.cache[id] === undefined) {\nconst results = [];\nthis.nodes.forEach(node => {\nconst match = node.items.find(item => item.id === id);\n@@ -40,7 +43,9 @@ export class BellNodesService {\nresults.push(nodeCopy);\n}\n});\n- return results;\n+ this.cache[id] = results;\n+ }\n+ return this.cache[id];\n}\ngetNode(id: number): any {\n",
"new_path": "src/app/core/data/bell-nodes.service.ts",
"old_path": "src/app/core/data/bell-nodes.service.ts"
},
{
"change_type": "MODIFY",
"diff": "-import {Component, Inject} from '@angular/core';\n+import {ChangeDetectionStrategy, Component, Inject} from '@angular/core';\nimport {MAT_DIALOG_DATA} from '@angular/material';\nimport {BellNodesService} from '../../../core/data/bell-nodes.service';\n@Component({\nselector: 'app-reduction-details-popup',\ntemplateUrl: './reduction-details-popup.component.html',\n- styleUrls: ['./reduction-details-popup.component.scss']\n+ styleUrls: ['./reduction-details-popup.component.scss'],\n+ changeDetection: ChangeDetectionStrategy.OnPush\n})\nexport class ReductionDetailsPopupComponent {\n",
"new_path": "src/app/modules/item/reduction-details-popup/reduction-details-popup.component.ts",
"old_path": "src/app/modules/item/reduction-details-popup/reduction-details-popup.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: fixed an issue with reduction details popup freezing the app
closes #383 | 1 | fix | null |
217,922 | 29.05.2018 23:46:10 | -7,200 | a9a28682a5bad96601a57c4ef84fb954c9d5719e | fix: fixed an issue with custom layouts panel sometimes broken | [
{
"change_type": "MODIFY",
"diff": "@@ -26,6 +26,9 @@ export class ListLayoutPopupComponent {\nprivate serializer: NgSerializerService) {\nthis.layoutService.layouts.subscribe(layouts => {\nthis.availableLayouts = layouts;\n+ if (this.availableLayouts[this.selectedIndex] === undefined) {\n+ this.selectedIndex = 0;\n+ }\n});\nthis.selectedIndex = +(localStorage.getItem('layout:selected') || 0);\n}\n",
"new_path": "src/app/pages/list/list-layout-popup/list-layout-popup.component.ts",
"old_path": "src/app/pages/list/list-layout-popup/list-layout-popup.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: fixed an issue with custom layouts panel sometimes broken | 1 | fix | null |
217,922 | 29.05.2018 23:47:41 | -7,200 | 768093b5c651d83effc8fcc204bac40034ac1a0e | fix: fixed an issue with precrafts inside pricing view | [
{
"change_type": "MODIFY",
"diff": "@@ -61,9 +61,6 @@ export class PricingComponent {\n// If the crafting price is cheaper than the item itself,\n// don't add the price because mats are already used in the price.\ntotal += 0;\n- } else {\n- // Else, remove the price of the craft because the user won't craft the item, he'll buy it.\n- total -= craftingPrice;\n}\n} else {\n// If this is not a craft, simply add its price.\n",
"new_path": "src/app/modules/pricing/pricing/pricing.component.ts",
"old_path": "src/app/modules/pricing/pricing/pricing.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: fixed an issue with precrafts inside pricing view | 1 | fix | null |
217,922 | 29.05.2018 23:49:14 | -7,200 | 83dee1258474972e6bfc27d1925a52aa738a136a | fix: fixed an issue with masterbooks popup in profile page | [
{
"change_type": "MODIFY",
"diff": "@@ -17,7 +17,7 @@ export class MasterbooksPopupComponent {\nsetMasterbook(id: number, active: boolean): void {\n// We set a default value if it's currently undefined.\n- // this.data.user.masterbooks = this.data.user.masterbooks || [];\n+ this.data.user.masterbooks = this.data.user.masterbooks || [];\nif (active) {\nthis.data.user.masterbooks.push(id);\n} else {\n",
"new_path": "src/app/pages/profile/masterbooks-popup/masterbooks-popup.component.ts",
"old_path": "src/app/pages/profile/masterbooks-popup/masterbooks-popup.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: fixed an issue with masterbooks popup in profile page | 1 | fix | null |
311,021 | 30.05.2018 02:25:03 | -36,000 | 867ce3dc599bc8e0475cb466e437959e4bafa9d7 | test(windows): fix broken tests on windows | [
{
"change_type": "MODIFY",
"diff": "@@ -12,9 +12,6 @@ describe('@ionic/cli-framework', () => {\nconst mock_os = os;\njest.resetModules();\n- const mock_homedir = () => '/home/user';\n- jest.mock('os', () => ({ ...mock_os, homedir: mock_homedir }));\n- const { prettyPath } = require('../format');\nbeforeEach(() => {\nthis.originalCwd = process.cwd;\n@@ -25,6 +22,15 @@ describe('@ionic/cli-framework', () => {\nprocess.cwd = this.originalCwd;\n});\n+ describe('posix', () => {\n+\n+ jest.resetModules();\n+ const mock_path_posix = path.posix;\n+ const mock_homedir = () => '/home/user';\n+ jest.mock('os', () => ({ ...mock_os, homedir: mock_homedir }));\n+ jest.mock('path', () => mock_path_posix);\n+ const { prettyPath } = require('../format');\n+\nit('should pretty print file in cwd', () => {\nconst result = prettyPath('/home/user/dir1/dir2/dir3/file.txt');\nexpect(result).toEqual('./file.txt');\n@@ -95,6 +101,8 @@ describe('@ionic/cli-framework', () => {\nexpect(result).toEqual('~');\n});\n+ });\n+\ndescribe('windows', () => {\njest.resetModules();\n",
"new_path": "packages/@ionic/cli-framework/src/utils/__tests__/format.ts",
"old_path": "packages/@ionic/cli-framework/src/utils/__tests__/format.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -6,6 +6,12 @@ describe('@ionic/cli-framework', () => {\ndescribe('findBaseDirectory', () => {\n+ describe('posix', () => {\n+\n+ const mock_path_posix = path.posix;\n+ jest.resetModules();\n+ jest.mock('path', () => mock_path_posix);\n+\nconst fslib = require('../fs');\nit('should get undefined with empty input', async () => {\n@@ -45,6 +51,8 @@ describe('@ionic/cli-framework', () => {\nexpect(result).toEqual('/some');\n});\n+ });\n+\ndescribe('windows', () => {\nconst mock_path_win32 = path.win32;\n",
"new_path": "packages/@ionic/cli-framework/src/utils/__tests__/fs.ts",
"old_path": "packages/@ionic/cli-framework/src/utils/__tests__/fs.ts"
},
{
"change_type": "MODIFY",
"diff": "+import * as path from 'path'\nimport { compileNodeModulesPaths } from '../npm';\ndescribe('@ionic/cli-framework', () => {\n@@ -6,22 +7,54 @@ describe('@ionic/cli-framework', () => {\ndescribe('compileNodeModulesPaths', () => {\n+ describe('posix', () => {\n+ const mock_path_posix = path.posix;\n+ jest.resetModules();\n+ jest.mock('path', () => mock_path_posix);\n+\n+ const npmLib = require('../npm');\n+\nit('should not accept a malformed path', () => {\n- expect(() => compileNodeModulesPaths('.')).toThrowError('. is not an absolute path');\n+ expect(() => npmLib.compileNodeModulesPaths('.')).toThrowError('. is not an absolute path');\n});\nit('should compile an array of node_modules directories working backwards from a base directory', () => {\n- const result = compileNodeModulesPaths('/some/dir');\n+ const result = npmLib.compileNodeModulesPaths('/some/dir');\nexpect(result).toEqual(['/some/dir/node_modules', '/some/node_modules', '/node_modules']);\n});\nit('should work for the root directory', () => {\n- const result = compileNodeModulesPaths('/');\n+ const result = npmLib.compileNodeModulesPaths('/');\nexpect(result).toEqual(['/node_modules']);\n});\n});\n+ describe('windows', () => {\n+ const mock_path_win32 = path.win32;\n+ jest.resetModules();\n+ jest.mock('path', () => mock_path_win32);\n+\n+ const npmLib = require('../npm');\n+\n+ it('should not accept a malformed path', () => {\n+ expect(() => npmLib.compileNodeModulesPaths('.')).toThrowError('. is not an absolute path');\n+ });\n+\n+ it('should compile an array of node_modules directories working backwards from a base directory', () => {\n+ const result = npmLib.compileNodeModulesPaths('\\\\some\\\\dir');\n+ expect(result).toEqual(['\\\\some\\\\dir\\\\node_modules', '\\\\some\\\\node_modules', '\\\\node_modules']);\n+ });\n+\n+ it('should work for the root directory', () => {\n+ const result = npmLib.compileNodeModulesPaths('\\\\');\n+ expect(result).toEqual(['\\\\node_modules']);\n+ });\n+\n+ });\n+\n+ });\n+\n});\n});\n",
"new_path": "packages/@ionic/cli-framework/src/utils/__tests__/npm.ts",
"old_path": "packages/@ionic/cli-framework/src/utils/__tests__/npm.ts"
},
{
"change_type": "MODIFY",
"diff": "import * as path from 'path';\n-import { compilePaths } from '../path';\n-\ndescribe('@ionic/cli-framework', () => {\ndescribe('utils/path', () => {\ndescribe('compilePaths', () => {\n+ describe('posix', () => {\n+\n+ const mock_path_posix = path.posix;\n+ jest.resetModules();\n+ jest.mock('path', () => mock_path_posix);\n+\n+ const pathlib = require('../path');\n+\nit('should not accept a malformed path', () => {\n- expect(() => compilePaths('.')).toThrowError('. is not an absolute path');\n+ expect(() => pathlib.compilePaths('.')).toThrowError('. is not an absolute path');\n});\nit('should compile an array of paths working backwards from a base directory', () => {\n- const result = compilePaths('/some/dir');\n+ const result = pathlib.compilePaths('/some/dir');\nexpect(result).toEqual(['/some/dir', '/some', '/']);\n});\nit('should work for the root directory', () => {\n- const result = compilePaths('/');\n+ const result = pathlib.compilePaths('/');\nexpect(result).toEqual(['/']);\n});\n+ });\n+\ndescribe('windows', () => {\nconst mock_path_win32 = path.win32;\n",
"new_path": "packages/@ionic/cli-framework/src/utils/__tests__/path.ts",
"old_path": "packages/@ionic/cli-framework/src/utils/__tests__/path.ts"
},
{
"change_type": "MODIFY",
"diff": "import { EventEmitter } from 'events';\n+import { createProcessEnv } from '../process';\nimport { PromiseUtil, promisifyEvent } from '../promise';\nimport { ReadableStreamBuffer, WritableStreamBuffer } from '../streams';\n+import * as path from 'path';\ndescribe('@ionic/cli-framework', () => {\n@@ -63,6 +65,8 @@ describe('@ionic/cli-framework', () => {\nconst mockCrossSpawn = { spawn: mockSpawn };\njest.mock('cross-spawn', () => mockCrossSpawn);\njest.mock('os', () => mock_os);\n+ const mock_path_posix = path.posix;\n+ jest.mock('path', () => mock_path_posix);\nconst { ShellCommand } = require('../shell');\nbeforeEach(() => {\n@@ -79,25 +83,25 @@ describe('@ionic/cli-framework', () => {\nit('should provide default env option', async () => {\nconst cmd = new ShellCommand('cmd', []);\n- expect(cmd.options).toEqual({ env: process.env });\n+ expect(cmd.options).toEqual({ env: createProcessEnv(process.env) });\n});\nit('should provide only PATH with empty env', async () => {\nconst PATH = process.env.PATH;\nconst cmd = new ShellCommand('cmd', [], { env: {} });\n- expect(cmd.options).toEqual({ env: { PATH } });\n+ expect(cmd.options).toEqual({ env: createProcessEnv({ PATH }) });\n});\nit('should not alter PATH if provided', async () => {\nconst PATH = '/path/to/bin';\nconst cmd = new ShellCommand('cmd', [], { env: { PATH } });\n- expect(cmd.options).toEqual({ env: { PATH } });\n+ expect(cmd.options.env.PATH).toEqual(PATH);\n});\nit('should alter PATH with tildes if provided', async () => {\nconst PATH = '/path/to/bin:~/bin';\nconst cmd = new ShellCommand('cmd', [], { env: { PATH } });\n- expect(cmd.options).toEqual({ env: { PATH: '/path/to/bin:/home/me/bin' } });\n+ expect(cmd.options.env.PATH).toEqual('/path/to/bin:/home/me/bin');\n});\nit('should bashify command and args', async () => {\n@@ -131,9 +135,10 @@ describe('@ionic/cli-framework', () => {\nconst args = ['foo', 'bar', 'baz'];\nconst options = { env: { PATH: '' } };\nconst cmd = new ShellCommand(name, args, options);\n+ const expectedOptions = { env: createProcessEnv(options.env) };\nexpect(cmd.spawn()).toBe(result);\nexpect(mockSpawn).toHaveBeenCalledTimes(1);\n- expect(mockSpawn).toHaveBeenCalledWith(name, args, options);\n+ expect(mockSpawn).toHaveBeenCalledWith(name, args, expectedOptions);\n});\nit('should pipe stdout and stderr in run()', async () => {\n",
"new_path": "packages/@ionic/cli-framework/src/utils/__tests__/shell.ts",
"old_path": "packages/@ionic/cli-framework/src/utils/__tests__/shell.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -22,7 +22,7 @@ describe('@ionic/cli-utils', () => {\nplatform: 'ios',\nresType: 'splash',\nname: 'Default-568h@2x~iphone.png',\n- dest: '/path/to/proj/resources/ios/splash/Default-568h@2x~iphone.png',\n+ dest: path.resolve('/path/to/proj/resources/ios/splash/Default-568h@2x~iphone.png'),\nwidth: 640,\nheight: 1136,\ndensity: undefined,\n@@ -76,8 +76,8 @@ describe('@ionic/cli-utils', () => {\nawait resources.createImgDestinationDirectories(imgResources);\nexpect(fsSpy.fsMkdirp.calls.count()).toEqual(2);\n- expect(fsSpy.fsMkdirp.calls.argsFor(0)).toEqual(['/resourcesDir/ios/splash']);\n- expect(fsSpy.fsMkdirp.calls.argsFor(1)).toEqual(['/resourcesDir/android/splash']);\n+ expect(fsSpy.fsMkdirp.calls.argsFor(0)).toEqual([path.normalize('/resourcesDir/ios/splash')]);\n+ expect(fsSpy.fsMkdirp.calls.argsFor(1)).toEqual([path.normalize('/resourcesDir/android/splash')]);\n});\n});\n@@ -88,9 +88,9 @@ describe('@ionic/cli-utils', () => {\nawait resources.getSourceImages('/path/to/proj', ['ios', 'android'], ['splash', 'icon']);\nexpect(fsSpy.readDir.calls.count()).toEqual(3);\n- expect(fsSpy.readDir.calls.argsFor(0)).toEqual(['/path/to/proj/resources/ios']);\n- expect(fsSpy.readDir.calls.argsFor(1)).toEqual(['/path/to/proj/resources/android']);\n- expect(fsSpy.readDir.calls.argsFor(2)).toEqual(['/path/to/proj/resources']);\n+ expect(fsSpy.readDir.calls.argsFor(0)).toEqual([path.resolve('/path/to/proj/resources/ios')]);\n+ expect(fsSpy.readDir.calls.argsFor(1)).toEqual([path.resolve('/path/to/proj/resources/android')]);\n+ expect(fsSpy.readDir.calls.argsFor(2)).toEqual([path.resolve('/path/to/proj/resources')]);\n});\nit('should find all sourceImages available and prioritize based on specificity', async () => {\n@@ -98,18 +98,18 @@ describe('@ionic/cli-utils', () => {\nspyOn(fsSpy, 'cacheFileChecksum').and.callFake(() => {});\nspyOn(fsSpy, 'readDir').and.callFake(dir => {\nswitch (dir) {\n- case '/path/to/proj/resources/ios':\n+ case path.resolve('/path/to/proj/resources/ios'):\nreturn Promise.resolve([\n'icon.png',\n'splash.jpg',\n'things.ai'\n]);\n- case '/path/to/proj/resources/android':\n+ case path.resolve('/path/to/proj/resources/android'):\nreturn Promise.resolve([\n'icon.ai',\n'splash.png'\n]);\n- case '/path/to/proj/resources':\n+ case path.resolve('/path/to/proj/resources'):\nreturn Promise.resolve([\n'icon.png',\n'splash.psd'\n@@ -126,7 +126,7 @@ describe('@ionic/cli-utils', () => {\nimageId: 'FJDKLFJDKL',\nplatform: 'ios',\nresType: 'icon',\n- path: '/path/to/proj/resources/ios/icon.png',\n+ path: path.resolve('/path/to/proj/resources/ios/icon.png'),\nvector: false,\nwidth: 0\n},\n@@ -136,7 +136,7 @@ describe('@ionic/cli-utils', () => {\nimageId: 'FJDKLFJDKL',\nplatform: 'android',\nresType: 'icon',\n- path: '/path/to/proj/resources/android/icon.ai',\n+ path: path.resolve('/path/to/proj/resources/android/icon.ai'),\nvector: false,\nwidth: 0\n},\n@@ -146,7 +146,7 @@ describe('@ionic/cli-utils', () => {\nimageId: 'FJDKLFJDKL',\nplatform: 'android',\nresType: 'splash',\n- path: '/path/to/proj/resources/android/splash.png',\n+ path: path.resolve('/path/to/proj/resources/android/splash.png'),\nvector: false,\nwidth: 0\n},\n@@ -156,7 +156,7 @@ describe('@ionic/cli-utils', () => {\nimageId: 'FJDKLFJDKL',\nplatform: 'global',\nresType: 'icon',\n- path: '/path/to/proj/resources/icon.png',\n+ path: path.resolve('/path/to/proj/resources/icon.png'),\nvector: false,\nwidth: 0\n},\n@@ -166,7 +166,7 @@ describe('@ionic/cli-utils', () => {\nimageId: 'FJDKLFJDKL',\nplatform: 'global',\nresType: 'splash',\n- path: '/path/to/proj/resources/splash.psd',\n+ path: path.resolve('/path/to/proj/resources/splash.psd'),\nvector: false,\nwidth: 0\n}\n@@ -183,7 +183,7 @@ describe('@ionic/cli-utils', () => {\next: '.png',\nplatform: 'ios',\nresType: 'icon',\n- path: '/path/to/proj/resources/ios/icon.png'\n+ path: path.resolve('/path/to/proj/resources/ios/icon.png')\n},\n{\nwidth: 640,\n@@ -192,7 +192,7 @@ describe('@ionic/cli-utils', () => {\next: '.ai',\nplatform: 'android',\nresType: 'icon',\n- path: '/path/to/proj/resources/android/icon.ai'\n+ path: path.resolve('/path/to/proj/resources/android/icon.ai')\n},\n{\nwidth: 640,\n@@ -201,7 +201,7 @@ describe('@ionic/cli-utils', () => {\next: '.png',\nplatform: 'android',\nresType: 'splash',\n- path: '/path/to/proj/resources/android/splash.png'\n+ path: path.resolve('/path/to/proj/resources/android/splash.png')\n},\n{\nwidth: 640,\n@@ -210,7 +210,7 @@ describe('@ionic/cli-utils', () => {\next: '.png',\nplatform: 'global',\nresType: 'icon',\n- path: '/path/to/proj/resources/icon.png'\n+ path: path.resolve('/path/to/proj/resources/icon.png')\n},\n{\nwidth: 640,\n@@ -219,7 +219,7 @@ describe('@ionic/cli-utils', () => {\next: '.psd',\nplatform: 'global',\nresType: 'splash',\n- path: '/path/to/proj/resources/splash.psd'\n+ path: path.resolve('/path/to/proj/resources/splash.psd')\n}\n];\n@@ -246,7 +246,7 @@ describe('@ionic/cli-utils', () => {\next: '.psd',\nplatform: 'global',\nresType: 'splash',\n- path: '/path/to/proj/resources/splash.psd'\n+ path: path.resolve('/path/to/proj/resources/splash.psd')\n});\n});\n@@ -270,7 +270,7 @@ describe('@ionic/cli-utils', () => {\next: '.png',\nplatform: 'ios',\nresType: 'icon',\n- path: '/path/to/proj/resources/ios/icon.png',\n+ path: path.resolve('/path/to/proj/resources/ios/icon.png'),\nwidth: 640,\nheight: 1136,\nvector: false\n",
"new_path": "packages/@ionic/cli-utils/src/lib/integrations/cordova/__tests__/resources.ts",
"old_path": "packages/@ionic/cli-utils/src/lib/integrations/cordova/__tests__/resources.ts"
},
{
"change_type": "MODIFY",
"diff": "+import * as path from 'path'\nimport { AngularProject } from '../';\ndescribe('@ionic/cli-utils', () => {\n@@ -8,7 +9,7 @@ describe('@ionic/cli-utils', () => {\nit('should set directory attribute', async () => {\nconst p = new AngularProject('/path/to/proj', 'file', {});\n- expect(p.directory).toEqual('/path/to/proj');\n+ expect(p.directory).toEqual(path.resolve('/path/to/proj'));\n});\ndescribe('getSourceDir', () => {\n@@ -16,14 +17,14 @@ describe('@ionic/cli-utils', () => {\nit('should default to src', async () => {\nconst p = new AngularProject('/path/to/proj', 'file', {});\nconst result = await p.getSourceDir();\n- expect(result).toEqual('/path/to/proj/src');\n+ expect(result).toEqual(path.resolve('/path/to/proj/src'));\n});\nit('should should set the src root relative to the project root', async () => {\nconst sourceRoot = 'relative/path/to/src';\nconst p = new AngularProject('/path/to/proj', 'file', {});\nconst result = await p.getSourceDir(sourceRoot);\n- expect(result).toEqual(`/path/to/proj/${sourceRoot}`);\n+ expect(result).toEqual(path.resolve(`/path/to/proj/${sourceRoot}`));\n});\n});\n",
"new_path": "packages/@ionic/cli-utils/src/lib/project/angular/__tests__/index.ts",
"old_path": "packages/@ionic/cli-utils/src/lib/project/angular/__tests__/index.ts"
},
{
"change_type": "MODIFY",
"diff": "+import * as path from 'path'\nimport { IonicAngularProject } from '../';\ndescribe('@ionic/cli-utils', () => {\n@@ -8,7 +9,7 @@ describe('@ionic/cli-utils', () => {\nit('should set directory attribute', async () => {\nconst p = new IonicAngularProject('/path/to/proj', 'file', {});\n- expect(p.directory).toEqual('/path/to/proj');\n+ expect(p.directory).toEqual(path.resolve('/path/to/proj'));\n});\ndescribe('getSourceDir', () => {\n@@ -16,7 +17,7 @@ describe('@ionic/cli-utils', () => {\nit('should default to src', async () => {\nconst p = new IonicAngularProject('/path/to/proj', 'file', {});\nconst result = await p.getSourceDir();\n- expect(result).toEqual('/path/to/proj/src');\n+ expect(result).toEqual(path.resolve('/path/to/proj/src'));\n});\n});\n",
"new_path": "packages/@ionic/cli-utils/src/lib/project/ionic-angular/__tests__/index.ts",
"old_path": "packages/@ionic/cli-utils/src/lib/project/ionic-angular/__tests__/index.ts"
},
{
"change_type": "MODIFY",
"diff": "+import * as path from 'path'\nimport { Ionic1Project } from '../';\ndescribe('@ionic/cli-utils', () => {\n@@ -8,7 +9,7 @@ describe('@ionic/cli-utils', () => {\nit('should set directory attribute', async () => {\nconst p = new Ionic1Project('/path/to/proj', 'file', {});\n- expect(p.directory).toEqual('/path/to/proj');\n+ expect(p.directory).toEqual(path.resolve('/path/to/proj'));\n});\ndescribe('getSourceDir', () => {\n@@ -16,13 +17,13 @@ describe('@ionic/cli-utils', () => {\nit('should use documentRoot, if set', async () => {\nconst p = new Ionic1Project('/path/to/proj', 'file', {});\nspyOn(p, 'load').and.callFake(() => Promise.resolve({ documentRoot: 'some/dir' }));\n- expect(await p.getSourceDir()).toEqual('/path/to/proj/some/dir');\n+ expect(await p.getSourceDir()).toEqual(path.resolve('/path/to/proj/some/dir'));\n});\nit('should default to www', async () => {\nconst p = new Ionic1Project('/path/to/proj', 'file', {});\nconst result = await p.getSourceDir();\n- expect(result).toEqual('/path/to/proj/www');\n+ expect(result).toEqual(path.resolve('/path/to/proj/www'));\n});\n});\n",
"new_path": "packages/@ionic/cli-utils/src/lib/project/ionic1/__tests__/index.ts",
"old_path": "packages/@ionic/cli-utils/src/lib/project/ionic1/__tests__/index.ts"
}
] | TypeScript | MIT License | ionic-team/ionic-cli | test(windows): fix broken tests on windows (#3219) | 1 | test | windows |
311,021 | 30.05.2018 04:04:08 | -36,000 | 91b69f64e3cc7aac1c92aeca3387af8919c35240 | refactor(cordova): don't mutate angular source files | [
{
"change_type": "MODIFY",
"diff": "@@ -664,14 +664,16 @@ export interface IAilmentRegistry {\nget(id: string): IAilment | undefined;\n}\n-export interface AngularConfig {\n- defaultProject: string;\n- projects: {\n- [key: string]: {\n+export interface AngularConfigProject {\nroot: string;\nsourceRoot: string;\narchitect: any;\n- } | undefined;\n+}\n+\n+export interface AngularConfig {\n+ defaultProject: string;\n+ projects: {\n+ [key: string]: AngularConfigProject | undefined;\n};\n}\n",
"new_path": "packages/@ionic/cli-utils/src/definitions.ts",
"old_path": "packages/@ionic/cli-utils/src/definitions.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -74,10 +74,12 @@ ${chalk.cyan('[1]')}: ${chalk.bold('https://github.com/angular/angular-cli/wiki/\n}\nasync buildOptionsToNgArgs(options: AngularBuildOptions): Promise<string[]> {\n+ const project = `ionic-cordova-platform-${options.platform}`;\n+\nconst args: ParsedArgs = {\n_: [],\nprod: options.prod,\n- project: options.project,\n+ project: project,\nconfiguration: options.configuration,\n};\n@@ -130,7 +132,7 @@ ${chalk.cyan('[1]')}: ${chalk.bold('https://github.com/angular/angular-cli/wiki/\nconst p = await this.project.load();\nif (p.integrations.cordova && p.integrations.cordova.enabled !== false && options.engine === 'cordova' && options.platform) {\n- await removeCordovaEngineForAngular(this.project, options.platform, options.project);\n+ await removeCordovaEngineForAngular(this.project, options.platform);\n}\nawait super.afterBuild(options);\n",
"new_path": "packages/@ionic/cli-utils/src/lib/project/angular/build.ts",
"old_path": "packages/@ionic/cli-utils/src/lib/project/angular/build.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -123,7 +123,7 @@ ${chalk.cyan('[2]')}: ${chalk.bold('https://github.com/angular/angular-cli/wiki/\nconst p = await this.project.load();\nif (p.integrations.cordova && p.integrations.cordova.enabled !== false && options.engine === 'cordova' && options.platform) {\n- await removeCordovaEngineForAngular(this.project, options.platform, options.project);\n+ await removeCordovaEngineForAngular(this.project, options.platform);\n}\nawait super.afterServe(options, details);\n",
"new_path": "packages/@ionic/cli-utils/src/lib/project/angular/serve.ts",
"old_path": "packages/@ionic/cli-utils/src/lib/project/angular/serve.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -7,7 +7,7 @@ import { fsReadJsonFile, fsWriteFile } from '@ionic/cli-framework/utils/fs';\nimport { AngularConfig, IProject } from '../../../definitions';\nimport { isAngularConfig } from '../../../guards';\nimport { FatalException } from '../../errors';\n-import { addCordovaEngine, removeCordovaEngine } from '../../integrations/cordova/utils';\n+import { cloneDeep, isArray, isPlainObject, mapValues, mergeWith } from 'lodash';\nconst debug = Debug('ionic:cli-utils:lib:project:angular:utils');\n@@ -24,42 +24,82 @@ export async function readAngularConfigFile(p: string): Promise<AngularConfig> {\nreturn angularJson;\n}\n+export function replaceBrowserTarget(config: {}, source: string, target: string): any {\n+ function recurse(value: any): any {\n+ if (isPlainObject(value)) {\n+ mapValues(value, recurse);\n+ }\n+\n+ if (value['browserTarget']) {\n+ value['browserTarget'] = value['browserTarget'].replace(new RegExp(`^${source}:`), `${target}:`);\n+ }\n+ }\n+\n+ return mapValues(config, recurse);\n+}\n+\n+export function extendAngularConfig(config: AngularConfig, source: string, target: string, buildOptions: any): AngularConfig {\n+ if (config.projects[source]) {\n+ const app = config.projects[target] = cloneDeep(config.projects[source]);\n+\n+ if (app) {\n+ mergeWith(app.architect.build.options, buildOptions, (objValue, srcValue) => {\n+ if (isArray(objValue)) {\n+ return objValue.concat(srcValue);\n+ }\n+ });\n+\n+ replaceBrowserTarget(app.architect, source, target);\n+ }\n+ } else {\n+ throw new FatalException(`${chalk.bold(`projects.${source}`)} key in ${chalk.bold(ANGULAR_CONFIG_FILE)} is undefined--cannot add assets.`);\n+ }\n+\n+ return config;\n+}\n+\n+export function getCordovaJsPath(platform: string): string {\n+ switch (platform) {\n+ case 'android':\n+ return 'node_modules/cordova-android/bin/templates/project/assets/www/cordova.js';\n+ case 'ios':\n+ return `node_modules/cordova-ios/cordovaLib/cordova.js`;\n+ case 'windows':\n+ return 'node_modules/cordova-windows/template/www/cordova.js';\n+ case 'browser':\n+ default:\n+ return `node_modules/cordova-${platform}/cordova-lib/cordova.js`;\n+ }\n+}\n+\nexport async function addCordovaEngineForAngular(project: IProject, platform: string, appName?: string): Promise<void> {\ndebug('Adding Cordova engine for platform: %s', platform);\nconst platformWWW = path.resolve(project.directory, 'platforms', platform, 'platform_www');\n+ const cordovaAssets = [{ glob: '**/*', input: platformWWW, output: './' }];\n+ const cordovaScripts = [{ input: getCordovaJsPath(platform), bundleName: 'cordova' }];\nconst angularJsonPath = path.resolve(project.directory, ANGULAR_CONFIG_FILE);\nconst angularJson = await readAngularConfigFile(angularJsonPath);\n- const angularApp = angularJson.projects[appName || angularJson.defaultProject];\n+ const angularProject = appName || angularJson.defaultProject;\n+ const extendedProject = `ionic-cordova-platform-${platform}`;\n- if (!angularApp) {\n- throw new FatalException(`${chalk.bold(`projects.${appName || angularJson.defaultProject}`)} key in ${chalk.bold(ANGULAR_CONFIG_FILE)} is undefined--cannot add assets.`);\n- }\n-\n- const srcDir = await project.getSourceDir(angularApp.sourceRoot || path.resolve(angularApp.root, 'src'));\n- const buildOptions = angularApp.architect.build.options;\n+ extendAngularConfig(angularJson, angularProject, extendedProject, {\n+ assets: cordovaAssets,\n+ scripts: cordovaScripts,\n+ });\n- const cordovaAssets = { glob: '**/*', input: platformWWW, output: './' };\n- buildOptions.assets.push(cordovaAssets);\ndebug('Adding Cordova assets to %s: %o', ANGULAR_CONFIG_FILE, cordovaAssets);\n+ debug('Adding Cordova scripts to %s: %o', ANGULAR_CONFIG_FILE, cordovaScripts);\n+\nawait fsWriteFile(angularJsonPath, JSON.stringify(angularJson, undefined, 2) + '\\n', { encoding: 'utf8' });\n- debug('Inserting Cordova HTML within %s', srcDir);\n- await addCordovaEngine(srcDir);\n}\n-export async function removeCordovaEngineForAngular(project: IProject, platform: string, appName?: string): Promise<void> {\n+export async function removeCordovaEngineForAngular(project: IProject, platform: string): Promise<void> {\ndebug('Removing Cordova engine for platform: %s', platform);\nconst angularJsonPath = path.resolve(project.directory, ANGULAR_CONFIG_FILE);\nconst angularJson = await readAngularConfigFile(angularJsonPath);\n- const angularApp = angularJson.projects[appName || angularJson.defaultProject];\n-\n- if (!angularApp) {\n- throw new FatalException(`${chalk.bold(`projects.${appName || angularJson.defaultProject}`)} key in ${chalk.bold(ANGULAR_CONFIG_FILE)} is undefined--cannot remove assets.`);\n- }\n+ const extendedProject = `ionic-cordova-platform-${platform}`;\n- const srcDir = await project.getSourceDir(angularApp.sourceRoot || path.resolve(angularApp.root, 'src'));\n- const buildOptions = angularApp.architect.build.options;\n+ delete angularJson.projects[extendedProject];\n- buildOptions.assets = buildOptions.assets.filter((asset: any) => !asset.input || !asset.input.endsWith('platform_www'));\nawait fsWriteFile(angularJsonPath, JSON.stringify(angularJson, undefined, 2) + '\\n', { encoding: 'utf8' });\n- await removeCordovaEngine(srcDir);\n}\n",
"new_path": "packages/@ionic/cli-utils/src/lib/project/angular/utils.ts",
"old_path": "packages/@ionic/cli-utils/src/lib/project/angular/utils.ts"
}
] | TypeScript | MIT License | ionic-team/ionic-cli | refactor(cordova): don't mutate angular source files (#3220) | 1 | refactor | cordova |
821,227 | 30.05.2018 10:40:08 | -28,800 | dd37310b8231cda76fd240fb3b7c329e40acf3ca | fix: command descriptions not showing up in the help
This is for JavaScript-based commands. See discussion in | [
{
"change_type": "MODIFY",
"diff": "@@ -9,8 +9,7 @@ class <%- klass %> extends Command {\n}\n}\n-<%- klass %>.description = `\n-Describe the command here\n+<%- klass %>.description = `Describe the command here\n...\nExtra documentation goes here\n`\n",
"new_path": "templates/src/command.js.ejs",
"old_path": "templates/src/command.js.ejs"
}
] | TypeScript | MIT License | oclif/oclif | fix: command descriptions not showing up in the help (#124)
This is for JavaScript-based commands. See discussion in https://github.com/oclif/oclif/issues/120 | 1 | fix | null |
815,746 | 30.05.2018 12:44:40 | -10,800 | 7a3dfb33a57add982cef8a5d7540e29e3e25c2d4 | fix: allow to use compareWith fn when bindValue is used
closes | [
{
"change_type": "MODIFY",
"diff": "@@ -123,7 +123,7 @@ map: {\n| [closeOnSelect] | `boolean` | true | no | Whether to close the menu when a value is selected |\n| clearAllText | `string` | `Clear all` | no | Set custom text for clear all icon title |\n| [clearable] | `boolean` | `true` | no | Allow to clear selected value. Default `true`|\n-| [compareWith] | `(a: any, b: any) => boolean` | `(a, b) => a === b` | no | A function to compare the option values with the selected values |\n+| [compareWith] | `(a: any, b: any) => boolean` | `(a, b) => a === b` | no | A function to compare the option values with the selected values. The first argument is a value from an option. The second is a value from the selection(model). A boolean should be returned. |\n| dropdownPosition | `bottom` \\| `top` \\| `auto` | `auto` | no | Set the dropdown position on open |\n| [groupBy] | `string` \\| `Function` | null | no | Allow to group items by key or function expression |\n| [selectableGroup] | `boolean` | false | no | Allow to select group when groupBy is used |\n",
"new_path": "README.md",
"old_path": "README.md"
},
{
"change_type": "MODIFY",
"diff": "@@ -76,15 +76,16 @@ export class ItemsList {\n}\nfindItem(value: any): NgOption {\n- if (this._ngSelect.bindValue) {\n- return this._items.find(item => !item.hasChildren && this.resolveNested(item.value, this._ngSelect.bindValue) === value);\n+ let findBy: (item: NgOption) => boolean;\n+ if (this._ngSelect.compareWith) {\n+ findBy = item => this._ngSelect.compareWith(item.value, value)\n+ } else if (this._ngSelect.bindValue) {\n+ findBy = item => !item.hasChildren && this.resolveNested(item.value, this._ngSelect.bindValue) === value\n+ } else {\n+ findBy = item => item.value === value ||\n+ !item.hasChildren && item.label && item.label === this.resolveNested(value, this._ngSelect.bindLabel)\n}\n- const option = this._items.find(x => x.value === value);\n- const findBy = this._ngSelect.compareWith ?\n- (item: NgOption) => this._ngSelect.compareWith(item.value, value) :\n- (item: NgOption) => !item.hasChildren && item.label && item.label === this.resolveNested(value, this._ngSelect.bindLabel);\n-\n- return option || this._items.find(item => findBy(item));\n+ return this._items.find(item => findBy(item));\n}\nunselect(item: NgOption) {\n",
"new_path": "src/ng-select/items-list.ts",
"old_path": "src/ng-select/items-list.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -709,7 +709,7 @@ describe('NgSelectComponent', function () {\nexpect(fixture.componentInstance.select.selectedItems).toEqual(result);\n}));\n- it('should select by compareWith function', fakeAsync(() => {\n+ it('should select by compareWith function when bindValue is not used', fakeAsync(() => {\nconst fixture = createTestingModule(\nNgSelectTestCmp,\n`<ng-select [items]=\"cities\"\n@@ -729,6 +729,27 @@ describe('NgSelectComponent', function () {\nexpect(fixture.componentInstance.select.selectedItems[0].value).toEqual(city);\n}));\n+ it('should select by compareWith function when bindValue is used', fakeAsync(() => {\n+ const fixture = createTestingModule(\n+ NgSelectTestCmp,\n+ `<ng-select [items]=\"cities\"\n+ bindLabel=\"name\"\n+ bindValue=\"id\"\n+ placeholder=\"select value\"\n+ [compareWith]=\"compareWith\"\n+ [(ngModel)]=\"selectedCityId\">\n+ </ng-select>`);\n+\n+ const cmp = fixture.componentInstance;\n+ const cityId = cmp.cities[1].id.toString();\n+ cmp.selectedCityId = cityId;\n+\n+ cmp.compareWith = (city, model: string) => city.id === +model;\n+\n+ tickAndDetectChanges(fixture);\n+ expect(cmp.select.selectedItems[0].value).toEqual(cmp.cities[1]);\n+ }));\n+\nit('should select selected when there is no items', fakeAsync(() => {\nconst fixture = createTestingModule(\nNgSelectTestCmp,\n",
"new_path": "src/ng-select/ng-select.component.spec.ts",
"old_path": "src/ng-select/ng-select.component.spec.ts"
}
] | TypeScript | MIT License | ng-select/ng-select | fix: allow to use compareWith fn when bindValue is used (#586)
closes #535 | 1 | fix | null |
815,746 | 30.05.2018 12:45:10 | -10,800 | 5c53fbf53132eabe8b33fa6e4f45b8acca6136ec | chore(release): 2.1.2 | [
{
"change_type": "MODIFY",
"diff": "All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n+<a name=\"2.1.2\"></a>\n+## [2.1.2](https://github.com/ng-select/ng-select/compare/v2.1.1...v2.1.2) (2018-05-30)\n+\n+\n+### Bug Fixes\n+\n+* allow to use compareWith fn when bindValue is used ([#586](https://github.com/ng-select/ng-select/issues/586)) ([7a3dfb3](https://github.com/ng-select/ng-select/commit/7a3dfb3)), closes [#535](https://github.com/ng-select/ng-select/issues/535)\n+\n+\n+\n<a name=\"2.1.1\"></a>\n## [2.1.1](https://github.com/ng-select/ng-select/compare/v2.1.0...v2.1.1) (2018-05-29)\n",
"new_path": "CHANGELOG.md",
"old_path": "CHANGELOG.md"
},
{
"change_type": "MODIFY",
"diff": "{\n\"$schema\": \"../node_modules/ng-packagr/package.schema.json\",\n\"name\": \"@ng-select/ng-select\",\n- \"version\": \"2.1.1\",\n+ \"version\": \"2.1.2\",\n\"description\": \"Angular ng-select - All in One UI Select, Multiselect and Autocomplete\",\n\"author\": \"@ng-select/ng-select\",\n\"license\": \"MIT\",\n",
"new_path": "src/package.json",
"old_path": "src/package.json"
}
] | TypeScript | MIT License | ng-select/ng-select | chore(release): 2.1.2 | 1 | chore | release |
217,922 | 30.05.2018 16:46:19 | -7,200 | 7119389778858456aa81689c0ba2ff676acdfe09 | chore: tests are now working and integrated with travis | [
{
"change_type": "MODIFY",
"diff": "@@ -9,22 +9,7 @@ before_install:\n- npm i -g firebase-functions\nscript:\n- - if [ $TRAVIS_BRANCH = \"beta\" ]; then npm run build:beta; else npm run build:prod; fi\n-\n-deploy:\n- - provider: firebase\n- skip_cleanup: true\n- on:\n- branch: master\n- token:\n- secure: m+OWcJipxF84Awq3rW3GZ+kH5WMOYYvYjn5Pj82Y+k9MRSA6MPqsk6bviOTcHK6R3hgif907ANnoqnDWLlF+AGh5F+eMfv4B/BFbqpKHkUUNz2FMgYRK+enSdovvvJQvm4EExOsrUA5jdZt0rPwXf5G3I3x3ZkFZb6c77UYjN7Kr/MoLNidGiDI7egkymRIkHSgfh8MWkZ4+QFAbHZER+DxRkQrMwvlVEbBSpY5OqPdaCflSL5MIFrRyXN4qWnPAyrx5dSegMTr5l6NWWS65Avk0fUucux7U2kRIkCnZ+11oE2qTjlE6U65zMxF9IU3VAqtOnt3KObQBO4WvPccLOev2tbg03t3bWC2TK4I/HkNPKwyqV6+iou9os6JSn7BEDCJiPmL9IGVzyzfwUyFSSMrNxjpZwUWvCkAxZbq5vMX5J+F4uhnPEIE1ZsuFlaKHn0NxQAgoFeH4cmTY3FPqtRb1vO/ndRlc/Z0IHY/UeEdS2aUVyb24xinudRXfqmZMZGVze2vzA5KEzY6tGqT23IKfWaRWY6imDiW7iDei6yvA70cz49veIHdxgVPNdqjjUtpt+oT5OtG7lxAGQJMjwyMKu52ARCuoP/spCxRrxudtVsxnzp8JynJgqDLydtKW5pn0lTAM/6u5Z+ga3DnIstrI0tuh+VXYT4ZztMH6j+Q=\n- - provider: firebase\n- skip_cleanup: true\n- project: \"ffxiv-teamcraft-beta\"\n- on:\n- branch: beta\n- token:\n- secure: m+OWcJipxF84Awq3rW3GZ+kH5WMOYYvYjn5Pj82Y+k9MRSA6MPqsk6bviOTcHK6R3hgif907ANnoqnDWLlF+AGh5F+eMfv4B/BFbqpKHkUUNz2FMgYRK+enSdovvvJQvm4EExOsrUA5jdZt0rPwXf5G3I3x3ZkFZb6c77UYjN7Kr/MoLNidGiDI7egkymRIkHSgfh8MWkZ4+QFAbHZER+DxRkQrMwvlVEbBSpY5OqPdaCflSL5MIFrRyXN4qWnPAyrx5dSegMTr5l6NWWS65Avk0fUucux7U2kRIkCnZ+11oE2qTjlE6U65zMxF9IU3VAqtOnt3KObQBO4WvPccLOev2tbg03t3bWC2TK4I/HkNPKwyqV6+iou9os6JSn7BEDCJiPmL9IGVzyzfwUyFSSMrNxjpZwUWvCkAxZbq5vMX5J+F4uhnPEIE1ZsuFlaKHn0NxQAgoFeH4cmTY3FPqtRb1vO/ndRlc/Z0IHY/UeEdS2aUVyb24xinudRXfqmZMZGVze2vzA5KEzY6tGqT23IKfWaRWY6imDiW7iDei6yvA70cz49veIHdxgVPNdqjjUtpt+oT5OtG7lxAGQJMjwyMKu52ARCuoP/spCxRrxudtVsxnzp8JynJgqDLydtKW5pn0lTAM/6u5Z+ga3DnIstrI0tuh+VXYT4ZztMH6j+Q=\n+ - npm test && npm run build:prod\nnotifications:\nemail:\n",
"new_path": ".travis.yml",
"old_path": ".travis.yml"
},
{
"change_type": "MODIFY",
"diff": "// Karma configuration file, see link for more information\n-// https://karma-runner.github.io/0.13/config/configuration-file.html\n+// https://karma-runner.github.io/1.0/config/configuration-file.html\nmodule.exports = function (config) {\nconfig.set({\n@@ -8,39 +8,11 @@ module.exports = function (config) {\nplugins: [\nrequire('karma-jasmine'),\nrequire('karma-chrome-launcher'),\n- require('karma-jasmine-html-reporter'),\n- require('karma-coverage-istanbul-reporter'),\nrequire('@angular-devkit/build-angular/plugins/karma')\n],\nclient: {\nclearContext: false // leave Jasmine Spec Runner output visible in browser\n},\n- files: [\n- {pattern: './src/test.ts', watched: false}\n- ],\n- preprocessors: {\n-\n- },\n- mime: {\n- 'text/x-typescript': ['ts', 'tsx']\n- },\n- coverageIstanbulReporter: {\n- dir: require('path').join(__dirname, 'coverage'), reports: ['html', 'lcovonly'],\n- fixWebpackSourcePaths: true\n- },\n- customLaunchers: {\n- // chrome setup for travis CI using chromium\n- Chrome_travis_ci: {\n- base: 'Chrome',\n- flags: [' --no-sandbox']\n- }\n- },\n- angularCli: {\n- environment: 'dev'\n- },\n- reporters: config.angularCli && config.angularCli.codeCoverage\n- ? ['progress', 'coverage-istanbul']\n- : ['progress', 'kjhtml'],\nport: 9876,\ncolors: true,\nlogLevel: config.LOG_INFO,\n",
"new_path": "karma.conf.js",
"old_path": "karma.conf.js"
},
{
"change_type": "MODIFY",
"diff": "}\n},\n\"jasmine\": {\n- \"version\": \"3.1.0\",\n- \"resolved\": \"https://registry.npmjs.org/jasmine/-/jasmine-3.1.0.tgz\",\n- \"integrity\": \"sha1-K9Wf1+xuwOistk4J9Fpo7SrRlSo=\",\n+ \"version\": \"2.99.0\",\n+ \"resolved\": \"https://registry.npmjs.org/jasmine/-/jasmine-2.99.0.tgz\",\n+ \"integrity\": \"sha1-jKctEC5jm4Z8ZImFbg4YqceqQrc=\",\n\"dev\": true,\n\"requires\": {\n+ \"exit\": \"^0.1.2\",\n\"glob\": \"^7.0.6\",\n- \"jasmine-core\": \"~3.1.0\"\n+ \"jasmine-core\": \"~2.99.0\"\n}\n},\n\"jasmine-core\": {\n- \"version\": \"3.1.0\",\n- \"resolved\": \"https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.1.0.tgz\",\n- \"integrity\": \"sha1-pHheE11d9lAk38kiSVPfWFvSdmw=\",\n+ \"version\": \"2.99.0\",\n+ \"resolved\": \"https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.0.tgz\",\n+ \"integrity\": \"sha1-wQWrUiLaRfGwoQWAOD9a27/1bSw=\",\n\"dev\": true\n},\n\"jasmine-spec-reporter\": {\n\"dev\": true\n},\n\"karma-jasmine-html-reporter\": {\n- \"version\": \"1.1.0\",\n- \"resolved\": \"https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.1.0.tgz\",\n- \"integrity\": \"sha512-uhNED+4B1axgptXkM8cCa3kztpQqsPrOxhfbjr4FdunNexnU6+cF2bfiIeGfsFMhphVyOMKy/S9LFaOFj8VXRA==\",\n- \"dev\": true\n+ \"version\": \"1.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.0.0.tgz\",\n+ \"integrity\": \"sha512-SN9R/Pl9cY40yLlc7FkTcfswUr19M6ZZ25eM8X5wtZ0gvp0gneWZbe5lPYcer/Yrbz0D6QUiTSJaEzr3KBPvSg==\",\n+ \"dev\": true,\n+ \"requires\": {\n+ \"karma-jasmine\": \"^1.0.2\"\n+ }\n},\n\"karma-source-map-support\": {\n\"version\": \"1.3.0\",\n\"integrity\": \"sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=\",\n\"dev\": true\n},\n- \"open\": {\n- \"version\": \"0.0.5\",\n- \"resolved\": \"https://registry.npmjs.org/open/-/open-0.0.5.tgz\",\n- \"integrity\": \"sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=\"\n- },\n\"opn\": {\n\"version\": \"5.3.0\",\n\"resolved\": \"https://registry.npmjs.org/opn/-/opn-5.3.0.tgz\",\n",
"new_path": "package-lock.json",
"old_path": "package-lock.json"
},
{
"change_type": "MODIFY",
"diff": "\"standard-version:dry\": \"standard-version --dry-run\",\n\"release:prod\": \"git push --follow-tags origin master\",\n\"release:beta\": \"npm run standard-version -- --prerelease beta && git push --follow-tags origin beta\",\n- \"test\": \"node ./build/prebuild.js && ng test --single-run\",\n+ \"test\": \"node ./build/prebuild.js && ng test --watch=false\",\n\"lint\": \"ng lint\",\n\"e2e\": \"ng e2e\",\n\"commitmsg\": \"validate-commit-msg\",\n\"zone.js\": \"^0.8.26\"\n},\n\"devDependencies\": {\n+ \"@angular/compiler-cli\": \"6.0.1\",\n\"@angular-devkit/build-angular\": \"~0.6.1\",\n+ \"typescript\": \">=2.7.2 <2.8.0\",\n\"@angular/cli\": \"^6.0.1\",\n- \"@angular/compiler-cli\": \"6.0.1\",\n\"@biesbjerg/ngx-translate-extract\": \"^2.3.4\",\n\"@firebase/auth-types\": \"^0.3.2\",\n\"@types/electron\": \"^1.6.10\",\n\"electron-reload\": \"^1.2.2\",\n\"express\": \"^4.16.3\",\n\"husky\": \"^0.14.3\",\n- \"jasmine\": \"^3.1.0\",\n- \"jasmine-core\": \"~3.1.0\",\n+ \"jasmine\": \"2.99.0\",\n+ \"jasmine-core\": \"2.99.0\",\n\"jasmine-spec-reporter\": \"~4.2.1\",\n\"karma\": \"~2.0.2\",\n\"karma-chrome-launcher\": \"~2.2.0\",\n\"karma-cli\": \"~1.0.1\",\n\"karma-coverage-istanbul-reporter\": \"^1.4.2\",\n\"karma-jasmine\": \"~1.1.2\",\n- \"karma-jasmine-html-reporter\": \"^1.1.0\",\n\"node-sass\": \"^4.9.0\",\n\"protractor\": \"~5.3.2\",\n\"rxjs-compat\": \"^6.1.0\",\n\"standard-version\": \"^4.2.0\",\n\"ts-node\": \"~6.0.3\",\n\"tslint\": \"^5.10.0\",\n- \"typescript\": \">=2.7.2 <2.8.0\",\n\"validate-commit-msg\": \"^2.14.0\"\n},\n\"config\": {\n",
"new_path": "package.json",
"old_path": "package.json"
},
{
"change_type": "MODIFY",
"diff": "@@ -44,7 +44,7 @@ import {PlatformService} from './tools/platform.service';\nimport {IpcService} from './electron/ipc.service';\n-const dataExtractorProviders: Provider[] = [\n+export const DATA_EXTRACTORS: Provider[] = [\n{provide: EXTRACTORS, useClass: CraftedByExtractor, deps: [GarlandToolsService, HtmlToolsService, DataService], multi: true},\n{provide: EXTRACTORS, useClass: GatheredByExtractor, deps: [GarlandToolsService, HtmlToolsService, LocalizedDataService], multi: true},\n{provide: EXTRACTORS, useClass: TradeSourcesExtractor, deps: [DataService], multi: true},\n@@ -70,7 +70,7 @@ const dataExtractorProviders: Provider[] = [\n],\nproviders: [\n// Data Extraction\n- ...dataExtractorProviders,\n+ ...DATA_EXTRACTORS,\nDataExtractorService,\n// Other services\nGarlandToolsService,\n",
"new_path": "src/app/core/core.module.ts",
"old_path": "src/app/core/core.module.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -5,31 +5,30 @@ import {ListRow} from '../../model/list/list-row';\nimport {mockList} from '../../../test/mock-list';\nimport {LayoutRowFilter} from './layout-row-filter';\nimport {NgSerializerModule} from '@kaiu/ng-serializer';\n-import {LayoutRowDisplay} from './layout-row-display';\nimport {LayoutOrderService} from './layout-order.service';\nimport {TranslateService} from '@ngx-translate/core';\nimport {CoreModule} from '../core.module';\nconst mockRows: ListRow[] = mockList.items;\n-function testFilter(filter: LayoutRowFilter, ...args: any[]): void {\n- const result = filter.filter(mockRows, ...args);\n+function testFilter(filter: LayoutRowFilter): void {\n+ const result = filter.filter(mockRows);\nexpect(result.accepted.length).toBeGreaterThan(0);\nexpect(result.rejected.length).toBeGreaterThan(0);\n- expect(filter.filter(result.rejected, ...args).accepted.length).toBe(0);\n+ expect(filter.filter(result.rejected).accepted.length).toBe(0);\n}\nclass MockTranslate extends TranslateService {\ncurrentLang = 'en';\n}\n-describe('LayoutService', () => {\n+xdescribe('LayoutService', () => {\nbeforeEach(() => {\nTestBed.configureTestingModule({\nproviders: [\nLayoutService,\nLayoutOrderService,\n- {provide: TranslateService, useValue: MockTranslate}\n+ {provide: TranslateService, useValue: MockTranslate},\n],\nimports: [\nNgSerializerModule.forRoot(),\n",
"new_path": "src/app/core/layout/layout.service.spec.ts",
"old_path": "src/app/core/layout/layout.service.spec.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -9,6 +9,9 @@ import {GarlandToolsService} from '../api/garland-tools.service';\nimport {DataService} from '../api/data.service';\nimport {HtmlToolsService} from '../tools/html-tools.service';\nimport {EorzeanTimeService} from '../time/eorzean-time.service';\n+import {DataExtractorService} from './data/data-extractor.service';\n+import {DATA_EXTRACTORS} from '../core.module';\n+import {LocalizedDataService} from '../data/localized-data.service';\ndescribe('ListManagerService', () => {\n@@ -30,7 +33,10 @@ describe('ListManagerService', () => {\nListManagerService,\nHtmlToolsService,\nEorzeanTimeService,\n- {provide: I18nToolsService, useFactory: () => new I18nToolsService({currentLang: 'en'} as TranslateService)}\n+ {provide: I18nToolsService, useFactory: () => new I18nToolsService({currentLang: 'en'} as TranslateService)},\n+ DataExtractorService,\n+ LocalizedDataService,\n+ ...DATA_EXTRACTORS\n],\n});\n});\n",
"new_path": "src/app/core/list/list-manager.service.spec.ts",
"old_path": "src/app/core/list/list-manager.service.spec.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -2,12 +2,19 @@ import {async, inject, TestBed} from '@angular/core/testing';\nimport {MapService} from './map.service';\nimport {HttpClientModule} from '@angular/common/http';\n+import {MathToolsService} from '../../core/tools/math-tools';\n+import {LocalizedDataService} from '../../core/data/localized-data.service';\n+import {MapData} from './map-data';\ndescribe('MapService', () => {\nbeforeEach(() => {\nTestBed.configureTestingModule({\nimports: [HttpClientModule],\n- providers: [MapService]\n+ providers: [\n+ MapService,\n+ MathToolsService,\n+ LocalizedDataService\n+ ]\n});\n});\n@@ -17,24 +24,25 @@ describe('MapService', () => {\nit('should return proper map', async(inject([MapService], (service: MapService) => {\nservice.getMapById(31).subscribe(map => {\n- expect(map).toEqual({\n- 'id': 16,\n- 'folder': 's1f2/00',\n- 'path': 's1f2/s1f2.00.png',\n- 'region': 'La Noscea',\n- 'placename': 'Lower La Noscea',\n- 'zone': 0,\n- 'size_factor': 100,\n- 'offset_x': 0,\n- 'offset_y': 0,\n- 'map_marker_range': 75,\n- 'hierarchy': 1,\n- 'territory_id': 135,\n- 'patch': 0,\n- 'image': 'https://secure.xivdb.com/img/maps/s1f2/s1f2.00.jpg',\n- 'layer_count': 1,\n- 'placename_id': 31,\n- 'region_id': 22\n+ expect(map).toEqual(<MapData>{\n+ id: 16,\n+ folder: 's1f2/00',\n+ path: 's1f2/s1f2.00.png',\n+ region: 'La Noscea',\n+ placename: 'Lower La Noscea',\n+ zone: 0,\n+ size_factor: 100,\n+ offset_x: 0,\n+ offset_y: 0,\n+ map_marker_range: 75,\n+ hierarchy: 1,\n+ territory_id: 135,\n+ patch: 0,\n+ image: 'https://secure.xivdb.com/img/maps/s1f2/s1f2.00.jpg',\n+ layer_count: 1,\n+ placename_id: 31,\n+ region_id: 22,\n+ aetherytes: [Object({id: 10, zoneid: 16, placenameid: 31, x: 24.6, y: 35, type: 0, nameid: 337})]\n});\n});\n})));\n",
"new_path": "src/app/modules/map/map.service.spec.ts",
"old_path": "src/app/modules/map/map.service.spec.ts"
},
{
"change_type": "DELETE",
"diff": "-import { async, ComponentFixture, TestBed } from '@angular/core/testing';\n-\n-import { ChangeEmailPopupComponent } from './change-email-popup.component';\n-\n-describe('ChangeEmailPopupComponent', () => {\n- let component: ChangeEmailPopupComponent;\n- let fixture: ComponentFixture<ChangeEmailPopupComponent>;\n-\n- beforeEach(async(() => {\n- TestBed.configureTestingModule({\n- declarations: [ ChangeEmailPopupComponent ]\n- })\n- .compileComponents();\n- }));\n-\n- beforeEach(() => {\n- fixture = TestBed.createComponent(ChangeEmailPopupComponent);\n- component = fixture.componentInstance;\n- fixture.detectChanges();\n- });\n-\n- it('should create', () => {\n- expect(component).toBeTruthy();\n- });\n-});\n",
"new_path": null,
"old_path": "src/app/pages/profile/change-email-popup/change-email-popup.component.spec.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -53,7 +53,7 @@ describe('Craft simulator tests', () => {\n});\nit('should apply stroke of genius on specialist craft start', () => {\n- const simulation = new Simulation(infusionOfMind_Recipe, [new BasicTouch()], alc_70_350_stats);\n+ const simulation = new Simulation(infusionOfMind_Recipe, [new BasicSynthesis()], alc_70_350_stats);\nsimulation.run();\nexpect(simulation.availableCP).toBe(489);\nexpect(simulation.maxCP).toBe(489);\n@@ -177,22 +177,6 @@ describe('Craft simulator tests', () => {\n});\n});\n- describe('Initial preparations', () => {\n- it('should apply initial preparations and reduce cost on proc', () => {\n- const results = [];\n- for (let i = 0; i < 10000; i++) {\n- const simulation = new Simulation(infusionOfMind_Recipe,\n- [new InitialPreparations(), new IngenuityII()],\n- alc_70_350_stats);\n- simulation.run();\n- results.push(simulation.steps[1].cpDifference === 22);\n- }\n- // Expect around 2k procs with a precision of +/- 100\n- expect(results.filter(res => res).length).toBeGreaterThan(1900);\n- expect(results.filter(res => res).length).toBeLessThan(2100);\n- });\n- });\n-\ndescribe('Maker\\'s Mark', () => {\nit('should compute correct stacks amount', () => {\nconst simulation = new Simulation(infusionOfMind_Recipe,\n",
"new_path": "src/app/pages/simulator/test/simulation.spec.ts",
"old_path": "src/app/pages/simulator/test/simulation.spec.ts"
},
{
"change_type": "MODIFY",
"diff": "// This file is required by karma.conf.js and loads recursively all the .spec and framework files\n-import 'zone.js/dist/long-stack-trace-zone';\n-import 'zone.js/dist/proxy.js';\n-import 'zone.js/dist/sync-test';\n-import 'zone.js/dist/jasmine-patch';\n-import 'zone.js/dist/async-test';\n-import 'zone.js/dist/fake-async-test';\n+import 'zone.js/dist/zone-testing';\nimport {getTestBed} from '@angular/core/testing';\nimport {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';\n-// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.\n-declare const __karma__: any;\ndeclare const require: any;\n-// Prevent Karma from running prematurely.\n-__karma__.loaded = function () {\n-};\n-\n// First, initialize the Angular testing environment.\ngetTestBed().initTestEnvironment(\nBrowserDynamicTestingModule,\n@@ -26,5 +15,3 @@ getTestBed().initTestEnvironment(\nconst context = require.context('./', true, /\\.spec\\.ts$/);\n// And load the modules.\ncontext.keys().map(context);\n-// Finally, start Karma to run the tests.\n-__karma__.start();\n",
"new_path": "src/test.ts",
"old_path": "src/test.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | chore: tests are now working and integrated with travis | 1 | chore | null |
679,913 | 30.05.2018 17:40:05 | -3,600 | 7ac6227dcb8b2ce3c17bbf01d74f7087fb06f117 | feat(atom): provide prev/curr states to history event listeners
update undo()/redo() event value
(now an object w/ `prev`/`curr` keys/states)
refactor/fix record(), only expunge history and truncate future
if actually recording new state | [
{
"change_type": "MODIFY",
"diff": "@@ -77,17 +77,19 @@ export class History<T> implements\n* there's no history.\n*\n* If undo was possible, the `History.EVENT_UNDO` event is emitted\n- * after the restoration with the restored state provided as event\n- * value. This allows for additional state handling to be executed,\n- * e.g. application of the Command pattern. See `addListener()` for\n+ * after the restoration with both the `prev` and `curr` (restored)\n+ * states provided as event value (and object with these two keys).\n+ * This allows for additional state handling to be executed, e.g.\n+ * application of the \"Command pattern\". See `addListener()` for\n* registering event listeners.\n*/\nundo() {\nif (this.history.length) {\n- this.future.push(this.state.deref());\n- const res = this.state.reset(this.history.pop());\n- this.notify({ id: History.EVENT_UNDO, value: res });\n- return res;\n+ const prev = this.state.deref();\n+ this.future.push(prev);\n+ const curr = this.state.reset(this.history.pop());\n+ this.notify({ id: History.EVENT_UNDO, value: { prev, curr } });\n+ return curr;\n}\n}\n@@ -99,17 +101,19 @@ export class History<T> implements\n* there's no future (so sad!).\n*\n* If redo was possible, the `History.EVENT_REDO` event is emitted\n- * after the restoration with the restored state provided as event\n- * value. This allows for additional state handling to be executed,\n- * e.g. application of the Command pattern. See `addListener()` for\n+ * after the restoration with both the `prev` and `curr` (restored)\n+ * states provided as event value (and object with these two keys).\n+ * This allows for additional state handling to be executed, e.g.\n+ * application of the \"Command pattern\". See `addListener()` for\n* registering event listeners.\n*/\nredo() {\nif (this.future.length) {\n- this.history.push(this.state.deref());\n- const res = this.state.reset(this.future.pop());\n- this.notify({ id: History.EVENT_REDO, value: res });\n- return res;\n+ const prev = this.state.deref();\n+ this.history.push(prev);\n+ const curr = this.state.reset(this.future.pop());\n+ this.notify({ id: History.EVENT_REDO, value: { prev, curr } });\n+ return curr;\n}\n}\n@@ -164,10 +168,10 @@ export class History<T> implements\n* manually managing snapshots, i.e. when applying multiple swaps on\n* the wrapped atom directly, but not wanting to create an history\n* entry for each change. **DO NOT call this explicitly if using\n- * `History.reset()` / `History.swap()`**.\n+ * `History.reset()` / `History.swap()` etc.**\n*\n* If no `state` is given, uses the wrapped atom's current state\n- * value.\n+ * value (user code SHOULD always call without arg).\n*\n* If recording succeeded, the `History.EVENT_RECORD` event is\n* emitted with the recorded state provided as event value.\n@@ -177,23 +181,22 @@ export class History<T> implements\nrecord(state?: T) {\nconst history = this.history;\nconst n = history.length;\n- if (n >= this.maxLen) {\n- history.shift();\n- }\n+ let ok = true;\n// check for arg given and not if `state == null` we want to\n// allow null/undefined as possible values\nif (!arguments.length) {\nstate = this.state.deref();\n- if (!n || this.changed(history[n - 1], state)) {\n- history.push(state);\n- this.notify({ id: History.EVENT_RECORD, value: state });\n+ ok = (!n || this.changed(history[n - 1], state));\n+ }\n+ if (ok) {\n+ if (n >= this.maxLen) {\n+ history.shift();\n}\n- } else {\nhistory.push(state);\nthis.notify({ id: History.EVENT_RECORD, value: state });\n- }\nthis.future.length = 0;\n}\n+ }\n/**\n* Returns wrapped atom's **current** value.\n",
"new_path": "packages/atom/src/history.ts",
"old_path": "packages/atom/src/history.ts"
}
] | TypeScript | Apache License 2.0 | thi-ng/umbrella | feat(atom): provide prev/curr states to history event listeners
- update undo()/redo() event value
(now an object w/ `prev`/`curr` keys/states)
- refactor/fix record(), only expunge history and truncate future
if actually recording new state | 1 | feat | atom |
217,922 | 30.05.2018 17:46:33 | -7,200 | 373cafd0eb9b97024c79a03dbbee9ae73bb011c6 | feat(desktop): way better window state management (position and size saving properly) | [
{
"change_type": "MODIFY",
"diff": "const {app, ipcMain, BrowserWindow, Tray, nativeImage} = require('electron');\nconst {autoUpdater} = require('electron-updater');\nconst path = require('path');\n-const windowStateKeeper = require('electron-window-state');\n+const Config = require('electron-config');\n+const config = new Config();\nconst electronOauth2 = require('electron-oauth2');\n@@ -25,29 +26,14 @@ if (shouldQuit) {\n}\nfunction createWindow() {\n-\n- // Load the previous state with fallback to defaults\n- let mainWindowState = windowStateKeeper({\n- id: 'main',\n- defaultWidth: 1280,\n- defaultHeight: 720\n- });\n-\n- // Create the window using the state information\n- win = new BrowserWindow({\n- x: mainWindowState.x,\n- y: mainWindowState.y,\n- width: mainWindowState.width,\n- height: mainWindowState.height,\n+ let opts = {\n+ show: false,\nbackgroundColor: '#ffffff',\nframe: false,\nicon: `file://${__dirname}/dist/assets/logo.png`\n- });\n-\n- // Let us register listeners on the window, so we can update the state\n- // automatically (the listeners will be removed when the window is closed)\n- // and restore the maximized or full screen state\n- mainWindowState.manage(win);\n+ };\n+ Object.assign(opts, config.get('win:bounds'));\n+ win = new BrowserWindow(opts);\nwin.loadURL(`file://${__dirname}/dist/index.html`);\n@@ -59,6 +45,13 @@ function createWindow() {\nwin = null\n});\n+ win.once('ready-to-show', win.show);\n+\n+ // save window size and position\n+ win.on('close', () => {\n+ config.set('win:bounds', win.getBounds());\n+ });\n+\nconst iconPath = path.join(__dirname, 'dist', 'assets', 'logo.png');\nnativeIcon = nativeImage.createFromPath(iconPath);\nconst trayIcon = nativeIcon.resize({width: 16, height: 16});\n@@ -166,18 +159,8 @@ ipcMain.on('notification', (event, config) => {\n});\nipcMain.on('overlay', (event, url) => {\n- let overlayWindowState = windowStateKeeper({\n- id: url,\n- defaultWidth: 280,\n- defaultHeight: 400\n- });\n-\n- // Create the window using the state information\n- const overlayWindowConfig = {\n- height: overlayWindowState.height,\n- width: overlayWindowState.width,\n- x: overlayWindowState.x,\n- y: overlayWindowState.y,\n+ let opts = {\n+ show: false,\nresizable: true,\nframe: false,\nalwaysOnTop: true,\n@@ -186,12 +169,20 @@ ipcMain.on('overlay', (event, url) => {\nnodeIntegration: false\n}\n};\n+ Object.assign(opts, config.get(`overlay:${url}:bounds`));\n+ const overlay = new BrowserWindow(opts);\n+\n+ overlay.once('ready-to-show', overlay.show);\n+\n+\n+ // save window size and position\n+ overlay.on('close', () => {\n+ config.set(`overlay:${url}:bounds`, overlay.getBounds());\n+ });\n+\n- const overlay = new BrowserWindow(overlayWindowConfig);\noverlay.loadURL(`file://${__dirname}/dist/index.html#${url}?overlay=true`);\nopenedOverlays[url] = overlay;\n-\n- overlayWindowState.manage(overlay);\n});\nipcMain.on('overlay-close', (event, url) => {\n",
"new_path": "main.js",
"old_path": "main.js"
},
{
"change_type": "MODIFY",
"diff": "\"typedarray\": \"^0.0.6\"\n}\n},\n+ \"conf\": {\n+ \"version\": \"1.4.0\",\n+ \"resolved\": \"https://registry.npmjs.org/conf/-/conf-1.4.0.tgz\",\n+ \"integrity\": \"sha512-bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==\",\n+ \"requires\": {\n+ \"dot-prop\": \"^4.1.0\",\n+ \"env-paths\": \"^1.0.0\",\n+ \"make-dir\": \"^1.0.0\",\n+ \"pkg-up\": \"^2.0.0\",\n+ \"write-file-atomic\": \"^2.3.0\"\n+ },\n+ \"dependencies\": {\n+ \"dot-prop\": {\n+ \"version\": \"4.2.0\",\n+ \"resolved\": \"https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz\",\n+ \"integrity\": \"sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==\",\n+ \"requires\": {\n+ \"is-obj\": \"^1.0.0\"\n+ }\n+ }\n+ }\n+ },\n\"configstore\": {\n\"version\": \"3.1.2\",\n\"resolved\": \"https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz\",\n\"deep-equal\": {\n\"version\": \"1.0.1\",\n\"resolved\": \"https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz\",\n- \"integrity\": \"sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=\"\n+ \"integrity\": \"sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=\",\n+ \"dev\": true\n},\n\"deep-extend\": {\n\"version\": \"0.5.1\",\n}\n}\n},\n+ \"electron-config\": {\n+ \"version\": \"1.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/electron-config/-/electron-config-1.0.0.tgz\",\n+ \"integrity\": \"sha1-Bp0ETMeU8EeErnLxKRZyXTyMOa8=\",\n+ \"requires\": {\n+ \"conf\": \"^1.0.0\"\n+ }\n+ },\n\"electron-download\": {\n\"version\": \"3.3.0\",\n\"resolved\": \"https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz\",\n\"source-map-support\": \"^0.5.5\"\n}\n},\n- \"electron-window-state\": {\n- \"version\": \"4.1.1\",\n- \"resolved\": \"https://registry.npmjs.org/electron-window-state/-/electron-window-state-4.1.1.tgz\",\n- \"integrity\": \"sha1-azT9wxs4UU3+yLfI97XUrdtnYy0=\",\n- \"requires\": {\n- \"deep-equal\": \"^1.0.1\",\n- \"jsonfile\": \"^2.2.3\",\n- \"mkdirp\": \"^0.5.1\"\n- }\n- },\n\"elliptic\": {\n\"version\": \"6.4.0\",\n\"resolved\": \"https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz\",\n\"env-paths\": {\n\"version\": \"1.0.0\",\n\"resolved\": \"https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz\",\n- \"integrity\": \"sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=\",\n- \"dev\": true\n+ \"integrity\": \"sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=\"\n},\n\"errno\": {\n\"version\": \"0.1.7\",\n\"version\": \"2.1.0\",\n\"resolved\": \"https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz\",\n\"integrity\": \"sha1-RdG35QbHF93UgndaK3eSCjwMV6c=\",\n- \"dev\": true,\n\"requires\": {\n\"locate-path\": \"^2.0.0\"\n}\n\"imurmurhash\": {\n\"version\": \"0.1.4\",\n\"resolved\": \"https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz\",\n- \"integrity\": \"sha1-khi5srkoojixPcT7a21XbyMUU+o=\",\n- \"dev\": true\n+ \"integrity\": \"sha1-khi5srkoojixPcT7a21XbyMUU+o=\"\n},\n\"in-publish\": {\n\"version\": \"2.0.0\",\n\"is-obj\": {\n\"version\": \"1.0.1\",\n\"resolved\": \"https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz\",\n- \"integrity\": \"sha1-PkcprB9f3gJc19g6iW2rn09n2w8=\",\n- \"dev\": true\n+ \"integrity\": \"sha1-PkcprB9f3gJc19g6iW2rn09n2w8=\"\n},\n\"is-odd\": {\n\"version\": \"2.0.0\",\n\"version\": \"2.4.0\",\n\"resolved\": \"https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz\",\n\"integrity\": \"sha1-NzaitCi4e72gzIO1P6PWM6NcKug=\",\n+ \"dev\": true,\n\"requires\": {\n\"graceful-fs\": \"^4.1.6\"\n}\n\"integrity\": \"sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=\",\n\"dev\": true\n},\n- \"karma-jasmine-html-reporter\": {\n- \"version\": \"1.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.0.0.tgz\",\n- \"integrity\": \"sha512-SN9R/Pl9cY40yLlc7FkTcfswUr19M6ZZ25eM8X5wtZ0gvp0gneWZbe5lPYcer/Yrbz0D6QUiTSJaEzr3KBPvSg==\",\n- \"dev\": true,\n- \"requires\": {\n- \"karma-jasmine\": \"^1.0.2\"\n- }\n- },\n\"karma-source-map-support\": {\n\"version\": \"1.3.0\",\n\"resolved\": \"https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz\",\n\"version\": \"2.0.0\",\n\"resolved\": \"https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz\",\n\"integrity\": \"sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=\",\n- \"dev\": true,\n\"requires\": {\n\"p-locate\": \"^2.0.0\",\n\"path-exists\": \"^3.0.0\"\n\"version\": \"1.3.0\",\n\"resolved\": \"https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz\",\n\"integrity\": \"sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==\",\n- \"dev\": true,\n\"requires\": {\n\"pify\": \"^3.0.0\"\n}\n\"minimist\": {\n\"version\": \"0.0.8\",\n\"resolved\": \"https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz\",\n- \"integrity\": \"sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=\"\n+ \"integrity\": \"sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=\",\n+ \"dev\": true\n},\n\"minimist-options\": {\n\"version\": \"3.0.2\",\n\"version\": \"0.5.1\",\n\"resolved\": \"https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz\",\n\"integrity\": \"sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=\",\n+ \"dev\": true,\n\"requires\": {\n\"minimist\": \"0.0.8\"\n}\n\"version\": \"1.2.0\",\n\"resolved\": \"https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz\",\n\"integrity\": \"sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==\",\n- \"dev\": true,\n\"requires\": {\n\"p-try\": \"^1.0.0\"\n}\n\"version\": \"2.0.0\",\n\"resolved\": \"https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz\",\n\"integrity\": \"sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=\",\n- \"dev\": true,\n\"requires\": {\n\"p-limit\": \"^1.1.0\"\n}\n\"p-try\": {\n\"version\": \"1.0.0\",\n\"resolved\": \"https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz\",\n- \"integrity\": \"sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=\",\n- \"dev\": true\n+ \"integrity\": \"sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=\"\n},\n\"pac-proxy-agent\": {\n\"version\": \"2.0.2\",\n\"path-exists\": {\n\"version\": \"3.0.0\",\n\"resolved\": \"https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz\",\n- \"integrity\": \"sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=\",\n- \"dev\": true\n+ \"integrity\": \"sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=\"\n},\n\"path-is-absolute\": {\n\"version\": \"1.0.1\",\n\"pify\": {\n\"version\": \"3.0.0\",\n\"resolved\": \"https://registry.npmjs.org/pify/-/pify-3.0.0.tgz\",\n- \"integrity\": \"sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=\",\n- \"dev\": true\n+ \"integrity\": \"sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=\"\n},\n\"pinkie\": {\n\"version\": \"2.0.4\",\n\"find-up\": \"^2.1.0\"\n}\n},\n+ \"pkg-up\": {\n+ \"version\": \"2.0.0\",\n+ \"resolved\": \"https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz\",\n+ \"integrity\": \"sha1-yBmscoBZpGHKscOImivjxJoATX8=\",\n+ \"requires\": {\n+ \"find-up\": \"^2.1.0\"\n+ }\n+ },\n\"plist\": {\n\"version\": \"3.0.1\",\n\"resolved\": \"https://registry.npmjs.org/plist/-/plist-3.0.1.tgz\",\n\"signal-exit\": {\n\"version\": \"3.0.2\",\n\"resolved\": \"https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz\",\n- \"integrity\": \"sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=\",\n- \"dev\": true\n+ \"integrity\": \"sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=\"\n},\n\"silent-error\": {\n\"version\": \"1.1.0\",\n\"version\": \"2.3.0\",\n\"resolved\": \"https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz\",\n\"integrity\": \"sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==\",\n- \"dev\": true,\n\"requires\": {\n\"graceful-fs\": \"^4.1.11\",\n\"imurmurhash\": \"^0.1.4\",\n",
"new_path": "package-lock.json",
"old_path": "package-lock.json"
},
{
"change_type": "MODIFY",
"diff": "\"angularfire2\": \"5.0.0-rc.8\",\n\"classlist.js\": \"^1.1.20150312\",\n\"core-js\": \"^2.5.6\",\n+ \"electron-config\": \"^1.0.0\",\n\"electron-log\": \"^2.2.14\",\n\"electron-oauth2\": \"^3.0.0\",\n\"electron-updater\": \"^2.21.10\",\n- \"electron-window-state\": \"^4.1.1\",\n\"firebase\": \"^5.0.2\",\n\"hammerjs\": \"^2.0.8\",\n\"jwt-decode\": \"^2.2.0\",\n",
"new_path": "package.json",
"old_path": "package.json"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat(desktop): way better window state management (position and size saving properly) | 1 | feat | desktop |
217,922 | 30.05.2018 17:54:32 | -7,200 | 1f4e9cc88596042bab712e8a375d36696cad6fac | feat: new button to copy macro fragments to clipboard
closes | [
{
"change_type": "MODIFY",
"diff": "</mat-checkbox>\n<div class=\"macro\">\n<pre *ngFor=\"let macroFragment of macro\" class=\"macro-fragment\">\n+ <button mat-icon-button class=\"copy-macro\" ngxClipboard [cbContent]=\"getText(macroFragment)\">\n+ <mat-icon>content_copy</mat-icon>\n+ </button>\n<span class=\"macro-line\" *ngFor=\"let line of macroFragment\">{{line}}<br></span>\n</pre>\n</div>\n<mat-divider></mat-divider>\n<div class=\"macro\">\n<pre class=\"macro-fragment\">\n+ <button mat-icon-button class=\"copy-macro\" ngxClipboard [cbContent]=\"getText(aactionsMacro)\">\n+ <mat-icon>content_copy</mat-icon>\n+ </button>\n<span class=\"macro-line\" *ngFor=\"let line of aactionsMacro\">{{line}}<br></span>\n</pre>\n</div>\n",
"new_path": "src/app/pages/simulator/components/macro-popup/macro-popup.component.html",
"old_path": "src/app/pages/simulator/components/macro-popup/macro-popup.component.html"
},
{
"change_type": "MODIFY",
"diff": "flex-direction: column;\nbackground: rgba(0, 0, 0, .1);\nborder: 1px solid darkgrey;\n- padding: 10px;\n+ padding: 20px;\n+ position: relative;\n+ .copy-macro {\n+ position: absolute;\n+ top: 0;\n+ right: 0;\n+ }\n}\n}\n",
"new_path": "src/app/pages/simulator/components/macro-popup/macro-popup.component.scss",
"old_path": "src/app/pages/simulator/components/macro-popup/macro-popup.component.scss"
},
{
"change_type": "MODIFY",
"diff": "@@ -56,6 +56,10 @@ export class MacroPopupComponent implements OnInit {\n}\n}\n+ getText(macro: string[]): string {\n+ return macro.join('\\n');\n+ }\n+\nngOnInit() {\nthis.generateMacros();\n}\n",
"new_path": "src/app/pages/simulator/components/macro-popup/macro-popup.component.ts",
"old_path": "src/app/pages/simulator/components/macro-popup/macro-popup.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat: new button to copy macro fragments to clipboard
closes #382 | 1 | feat | null |
217,922 | 30.05.2018 18:03:06 | -7,200 | 0d7d435bfd506561be3fa1553027a1e231bace43 | feat(simulator): you can now see & edit rotation name inside simulator
closes | [
{
"change_type": "MODIFY",
"diff": "<mat-icon>format_list_numbered</mat-icon>\n</button>\n</div>\n+<div class=\"rotation-name\" *ngIf=\"rotation !== undefined\">\n+ {{rotation.getName()}}\n+ <button mat-icon-button (click)=\"$event.preventDefault();editRotationName(rotation)\">\n+ <mat-icon>mode_edit</mat-icon>\n+ </button>\n+</div>\n<mat-expansion-panel [expanded]=\"customMode\" #configPanel>\n<mat-expansion-panel-header>\n<mat-panel-title>\n",
"new_path": "src/app/pages/simulator/components/simulator/simulator.component.html",
"old_path": "src/app/pages/simulator/components/simulator/simulator.component.html"
},
{
"change_type": "MODIFY",
"diff": "-import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output} from '@angular/core';\n+import {ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output} from '@angular/core';\nimport {Craft} from '../../../../model/garland-tools/craft';\nimport {Simulation} from '../../simulation/simulation';\nimport {BehaviorSubject, combineLatest, Observable, of, ReplaySubject} from 'rxjs';\n@@ -36,6 +36,7 @@ import {AppUser} from 'app/model/list/app-user';\nimport {debounceTime, filter, first, map, mergeMap, tap} from 'rxjs/operators';\nimport {CraftingJob} from '../../model/crafting-job.enum';\nimport {StepByStepReportPopupComponent} from '../step-by-step-report-popup/step-by-step-report-popup.component';\n+import {RotationNamePopupComponent} from '../rotation-name-popup/rotation-name-popup.component';\n@Component({\nselector: 'app-simulator',\n@@ -253,7 +254,7 @@ export class SimulatorComponent implements OnInit, OnDestroy {\nprivate dataService: DataService, private htmlTools: HtmlToolsService, private dialog: MatDialog,\nprivate pendingChanges: PendingChangesService, private localizedDataService: LocalizedDataService,\nprivate translate: TranslateService, consumablesService: ConsumablesService, private i18nTools: I18nToolsService,\n- private snack: MatSnackBar) {\n+ private snack: MatSnackBar, private cd: ChangeDetectorRef) {\nthis.foods = consumablesService.fromData(foods)\n.sort(this.consumablesSortFn);\n@@ -521,6 +522,17 @@ export class SimulatorComponent implements OnInit, OnDestroy {\n}\n}\n+ editRotationName(rotation: CraftingRotation): void {\n+ this.dialog.open(RotationNamePopupComponent, {data: rotation})\n+ .afterClosed()\n+ .pipe(\n+ filter(res => res !== undefined && res.length > 0 && res !== this.rotation.getName())\n+ ).subscribe(name => {\n+ this.rotation.name = name;\n+ this.cd.detectChanges();\n+ });\n+ }\n+\nsaveSet(set: GearSet): void {\n// First of all, remove old gearset in userData for this job.\nthis.userData.gearSets = (this.userData.gearSets || []).filter(s => s.jobId !== set.jobId);\n@@ -530,11 +542,6 @@ export class SimulatorComponent implements OnInit, OnDestroy {\nthis.userService.set(this.userData.$key, this.userData).subscribe();\n}\n- resetSet(set: GearSet): void {\n- this.userData.gearSets = this.userData.gearSets.filter(s => s.jobId !== set.jobId);\n- this.userService.set(this.userData.$key, this.userData).subscribe();\n- }\n-\naddAction(action: CraftingAction): void {\nthis.actions$.next(this.actions$.getValue().concat(action));\nthis.markAsDirty();\n",
"new_path": "src/app/pages/simulator/components/simulator/simulator.component.ts",
"old_path": "src/app/pages/simulator/components/simulator/simulator.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat(simulator): you can now see & edit rotation name inside simulator
closes #380 | 1 | feat | simulator |
217,922 | 30.05.2018 18:06:35 | -7,200 | ef547c758445957c048c2a41bac3b1f44b395ec3 | fix: custom links popup now creates links properly
closes | [
{
"change_type": "MODIFY",
"diff": "@@ -115,7 +115,7 @@ export class CustomLinkPopupComponent implements OnInit {\n}\ngetRedirectTo(): string {\n- if (this.data !== undefined) {\n+ if (this.data !== undefined && this.data !== null) {\nreturn this.data.redirectTo;\n} else if (this.selectedType === 'simulator') {\nreturn `${this.selectedType}/custom/${this.selectedUid}`;\n",
"new_path": "src/app/pages/custom-links/custom-link-popup/custom-link-popup.component.ts",
"old_path": "src/app/pages/custom-links/custom-link-popup/custom-link-popup.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: custom links popup now creates links properly
closes #385 | 1 | fix | null |
217,922 | 30.05.2018 18:21:21 | -7,200 | c4577b48b2c81acbb6dc75e262fd64919debb20d | feat: current list shown inside bulk regeneration popup
closes | [
{
"change_type": "MODIFY",
"diff": "<h2 mat-dialog-title>{{'Regenerating_lists' | translate }}</h2>\n<div mat-dialog-content>\n+ <div class=\"current-list\">{{currentList}}</div>\n<mat-progress-bar mode=\"determinate\" [value]=\"progress\"></mat-progress-bar>\n<app-random-gif></app-random-gif>\n</div>\n",
"new_path": "src/app/pages/lists/bulk-regenerate-popup/bulk-regenerate-popup.component.html",
"old_path": "src/app/pages/lists/bulk-regenerate-popup/bulk-regenerate-popup.component.html"
},
{
"change_type": "MODIFY",
"diff": "mat-progress-bar {\nmargin-bottom: 20px;\n}\n+\n+.current-list {\n+ margin: 10px 0;\n+}\n",
"new_path": "src/app/pages/lists/bulk-regenerate-popup/bulk-regenerate-popup.component.scss",
"old_path": "src/app/pages/lists/bulk-regenerate-popup/bulk-regenerate-popup.component.scss"
},
{
"change_type": "MODIFY",
"diff": "import {Component, Inject, OnInit} from '@angular/core';\nimport {ListService} from '../../../core/database/list.service';\n-import {concat, Observable} from 'rxjs';\n+import {concat, Observable, of} from 'rxjs';\nimport {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material';\nimport {ComponentWithSubscriptions} from '../../../core/component/component-with-subscriptions';\nimport {ListManagerService} from '../../../core/list/list-manager.service';\nimport {List} from '../../../model/list/list';\n-import {filter, switchMap, tap} from 'rxjs/operators';\n+import {filter, mergeMap, switchMap, tap} from 'rxjs/operators';\n@Component({\nselector: 'app-bulk-regenerate-popup',\n@@ -16,6 +16,8 @@ export class BulkRegeneratePopupComponent extends ComponentWithSubscriptions imp\nprogress = 0;\n+ currentList: string;\n+\nconstructor(@Inject(MAT_DIALOG_DATA) public data: any,\npublic dialogRef: MatDialogRef<BulkRegeneratePopupComponent>,\nprivate listService: ListService, private listManager: ListManagerService) {\n@@ -25,8 +27,10 @@ export class BulkRegeneratePopupComponent extends ComponentWithSubscriptions imp\nngOnInit(): void {\nlet done = 0;\nconst regenerations: Observable<List>[] = this.data.map(list => {\n- return this.listManager.upgradeList(list)\n+ return of(list)\n.pipe(\n+ tap(l => this.currentList = l.name),\n+ mergeMap(l => this.listManager.upgradeList(l)),\nswitchMap((l: List) => this.listService.set(l.$key, l))\n);\n});\n",
"new_path": "src/app/pages/lists/bulk-regenerate-popup/bulk-regenerate-popup.component.ts",
"old_path": "src/app/pages/lists/bulk-regenerate-popup/bulk-regenerate-popup.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat: current list shown inside bulk regeneration popup
closes #384 | 1 | feat | null |
217,922 | 30.05.2018 18:39:46 | -7,200 | 7220dcc003b54c28722a04cbedef992bd14e6acd | fix(simulator): fixed an issue with Innovative Touch not decreasing durability
closes | [
{
"change_type": "MODIFY",
"diff": "@@ -36,7 +36,7 @@ export class InnovativeTouch extends QualityAction {\n}\ngetBaseDurabilityCost(simulationState: Simulation): number {\n- return 0;\n+ return 10;\n}\ngetBaseSuccessRate(simulationState: Simulation): number {\n",
"new_path": "src/app/pages/simulator/model/actions/quality/innovative-touch.ts",
"old_path": "src/app/pages/simulator/model/actions/quality/innovative-touch.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix(simulator): fixed an issue with Innovative Touch not decreasing durability
closes #386 | 1 | fix | simulator |
217,922 | 30.05.2018 23:45:09 | -7,200 | 90feec114d4cc54d12c11e49f2f84e1a17d5c642 | perf(list): huge performance improvement on lists regeneration | [
{
"change_type": "MODIFY",
"diff": "@@ -11,7 +11,7 @@ import {environment} from '../../../environments/environment';\nimport {Ingredient} from '../../model/garland-tools/ingredient';\nimport {DataExtractorService} from './data/data-extractor.service';\n-import {map} from 'rxjs/operators';\n+import {map, skip} from 'rxjs/operators';\n@Injectable()\nexport class ListManagerService {\n@@ -128,6 +128,8 @@ export class ListManagerService {\nlist.recipes = [];\nreturn concat(...add)\n.pipe(\n+ // Only apply backup at last iteration, to avoid unnecessary slow process.\n+ skip(add.length - 1),\nmap((resultList: List) => {\nbackup.forEach(row => {\nconst listRow = resultList[row.array].find(item => item.id === row.item.id);\n",
"new_path": "src/app/core/list/list-manager.service.ts",
"old_path": "src/app/core/list/list-manager.service.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | perf(list): huge performance improvement on lists regeneration | 1 | perf | list |
217,922 | 31.05.2018 08:53:47 | -7,200 | 769c06d6a57c770a2213e8100e477859425f9d6e | fix: fixed an issue that was preventing to add community lists in a workshop | [
{
"change_type": "MODIFY",
"diff": "[templateButton]=\"userData?.patron || userData?.admin\"></app-list-panel>\n</div>\n<button mat-button class=\"full-width-button\" color=\"accent\"\n- (click)=\"addListsToWorkhop(workshop, display.basicLists)\">\n+ (click)=\"addListsToWorkhop(workshop, display.basicLists.concat(display.publicLists))\">\n<mat-icon>add</mat-icon>\n{{'WORKSHOP.Add_lists' | translate}}\n</button>\n[templateButton]=\"userData?.patron || userData?.admin\"></app-list-panel>\n</div>\n<button mat-button class=\"full-width-button\" color=\"accent\"\n- (click)=\"addListsToWorkhop(workshopData.workshop, display.basicLists)\">\n+ (click)=\"addListsToWorkhop(workshopData.workshop, display.basicLists.concat(display.publicLists))\">\n<mat-icon>add</mat-icon>\n{{'WORKSHOP.Add_lists' | translate}}\n</button>\n",
"new_path": "src/app/pages/lists/lists/lists.component.html",
"old_path": "src/app/pages/lists/lists/lists.component.html"
},
{
"change_type": "MODIFY",
"diff": "@@ -216,7 +216,7 @@ export class ListsComponent extends ComponentWithSubscriptions implements OnInit\nthis.lists.pipe(\nfirst(),\nmap(display => {\n- let res = display.basicLists;\n+ let res = display.basicLists.concat(display.publicLists);\nObject.keys(display.rows).map(key => display.rows[key]).forEach(row => {\nres = [...res, ...row];\n});\n",
"new_path": "src/app/pages/lists/lists/lists.component.ts",
"old_path": "src/app/pages/lists/lists/lists.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: fixed an issue that was preventing to add community lists in a workshop | 1 | fix | null |
821,196 | 31.05.2018 11:37:15 | 25,200 | 64808b302f741670ac05cae09c774b23c8c4c434 | fix: path names for eslint | [
{
"change_type": "MODIFY",
"diff": "@@ -16,7 +16,7 @@ module.exports = {\npath: '@semantic-release/exec',\ncmd: 'OCLIF_NEXT_VERSION=${nextRelease.version} yarn run version',\n},\n- {path: './scripts/release_example'},\n+ {path: './scripts/release-example'},\n'@semantic-release/changelog',\n'@semantic-release/npm',\n{\n@@ -29,7 +29,7 @@ module.exports = {\n'@semantic-release/github',\n{\npath: '@semantic-release/exec',\n- cmd: './scripts/release_create_oclif.js',\n+ cmd: './scripts/release-create-oclif.js',\n},\n],\n}\n",
"new_path": "release.config.js",
"old_path": "release.config.js"
},
{
"change_type": "RENAME",
"diff": "",
"new_path": "scripts/release-create-oclif.js",
"old_path": "scripts/release_create_oclif.js"
},
{
"change_type": "RENAME",
"diff": "",
"new_path": "scripts/release-example.js",
"old_path": "scripts/release_example.js"
}
] | TypeScript | MIT License | oclif/oclif | fix: path names for eslint | 1 | fix | null |
791,690 | 31.05.2018 11:37:30 | 25,200 | a7710ef7cc8201b7cc2fe01fd8f7a6303d8c3765 | core(opportunities): more granular score | [
{
"change_type": "MODIFY",
"diff": "@@ -133,7 +133,7 @@ module.exports = [\n},\n},\n'efficient-animated-content': {\n- score: 0,\n+ score: '<0.5',\ndetails: {\noverallSavingsMs: '>2000',\nitems: [\n",
"new_path": "lighthouse-cli/test/smokehouse/dobetterweb/dbw-expectations.js",
"old_path": "lighthouse-cli/test/smokehouse/dobetterweb/dbw-expectations.js"
},
{
"change_type": "MODIFY",
"diff": "'use strict';\nconst Audit = require('../audit');\n+const linearInterpolation = require('../../lib/statistics').linearInterpolation;\nconst Interactive = require('../../gather/computed/metrics/lantern-interactive'); // eslint-disable-line max-len\nconst Simulator = require('../../lib/dependency-graph/simulator/simulator'); // eslint-disable-line no-unused-vars\nconst Node = require('../../lib/dependency-graph/node.js'); // eslint-disable-line no-unused-vars\n@@ -16,6 +17,7 @@ const KB_IN_BYTES = 1024;\nconst WASTED_MS_FOR_AVERAGE = 300;\nconst WASTED_MS_FOR_POOR = 750;\n+const WASTED_MS_FOR_SCORE_OF_ZERO = 5000;\n/**\n* @typedef {object} ByteEfficiencyProduct\n@@ -32,14 +34,24 @@ const WASTED_MS_FOR_POOR = 750;\n*/\nclass UnusedBytes extends Audit {\n/**\n+ * Creates a score based on the wastedMs value using linear interpolation between control points.\n+ *\n* @param {number} wastedMs\n* @return {number}\n*/\nstatic scoreForWastedMs(wastedMs) {\n- if (wastedMs === 0) return 1;\n- else if (wastedMs < WASTED_MS_FOR_AVERAGE) return 0.9;\n- else if (wastedMs < WASTED_MS_FOR_POOR) return 0.65;\n- else return 0;\n+ if (wastedMs === 0) {\n+ return 1;\n+ } else if (wastedMs < WASTED_MS_FOR_AVERAGE) {\n+ return linearInterpolation(0, 1, WASTED_MS_FOR_AVERAGE, 0.75, wastedMs);\n+ } else if (wastedMs < WASTED_MS_FOR_POOR) {\n+ return linearInterpolation(WASTED_MS_FOR_AVERAGE, 0.75, WASTED_MS_FOR_POOR, 0.5, wastedMs);\n+ } else {\n+ return Math.max(\n+ 0,\n+ linearInterpolation(WASTED_MS_FOR_POOR, 0.5, WASTED_MS_FOR_SCORE_OF_ZERO, 0, wastedMs)\n+ );\n+ }\n}\n/**\n",
"new_path": "lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js",
"old_path": "lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -11,6 +11,7 @@ const parseCacheControl = require('parse-cache-control');\nconst Audit = require('../audit');\nconst WebInspector = require('../../lib/web-inspector');\nconst URL = require('../../lib/url-shim');\n+const linearInterpolation = require('../../lib/statistics').linearInterpolation;\n// Ignore assets that have very high likelihood of cache hit\nconst IGNORE_THRESHOLD_IN_PERCENT = 0.925;\n@@ -45,20 +46,6 @@ class CacheHeaders extends Audit {\n};\n}\n- /**\n- * Interpolates the y value at a point x on the line defined by (x0, y0) and (x1, y1)\n- * @param {number} x0\n- * @param {number} y0\n- * @param {number} x1\n- * @param {number} y1\n- * @param {number} x\n- * @return {number}\n- */\n- static linearInterpolation(x0, y0, x1, y1, x) {\n- const slope = (y1 - y0) / (x1 - x0);\n- return y0 + (x - x0) * slope;\n- }\n-\n/**\n* Computes the percent likelihood that a return visit will be within the cache lifetime, based on\n* Chrome UMA stats see the note below.\n@@ -90,7 +77,7 @@ class CacheHeaders extends Audit {\nconst lowerDecile = (upperDecileIndex - 1) / 10;\n// Approximate the real likelihood with linear interpolation\n- return CacheHeaders.linearInterpolation(\n+ return linearInterpolation(\nlowerDecileValue,\nlowerDecile,\nupperDecileValue,\n",
"new_path": "lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js",
"old_path": "lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -59,6 +59,21 @@ function getLogNormalDistribution(median, falloff) {\n};\n}\n+/**\n+ * Interpolates the y value at a point x on the line defined by (x0, y0) and (x1, y1)\n+ * @param {number} x0\n+ * @param {number} y0\n+ * @param {number} x1\n+ * @param {number} y1\n+ * @param {number} x\n+ * @return {number}\n+ */\n+function linearInterpolation(x0, y0, x1, y1, x) {\n+ const slope = (y1 - y0) / (x1 - x0);\n+ return y0 + (x - x0) * slope;\n+}\n+\nmodule.exports = {\n+ linearInterpolation,\ngetLogNormalDistribution,\n};\n",
"new_path": "lighthouse-core/lib/statistics.js",
"old_path": "lighthouse-core/lib/statistics.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -39,22 +39,6 @@ describe('Cache headers audit', () => {\n};\n});\n- describe('#linearInterpolation', () => {\n- it('correctly interpolates when slope is 2', () => {\n- const slopeOf2 = x => CacheHeadersAudit.linearInterpolation(0, 0, 10, 20, x);\n- assert.equal(slopeOf2(-10), -20);\n- assert.equal(slopeOf2(5), 10);\n- assert.equal(slopeOf2(10), 20);\n- });\n-\n- it('correctly interpolates when slope is 0', () => {\n- const slopeOf0 = x => CacheHeadersAudit.linearInterpolation(0, 0, 10, 0, x);\n- assert.equal(slopeOf0(-10), 0);\n- assert.equal(slopeOf0(5), 0);\n- assert.equal(slopeOf0(10), 0);\n- });\n- });\n-\nit('detects missing cache headers', () => {\nnetworkRecords = [networkRecord()];\nreturn CacheHeadersAudit.audit(artifacts, {options}).then(result => {\n",
"new_path": "lighthouse-core/test/audits/byte-efficiency/uses-long-cache-ttl-test.js",
"old_path": "lighthouse-core/test/audits/byte-efficiency/uses-long-cache-ttl-test.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -97,7 +97,7 @@ describe('Performance: Redirects audit', () => {\n]);\nreturn Audit.audit(mockArtifacts(FAILING_TWO_REDIRECTS), {}).then(output => {\n- assert.equal(output.score, 0.65);\n+ assert.equal(Math.round(output.score * 100) / 100, 0.56);\nassert.equal(output.details.items.length, 3);\nassert.equal(Math.round(output.rawValue), 638);\n});\n",
"new_path": "lighthouse-core/test/audits/redirects-test.js",
"old_path": "lighthouse-core/test/audits/redirects-test.js"
},
{
"change_type": "MODIFY",
"diff": "const assert = require('assert');\nconst statistics = require('../../lib/statistics.js');\n-describe('log normal distribution', () => {\n+describe('statistics', () => {\n+ describe('#getLogNormalDistribution', () => {\nit('creates a log normal distribution', () => {\n// This curve plotted with the below percentile assertions\n// https://www.desmos.com/calculator/vjk2rwd17y\n@@ -35,3 +36,20 @@ describe('log normal distribution', () => {\nassert.equal(getPct(distribution, 10000), 0.00, 'pct for 10000 does not match');\n});\n});\n+\n+ describe('#linearInterpolation', () => {\n+ it('correctly interpolates when slope is 2', () => {\n+ const slopeOf2 = x => statistics.linearInterpolation(0, 0, 10, 20, x);\n+ assert.equal(slopeOf2(-10), -20);\n+ assert.equal(slopeOf2(5), 10);\n+ assert.equal(slopeOf2(10), 20);\n+ });\n+\n+ it('correctly interpolates when slope is 0', () => {\n+ const slopeOf0 = x => statistics.linearInterpolation(0, 0, 10, 0, x);\n+ assert.equal(slopeOf0(-10), 0);\n+ assert.equal(slopeOf0(5), 0);\n+ assert.equal(slopeOf0(10), 0);\n+ });\n+ });\n+});\n",
"new_path": "lighthouse-core/test/lib/statistics-test.js",
"old_path": "lighthouse-core/test/lib/statistics-test.js"
},
{
"change_type": "MODIFY",
"diff": "\"id\": \"render-blocking-resources\",\n\"title\": \"Eliminate render-blocking resources\",\n\"description\": \"Resources are blocking the first paint of your page. Consider delivering critical JS/CSS inline and deferring all non-critical JS/styles. [Learn more](https://developers.google.com/web/tools/lighthouse/audits/blocking-resources).\",\n- \"score\": 0,\n+ \"score\": 0.46,\n\"scoreDisplayMode\": \"numeric\",\n\"rawValue\": 1129,\n\"displayValue\": \"5 resources delayed first paint by 1129ms\",\n\"id\": \"uses-text-compression\",\n\"title\": \"Enable text compression\",\n\"description\": \"Text-based responses should be served with compression (gzip, deflate or brotli) to minimize total network bytes. [Learn more](https://developers.google.com/web/fundamentals/performance/optimizing-content-efficiency/optimize-encoding-and-transfer).\",\n- \"score\": 0.9,\n+ \"score\": 0.88,\n\"scoreDisplayMode\": \"numeric\",\n\"rawValue\": 150,\n\"displayValue\": [\n",
"new_path": "lighthouse-core/test/results/sample_v2.json",
"old_path": "lighthouse-core/test/results/sample_v2.json"
}
] | JavaScript | Apache License 2.0 | googlechrome/lighthouse | core(opportunities): more granular score (#5331) | 1 | core | opportunities |
743,974 | 31.05.2018 15:06:03 | 25,200 | b3544cc092297b86c8f76e01ecf0831b85a4a2d1 | chore: Allow v4 of y18n | [
{
"change_type": "MODIFY",
"diff": "\"set-blocking\": \"^2.0.0\",\n\"string-width\": \"^2.0.0\",\n\"which-module\": \"^2.0.0\",\n- \"y18n\": \"^3.2.1\",\n+ \"y18n\": \"^3.2.1 || ^4.0.0\",\n\"yargs-parser\": \"^10.0.0\"\n},\n\"devDependencies\": {\n",
"new_path": "package.json",
"old_path": "package.json"
}
] | JavaScript | MIT License | yargs/yargs | chore: Allow v4 of y18n (#1138) | 1 | chore | null |
821,196 | 31.05.2018 18:27:12 | 25,200 | 80ef22b17bd96247b9d41ad2070e25d1ff3d185d | fix: remove es module config | [
{
"change_type": "MODIFY",
"diff": "{\n\"compilerOptions\": {\n\"declaration\": true,\n- \"esModuleInterop\": true,\n\"forceConsistentCasingInFileNames\": true,\n\"importHelpers\": true,\n\"module\": \"commonjs\",\n\"outDir\": \"./lib\",\n- \"resolveJsonModule\": true,\n\"rootDirs\": [ \"./src\" ],\n\"strict\": true,\n\"target\": \"es2017\",\n",
"new_path": "templates/tsconfig.json",
"old_path": "templates/tsconfig.json"
}
] | TypeScript | MIT License | oclif/oclif | fix: remove es module config | 1 | fix | null |
821,196 | 31.05.2018 18:35:37 | 25,200 | dd927fb458bc30fc5606c10b12d7cf9f4ec8ba87 | fix: add prepare step | [
{
"change_type": "MODIFY",
"diff": "@@ -262,6 +262,7 @@ class App extends Generator {\nthis.pjson.scripts.test = 'echo NO TESTS'\n}\nif (this.ts) {\n+ this.pjson.scripts.prepare = 'rm -rf lib && tsc'\nthis.pjson.scripts.prepack = 'rm -rf lib && tsc'\n}\nif (['plugin', 'multi'].includes(this.type)) {\n",
"new_path": "src/generators/app.ts",
"old_path": "src/generators/app.ts"
}
] | TypeScript | MIT License | oclif/oclif | fix: add prepare step | 1 | fix | null |
821,196 | 31.05.2018 19:07:01 | 25,200 | a58f9428e6c7f54873da4f771f665dec4842ecba | fix: updated fancy-test | [
{
"change_type": "MODIFY",
"diff": "\"eslint\": \"^4.19.1\",\n\"eslint-config-oclif\": \"^1.5.1\",\n\"execa\": \"^0.10.0\",\n- \"fancy-test\": \"^1.1.2\",\n+ \"fancy-test\": \"^1.1.4\",\n\"fs-extra\": \"^6.0.1\",\n\"globby\": \"^8.0.1\",\n\"mocha\": \"^5.2.0\",\n",
"new_path": "package.json",
"old_path": "package.json"
},
{
"change_type": "MODIFY",
"diff": "@@ -1337,9 +1337,9 @@ extract-stack@^1.0.0:\nversion \"1.0.0\"\nresolved \"https://registry.yarnpkg.com/extract-stack/-/extract-stack-1.0.0.tgz#b97acaf9441eea2332529624b732fc5a1c8165fa\"\n-fancy-test@^1.1.2:\n- version \"1.1.2\"\n- resolved \"https://registry.yarnpkg.com/fancy-test/-/fancy-test-1.1.2.tgz#570db0c24ac49f49d780385abbee121757de5e46\"\n+fancy-test@^1.1.4:\n+ version \"1.1.4\"\n+ resolved \"https://registry.yarnpkg.com/fancy-test/-/fancy-test-1.1.4.tgz#1bcc7b7a526218a85ed1ff0d2e95afc4b69fab23\"\ndependencies:\n\"@types/chai\" \"^4.1.3\"\n\"@types/lodash\" \"^4.14.109\"\n",
"new_path": "yarn.lock",
"old_path": "yarn.lock"
}
] | TypeScript | MIT License | oclif/oclif | fix: updated fancy-test | 1 | fix | null |
217,922 | 01.06.2018 12:07:48 | -7,200 | 6ce2a37102a8b84bd3d236caba1222826d6e6632 | fix(alarms): you can now properly change sound, delay and volume of your alarms | [
{
"change_type": "MODIFY",
"diff": "<h2 mat-dialog-title>Timer options</h2>\n<div mat-dialog-content>\n<mat-form-field>\n- <mat-select placeholder=\"{{'Sound' | translate}}\" [value]=\"settings.alarmSound\"\n- (change)=\"setSound($event.value)\">\n+ <mat-select placeholder=\"{{'Sound' | translate}}\" [ngModel]=\"settings.alarmSound\"\n+ (ngModelChange)=\"setSound($event)\">\n<mat-option *ngFor=\"let sound of sounds\" [value]=\"sound\">\n{{ sound }}\n</mat-option>\n</mat-select>\n</mat-form-field>\n<mat-form-field>\n- <mat-select placeholder=\"{{'Early_by' | translate}}\" [value]=\"settings.alarmHoursBefore\"\n- (change)=\"setHoursBefore($event.value)\">\n+ <mat-select placeholder=\"{{'Early_by' | translate}}\" [ngModel]=\"settings.alarmHoursBefore\"\n+ (ngModelChange)=\"setHoursBefore($event)\">\n<mat-option *ngFor=\"let value of [0,1,2,5]\" [value]=\"value\">\n{{ value }}\n</mat-option>\n</mat-select>\n</mat-form-field>\n<p>Volume</p>\n- <mat-slider min=\"1\" max=\"100\" step=\"1\" [value]=\"settings.alarmVolume * 100\"\n- (change)=\"setVolume($event.value/100)\"></mat-slider>\n+ <mat-slider min=\"1\" max=\"100\" step=\"1\" [ngModel]=\"settings.alarmVolume * 100\"\n+ (ngModelChange)=\"setVolume($event/100)\"></mat-slider>\n</div>\n",
"new_path": "src/app/pages/list/timer-options-popup/timer-options-popup.component.html",
"old_path": "src/app/pages/list/timer-options-popup/timer-options-popup.component.html"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix(alarms): you can now properly change sound, delay and volume of your alarms | 1 | fix | alarms |
791,834 | 01.06.2018 13:05:30 | 14,400 | c9749e14297f3a2116cebb8c1feacef511121dc2 | extension: update minimum Chrome version to 66 | [
{
"change_type": "MODIFY",
"diff": "{\n\"name\": \"__MSG_appName__\",\n\"version\": \"2.10.1.3000\",\n- \"minimum_chrome_version\": \"56\",\n+ \"minimum_chrome_version\": \"66\",\n\"manifest_version\": 2,\n\"description\": \"__MSG_appDescription__\",\n\"icons\": {\n",
"new_path": "lighthouse-extension/app/manifest.json",
"old_path": "lighthouse-extension/app/manifest.json"
}
] | JavaScript | Apache License 2.0 | googlechrome/lighthouse | extension: update minimum Chrome version to 66 (#5403) | 1 | extension | null |
217,922 | 01.06.2018 14:06:14 | -7,200 | 6faf5d07b6b631828a774b9b151efd7c8a3cc39b | chore: WIP custom timer sound | [
{
"change_type": "MODIFY",
"diff": "@@ -19,6 +19,7 @@ import {\nMatProgressSpinnerModule,\nMatSelectModule,\nMatSliderModule,\n+ MatSlideToggleModule,\nMatTooltipModule\n} from '@angular/material';\nimport {FormsModule} from '@angular/forms';\n@@ -80,6 +81,7 @@ const routes: Routes = [\nMatProgressSpinnerModule,\nMatGridListModule,\nMatTooltipModule,\n+ MatSlideToggleModule,\nFlexLayoutModule,\nClipboardModule,\n",
"new_path": "src/app/pages/list/list.module.ts",
"old_path": "src/app/pages/list/list.module.ts"
},
{
"change_type": "MODIFY",
"diff": "<h2 mat-dialog-title>Timer options</h2>\n<div mat-dialog-content>\n- <mat-form-field>\n+ <mat-slide-toggle *ngIf=\"platform.isDesktop()\" [(ngModel)]=\"enableCustomSound\">\n+ {{'ALARMS.Custom_sound' | translate}}\n+ </mat-slide-toggle>\n+ <mat-form-field *ngIf=\"!enableCustomSound\">\n<mat-select placeholder=\"{{'Sound' | translate}}\" [ngModel]=\"settings.alarmSound\"\n(ngModelChange)=\"setSound($event)\">\n<mat-option *ngFor=\"let sound of sounds\" [value]=\"sound\">\n</mat-option>\n</mat-select>\n</mat-form-field>\n+ <div *ngIf=\"enableCustomSound\">\n+ <input type=\"file\" (change)=\"setSound($event.target.files[0].path)\">\n+ </div>\n<mat-form-field>\n<mat-select placeholder=\"{{'Early_by' | translate}}\" [ngModel]=\"settings.alarmHoursBefore\"\n(ngModelChange)=\"setHoursBefore($event)\">\n",
"new_path": "src/app/pages/list/timer-options-popup/timer-options-popup.component.html",
"old_path": "src/app/pages/list/timer-options-popup/timer-options-popup.component.html"
},
{
"change_type": "MODIFY",
"diff": "import {Component} from '@angular/core';\nimport {SettingsService} from '../../settings/settings.service';\n+import {PlatformService} from '../../../core/tools/platform.service';\n@Component({\nselector: 'app-timer-options-popup',\n@@ -10,11 +11,22 @@ export class TimerOptionsPopupComponent {\npublic sounds = ['Wondrous_tales', 'LB_charged', 'Notification'];\n- constructor(public settings: SettingsService) {\n+ enableCustomSound = false;\n+\n+ public customSound: File;\n+\n+ constructor(public settings: SettingsService, public platform: PlatformService) {\n}\npublic previewSound(): void {\n- const audio = new Audio(`./assets/audio/${this.settings.alarmSound}.mp3`);\n+ let audio: HTMLAudioElement;\n+ if (this.settings.alarmSound.indexOf('file://') === -1) {\n+ // If this is not a custom alarm sound, create the audio element from assets\n+ audio = new Audio(`./assets/audio/${this.settings.alarmSound}.mp3`);\n+ } else {\n+ // Else, create it from the custom file path\n+ audio = new Audio(this.settings.alarmSound);\n+ }\naudio.loop = false;\naudio.volume = this.settings.alarmVolume;\naudio.play();\n@@ -23,17 +35,15 @@ export class TimerOptionsPopupComponent {\npublic setVolume(volume: number): void {\nthis.settings.alarmVolume = volume;\nthis.previewSound();\n-\n}\npublic setSound(sound: string): void {\n+ console.log(sound);\nthis.settings.alarmSound = sound;\nthis.previewSound();\n-\n}\npublic setHoursBefore(hours: number): void {\n- console.log(hours);\nthis.settings.alarmHoursBefore = hours;\n}\n",
"new_path": "src/app/pages/list/timer-options-popup/timer-options-popup.component.ts",
"old_path": "src/app/pages/list/timer-options-popup/timer-options-popup.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | chore: WIP custom timer sound | 1 | chore | null |
217,922 | 01.06.2018 15:06:13 | -7,200 | e64768903222343c214908265ef0f33c28cbcd43 | feat(desktop): you can now use custom sounds as alarm
closes | [
{
"change_type": "MODIFY",
"diff": "@@ -186,7 +186,12 @@ export class AlarmService {\n.onAction().subscribe(() => {\nthis.dialog.open(MapPopupComponent, {data: {coords: {x: alarm.coords[0], y: alarm.coords[1]}, id: alarm.zoneId}});\n});\n- const audio = new Audio(`./assets/audio/${this.settings.alarmSound}.mp3`);\n+ let audio: HTMLAudioElement;\n+ if (this.settings.alarmSound.indexOf(':') === -1) {\n+ audio = new Audio(`./assets/audio/${this.settings.alarmSound}.mp3`);\n+ } else {\n+ audio = new Audio(this.settings.alarmSound);\n+ }\naudio.loop = false;\naudio.volume = this.settings.alarmVolume;\naudio.play();\n@@ -334,9 +339,10 @@ export class AlarmService {\n* @private\n*/\npublic _isSpawned(alarm: Alarm, time: Date): boolean {\n- const spawn = alarm.spawn;\n+ let spawn = alarm.spawn;\nlet despawn = (spawn + alarm.duration) % 24;\ndespawn = despawn === 0 ? 24 : despawn;\n+ spawn = spawn === 0 ? 24 : spawn;\nreturn time.getUTCHours() >= spawn && time.getUTCHours() < despawn;\n}\n",
"new_path": "src/app/core/time/alarm.service.ts",
"old_path": "src/app/core/time/alarm.service.ts"
},
{
"change_type": "MODIFY",
"diff": "</mat-option>\n</mat-select>\n</mat-form-field>\n- <div *ngIf=\"enableCustomSound\">\n- <input type=\"file\" (change)=\"setSound($event.target.files[0].path)\">\n+ <div *ngIf=\"enableCustomSound\" class=\"custom-alarm\">\n+ <div class=\"sound-preview\">{{settings.alarmSound}}\n+ <button mat-icon-button (click)=\"previewSound()\">\n+ <mat-icon>play_circle_outline</mat-icon>\n+ </button>\n+ </div>\n+ <input type=\"file\" (change)=\"setSound($event.target.files[0].path)\" accept=\"audio/*\">\n</div>\n<mat-form-field>\n<mat-select placeholder=\"{{'Early_by' | translate}}\" [ngModel]=\"settings.alarmHoursBefore\"\n",
"new_path": "src/app/pages/list/timer-options-popup/timer-options-popup.component.html",
"old_path": "src/app/pages/list/timer-options-popup/timer-options-popup.component.html"
},
{
"change_type": "MODIFY",
"diff": "@@ -6,3 +6,12 @@ div {\nmargin: 20px 0;\n}\n}\n+\n+.custom-alarm {\n+ margin: 20px 0;\n+ .sound-preview {\n+ display: flex;\n+ flex-direction: row;\n+ align-items: center;\n+ }\n+}\n",
"new_path": "src/app/pages/list/timer-options-popup/timer-options-popup.component.scss",
"old_path": "src/app/pages/list/timer-options-popup/timer-options-popup.component.scss"
},
{
"change_type": "MODIFY",
"diff": "@@ -13,14 +13,13 @@ export class TimerOptionsPopupComponent {\nenableCustomSound = false;\n- public customSound: File;\n-\nconstructor(public settings: SettingsService, public platform: PlatformService) {\n+ this.enableCustomSound = this.settings.alarmSound.indexOf(':') > -1;\n}\npublic previewSound(): void {\nlet audio: HTMLAudioElement;\n- if (this.settings.alarmSound.indexOf('file://') === -1) {\n+ if (this.settings.alarmSound.indexOf(':') === -1) {\n// If this is not a custom alarm sound, create the audio element from assets\naudio = new Audio(`./assets/audio/${this.settings.alarmSound}.mp3`);\n} else {\n@@ -38,7 +37,6 @@ export class TimerOptionsPopupComponent {\n}\npublic setSound(sound: string): void {\n- console.log(sound);\nthis.settings.alarmSound = sound;\nthis.previewSound();\n}\n",
"new_path": "src/app/pages/list/timer-options-popup/timer-options-popup.component.ts",
"old_path": "src/app/pages/list/timer-options-popup/timer-options-popup.component.ts"
},
{
"change_type": "MODIFY",
"diff": "\"No_alarm\": \"No alarms set\",\n\"Add_alarm\": \"Add alarm\",\n\"Alarm_created\": \"Alarm created\",\n- \"Alarm_already_created\": \"Alarm already set\"\n+ \"Alarm_already_created\": \"Alarm already set\",\n+ \"Custom_sound\": \"Custom alarm sound\"\n},\n\"Item_name\": \"Item name\",\n\"No_items_found\": \"No item found\",\n",
"new_path": "src/assets/i18n/en.json",
"old_path": "src/assets/i18n/en.json"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat(desktop): you can now use custom sounds as alarm
closes #350 | 1 | feat | desktop |
217,922 | 01.06.2018 16:02:22 | -7,200 | b93a1c0e0ee6d702d2da2ea38d86055c4b6a4b01 | style: better representation of craftable/done state on list rows | [
{
"change_type": "MODIFY",
"diff": "<!--Layout for desktop browsers-->\n<mat-list-item *ngIf=\"!(isMobile | async); else mobileLayout\"\n- [ngClass]=\"{'even': even, 'auto-height':true, 'compact':settings.compactLists}\">\n+ [ngClass]=\"{'even': even, 'auto-height':true, 'compact':settings.compactLists,\n+ 'done-row': item.done >= item.amount, 'craftable-row': canBeCrafted}\">\n<div class=\"item-col-left\">\n<div matListAvatar [ngClass]=\"{'icon':true, 'compact': settings.compactLists}\"\n[appXivdbTooltip]=\"item.id\" [appXivdbTooltipDisabled]=\"isDraft()\">\n",
"new_path": "src/app/modules/item/item/item.component.html",
"old_path": "src/app/modules/item/item/item.component.html"
},
{
"change_type": "MODIFY",
"diff": ".even {\nbackground-color: rgba(123, 123, 123, .2);\n+ &.done-row {\n+ background-color: rgba(0, 255, 0, .1);\n+ }\n+ &.craftable-row {\n+ background-color: rgba(19, 168, 255, .2);\n+ }\n+ }\n+\n+ .done-row {\n+ background-color: rgba(94, 255, 91, 0.15);\n+ }\n+\n+ .craftable-row {\n+ background-color: rgba(19, 168, 255, .3);\n}\n.strike {\n",
"new_path": "src/app/modules/item/item/item.component.scss",
"old_path": "src/app/modules/item/item/item.component.scss"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | style: better representation of craftable/done state on list rows | 1 | style | null |
730,412 | 01.06.2018 16:29:22 | 0 | c3d1e3b656f817d4f0e92394adf9ab03f0d79b39 | chore(release): 0.1.304 | [
{
"change_type": "MODIFY",
"diff": "All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n+<a name=\"0.1.304\"></a>\n+## [0.1.304](https://github.com/webex/react-ciscospark/compare/v0.1.303...v0.1.304) (2018-06-01)\n+\n+\n+\n<a name=\"0.1.303\"></a>\n## [0.1.303](https://github.com/webex/react-ciscospark/compare/v0.1.302...v0.1.303) (2018-05-24)\n",
"new_path": "CHANGELOG.md",
"old_path": "CHANGELOG.md"
},
{
"change_type": "MODIFY",
"diff": "{\n\"name\": \"@ciscospark/react-ciscospark\",\n- \"version\": \"0.1.303\",\n+ \"version\": \"0.1.304\",\n\"description\": \"The Cisco Spark for React library allows developers to easily incorporate Spark functionality into an application.\",\n\"scripts\": {\n\"build\": \"./scripts/build/index.js\",\n",
"new_path": "package.json",
"old_path": "package.json"
}
] | JavaScript | MIT License | webex/react-widgets | chore(release): 0.1.304 | 1 | chore | release |
815,745 | 01.06.2018 17:05:44 | -10,800 | acef71480604b2c4956cd2db2f559fe6b90611e7 | fix(groupBy): treat empty string as valid group | [
{
"change_type": "MODIFY",
"diff": "@@ -271,17 +271,17 @@ export class ItemsList {\nprivate _groupBy(items: NgOption[], prop: string | Function): OptionGroups {\nconst isFn = isFunction(this._ngSelect.groupBy);\n- const groups = items.reduce((grouped, item) => {\n+ const groups = new Map<string, NgOption[]>();\n+ for (const item of items) {\nlet key = isFn ? (<Function>prop).apply(this, [item.value]) : item.value[<string>prop];\n- key = key || undefined;\n- const group = grouped.get(key);\n+ key = isDefined(key) ? key : undefined;\n+ const group = groups.get(key);\nif (group) {\ngroup.push(item);\n} else {\n- grouped.set(key, [item]);\n+ groups.set(key, [item]);\n+ }\n}\n- return grouped;\n- }, new Map<string, NgOption[]>());\nreturn groups;\n}\n@@ -292,7 +292,7 @@ export class ItemsList {\nitems.push(...withoutGroup);\nlet i = withoutGroup.length;\nfor (const key of Array.from(groups.keys())) {\n- if (!key) {\n+ if (!isDefined(key)) {\ncontinue;\n}\nconst parent: NgOption = {\n",
"new_path": "src/ng-select/items-list.ts",
"old_path": "src/ng-select/items-list.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -424,7 +424,7 @@ describe('NgSelectComponent', function () {\nfixture.componentInstance.selectedCity = { name: 'New city', id: 5 };\ntickAndDetectChanges(fixture);\n- fixture.componentInstance.cities = [...fixture.componentInstance.cities]\n+ fixture.componentInstance.cities = [...fixture.componentInstance.cities];\ntickAndDetectChanges(fixture);\nexpect(fixture.componentInstance.select.itemsList.markedItem.value).toEqual({ name: 'Vilnius', id: 1 });\n}));\n@@ -552,7 +552,7 @@ describe('NgSelectComponent', function () {\nexpect(fixture.componentInstance.selectedCityId).toEqual(1);\n// from model to component\n- fixture.componentInstance.selectedCityId = 2\n+ fixture.componentInstance.selectedCityId = 2;\ntickAndDetectChanges(fixture);\nexpect(fixture.componentInstance.select.selectedItems).toEqual([jasmine.objectContaining({\n@@ -741,8 +741,7 @@ describe('NgSelectComponent', function () {\n</ng-select>`);\nconst cmp = fixture.componentInstance;\n- const cityId = cmp.cities[1].id.toString();\n- cmp.selectedCityId = cityId;\n+ cmp.selectedCityId = cmp.cities[1].id.toString();\ncmp.compareWith = (city, model: string) => city.id === +model;\n@@ -1022,7 +1021,7 @@ describe('NgSelectComponent', function () {\nit('should stop marked loop if all items disabled', fakeAsync(() => {\nfixture.componentInstance.cities[0].disabled = true;\n- fixture.componentInstance.cities = [...fixture.componentInstance.cities]\n+ fixture.componentInstance.cities = [...fixture.componentInstance.cities];\ntickAndDetectChanges(fixture);\nselect.filter('vil');\ntickAndDetectChanges(fixture);\n@@ -1119,7 +1118,7 @@ describe('NgSelectComponent', function () {\nconst result = jasmine.objectContaining({\nvalue: fixture.componentInstance.cities[2]\n});\n- expect(fixture.componentInstance.select.itemsList.markedItem).toEqual(result)\n+ expect(fixture.componentInstance.select.itemsList.markedItem).toEqual(result);\ntriggerKeyDownEvent(getNgSelectElement(fixture), KeyCode.Tab);\nexpect(fixture.componentInstance.select.selectedItems).toEqual([result]);\n}));\n@@ -1201,7 +1200,7 @@ describe('NgSelectComponent', function () {\ntick(200);\nexpect(fixture.componentInstance.selectedCity).toBeUndefined();\n- expect(select.itemsList.markedItem.label).toBe('Vilnius')\n+ expect(select.itemsList.markedItem.label).toBe('Vilnius');\nexpect(findByLabel).toHaveBeenCalledWith('vil')\n}));\n});\n@@ -1215,7 +1214,7 @@ describe('NgSelectComponent', function () {\nit('should select option and close dropdown', () => {\ntriggerKeyDownEvent(getNgSelectElement(fixture), KeyCode.Space);\ntriggerKeyDownEvent(getNgSelectElement(fixture), KeyCode.Enter);\n- expect(select.selectedItems[0].value).toEqual(fixture.componentInstance.cities[0])\n+ expect(select.selectedItems[0].value).toEqual(fixture.componentInstance.cities[0]);\nexpect(select.isOpen).toBe(false);\n});\n});\n@@ -1347,7 +1346,7 @@ describe('NgSelectComponent', function () {\nfixture.detectChanges();\nexpect(fixture.componentInstance.select.selectedItems.length).toBe(1);\n- fixture.componentInstance.select.clearItem(fixture.componentInstance.cities[0])\n+ fixture.componentInstance.select.clearItem(fixture.componentInstance.cities[0]);\nexpect(fixture.componentInstance.select.selectedItems.length).toBe(0);\ntick();\n}));\n@@ -1367,7 +1366,7 @@ describe('NgSelectComponent', function () {\nfixture.componentInstance.cities = [];\nfixture.detectChanges();\n- fixture.componentInstance.select.clearItem(selected)\n+ fixture.componentInstance.select.clearItem(selected);\nexpect(fixture.componentInstance.select.selectedItems.length).toBe(0);\ntick();\n}));\n@@ -1671,9 +1670,9 @@ describe('NgSelectComponent', function () {\nit('should keep same ordering while unselecting', fakeAsync(() => {\nfixture.componentInstance.selectedCities = [...fixture.componentInstance.cities.reverse()];\ntickAndDetectChanges(fixture);\n- select.unselect(select.selectedItems[0])\n- select.unselect(select.selectedItems[0])\n- select.unselect(select.selectedItems[0])\n+ select.unselect(select.selectedItems[0]);\n+ select.unselect(select.selectedItems[0]);\n+ select.unselect(select.selectedItems[0]);\nexpect(select.selectedItems.length).toBe(0);\nexpect(select.itemsList.filteredItems.length).toBe(3);\nexpect(select.itemsList.filteredItems[0].label).toBe('Vilnius');\n@@ -1840,7 +1839,7 @@ describe('NgSelectComponent', function () {\ntickAndDetectChanges(fixture);\ntickAndDetectChanges(fixture);\nconst selectEl: HTMLElement = select.elementRef.nativeElement;\n- const ngControl = selectEl.querySelector('.ng-select-container')\n+ const ngControl = selectEl.querySelector('.ng-select-container');\nconst placeholder: any = selectEl.querySelector('.ng-placeholder');\nexpect(ngControl.classList.contains('ng-has-value')).toBeTruthy();\n@@ -1855,7 +1854,7 @@ describe('NgSelectComponent', function () {\nit('should contain .ng-has-value when value was selected', fakeAsync(() => {\ntickAndDetectChanges(fixture);\nconst selectEl: HTMLElement = fixture.componentInstance.select.elementRef.nativeElement;\n- const ngControl = selectEl.querySelector('.ng-select-container')\n+ const ngControl = selectEl.querySelector('.ng-select-container');\nselectOption(fixture, KeyCode.ArrowDown, 2);\ntickAndDetectChanges(fixture);\nexpect(ngControl.classList.contains('ng-has-value')).toBeTruthy();\n@@ -1963,7 +1962,7 @@ describe('NgSelectComponent', function () {\nconst result = jasmine.objectContaining({\nvalue: fixture.componentInstance.cities[2]\n});\n- expect(fixture.componentInstance.select.itemsList.markedItem).toEqual(result)\n+ expect(fixture.componentInstance.select.itemsList.markedItem).toEqual(result);\ntriggerKeyDownEvent(getNgSelectElement(fixture), KeyCode.Enter);\nexpect(fixture.componentInstance.select.selectedItems).toEqual([result]);\n}));\n@@ -1984,7 +1983,7 @@ describe('NgSelectComponent', function () {\nconst result = jasmine.objectContaining({\nvalue: fixture.componentInstance.cities[2]\n});\n- expect(fixture.componentInstance.select.itemsList.markedItem).toEqual(result)\n+ expect(fixture.componentInstance.select.itemsList.markedItem).toEqual(result);\ntriggerKeyDownEvent(getNgSelectElement(fixture), KeyCode.Enter);\nexpect(fixture.componentInstance.select.selectedItems).toEqual([result]);\n}));\n@@ -2097,7 +2096,7 @@ describe('NgSelectComponent', function () {\n}));\ndescribe('with typeahead', () => {\n- let fixture: ComponentFixture<NgSelectTestCmp>\n+ let fixture: ComponentFixture<NgSelectTestCmp>;\nbeforeEach(() => {\nfixture = createTestingModule(\nNgSelectTestCmp,\n@@ -2447,7 +2446,7 @@ describe('NgSelectComponent', function () {\ntickAndDetectChanges(fixture);\ntickAndDetectChanges(fixture);\ntriggerMousedown = () => {\n- const control = fixture.debugElement.query(By.css('.ng-select-container'))\n+ const control = fixture.debugElement.query(By.css('.ng-select-container'));\ncontrol.triggerEventHandler('mousedown', createEvent({ target: { className: 'ng-control' } }));\n};\n}));\n@@ -2476,7 +2475,7 @@ describe('NgSelectComponent', function () {\ntickAndDetectChanges(fixture);\ntickAndDetectChanges(fixture);\ntriggerMousedown = () => {\n- const control = fixture.debugElement.query(By.css('.ng-select-container'))\n+ const control = fixture.debugElement.query(By.css('.ng-select-container'));\ncontrol.triggerEventHandler('mousedown', createEvent({ target: { className: 'ng-clear' } }));\n};\n}));\n@@ -2528,7 +2527,7 @@ describe('NgSelectComponent', function () {\ntickAndDetectChanges(fixture);\ntickAndDetectChanges(fixture);\ntriggerMousedown = () => {\n- const control = fixture.debugElement.query(By.css('.ng-select-container'))\n+ const control = fixture.debugElement.query(By.css('.ng-select-container'));\ncontrol.triggerEventHandler('mousedown', createEvent({ target: { className: 'ng-value-icon' } }));\n};\n}));\n@@ -2559,7 +2558,7 @@ describe('NgSelectComponent', function () {\nfixture.componentInstance.selectedCity = fixture.componentInstance.cities[0];\ntickAndDetectChanges(fixture);\ntriggerMousedown = () => {\n- const control = fixture.debugElement.query(By.css('.ng-select-container'))\n+ const control = fixture.debugElement.query(By.css('.ng-select-container'));\ncontrol.triggerEventHandler('mousedown', createEvent({ target: { className: 'ng-arrow' } }));\n};\n}));\n@@ -2670,16 +2669,20 @@ describe('NgSelectComponent', function () {\nfixture.componentInstance.accounts.push(\n<any>{ name: 'Henry', email: 'henry@email.com', age: 10 },\n<any>{ name: 'Meg', email: 'meg@email.com', age: 7, country: null },\n+ <any>{ name: 'Meg', email: 'meg@email.com', age: 7, country: '' },\n);\n- fixture.componentInstance.accounts = [...fixture.componentInstance.accounts]\n+ fixture.componentInstance.accounts = [...fixture.componentInstance.accounts];\ntickAndDetectChanges(fixture);\n- const items = fixture.componentInstance.select.itemsList.items;\n- expect(items.length).toBe(16);\n+ const items: NgOption[] = fixture.componentInstance.select.itemsList.items;\n+ expect(items.length).toBe(18);\nexpect(items[0].hasChildren).toBeUndefined();\nexpect(items[0].parent).toBeUndefined();\nexpect(items[1].hasChildren).toBeUndefined();\nexpect(items[1].parent).toBeUndefined();\n+ expect(items[16].hasChildren).toBeTruthy();\n+ expect(items[16].label).toBe('');\n+ expect(items[17].parent).toBeDefined();\n}));\nit('should group by group fn', fakeAsync(() => {\n",
"new_path": "src/ng-select/ng-select.component.spec.ts",
"old_path": "src/ng-select/ng-select.component.spec.ts"
}
] | TypeScript | MIT License | ng-select/ng-select | fix(groupBy): treat empty string as valid group | 1 | fix | groupBy |
815,745 | 01.06.2018 17:20:29 | -10,800 | 40a6eb72b8bdb36d611bf427da6d7c225739d289 | chore(release): 2.1.3 | [
{
"change_type": "MODIFY",
"diff": "All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n+<a name=\"2.1.3\"></a>\n+## [2.1.3](https://github.com/ng-select/ng-select/compare/v2.1.2...v2.1.3) (2018-06-01)\n+\n+\n+### Bug Fixes\n+\n+* **groupBy:** treat empty string as valid group ([acef714](https://github.com/ng-select/ng-select/commit/acef714))\n+\n+\n+\n<a name=\"2.1.2\"></a>\n## [2.1.2](https://github.com/ng-select/ng-select/compare/v2.1.1...v2.1.2) (2018-05-30)\n",
"new_path": "CHANGELOG.md",
"old_path": "CHANGELOG.md"
},
{
"change_type": "MODIFY",
"diff": "{\n\"$schema\": \"../node_modules/ng-packagr/package.schema.json\",\n\"name\": \"@ng-select/ng-select\",\n- \"version\": \"2.1.2\",\n+ \"version\": \"2.1.3\",\n\"description\": \"Angular ng-select - All in One UI Select, Multiselect and Autocomplete\",\n\"author\": \"@ng-select/ng-select\",\n\"license\": \"MIT\",\n",
"new_path": "src/package.json",
"old_path": "src/package.json"
}
] | TypeScript | MIT License | ng-select/ng-select | chore(release): 2.1.3 | 1 | chore | release |
217,922 | 01.06.2018 17:33:57 | -7,200 | 3d9aebb86ae158e0c91c2ac5989b5cad5f8799b4 | feat: new "Copy as text" button to copy a panel or the whole list as text
closes | [
{
"change_type": "MODIFY",
"diff": "<mat-expansion-panel [expanded]=\"expanded\" (opened)=\"opened.emit()\" (closed)=\"closed.emit()\">\n<mat-expansion-panel-header>\n<mat-panel-title>{{title}}</mat-panel-title>\n+ <button mat-icon-button ngxClipboard\n+ *ngIf=\"data !== null\"\n+ matTooltip=\"{{'LIST.Copy_as_text' | translate}}\"\n+ matTooltipPosition=\"above\"\n+ (click)=\"$event.stopPropagation()\"\n+ [cbContent]=\"getTextExport()\"\n+ class=\"export-button\">\n+ <mat-icon>content_copy</mat-icon>\n+ </button>\n</mat-expansion-panel-header>\n<!--DEFAULT LIST-->\n<mat-list dense *ngIf=\"!showTier && !zoneBreakdown\">\n",
"new_path": "src/app/pages/list/list-details-panel/list-details-panel.component.html",
"old_path": "src/app/pages/list/list-details-panel/list-details-panel.component.html"
},
{
"change_type": "MODIFY",
"diff": "@@ -17,3 +17,7 @@ mat-expansion-panel {\ndisplay: flex;\nalign-items: center;\n}\n+\n+.export-button {\n+ margin-right: 10px;\n+}\n",
"new_path": "src/app/pages/list/list-details-panel/list-details-panel.component.scss",
"old_path": "src/app/pages/list/list-details-panel/list-details-panel.component.scss"
},
{
"change_type": "MODIFY",
"diff": "@@ -12,6 +12,7 @@ import {NavigationMapPopupComponent} from '../navigation-map-popup/navigation-ma\nimport {NavigationObjective} from '../../../modules/map/navigation-objective';\nimport {Vector2} from '../../../core/tools/vector2';\nimport {Permissions} from '../../../core/database/permissions/permissions';\n+import {I18nToolsService} from '../../../core/tools/i18n-tools.service';\n@Component({\nselector: 'app-list-details-panel',\n@@ -67,7 +68,7 @@ export class ListDetailsPanelComponent implements OnChanges, OnInit {\npermissions: Permissions;\nconstructor(public settings: SettingsService, private dataService: LocalizedDataService, private dialog: MatDialog,\n- private l12n: LocalizedDataService) {\n+ private l12n: LocalizedDataService, private i18nTools: I18nToolsService) {\n}\n/**\n@@ -192,6 +193,12 @@ export class ListDetailsPanelComponent implements OnChanges, OnInit {\n.filter(row => row !== undefined).length >= 2;\n}\n+ public getTextExport(): string {\n+ return this.data.reduce((exportString, row) => {\n+ return exportString + `${row.amount}x ${this.i18nTools.getName(this.dataService.getItem(row.id))}\\n`\n+ }, `${this.title} :\\n`);\n+ }\n+\ntrackByFn(index: number, item: ListRow) {\nreturn item.id;\n}\n",
"new_path": "src/app/pages/list/list-details-panel/list-details-panel.component.ts",
"old_path": "src/app/pages/list/list-details-panel/list-details-panel.component.ts"
},
{
"change_type": "MODIFY",
"diff": "matTooltip=\"{{'Pricing_mode' | translate}}\" matTooltipPosition=\"above\">\n<mat-icon>attach_money</mat-icon>\n</button>\n+ <button mat-icon-button ngxClipboard\n+ matTooltip=\"{{'LIST.Copy_as_text' | translate}}\"\n+ matTooltipPosition=\"above\"\n+ *ngIf=\"listData !== null\"\n+ (click)=\"$event.stopPropagation()\"\n+ [cbContent]=\"getTextExport(display)\"\n+ class=\"export-button\">\n+ <mat-icon>content_copy</mat-icon>\n+ </button>\n<div class=\"spacer\"></div>\n<button mat-button (click)=\"openTimerOptionsPopup()\">{{\"Timer_options\" | translate}}</button>\n</div>\n<mat-checkbox [(ngModel)]=\"settings.crystalsTracking\" (click)=\"$event.stopPropagation()\" class=\"crystals-toggle\">\n{{'LIST.Enable_crystals_tracking' | translate}}\n</mat-checkbox>\n+ <button mat-icon-button ngxClipboard\n+ *ngIf=\"listData?.crystals !== null\"\n+ matTooltip=\"{{'LIST.Copy_as_text' | translate}}\"\n+ matTooltipPosition=\"above\"\n+ (click)=\"$event.stopPropagation()\"\n+ [cbContent]=\"getCrystalsTextExport('Crystals'| translate, listData?.crystals)\"\n+ class=\"export-button\">\n+ <mat-icon>content_copy</mat-icon>\n+ </button>\n</mat-expansion-panel-header>\n<div *ngFor=\"let crystal of listData?.crystals\" class=\"crystals\">\n<div *ngIf=\"crystal.amount > crystal.done\" class=\"crystal-row\"\n",
"new_path": "src/app/pages/list/list-details/list-details.component.html",
"old_path": "src/app/pages/list/list-details/list-details.component.html"
},
{
"change_type": "MODIFY",
"diff": "margin: 10px 0;\n}\n+.export-button {\n+ margin-right: 10px;\n+}\n+\n.public-list-toggle {\nmargin: 20px;\nheight: 20px;\n",
"new_path": "src/app/pages/list/list-details/list-details.component.scss",
"old_path": "src/app/pages/list/list-details/list-details.component.scss"
},
{
"change_type": "MODIFY",
"diff": "@@ -35,10 +35,11 @@ import {ListLayoutPopupComponent} from '../list-layout-popup/list-layout-popup.c\nimport {ComponentWithSubscriptions} from '../../../core/component/component-with-subscriptions';\nimport {PermissionsPopupComponent} from '../../../modules/common-components/permissions-popup/permissions-popup.component';\nimport {ListFinishedPopupComponent} from '../list-finished-popup/list-finished-popup.component';\n-import {filter} from 'rxjs/operators';\n-import {first, map, mergeMap, switchMap, tap} from 'rxjs/operators';\n+import {filter, first, map, mergeMap, switchMap, tap} from 'rxjs/operators';\nimport {PlatformService} from '../../../core/tools/platform.service';\nimport {LinkToolsService} from '../../../core/tools/link-tools.service';\n+import {I18nToolsService} from '../../../core/tools/i18n-tools.service';\n+import {LocalizedDataService} from '../../../core/data/localized-data.service';\ndeclare const ga: Function;\n@@ -105,7 +106,8 @@ export class ListDetailsComponent extends ComponentWithSubscriptions implements\nprivate listService: ListService, private listManager: ListManagerService, private snack: MatSnackBar,\nprivate translate: TranslateService, private router: Router, private eorzeanTimeService: EorzeanTimeService,\npublic settings: SettingsService, private layoutService: LayoutService, private cd: ChangeDetectorRef,\n- public platform: PlatformService, private linkTools: LinkToolsService) {\n+ public platform: PlatformService, private linkTools: LinkToolsService, private l12n: LocalizedDataService,\n+ private i18nTools: I18nToolsService) {\nsuper();\nthis.initFilters();\nthis.listDisplay = this.listData$\n@@ -277,6 +279,22 @@ export class ListDetailsComponent extends ComponentWithSubscriptions implements\nreturn this.user !== undefined && this.user !== null && this.user.uid === this.listData.authorId;\n}\n+ public getTextExport(display: LayoutRowDisplay[]): string {\n+ return display\n+ .filter(displayRow => displayRow.rows.length > 0)\n+ .reduce((exportString, displayRow) => {\n+ return exportString + displayRow.rows.reduce((rowExportString, row) => {\n+ return rowExportString + `${row.amount}x ${this.i18nTools.getName(this.l12n.getItem(row.id))}\\n`\n+ }, `${this.translate.instant(displayRow.title)}:\\n`) + '\\n';\n+ }, `${this.listData.name}: \\n\\n${this.getCrystalsTextExport(this.translate.instant('Crystals'), this.listData.crystals)}`);\n+ }\n+\n+ public getCrystalsTextExport(title: string, crystals: ListRow[]): string {\n+ return crystals.reduce((exportString, row) => {\n+ return exportString + `${row.amount}x ${this.i18nTools.getName(this.l12n.getItem(row.id))}\\n`\n+ }, `${title} :\\n`);\n+ }\n+\nupgradeList(): void {\nthis.upgradingList = true;\nconst dialogRef = this.dialog.open(RegenerationPopupComponent, {disableClose: true});\n",
"new_path": "src/app/pages/list/list-details/list-details.component.ts",
"old_path": "src/app/pages/list/list-details/list-details.component.ts"
},
{
"change_type": "MODIFY",
"diff": "\"LIST\": {\n\"Copied_x_times\": \"Copied {{count}} times\",\n\"Enable_crystals_tracking\": \"Enable crystals tracking\",\n+ \"Copy_as_text\": \"Copy as text\",\n\"BUTTONS\": {\n\"Add_link_description\": \"Create a custom link for this list\",\n\"Create_template_description\": \"Create a template link for this list, which will create a copy of the list for whoever opens it\",\n",
"new_path": "src/assets/i18n/en.json",
"old_path": "src/assets/i18n/en.json"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat: new "Copy as text" button to copy a panel or the whole list as text
closes #342 | 1 | feat | null |
821,196 | 01.06.2018 17:37:46 | 25,200 | 620707ce80a17f1ba0e4e3e447ad16128b81638a | feat: add oclif badge | [
{
"change_type": "MODIFY",
"diff": "<%= pjson.description %>\n+[](https://oclif.io)\n[](https://npmjs.org/package/<%= pjson.name %>)\n[](https://circleci.com/gh/<%= repository %>/tree/master)\n[](https://ci.appveyor.com/project/<%= repository %>/branch/master)\n",
"new_path": "templates/README.md.ejs",
"old_path": "templates/README.md.ejs"
}
] | TypeScript | MIT License | oclif/oclif | feat: add oclif badge | 1 | feat | null |
217,922 | 01.06.2018 17:39:45 | -7,200 | bed88d0759fe0c9cf4884483bee6c58a42efdd8e | chore: added link to the list text export | [
{
"change_type": "MODIFY",
"diff": "@@ -286,7 +286,9 @@ export class ListDetailsComponent extends ComponentWithSubscriptions implements\nreturn exportString + displayRow.rows.reduce((rowExportString, row) => {\nreturn rowExportString + `${row.amount}x ${this.i18nTools.getName(this.l12n.getItem(row.id))}\\n`\n}, `${this.translate.instant(displayRow.title)}:\\n`) + '\\n';\n- }, `${this.listData.name}: \\n\\n${this.getCrystalsTextExport(this.translate.instant('Crystals'), this.listData.crystals)}`);\n+ }, `${this.linkTools.getLink(`list/${this.listData.$key}`)\n+ }\\n\\n${this.listData.name}: \\n\\n${\n+ this.getCrystalsTextExport(this.translate.instant('Crystals'), this.listData.crystals)}`);\n}\npublic getCrystalsTextExport(title: string, crystals: ListRow[]): string {\n",
"new_path": "src/app/pages/list/list-details/list-details.component.ts",
"old_path": "src/app/pages/list/list-details/list-details.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | chore: added link to the list text export
#342 | 1 | chore | null |
448,065 | 02.06.2018 12:37:31 | 14,400 | da954c9492c24f8dcaa22cf6758be16bb0e2f9a5 | docs: fixes path for integration samples link | [
{
"change_type": "MODIFY",
"diff": "@@ -59,7 +59,7 @@ If neccessay, it's recommended that these tools pick up the `package.json` gener\n### Folder layout\nVarious folder layouts exist and are commonly used within the Angular community.\n-The different styles are reflected in the [integration samples of ng-packagr](./integration).\n+The different styles are reflected in the [integration samples of ng-packagr](../integration).\nFirst, the Angulare core package layout:\n",
"new_path": "docs/DESIGN.md",
"old_path": "docs/DESIGN.md"
}
] | TypeScript | MIT License | ng-packagr/ng-packagr | docs: fixes path for integration samples link (#918) | 1 | docs | null |
135,522 | 02.06.2018 14:59:10 | -10,800 | 9d4264b4fa9714b5a390eab92b8049ac792dd90d | fix: ignore case of words in quotes | [
{
"change_type": "MODIFY",
"diff": "@@ -7,7 +7,11 @@ import startCase from 'lodash.startcase';\nexport default ensureCase;\nfunction ensureCase(raw = '', target = 'lowercase') {\n- const input = String(raw);\n+ // We delete any content together with quotes because he can contains proper names (example `refactor: `Eslint` configuration`).\n+ // We need trim string because content with quotes can be at the beginning or end of a line\n+ const input = String(raw)\n+ .replace(/`.*?`|\".*?\"|'.*?'/g, '')\n+ .trim();\nconst transformed = toCase(input, target);\nif (transformed === '') {\n",
"new_path": "@commitlint/ensure/src/case.js",
"old_path": "@commitlint/ensure/src/case.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -106,11 +106,188 @@ test('true for * on snake-case', t => {\n});\ntest('true for * on pascal-case', t => {\n- const actual = ensure('*', 'snake-case');\n+ const actual = ensure('*', 'pascal-case');\nt.is(actual, true);\n});\ntest('true for * on start-case', t => {\n- const actual = ensure('*', 'snake-case');\n+ const actual = ensure('*', 'start-case');\n+ t.is(actual, true);\n+});\n+\n+test('true for `Any_CASE_iN_back-quotes` on lowercase', t => {\n+ const actual = ensure('`Any_CASE_iN_back-quotes`', 'lowercase');\n+ t.is(actual, true);\n+});\n+\n+test('true for `Any_CASE_iN_back-quotes` on uppercase', t => {\n+ const actual = ensure('`Any_CASE_iN_back-quotes`', 'uppercase');\n+ t.is(actual, true);\n+});\n+\n+test('true for `Any_CASE_iN_back-quotes` on sentence-case', t => {\n+ const actual = ensure('`Any_CASE_iN_back-quotes`', 'sentence-case');\n+ t.is(actual, true);\n+});\n+\n+test('true for `Any_CASE_iN_back-quotes` on camel-case', t => {\n+ const actual = ensure('`Any_CASE_iN_back-quotes`', 'camel-case');\n+ t.is(actual, true);\n+});\n+\n+test('true for `Any_CASE_iN_back-quotes` on kebab-case', t => {\n+ const actual = ensure('`Any_CASE_iN_back-quotes`', 'kebab-case');\n+ t.is(actual, true);\n+});\n+\n+test('true for `Any_CASE_iN_back-quotes` on snake-case', t => {\n+ const actual = ensure('`Any_CASE_iN_back-quotes`', 'snake-case');\n+ t.is(actual, true);\n+});\n+\n+test('true for `Any_CASE_iN_back-quotes` on pascal-case', t => {\n+ const actual = ensure('`Any_CASE_iN_back-quotes`', 'pascal-case');\n+ t.is(actual, true);\n+});\n+\n+test('true for `Any_CASE_iN_back-quotes` on start-case', t => {\n+ const actual = ensure('`Any_CASE_iN_back-quotes`', 'start-case');\nt.is(actual, true);\n});\n+\n+test('true for lowercase `Any_CASE_iN_back-quotes` lowercase on lowercase', t => {\n+ const actual = ensure(\n+ 'lowercase `Any_CASE_iN_back-quotes` lowercase',\n+ 'lowercase'\n+ );\n+ t.is(actual, true);\n+});\n+\n+test('false for UPPERCASE `Any_CASE_iN_back-quotes` UPPERCASE on lowercase', t => {\n+ const actual = ensure(\n+ 'UPPERCASE `Any_CASE_iN_back-quotes` UPPERCASE',\n+ 'lowercase'\n+ );\n+ t.is(actual, false);\n+});\n+\n+test('true for UPPERCASE `Any_CASE_iN_back-quotes` UPPERCASE on uppercase', t => {\n+ const actual = ensure(\n+ 'UPPERCASE `Any_CASE_iN_back-quotes` UPPERCASE',\n+ 'uppercase'\n+ );\n+ t.is(actual, true);\n+});\n+\n+test('false for lowercase `Any_CASE_iN_back-quotes` lowercase on uppercase', t => {\n+ const actual = ensure(\n+ 'lowercase `Any_CASE_iN_back-quotes` lowercase',\n+ 'uppercase'\n+ );\n+ t.is(actual, false);\n+});\n+\n+test('true for fooBar`Any_CASE_iN_back-quotes`fooBar on camel-case', t => {\n+ const actual = ensure('fooBar`Any_CASE_iN_back-quotes`fooBar', 'camel-case');\n+ t.is(actual, true);\n+});\n+\n+test('false for Foo Bar`Any_CASE_iN_back-quotes` Foo Bar on camel-case', t => {\n+ const actual = ensure(\n+ 'Foo Bar`Any_CASE_iN_back-quotes` Foo Bar',\n+ 'camel-case'\n+ );\n+ t.is(actual, false);\n+});\n+\n+test('true for foo-bar`Any_CASE_iN_back-quotes`foo-bar on kebab-case', t => {\n+ const actual = ensure(\n+ 'foo-bar`Any_CASE_iN_back-quotes`foo-bar',\n+ 'kebab-case'\n+ );\n+ t.is(actual, true);\n+});\n+\n+test('false for Foo Bar `Any_CASE_iN_back-quotes` Foo Bar on kebab-case', t => {\n+ const actual = ensure(\n+ 'Foo Bar `Any_CASE_iN_back-quotes` Foo Bar',\n+ 'kebab-case'\n+ );\n+ t.is(actual, false);\n+});\n+\n+test('true for foo_bar`Any_CASE_iN_back-quotes`foo_bar on snake-case', t => {\n+ const actual = ensure(\n+ 'foo_bar`Any_CASE_iN_back-quotes`foo_bar',\n+ 'snake-case'\n+ );\n+ t.is(actual, true);\n+});\n+\n+test('false for Foo Bar `Any_CASE_iN_back-quotes` Foo Bar on snake-case', t => {\n+ const actual = ensure(\n+ 'Foo Bar `Any_CASE_iN_back-quotes` Foo Bar',\n+ 'snake-case'\n+ );\n+ t.is(actual, false);\n+});\n+\n+test('true for PascalCase`Any_CASE_iN_back-quotes`PascalCase on pascal-case', t => {\n+ const actual = ensure(\n+ 'PascalCase`Any_CASE_iN_back-quotes`PascalCase',\n+ 'pascal-case'\n+ );\n+ t.is(actual, true);\n+});\n+\n+test('false for Foo Bar `Any_CASE_iN_back-quotes` Foo Bar on pascal-case', t => {\n+ const actual = ensure(\n+ 'Foo Bar `Any_CASE_iN_back-quotes` Foo Bar',\n+ 'pascal-case'\n+ );\n+ t.is(actual, false);\n+});\n+\n+test('true for Foo Bar`Any_CASE_iN_back-quotes` Foo Bar on start-case', t => {\n+ const actual = ensure(\n+ 'Foo Bar `Any_CASE_iN_back-quotes`Foo Bar',\n+ 'start-case'\n+ );\n+ t.is(actual, true);\n+});\n+\n+test('false for foo_bar`Any_CASE_iN_back-quotes`foo_bar on start-case', t => {\n+ const actual = ensure(\n+ 'foo_bar`Any_CASE_iN_back-quotes`foo_bar',\n+ 'start-case'\n+ );\n+ t.is(actual, false);\n+});\n+\n+test('true for lowercase `Any_CASE_iN_back-quotes` `Any_CASE_iN_back-quotes` lowercase on lowercase', t => {\n+ const actual = ensure(\n+ 'lowercase `Any_CASE_iN_back-quotes` `Any_CASE_iN_back-quotes` lowercase',\n+ 'lowercase'\n+ );\n+ t.is(actual, true);\n+});\n+\n+test(\"true for 'Any_CASE_iN_single-quotes' on lowercase\", t => {\n+ const actual = ensure(\"'Any_CASE_iN_single-quotes'\", 'lowercase');\n+ t.is(actual, true);\n+});\n+\n+test('true for \"Any_CASE_iN_double-quotes\" on lowercase', t => {\n+ const actual = ensure('\"Any_CASE_iN_double-quotes\"', 'lowercase');\n+ t.is(actual, true);\n+});\n+\n+test('true for `lowercasel\"\\'` on lowercase', t => {\n+ const actual = ensure('`lowercasel\"\\'`', 'lowercase');\n+ t.is(actual, true);\n+});\n+\n+test('false for `LOWERCASE on lowercase', t => {\n+ const actual = ensure('`LOWERCASE', 'lowercase');\n+ t.is(actual, false);\n+});\n",
"new_path": "@commitlint/ensure/src/case.test.js",
"old_path": "@commitlint/ensure/src/case.test.js"
}
] | TypeScript | MIT License | conventional-changelog/commitlint | fix: ignore case of words in quotes | 1 | fix | null |
217,922 | 02.06.2018 16:21:51 | -7,200 | dadf1bf7f4cc684d4d1c80e9aa287dd1d002da3a | feat: control is now properly handled in min stats popup | [
{
"change_type": "MODIFY",
"diff": "export class Tables {\n+ public static readonly HQ_TABLE = [\n+ 1, 1, 1, 1, 1, 2, 2, 2, 2, 3,\n+ 3, 3, 3, 4, 4, 4, 4, 5, 5, 5,\n+ 5, 6, 6, 6, 6, 7, 7, 7, 7, 8,\n+ 8, 8, 9, 9, 9, 10, 10, 10, 11, 11,\n+ 11, 12, 12, 12, 13, 13, 13, 14, 14, 14,\n+ 15, 15, 15, 16, 16, 17, 17, 17, 18, 18,\n+ 18, 19, 19, 20, 20, 21, 22, 23, 24, 26,\n+ 28, 31, 34, 38, 42, 47, 52, 58, 64, 68,\n+ 71, 74, 76, 78, 80, 81, 82, 83, 84, 85,\n+ 86, 87, 88, 89, 90, 91, 92, 94, 96, 98, 100];\n+\n// source: https://github.com/Ermad/ffxiv-craft-opt-web/blob/master/app/js/ffxivcraftmodel.js#L1942\npublic static readonly NYMEIAS_WHEEL_TABLE = {\n1: 30,\n",
"new_path": "src/app/pages/simulator/model/tables.ts",
"old_path": "src/app/pages/simulator/model/tables.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -6,6 +6,7 @@ import {EffectiveBuff} from '../model/effective-buff';\nimport {Buff} from '../model/buff.enum';\nimport {SimulationResult} from './simulation-result';\nimport {SimulationReliabilityReport} from './simulation-reliability-report';\n+import {Tables} from '../model/tables';\nexport class Simulation {\n@@ -72,7 +73,7 @@ export class Simulation {\nthis.crafterStats.craftsmanship--;\nthis.reset();\n}\n- while (this.run(true).success) {\n+ while (this.run(true).hqPercent >= 100) {\nthis.crafterStats._control--;\nthis.reset();\n}\n@@ -196,26 +197,15 @@ export class Simulation {\n}\n}\n- private qualityPercentFromHqPercent(hqPercent: number): number {\n- return -5.6604E-6 * Math.pow(hqPercent, 4)\n- + 0.0015369705 * Math.pow(hqPercent, 3)\n- - 0.1426469573 * Math.pow(hqPercent, 2)\n- + 5.6122722959 * hqPercent - 5.5950384565;\n- }\n-\nprivate getHQPercent(): number {\nconst qualityPercent = Math.min(this.quality / this.recipe.quality, 1) * 100;\n- let hqPercent = 0;\nif (qualityPercent === 0) {\nreturn 1;\n} else if (qualityPercent >= 100) {\nreturn 100;\n} else {\n- while (this.qualityPercentFromHqPercent(hqPercent) < qualityPercent && hqPercent < 100) {\n- hqPercent += 1;\n- }\n+ return Tables.HQ_TABLE[Math.floor(qualityPercent)];\n}\n- return hqPercent;\n}\npublic hasBuff(buff: Buff): boolean {\n",
"new_path": "src/app/pages/simulator/simulation/simulation.ts",
"old_path": "src/app/pages/simulator/simulation/simulation.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat: control is now properly handled in min stats popup | 1 | feat | null |
217,922 | 02.06.2018 16:24:36 | -7,200 | 527f60c305f7053968f04a46e7d6b536de04a0fe | feat(simulator): rotation name is suffixed by "*" if there's some unsaved changes | [
{
"change_type": "MODIFY",
"diff": "</div>\n<div class=\"rotation-name\" *ngIf=\"rotation !== undefined\">\n{{rotation.getName()}}\n+ <span *ngIf=\"dirty\">*</span>\n<button mat-icon-button (click)=\"$event.preventDefault();editRotationName(rotation)\">\n<mat-icon>mode_edit</mat-icon>\n</button>\n",
"new_path": "src/app/pages/simulator/components/simulator/simulator.component.html",
"old_path": "src/app/pages/simulator/components/simulator/simulator.component.html"
},
{
"change_type": "MODIFY",
"diff": "@@ -530,6 +530,7 @@ export class SimulatorComponent implements OnInit, OnDestroy {\n).subscribe(name => {\nthis.rotation.name = name;\nthis.cd.detectChanges();\n+ this.markAsDirty();\n});\n}\n",
"new_path": "src/app/pages/simulator/components/simulator/simulator.component.ts",
"old_path": "src/app/pages/simulator/components/simulator/simulator.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat(simulator): rotation name is suffixed by "*" if there's some unsaved changes | 1 | feat | simulator |
217,922 | 02.06.2018 18:27:28 | -7,200 | 39a877a37c8ff522de10d2f1d31e2939cfbad4ae | fix: change email popup is now loading properly
closes | [
{
"change_type": "MODIFY",
"diff": "<form [formGroup]=\"form\" (submit)=\"changeEmail()\">\n<mat-form-field>\n- <input type=\"text\" required matInput placeholder=\"Current\" formControlName=\"currentEmail\">\n+ <input type=\"text\" required matInput placeholder=\"Current email\" formControlName=\"currentEmail\">\n<mat-error></mat-error>\n</mat-form-field>\n<mat-form-field>\n",
"new_path": "src/app/pages/profile/change-email-popup/change-email-popup.component.html",
"old_path": "src/app/pages/profile/change-email-popup/change-email-popup.component.html"
},
{
"change_type": "MODIFY",
"diff": "@@ -15,9 +15,9 @@ export class ChangeEmailPopupComponent {\nconstructor(private userService: UserService, fb: FormBuilder, private dialogRef: MatDialogRef<ChangeEmailPopupComponent>) {\nthis.form = fb.group({\n- currentEmail: ['', Validators.email, Validators.required],\n- password: ['', Validators.required],\n- newEmail: ['', Validators.email, Validators.required],\n+ currentEmail: ['', [Validators.email, Validators.required]],\n+ password: ['', [Validators.required]],\n+ newEmail: ['', [Validators.email, Validators.required]],\n});\n}\n",
"new_path": "src/app/pages/profile/change-email-popup/change-email-popup.component.ts",
"old_path": "src/app/pages/profile/change-email-popup/change-email-popup.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: change email popup is now loading properly
closes #387 | 1 | fix | null |
217,922 | 02.06.2018 18:55:45 | -7,200 | 21af5d67e7a9e320154919aa688ab93b49d472ee | feat(simulator): you can now change the current rotation inside simulator
closes | [
{
"change_type": "MODIFY",
"diff": "<mat-icon>format_list_numbered</mat-icon>\n</button>\n</div>\n+\n+<mat-menu #rotationsMenu=\"matMenu\">\n+ <button mat-menu-item *ngFor=\"let availableRotation of availableRotations$ | async\"\n+ (click)=\"useRotation(availableRotation)\">{{availableRotation.getName()}}\n+ </button>\n+</mat-menu>\n+\n<div class=\"rotation-name\" *ngIf=\"rotation !== undefined\">\n{{rotation.getName()}}\n<span *ngIf=\"dirty\">*</span>\n<button mat-icon-button (click)=\"$event.preventDefault();editRotationName(rotation)\">\n<mat-icon>mode_edit</mat-icon>\n</button>\n+ <button mat-icon-button [matMenuTriggerFor]=\"rotationsMenu\" matTooltip=\"{{'SIMULATOR.Change_rotation' | translate}}\"\n+ matTooltipPosition=\"above\">\n+ <mat-icon>swap_horiz</mat-icon>\n+ </button>\n</div>\n<mat-expansion-panel [expanded]=\"customMode\" #configPanel>\n<mat-expansion-panel-header>\n<h3>{{'SIMULATOR.CONFIGURATION.Consumables' | translate}}</h3>\n<div class=\"consumables-cols\">\n<div class=\"foods\">\n- <mat-select [(ngModel)]=\"_selectedFood\" placeholder=\"{{'SIMULATOR.CONFIGURATION.Food' | translate}}\">\n+ <mat-select [(ngModel)]=\"_selectedFood\"\n+ placeholder=\"{{'SIMULATOR.CONFIGURATION.Food' | translate}}\">\n<mat-option [value]=\"undefined\"></mat-option>\n<mat-option *ngFor=\"let food of foods\" [value]=\"food\">\n{{food.itemId | itemName | i18n}}\n",
"new_path": "src/app/pages/simulator/components/simulator/simulator.component.html",
"old_path": "src/app/pages/simulator/components/simulator/simulator.component.html"
},
{
"change_type": "MODIFY",
"diff": "@@ -37,6 +37,7 @@ import {debounceTime, filter, first, map, mergeMap, tap} from 'rxjs/operators';\nimport {CraftingJob} from '../../model/crafting-job.enum';\nimport {StepByStepReportPopupComponent} from '../step-by-step-report-popup/step-by-step-report-popup.component';\nimport {RotationNamePopupComponent} from '../rotation-name-popup/rotation-name-popup.component';\n+import {CraftingRotationService} from '../../../../core/database/crafting-rotation.service';\n@Component({\nselector: 'app-simulator',\n@@ -237,6 +238,8 @@ export class SimulatorComponent implements OnInit, OnDestroy {\n@Input()\npublic rotation: CraftingRotation;\n+ private availableRotations$: Observable<CraftingRotation[]>;\n+\nprivate consumablesSortFn = (a, b) => {\nconst aName = this.i18nTools.getName(this.localizedDataService.getItem(a.itemId));\nconst bName = this.i18nTools.getName(this.localizedDataService.getItem(b.itemId));\n@@ -254,7 +257,14 @@ export class SimulatorComponent implements OnInit, OnDestroy {\nprivate dataService: DataService, private htmlTools: HtmlToolsService, private dialog: MatDialog,\nprivate pendingChanges: PendingChangesService, private localizedDataService: LocalizedDataService,\nprivate translate: TranslateService, consumablesService: ConsumablesService, private i18nTools: I18nToolsService,\n- private snack: MatSnackBar, private cd: ChangeDetectorRef) {\n+ private snack: MatSnackBar, private cd: ChangeDetectorRef, rotationsService: CraftingRotationService) {\n+\n+ this.availableRotations$ = this.userService.getUserData()\n+ .pipe(\n+ mergeMap(user => {\n+ return rotationsService.getUserRotations(user.$key);\n+ })\n+ );\nthis.foods = consumablesService.fromData(foods)\n.sort(this.consumablesSortFn);\n@@ -331,6 +341,13 @@ export class SimulatorComponent implements OnInit, OnDestroy {\n);\n}\n+ useRotation(rotation: CraftingRotation): void {\n+ this.rotation = rotation;\n+ this.authorId = rotation.authorId;\n+ this.actions = this.registry.deserializeRotation(rotation.rotation);\n+ this.canSave = this.userData.$key === rotation.authorId;\n+ }\n+\nprivate populateMissingSets(sets: GearSet[]): GearSet[] {\n// Get missing sets and concat to the input array, then return the result.\nreturn this.defaultGearSets.filter(row => sets.find(set => row.jobId === set.jobId) === undefined)\n",
"new_path": "src/app/pages/simulator/components/simulator/simulator.component.ts",
"old_path": "src/app/pages/simulator/components/simulator/simulator.component.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -24,7 +24,7 @@ import {\nMatExpansionModule,\nMatIconModule,\nMatInputModule,\n- MatListModule,\n+ MatListModule, MatMenuModule,\nMatProgressBarModule,\nMatProgressSpinnerModule,\nMatSelectModule,\n@@ -99,6 +99,7 @@ const routes: Routes = [\nMatDialogModule,\nMatSnackBarModule,\nMatTableModule,\n+ MatMenuModule,\nClipboardModule,\n",
"new_path": "src/app/pages/simulator/simulator.module.ts",
"old_path": "src/app/pages/simulator/simulator.module.ts"
},
{
"change_type": "MODIFY",
"diff": "\"Step_by_step_report\": \"Step by step report\",\n\"Save_as_new\": \"Save as new (navigates to the newly created rotation)\",\n\"Save_as_new_done\": \"You're now on a copy of your rotation\",\n+ \"Change_rotation\": \"Change rotation\",\n\"CUSTOM\": {\n\"Recipe_configuration\": \"Recipe configuration\",\n\"Recipe_level\": \"Recipe level\",\n",
"new_path": "src/assets/i18n/en.json",
"old_path": "src/assets/i18n/en.json"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat(simulator): you can now change the current rotation inside simulator
closes #389 | 1 | feat | simulator |
217,922 | 02.06.2018 18:58:49 | -7,200 | 5e1f341c58c7ed80485557e8e075f7200052c789 | chore: small race condition issue fix | [
{
"change_type": "MODIFY",
"diff": "<button mat-mini-fab\nmatTooltip=\"{{'SIMULATOR.Save_as_new' | translate}}\"\nmatTooltipPosition=\"{{isMobile()?'below':'right'}}\"\n- *ngIf=\"(actions$ | async).length > 0 && authorId === userData.$key\" (click)=\"save(true)\">\n+ *ngIf=\"(actions$ | async).length > 0 && authorId === userData?.$key\" (click)=\"save(true)\">\n<mat-icon>content_copy</mat-icon>\n</button>\n<button mat-mini-fab\n",
"new_path": "src/app/pages/simulator/components/simulator/simulator.component.html",
"old_path": "src/app/pages/simulator/components/simulator/simulator.component.html"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | chore: small race condition issue fix | 1 | chore | null |
217,922 | 02.06.2018 19:03:08 | -7,200 | fb765dde114e85bee1625d991c7183776e7998e3 | fix: navigation map no longer takes completed items into account | [
{
"change_type": "MODIFY",
"diff": "@@ -150,7 +150,7 @@ export class ListDetailsPanelComponent implements OnChanges, OnInit {\nconst data: { mapId: number, points: NavigationObjective[] } = {\nmapId: zoneBreakdownRow.zoneId,\npoints: <NavigationObjective[]>zoneBreakdownRow.items\n- .filter(item => item.done <= item.amount_needed)\n+ .filter(item => item.done <= item.amount)\n.map(item => {\nconst coords = this.getCoords(item, zoneBreakdownRow);\nif (coords !== undefined) {\n",
"new_path": "src/app/pages/list/list-details-panel/list-details-panel.component.ts",
"old_path": "src/app/pages/list/list-details-panel/list-details-panel.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: navigation map no longer takes completed items into account | 1 | fix | null |
217,922 | 02.06.2018 19:24:22 | -7,200 | 6048ef01d3e081c82320965edf9843075ef2a6a6 | feat: added the icon of the item in alarms overlay view | [
{
"change_type": "MODIFY",
"diff": "'primary-background': alarmService.isAlarmSpawned(alarm, time),\n'accent-background': alarmService.isAlerted(alarm.itemId) | async\n}\">\n- <img mat-list-avatar [appXivdbTooltip]=\"alarm.itemId\" [src]=\"alarm.icon | icon\" alt=\"\" *ngIf=\"!overlay\">\n+ <img mat-list-avatar [appXivdbTooltip]=\"alarm.itemId\" [src]=\"alarm.icon | icon\" alt=\"\">\n<span matLine>{{alarm.itemId | itemName | i18n}} <span *ngIf=\"alarm.slot\">({{alarm.slot}})</span></span>\n<i matLine>{{alarm.zoneId | placeName | i18n}} </i>\n<span class=\"coords\" matLine *ngIf=\"compact || overlay\">X: {{alarm.coords[0]}} - Y: {{alarm.coords[1]}}</span>\n",
"new_path": "src/app/pages/alarms/alarms/alarms.component.html",
"old_path": "src/app/pages/alarms/alarms/alarms.component.html"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat: added the icon of the item in alarms overlay view | 1 | feat | null |
217,922 | 02.06.2018 20:24:13 | -7,200 | 1c5501890747051d34a6a7d833bef2a8142d092b | fix: completion dialog is no longer shown for public lists | [
{
"change_type": "MODIFY",
"diff": "@@ -365,7 +365,7 @@ export class ListDetailsComponent extends ComponentWithSubscriptions implements\nthis.listService.remove(list.$key).pipe(first()).subscribe(() => {\nthis.router.navigate(['recipes']);\n});\n- } else if (l.isComplete()) {\n+ } else if (l.isComplete() && !l.public) {\nthis.onCompletion(list);\n}\n})\n",
"new_path": "src/app/pages/list/list-details/list-details.component.ts",
"old_path": "src/app/pages/list/list-details/list-details.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: completion dialog is no longer shown for public lists | 1 | fix | null |
217,922 | 03.06.2018 13:01:02 | -7,200 | 1017091104ca6c917a1a6d9a400a3db7aa1ed255 | feat: you can now organize alarms on groups, mute them by group and reorder using drag & drop
closes | [
{
"change_type": "MODIFY",
"diff": "import {Injectable} from '@angular/core';\nimport {EorzeanTimeService} from './eorzean-time.service';\nimport {Alarm} from './alarm';\n-import {Observable, Subscription} from 'rxjs';\n+import {Observable, of, Subscription} from 'rxjs';\nimport {ListRow} from '../../model/list/list-row';\nimport {SettingsService} from '../../pages/settings/settings.service';\nimport {MatDialog, MatSnackBar} from '@angular/material';\n@@ -168,6 +168,12 @@ export class AlarmService {\nreturn ['Rocky Outcropping', 'Mineral Deposit', 'Mature Tree', 'Lush Vegetation'].indexOf(node.type);\n}\n+ public setAlarmGroupName(alarm: Alarm, groupName: string): void {\n+ this.alarms.filter(a => a.itemId === alarm.itemId)\n+ .forEach(a => a.groupName = groupName);\n+ this.persistAlarms();\n+ }\n+\n/**\n* Plays the alarm (audio + snack).\n* @param {Alarm} alarm\n@@ -176,6 +182,15 @@ export class AlarmService {\nif (this.settings.alarmsMuted) {\nreturn;\n}\n+ this.userService.getUserData()\n+ .pipe(\n+ first(),\n+ mergeMap(user => {\n+ const alarmGroup = user.alarmGroups.find(group => group.name === alarm.groupName);\n+ // If the group of this alarm is disabled, don't play the alarm.\n+ if (alarmGroup !== undefined && !alarmGroup.enabled) {\n+ return of(null);\n+ }\nconst lastPlayed = localStorage.getItem('alarms:' + alarm.itemId);\n// Don't play the alarm if it was played less than a minute ago\nif (lastPlayed === null || Date.now() - +lastPlayed > 60000) {\n@@ -184,7 +199,15 @@ export class AlarmService {\nthis.translator.instant('ALARM.See_on_map'),\n{duration: 5000})\n.onAction().subscribe(() => {\n- this.dialog.open(MapPopupComponent, {data: {coords: {x: alarm.coords[0], y: alarm.coords[1]}, id: alarm.zoneId}});\n+ this.dialog.open(MapPopupComponent, {\n+ data: {\n+ coords: {\n+ x: alarm.coords[0],\n+ y: alarm.coords[1]\n+ },\n+ id: alarm.zoneId\n+ }\n+ });\n});\nlet audio: HTMLAudioElement;\nif (this.settings.alarmSound.indexOf(':') === -1) {\n@@ -195,13 +218,14 @@ export class AlarmService {\naudio.loop = false;\naudio.volume = this.settings.alarmVolume;\naudio.play();\n- this.mapService.getMapById(alarm.zoneId).pipe(\n+ return this.mapService.getMapById(alarm.zoneId)\n+ .pipe(\nmap(mapData => this.mapService.getNearestAetheryte(mapData, {x: alarm.coords[0], y: alarm.coords[1]})),\nmap(aetheryte => this.i18nTools.getName(this.localizedData.getPlace(aetheryte.nameid))),\nmergeMap(closestAetheryteName => {\nconst notificationTitle = this.localizedData.getItem(alarm.itemId)[this.translator.currentLang];\n- const notificationBody = `${this.localizedData.getPlace(alarm.zoneId)[this.translator.currentLang]} - ` +\n- `${closestAetheryteName}` +\n+ const notificationBody = `${this.localizedData.getPlace(alarm.zoneId)[this.translator.currentLang]} - `\n+ + `${closestAetheryteName}` +\n(alarm.slot !== null ? ` - Slot ${alarm.slot}` : '');\nconst notificationIcon = `https://www.garlandtools.org/db/icons/item/${alarm.icon}.png`;\nif (this.platform.isDesktop()) {\n@@ -221,13 +245,16 @@ export class AlarmService {\n)\n}\n})\n+ )\n+ }\n+ return of(null);\n+ })\n).subscribe(() => {\n}, err => {\n// If there's an error, it means that we don't have permission, that's not a problem but we want to catch it.\n});\nlocalStorage.setItem('alarms:' + alarm.itemId, Date.now().toString());\n}\n- }\n/**\n* Return the amount of minutes before the next alarm of the item.\n",
"new_path": "src/app/core/time/alarm.service.ts",
"old_path": "src/app/core/time/alarm.service.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -19,4 +19,6 @@ export interface Alarm {\ntype: number;\naetheryte$?: Observable<Aetheryte>;\n+\n+ groupName?: string;\n}\n",
"new_path": "src/app/core/time/alarm.ts",
"old_path": "src/app/core/time/alarm.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -4,6 +4,7 @@ import {DeserializeAs} from '@kaiu/serializer';\nimport {Alarm} from '../../core/time/alarm';\nimport {ListDetailsFilters} from '../other/list-details-filters';\nimport {GearSet} from '../../pages/simulator/model/gear-set';\n+import {AlarmGroup} from '../other/alarm-group';\nexport class AppUser extends DataModel {\nname?: string;\n@@ -35,4 +36,6 @@ export class AppUser extends DataModel {\ngearSets: GearSet[] = [];\n// Contact ids\ncontacts: string[] = [];\n+ // Alarm groups for the user\n+ alarmGroups: AlarmGroup[] = [{name: 'Default group', enabled: true}];\n}\n",
"new_path": "src/app/model/list/app-user.ts",
"old_path": "src/app/model/list/app-user.ts"
},
{
"change_type": "ADD",
"diff": "+export interface AlarmGroup {\n+ name: string;\n+ enabled: boolean;\n+}\n",
"new_path": "src/app/model/other/alarm-group.ts",
"old_path": null
},
{
"change_type": "ADD",
"diff": "+<h2 mat-dialog-title>{{'ALARMS.New_group' | translate}}</h2>\n+<div mat-dialog-content>\n+ <form (submit)=\"submit()\">\n+ <mat-form-field>\n+ <input matInput type=\"text\" [formControl]=\"form\" required>\n+ <mat-error *ngIf=\"form.hasError('required')\">\n+ {{'Please_enter_a_name' | translate}}\n+ </mat-error>\n+ </mat-form-field>\n+ <button mat-raised-button type=\"submit\" color=\"accent\">{{'Confirm' | translate}}</button>\n+ </form>\n+</div>\n",
"new_path": "src/app/modules/common-components/alarm-group-name-popup/alarm-group-name-popup.component.html",
"old_path": null
},
{
"change_type": "ADD",
"diff": "",
"new_path": "src/app/modules/common-components/alarm-group-name-popup/alarm-group-name-popup.component.scss",
"old_path": "src/app/modules/common-components/alarm-group-name-popup/alarm-group-name-popup.component.scss"
},
{
"change_type": "ADD",
"diff": "+import {Component, Inject} from '@angular/core';\n+import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material';\n+import {FormControl, Validators} from '@angular/forms';\n+\n+@Component({\n+ selector: 'app-alarm-group-name-popup',\n+ templateUrl: './alarm-group-name-popup.component.html',\n+ styleUrls: ['./alarm-group-name-popup.component.scss']\n+})\n+export class AlarmGroupNamePopupComponent {\n+\n+\n+ public form: FormControl;\n+\n+ constructor(private ref: MatDialogRef<AlarmGroupNamePopupComponent>, @Inject(MAT_DIALOG_DATA) private name: string) {\n+ this.form = new FormControl(name || '', Validators.required);\n+ }\n+\n+ submit() {\n+ if (this.form.valid) {\n+ this.ref.close(this.form.value);\n+ }\n+ }\n+}\n",
"new_path": "src/app/modules/common-components/alarm-group-name-popup/alarm-group-name-popup.component.ts",
"old_path": null
},
{
"change_type": "MODIFY",
"diff": "@@ -39,6 +39,7 @@ import { PermissionsPopupComponent } from './permissions-popup/permissions-popup\nimport { PermissionsRowComponent } from './permissions-popup/permissions-row/permissions-row.component';\nimport { AddNewRowPopupComponent } from './permissions-popup/add-new-row-popup/add-new-row-popup.component';\nimport { FcCrestComponent } from './fc-crest/fc-crest.component';\n+import { AlarmGroupNamePopupComponent } from './alarm-group-name-popup/alarm-group-name-popup.component';\n@NgModule({\nimports: [\n@@ -89,6 +90,7 @@ import { FcCrestComponent } from './fc-crest/fc-crest.component';\nPermissionsRowComponent,\nAddNewRowPopupComponent,\nFcCrestComponent,\n+ AlarmGroupNamePopupComponent,\n],\nexports: [\nRandomGifComponent,\n@@ -116,6 +118,7 @@ import { FcCrestComponent } from './fc-crest/fc-crest.component';\nAnnouncementPopupComponent,\nPermissionsPopupComponent,\nAddNewRowPopupComponent,\n+ AlarmGroupNamePopupComponent,\n]\n})\nexport class CommonComponentsModule {\n",
"new_path": "src/app/modules/common-components/common-components.module.ts",
"old_path": "src/app/modules/common-components/common-components.module.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -5,14 +5,15 @@ import {CoreModule} from '../../core/core.module';\nimport {RouterModule, Routes} from '@angular/router';\nimport {AlarmCardComponent} from './alarm-card/alarm-card.component';\nimport {\n- MatButtonModule,\n+ MatButtonModule, MatButtonToggleModule,\nMatCardModule,\nMatCheckboxModule,\n- MatDialogModule,\n+ MatDialogModule, MatExpansionModule,\nMatGridListModule,\nMatIconModule,\nMatInputModule,\n- MatListModule\n+ MatListModule,\n+ MatTooltipModule\n} from '@angular/material';\nimport {TranslateModule} from '@ngx-translate/core';\nimport {PipesModule} from '../../pipes/pipes.module';\n@@ -23,6 +24,7 @@ import {FormsModule} from '@angular/forms';\nimport {TooltipModule} from '../../modules/tooltip/tooltip.module';\nimport {ListModule} from '../list/list.module';\nimport {MapModule} from '../../modules/map/map.module';\n+import {NgDragDropModule} from 'ng-drag-drop';\nconst routes: Routes = [{\npath: 'alarms',\n@@ -47,8 +49,12 @@ const routes: Routes = [{\nMatInputModule,\nMatListModule,\nMatCheckboxModule,\n+ MatTooltipModule,\n+ MatExpansionModule,\n+ MatButtonToggleModule,\nMapModule,\n+ NgDragDropModule,\nCoreModule,\nCommonComponentsModule,\n",
"new_path": "src/app/pages/alarms/alarms.module.ts",
"old_path": "src/app/pages/alarms/alarms.module.ts"
},
{
"change_type": "MODIFY",
"diff": "<div class=\"buttons\" *ngIf=\"!overlay\">\n<mat-checkbox [(ngModel)]=\"muted\" (change)=\"saveMuted()\">{{\"Mute_alarms\" | translate}}</mat-checkbox>\n<mat-checkbox [(ngModel)]=\"compact\" (change)=\"saveCompact()\">{{\"Compact_display\" | translate}}</mat-checkbox>\n+ <button mat-mini-fab (click)=\"addGroup()\" matTooltip=\"{{'ALARMS.New_group' | translate}}\">\n+ <mat-icon>create_new_folder</mat-icon>\n+ </button>\n<button mat-mini-fab (click)=\"openAddAlarmPopup()\">\n<mat-icon>add_alert</mat-icon>\n</button>\n<mat-icon>screen_share</mat-icon>\n</button>\n</div>\n-<div *ngIf=\"(getAlarms() | async)?.length === 0\"><h4 class=\"no-alarm\">{{'ALARMS.No_alarm' | translate}}</h4></div>\n-<mat-grid-list cols=\"{{getCols()}}\" rowHeight=\"3:4\" class=\"grid\" *ngIf=\"!compact && !overlay\">\n- <mat-grid-tile *ngFor=\"let alarm of getAlarms() | async\">\n- <app-alarm-card [alarm]=\"alarm\"\n- [compact]=\"compact\"\n+<div *ngIf=\"(alarmGroups$ | async)?.length === 0\"><h4 class=\"no-alarm\">{{'ALARMS.No_alarm' | translate}}</h4></div>\n+\n+<div *ngIf=\"!compact && !overlay\">\n+ <div class=\"drop-zone group-zone\" (onDrop)=\"setGroupIndex($event.dragData, 0)\" droppable [dropScope]=\"'group'\">\n+ <div class=\"drop-overlay accent-background\">\n+ <mat-icon>save_alt</mat-icon>\n+ </div>\n+ </div>\n+ <div *ngFor=\"let group of alarmGroups$ | async; trackBy: trackByGroupFn; let i = index\">\n+ <mat-expansion-panel class=\"alarm-group\"\n+ [dragScope]=\"'group'\"\n+ [dragData]=\"group\"\n+ draggable\n+ expanded=\"{{group.enabled}}\" [class.disabled]=\"!group.enabled\">\n+ <mat-expansion-panel-header>\n+ <mat-panel-title>\n+ {{group.groupName}}\n+ <button mat-icon-button (click)=\"renameGroup(group)\"\n+ [disabled]=\"group.groupName === 'Default group'\">\n+ <mat-icon>edit</mat-icon>\n+ </button>\n+ <mat-button-toggle [checked]=\"!group.enabled\" (click)=\"$event.stopPropagation();\"\n+ (change)=\"toggleGroupEnabled(group.groupName)\">\n+ <mat-icon>alarm_off</mat-icon>\n+ </mat-button-toggle>\n+ </mat-panel-title>\n+ <button mat-icon-button color=\"warn\" [disabled]=\"group.groupName === 'Default group'\"\n+ (click)=\"$event.stopPropagation();deleteGroup(group.groupName)\">\n+ <mat-icon>delete</mat-icon>\n+ </button>\n+ </mat-expansion-panel-header>\n+ <div class=\"drop-zone\" droppable (onDrop)=\"onGroupDrop(group, $event.dragData)\" [dropScope]=\"'alarm'\">\n+ <div class=\"drop-overlay accent-background\">\n+ <mat-icon>save_alt</mat-icon>\n+ </div>\n+ <mat-grid-list cols=\"{{getCols()}}\" rowHeight=\"3:4\" class=\"grid\">\n+ <mat-grid-tile *ngFor=\"let alarm of group.alarms\">\n+ <app-alarm-card draggable\n+ [dragScope]=\"'alarm'\"\n+ [dragData]=\"alarm\"\n+ [alarm]=\"alarm\"\n[alerted]=\"alarmService.isAlerted(alarm.itemId) | async\"\n[spawned]=\"alarmService.isAlarmSpawned(alarm, time)\"\n[timer]=\"alarmService.getAlarmTimerString(alarm, time)\"\n(delete)=\"deleteAlarm(alarm)\"></app-alarm-card>\n</mat-grid-tile>\n</mat-grid-list>\n-<mat-list *ngIf=\"compact || overlay\" dense [class.overlay]=\"overlay\">\n- <mat-list-item *ngFor=\"let alarm of getAlarms() | async\"\n+ </div>\n+ </mat-expansion-panel>\n+ <div class=\"drop-zone group-zone\" (onDrop)=\"setGroupIndex($event.dragData, i+1)\" droppable\n+ [dropScope]=\"'group'\">\n+ <div class=\"drop-overlay accent-background\">\n+ <mat-icon>save_alt</mat-icon>\n+ </div>\n+ </div>\n+ </div>\n+</div>\n+\n+<div *ngIf=\"compact && !overlay\">\n+ <div class=\"drop-zone group-zone\" (onDrop)=\"setGroupIndex($event.dragData, 0)\" droppable [dropScope]=\"'group'\">\n+ <div class=\"drop-overlay accent-background\">\n+ <mat-icon>save_alt</mat-icon>\n+ </div>\n+ </div>\n+ <div *ngFor=\"let group of alarmGroups$ | async; trackBy: trackByGroupFn; let i = index\">\n+ <mat-expansion-panel class=\"alarm-group\"\n+ [dragScope]=\"'group'\"\n+ [dragData]=\"group\"\n+ draggable\n+ expanded=\"{{group.enabled}}\" [class.disabled]=\"!group.enabled\">\n+ <mat-expansion-panel-header>\n+ <mat-panel-title>\n+ {{group.groupName}}\n+ <button mat-icon-button (click)=\"renameGroup(group)\"\n+ [disabled]=\"group.groupName === 'Default group'\">\n+ <mat-icon>edit</mat-icon>\n+ </button>\n+ <mat-button-toggle [checked]=\"!group.enabled\" (click)=\"$event.stopPropagation();\"\n+ (change)=\"toggleGroupEnabled(group.groupName)\">\n+ <mat-icon>alarm_off</mat-icon>\n+ </mat-button-toggle>\n+ </mat-panel-title>\n+ <button mat-icon-button color=\"warn\" [disabled]=\"group.groupName === 'Default group'\"\n+ (click)=\"$event.stopPropagation();deleteGroup(group.groupName)\">\n+ <mat-icon>delete</mat-icon>\n+ </button>\n+ </mat-expansion-panel-header>\n+ <div class=\"drop-zone\" droppable (onDrop)=\"onGroupDrop(group, $event.dragData)\" [dropScope]=\"'alarm'\">\n+ <div class=\"drop-overlay accent-background\">\n+ <mat-icon>save_alt</mat-icon>\n+ </div>\n+ <mat-list dense>\n+ <mat-list-item *ngFor=\"let alarm of group.alarms\"\n+ draggable\n+ [dragData]=\"alarm\"\nclass=\"compact-alarm\"\n+ [dragScope]=\"'alarm'\"\n+ [ngClass]=\"{\n+ 'mat-elevation-z2': alarmService.isAlerted(alarm.itemId) | async,\n+ 'mat-elevation-z8': alarmService.isAlarmSpawned(alarm, time),\n+ 'primary-background': alarmService.isAlarmSpawned(alarm, time),\n+ 'accent-background': alarmService.isAlerted(alarm.itemId) | async\n+ }\">\n+ <img mat-list-avatar [appXivdbTooltip]=\"alarm.itemId\" [src]=\"alarm.icon | icon\" alt=\"\">\n+ <span matLine>{{alarm.itemId | itemName | i18n}} <span\n+ *ngIf=\"alarm.slot\">({{alarm.slot}})</span></span>\n+ <i matLine>{{alarm.zoneId | placeName | i18n}} </i>\n+ <span class=\"coords\" matLine\n+ *ngIf=\"compact || overlay\">X: {{alarm.coords[0]}} - Y: {{alarm.coords[1]}}</span>\n+ <app-map-position *ngIf=\"!overlay\"\n+ [zoneId]=\"alarm.zoneId\"\n+ class=\"map-marker\"\n+ [marker]=\"{x:alarm.coords[0], y:alarm.coords[1]}\"></app-map-position>\n+ <div>\n+ <span matLine\n+ *ngIf=\"alarm.aetheryte$\">{{(alarm.aetheryte$ | async)?.nameid | placeName | i18n}}</span>\n+ <span matLine class=\"compact-timer\">{{alarmService.getAlarmTimerString(alarm, time)}}</span>\n+ </div>\n+ <button mat-icon-button (click)=\"deleteAlarm(alarm)\" color=\"warn\" *ngIf=\"!overlay\">\n+ <mat-icon>delete</mat-icon>\n+ </button>\n+ </mat-list-item>\n+ </mat-list>\n+ </div>\n+ </mat-expansion-panel>\n+ <div class=\"drop-zone group-zone\" (onDrop)=\"setGroupIndex($event.dragData, i+1)\" droppable\n+ [dropScope]=\"'group'\">\n+ <div class=\"drop-overlay accent-background\">\n+ <mat-icon>save_alt</mat-icon>\n+ </div>\n+ </div>\n+ </div>\n+</div>\n+\n+<div *ngIf=\"overlay\">\n+ <mat-list dense class=\"overlay\">\n+ <mat-list-item *ngFor=\"let alarm of overlayAlarms$ | async; trackBy: trackByAlarmFn\"\n[ngClass]=\"{\n'mat-elevation-z2': alarmService.isAlerted(alarm.itemId) | async,\n'mat-elevation-z8': alarmService.isAlarmSpawned(alarm, time),\n'accent-background': alarmService.isAlerted(alarm.itemId) | async\n}\">\n<img mat-list-avatar [appXivdbTooltip]=\"alarm.itemId\" [src]=\"alarm.icon | icon\" alt=\"\">\n- <span matLine>{{alarm.itemId | itemName | i18n}} <span *ngIf=\"alarm.slot\">({{alarm.slot}})</span></span>\n+ <span matLine>{{alarm.itemId | itemName | i18n}} <span\n+ *ngIf=\"alarm.slot\">({{alarm.slot}})</span></span>\n<i matLine>{{alarm.zoneId | placeName | i18n}} </i>\n- <span class=\"coords\" matLine *ngIf=\"compact || overlay\">X: {{alarm.coords[0]}} - Y: {{alarm.coords[1]}}</span>\n+ <span class=\"coords\" matLine\n+ *ngIf=\"compact || overlay\">X: {{alarm.coords[0]}} - Y: {{alarm.coords[1]}}</span>\n<app-map-position *ngIf=\"!overlay\"\n[zoneId]=\"alarm.zoneId\"\nclass=\"map-marker\"\n[marker]=\"{x:alarm.coords[0], y:alarm.coords[1]}\"></app-map-position>\n<div>\n- <span matLine *ngIf=\"alarm.aetheryte$\">{{(alarm.aetheryte$ | async)?.nameid | placeName | i18n}}</span>\n+ <span matLine\n+ *ngIf=\"alarm.aetheryte$\">{{(alarm.aetheryte$ | async)?.nameid | placeName | i18n}}</span>\n<span matLine class=\"compact-timer\">{{alarmService.getAlarmTimerString(alarm, time)}}</span>\n</div>\n<button mat-icon-button (click)=\"deleteAlarm(alarm)\" color=\"warn\" *ngIf=\"!overlay\">\n</button>\n</mat-list-item>\n</mat-list>\n+</div>\n",
"new_path": "src/app/pages/alarms/alarms/alarms.component.html",
"old_path": "src/app/pages/alarms/alarms/alarms.component.html"
},
{
"change_type": "MODIFY",
"diff": "}\n}\n+mat-panel-title {\n+ display: flex;\n+ align-items: center;\n+ mat-button-toggle {\n+ margin-left: 15px;\n+ }\n+}\n+\n+.drag-hint-border {\n+ border: 2px dashed;\n+}\n+\n+mat-expansion-panel.disabled {\n+ opacity: .5;\n+}\n+\n+.drop-zone {\n+ min-height: 50px;\n+ position: relative;\n+ .drop-overlay {\n+ position: absolute;\n+ top: 0;\n+ left: 0;\n+ width: 100%;\n+ height: 100%;\n+ display: flex;\n+ align-items: center;\n+ justify-content: center;\n+ visibility: hidden;\n+ opacity: .6;\n+ .mat-icon {\n+ font-size: 45px;\n+ height: 45px;\n+ width: 45px;\n+ }\n+ }\n+ &.drag-over-border {\n+ .drop-overlay {\n+ visibility: visible;\n+ }\n+ }\n+}\n+\n.compact-timer {\ntext-align: right;\n}\n",
"new_path": "src/app/pages/alarms/alarms/alarms.component.scss",
"old_path": "src/app/pages/alarms/alarms/alarms.component.scss"
},
{
"change_type": "MODIFY",
"diff": "import {Component} from '@angular/core';\nimport {AlarmService} from '../../../core/time/alarm.service';\nimport {Alarm} from '../../../core/time/alarm';\n-import {BehaviorSubject, Observable} from 'rxjs';\n+import {BehaviorSubject, combineLatest, Observable} from 'rxjs';\nimport {EorzeanTimeService} from '../../../core/time/eorzean-time.service';\nimport {MatDialog} from '@angular/material';\nimport {AddAlarmPopupComponent} from '../add-alarm-popup/add-alarm-popup.component';\nimport {TimerOptionsPopupComponent} from '../../list/timer-options-popup/timer-options-popup.component';\nimport {SettingsService} from '../../settings/settings.service';\nimport {ObservableMedia} from '@angular/flex-layout';\n-import {filter, map, switchMap, tap} from 'rxjs/operators';\n+import {filter, first, map, mergeMap, switchMap, tap} from 'rxjs/operators';\nimport {IpcService} from '../../../core/electron/ipc.service';\nimport {PlatformService} from '../../../core/tools/platform.service';\nimport {ActivatedRoute} from '@angular/router';\n+import {UserService} from '../../../core/database/user.service';\n+import {AlarmGroupNamePopupComponent} from '../../../modules/common-components/alarm-group-name-popup/alarm-group-name-popup.component';\n+import {ConfirmationPopupComponent} from '../../../modules/common-components/confirmation-popup/confirmation-popup.component';\n@Component({\nselector: 'app-alarms',\n@@ -32,17 +35,26 @@ export class AlarmsComponent {\noverlay = false;\n+ alarmGroups$: Observable<{ groupName: string, alarms: Alarm[] }[]>;\n+\n+ overlayAlarms$: Observable<Alarm[]>;\n+\nconstructor(public alarmService: AlarmService, public etime: EorzeanTimeService, private dialog: MatDialog,\nprivate settings: SettingsService, private media: ObservableMedia, private platformService: PlatformService,\n- private ipc: IpcService, private route: ActivatedRoute) {\n+ private ipc: IpcService, private route: ActivatedRoute, private userService: UserService) {\nthis.desktop = platformService.isDesktop();\nroute.queryParams.subscribe(params => {\nthis.overlay = params.overlay === 'true';\n- })\n- }\n+ });\n+\n+ const timer$ = this.reloader.pipe(\n+ switchMap(() => this.etime.getEorzeanTime()),\n+ tap(time => this.time = time)\n+ );\n+\n+ const user$ = this.userService.getUserData();\n- public getAlarms(): Observable<Alarm[]> {\n- return this.reloader.pipe(\n+ this.overlayAlarms$ = this.reloader.pipe(\nswitchMap(() => this.etime.getEorzeanTime()),\ntap(time => this.time = time),\nmap(time => {\n@@ -63,7 +75,161 @@ export class AlarmsComponent {\n}\nreturn this.alarmService.getMinutesBefore(time, a.spawn) < this.alarmService.getMinutesBefore(time, b.spawn) ? -1 : 1;\n});\n- }));\n+ })\n+ );\n+\n+ this.alarmGroups$ = combineLatest(timer$, user$)\n+ .pipe(\n+ map(data => {\n+ const time = data[0];\n+ const user = data[1];\n+ const result = user.alarmGroups.map(group => {\n+ return {groupName: group.name, enabled: group.enabled, alarms: []};\n+ });\n+ const alarms: Alarm[] = [];\n+ this.alarmService.alarms.forEach(alarm => {\n+ if (alarms.find(a => a.itemId === alarm.itemId) !== undefined) {\n+ return;\n+ }\n+ const itemAlarms = this.alarmService.alarms.filter(a => a.itemId === alarm.itemId);\n+ alarms.push(this.alarmService.closestAlarm(itemAlarms, time));\n+ });\n+ alarms.forEach(alarm => {\n+ const group = result.find(row => row.groupName === alarm.groupName);\n+ if (alarm.groupName === undefined || group === undefined) {\n+ const defaultGroup = result.find(row => row.groupName === 'Default group');\n+ defaultGroup.alarms.push(alarm);\n+ } else {\n+ group.alarms.push(alarm);\n+ }\n+ });\n+ result.forEach(group => {\n+ group.alarms = group.alarms.sort((a, b) => {\n+ if (this.alarmService.isAlarmSpawned(a, time)) {\n+ return -1;\n+ }\n+ if (this.alarmService.isAlarmSpawned(b, time)) {\n+ return 1;\n+ }\n+ return this.alarmService.getMinutesBefore(time, a.spawn) < this.alarmService.getMinutesBefore(time, b.spawn)\n+ ? -1 : 1;\n+ });\n+ });\n+ return result;\n+ })\n+ )\n+ }\n+\n+ setGroupIndex(groupData: any, index: number): void {\n+ this.userService.getUserData()\n+ .pipe(\n+ first(),\n+ map(user => {\n+ user.alarmGroups = user.alarmGroups.filter(group => group.name !== groupData.groupName);\n+ user.alarmGroups.splice(index, 0, {name: groupData.groupName, enabled: groupData.enabled});\n+ return user;\n+ }),\n+ mergeMap(user => {\n+ return this.userService.set(user.$key, user);\n+ })\n+ ).subscribe()\n+ }\n+\n+ onGroupDrop(group: any, alarm: Alarm): void {\n+ this.alarmService.setAlarmGroupName(alarm, group.groupName);\n+ }\n+\n+ renameGroup(group: any): void {\n+ this.dialog.open(AlarmGroupNamePopupComponent, {data: group.groupName})\n+ .afterClosed()\n+ .pipe(\n+ filter(name => name !== '' && name !== undefined && name !== null && name !== 'Default group'),\n+ mergeMap(groupName => {\n+ return this.userService.getUserData()\n+ .pipe(\n+ first(),\n+ map(user => {\n+ const userGroup = user.alarmGroups.find(g => g.name === group.groupName);\n+ userGroup.name = groupName;\n+ group.alarms.forEach(alarm => {\n+ this.alarmService.setAlarmGroupName(alarm, groupName);\n+ });\n+ return user;\n+ }),\n+ mergeMap(user => {\n+ return this.userService.set(user.$key, user);\n+ })\n+ )\n+ })\n+ )\n+ .subscribe();\n+ }\n+\n+ trackByGroupFn(index: number, group: any): string {\n+ return group.groupName;\n+ }\n+\n+ trackByAlarmFn(index: number, alarm: Alarm): number {\n+ return alarm.itemId;\n+ }\n+\n+ addGroup(): void {\n+ this.dialog.open(AlarmGroupNamePopupComponent)\n+ .afterClosed()\n+ .pipe(\n+ filter(name => name !== '' && name !== undefined && name !== null && name !== 'Default group'),\n+ mergeMap(groupName => {\n+ return this.userService.getUserData()\n+ .pipe(\n+ first(),\n+ map(user => {\n+ if (user.alarmGroups.find(group => group.name === groupName) === undefined) {\n+ user.alarmGroups.push({name: groupName, enabled: true});\n+ }\n+ return user;\n+ }),\n+ mergeMap(user => {\n+ return this.userService.set(user.$key, user);\n+ })\n+ )\n+ })\n+ ).subscribe();\n+ }\n+\n+ toggleGroupEnabled(groupName: string): void {\n+ this.userService.getUserData()\n+ .pipe(\n+ first(),\n+ map(user => {\n+ const group = user.alarmGroups.find(g => g.name === groupName);\n+ group.enabled = !group.enabled;\n+ return user;\n+ }),\n+ mergeMap(user => {\n+ return this.userService.set(user.$key, user);\n+ })\n+ ).subscribe()\n+ }\n+\n+ deleteGroup(groupName: string): void {\n+ this.dialog.open(ConfirmationPopupComponent)\n+ .afterClosed()\n+ .pipe(\n+ filter(res => res),\n+ mergeMap(() => {\n+ return this.userService.getUserData()\n+ .pipe(\n+ first(),\n+ map(user => {\n+ user.alarmGroups = user.alarmGroups.filter(group => group.name !== groupName);\n+ return user;\n+ }),\n+ mergeMap(user => {\n+ return this.userService.set(user.$key, user);\n+ })\n+ )\n+ })\n+ ).subscribe();\n}\nsaveCompact(): void {\n@@ -113,10 +279,6 @@ export class AlarmsComponent {\nthis.ipc.send('overlay', '/alarms');\n}\n- closeOverlay(): void {\n- window.close();\n- }\n-\ngetCols(): number {\nif (this.media.isActive('xs') || this.media.isActive('sm')) {\nreturn 1;\n",
"new_path": "src/app/pages/alarms/alarms/alarms.component.ts",
"old_path": "src/app/pages/alarms/alarms/alarms.component.ts"
},
{
"change_type": "MODIFY",
"diff": "\"Add_alarm\": \"Add alarm\",\n\"Alarm_created\": \"Alarm created\",\n\"Alarm_already_created\": \"Alarm already set\",\n- \"Custom_sound\": \"Custom alarm sound\"\n+ \"Custom_sound\": \"Custom alarm sound\",\n+ \"New_group\": \"New alarm group\"\n},\n\"Item_name\": \"Item name\",\n\"No_items_found\": \"No item found\",\n",
"new_path": "src/assets/i18n/en.json",
"old_path": "src/assets/i18n/en.json"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat: you can now organize alarms on groups, mute them by group and reorder using drag & drop
closes #366 | 1 | feat | null |
217,922 | 03.06.2018 13:05:03 | -7,200 | bf351108a3d08ddf0ba9b672bab4bc439147eb9c | chore: forgot to stop propagation of rename click event | [
{
"change_type": "MODIFY",
"diff": "<mat-expansion-panel-header>\n<mat-panel-title>\n{{group.groupName}}\n- <button mat-icon-button (click)=\"renameGroup(group)\"\n+ <button mat-icon-button (click)=\"$event.stopPropagation();renameGroup(group)\"\n[disabled]=\"group.groupName === 'Default group'\">\n<mat-icon>edit</mat-icon>\n</button>\n<mat-expansion-panel-header>\n<mat-panel-title>\n{{group.groupName}}\n- <button mat-icon-button (click)=\"renameGroup(group)\"\n+ <button mat-icon-button (click)=\"$event.stopPropagation();renameGroup(group)\"\n[disabled]=\"group.groupName === 'Default group'\">\n<mat-icon>edit</mat-icon>\n</button>\n",
"new_path": "src/app/pages/alarms/alarms/alarms.component.html",
"old_path": "src/app/pages/alarms/alarms/alarms.component.html"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | chore: forgot to stop propagation of rename click event | 1 | chore | null |
217,922 | 03.06.2018 13:38:05 | -7,200 | f772456c0ae82a2cf080149f38a3987bb4a00946 | fix: fixed an error with crafts yielding more than one item | [
{
"change_type": "MODIFY",
"diff": "@@ -299,7 +299,7 @@ export class List extends DataWithPermissions {\n*/\npublic setDone(pitem: ListRow, amount: number, excludeRecipes = false, setUsed = false): void {\nconst item = this.getItemById(pitem.id, excludeRecipes);\n- const previousDone = item.done;\n+ const previousDone = MathTools.absoluteCeil(item.done / item.yield);\nif (setUsed) {\n// Save previous used amount\nconst previousUsed = item.used;\n@@ -322,7 +322,7 @@ export class List extends DataWithPermissions {\nitem.done = 0;\n}\namount = MathTools.absoluteCeil(amount / pitem.yield);\n- if (item.requires !== undefined) {\n+ if (item.requires !== undefined && MathTools.absoluteCeil(item.done / item.yield) > previousDone) {\nfor (const requirement of item.requires) {\nconst requirementItem = this.getItemById(requirement.id, excludeRecipes);\nif (requirementItem !== undefined) {\n",
"new_path": "src/app/model/list/list.ts",
"old_path": "src/app/model/list/list.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: fixed an error with crafts yielding more than one item | 1 | fix | null |
217,922 | 03.06.2018 15:33:35 | -7,200 | ea2720193ace63dc00590dddaee98d51a42b4cbf | fix: ordering by job no longer hides non-recipe items | [
{
"change_type": "MODIFY",
"diff": "@@ -72,7 +72,7 @@ export class LayoutOrderService {\n}\nprivate getJobId(row: ListRow): number {\n- if (row.craftedBy !== undefined) {\n+ if (row.craftedBy !== undefined && row.craftedBy.length > 0) {\n// Returns the lowest level available for the craft.\nconst jobName = LayoutOrderService.JOBS.find(job => row.craftedBy[0].icon.indexOf(job) > -1);\nif (jobName !== undefined) {\n",
"new_path": "src/app/core/layout/layout-order.service.ts",
"old_path": "src/app/core/layout/layout-order.service.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: ordering by job no longer hides non-recipe items | 1 | fix | null |
217,922 | 03.06.2018 16:42:48 | -7,200 | 8c50f6cfe150fa1cb4b157e29eef038518bf62e3 | fix: fixed an issue with vendors extractor | [
{
"change_type": "MODIFY",
"diff": "@@ -26,6 +26,7 @@ export class VendorsExtractor extends AbstractExtractor<Vendor[]> {\n// Else, simply bind the obj property to the effective partial\nitemPartial = itemPartial.obj;\n}\n+ if (itemPartial !== undefined) {\n// If we have an undefined price, this is not what we want\nif (itemPartial.p === undefined) {\ncontinue;\n@@ -44,6 +45,7 @@ export class VendorsExtractor extends AbstractExtractor<Vendor[]> {\n}\nvendors.push(vendor);\n}\n+ }\nreturn vendors\n}\n",
"new_path": "src/app/core/list/data/extractor/vendors-extractor.ts",
"old_path": "src/app/core/list/data/extractor/vendors-extractor.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: fixed an issue with vendors extractor | 1 | fix | null |
217,922 | 03.06.2018 16:52:01 | -7,200 | c8b9d0c72654c5c39f62c316c111ae8592759ebd | chore: small fix for bulk addition | [
{
"change_type": "MODIFY",
"diff": "@@ -8,29 +8,10 @@ All notable changes to this project will be documented in this file. See [standa\n### Bug Fixes\n-* **alarms:** you can now properly change sound, delay and volume of your alarms ([6ce2a37](https://github.com/Supamiu/ffxiv-teamcraft/commit/6ce2a37))\n-* change email popup is now loading properly ([39a877a](https://github.com/Supamiu/ffxiv-teamcraft/commit/39a877a)), closes [#387](https://github.com/Supamiu/ffxiv-teamcraft/issues/387)\n-* completion dialog is no longer shown for public lists ([1c55018](https://github.com/Supamiu/ffxiv-teamcraft/commit/1c55018))\n-* fixed an error with crafts yielding more than one item ([f772456](https://github.com/Supamiu/ffxiv-teamcraft/commit/f772456))\n-* fixed an issue that was preventing to add community lists in a workshop ([769c06d](https://github.com/Supamiu/ffxiv-teamcraft/commit/769c06d))\n* fixed an issue with vendors extractor ([8c50f6c](https://github.com/Supamiu/ffxiv-teamcraft/commit/8c50f6c))\n-* navigation map no longer takes completed items into account ([fb765dd](https://github.com/Supamiu/ffxiv-teamcraft/commit/fb765dd))\n* ordering by job no longer hides non-recipe items ([ea27201](https://github.com/Supamiu/ffxiv-teamcraft/commit/ea27201))\n-### Features\n-\n-* **desktop:** you can now use custom sounds as alarm ([e647689](https://github.com/Supamiu/ffxiv-teamcraft/commit/e647689)), closes [#350](https://github.com/Supamiu/ffxiv-teamcraft/issues/350)\n-* **simulator:** rotation name is suffixed by \"*\" if there's some unsaved changes ([527f60c](https://github.com/Supamiu/ffxiv-teamcraft/commit/527f60c))\n-* **simulator:** you can now change the current rotation inside simulator ([21af5d6](https://github.com/Supamiu/ffxiv-teamcraft/commit/21af5d6)), closes [#389](https://github.com/Supamiu/ffxiv-teamcraft/issues/389)\n-* added the icon of the item in alarms overlay view ([6048ef0](https://github.com/Supamiu/ffxiv-teamcraft/commit/6048ef0))\n-* control is now properly handled in min stats popup ([dadf1bf](https://github.com/Supamiu/ffxiv-teamcraft/commit/dadf1bf))\n-* new \"Copy as text\" button to copy a panel or the whole list as text ([3d9aebb](https://github.com/Supamiu/ffxiv-teamcraft/commit/3d9aebb)), closes [#342](https://github.com/Supamiu/ffxiv-teamcraft/issues/342)\n-* you can now add almost any item in the game to a list, even if it's not craftable ([fe72840](https://github.com/Supamiu/ffxiv-teamcraft/commit/fe72840)), closes [#336](https://github.com/Supamiu/ffxiv-teamcraft/issues/336)\n-* you can now organize alarms on groups, mute them by group and reorder using drag & drop ([1017091](https://github.com/Supamiu/ffxiv-teamcraft/commit/1017091)), closes [#366](https://github.com/Supamiu/ffxiv-teamcraft/issues/366)\n-\n-\n-\n<a name=\"4.1.0\"></a>\n# [4.1.0](https://github.com/Supamiu/ffxiv-teamcraft/compare/v4.0.14...v4.1.0) (2018-06-03)\n",
"new_path": "CHANGELOG.md",
"old_path": "CHANGELOG.md"
},
{
"change_type": "MODIFY",
"diff": "@@ -310,9 +310,8 @@ export class RecipesComponent extends PageComponent implements OnInit {\naddAllRecipes(list: List, key: string): void {\nconst additions = [];\nthis.results\n- .filter(row => (<Recipe>row).recipeId !== undefined)\n- .forEach(recipe => {\n- additions.push(this.resolver.addToList(recipe.itemId, list, (<Recipe>recipe).recipeId, 1));\n+ .forEach(item => {\n+ additions.push(this.resolver.addToList(item.itemId, list, (<Recipe>item).recipeId, 1));\n});\nthis.subscriptions.push(this.dialog.open(BulkAdditionPopupComponent, {\ndata: {additions: additions, key: key, listname: list.name},\n",
"new_path": "src/app/pages/recipes/recipes/recipes.component.ts",
"old_path": "src/app/pages/recipes/recipes/recipes.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | chore: small fix for bulk addition | 1 | chore | null |
217,922 | 03.06.2018 16:56:14 | -7,200 | 1f5561995a25f1306709d1d8464a7e4848d39c0d | style: changed text color to white in items for better UX | [
{
"change_type": "MODIFY",
"diff": "mat-icon-button ngxClipboard [cbContent]=\"item.id | itemName | i18n\"\n(cbOnSuccess)=\"afterNameCopy(item.id)\">\n<span\n- [ngClass]=\"{'strike': item.done >= item.amount, 'compact': settings.compactLists, 'craftable': canBeCrafted}\">\n+ [ngClass]=\"{'compact': settings.compactLists\">\n{{item.id | itemName | i18n}}\n</span>\n</div>\n<span class=\"yield\" *ngIf=\"item.yield > 1\">x{{item.yield}}</span>\n</div>\n<div class=\"item-name\" matLine>\n- <span [ngClass]=\"{'strike':item.done >= item.amount, 'craftable': canBeCrafted}\" matTooltipPosition=\"above\"\n+ <span matTooltipPosition=\"above\"\nmatTooltip=\"{{'Copy_item_name_to_clipboard' | translate}}\"\nmat-icon-button ngxClipboard [cbContent]=\"item.id | itemName | i18n\"\n(cbOnSuccess)=\"afterNameCopy(item.id)\">{{item.id | itemName | i18n}}</span>\n",
"new_path": "src/app/modules/item/item/item.component.html",
"old_path": "src/app/modules/item/item/item.component.html"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | style: changed text color to white in items for better UX | 1 | style | null |
217,922 | 03.06.2018 16:57:49 | -7,200 | ecb47dcfac3936a9d7b8ae3f42ac669ac2986270 | chore: fixed small typo | [
{
"change_type": "MODIFY",
"diff": "mat-icon-button ngxClipboard [cbContent]=\"item.id | itemName | i18n\"\n(cbOnSuccess)=\"afterNameCopy(item.id)\">\n<span\n- [ngClass]=\"{'compact': settings.compactLists\">\n+ [ngClass]=\"{'compact': settings.compactLists}\">\n{{item.id | itemName | i18n}}\n</span>\n</div>\n",
"new_path": "src/app/modules/item/item/item.component.html",
"old_path": "src/app/modules/item/item/item.component.html"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | chore: fixed small typo | 1 | chore | null |
217,922 | 03.06.2018 19:18:51 | -7,200 | 5bf2273eb7046f2ad51abd2da714186e59c04908 | fix: fixed a bug that prevented alarms from playing | [
{
"change_type": "MODIFY",
"diff": "@@ -186,7 +186,10 @@ export class AlarmService {\n.pipe(\nfirst(),\nmergeMap(user => {\n- const alarmGroup = user.alarmGroups.find(group => group.name === alarm.groupName);\n+ let alarmGroup = user.alarmGroups.find(group => group.name === alarm.groupName);\n+ if (alarmGroup === undefined) {\n+ alarmGroup = user.alarmGroups.find(group => group.name === 'Default group')\n+ }\n// If the group of this alarm is disabled, don't play the alarm.\nif (alarmGroup !== undefined && !alarmGroup.enabled) {\nreturn of(null);\n@@ -246,14 +249,15 @@ export class AlarmService {\n}\n})\n)\n- }\n+ } else {\nreturn of(null);\n+ }\n})\n).subscribe(() => {\n+ localStorage.setItem('alarms:' + alarm.itemId, Date.now().toString());\n}, err => {\n// If there's an error, it means that we don't have permission, that's not a problem but we want to catch it.\n});\n- localStorage.setItem('alarms:' + alarm.itemId, Date.now().toString());\n}\n/**\n",
"new_path": "src/app/core/time/alarm.service.ts",
"old_path": "src/app/core/time/alarm.service.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: fixed a bug that prevented alarms from playing | 1 | fix | null |
217,922 | 04.06.2018 13:41:51 | -7,200 | b65a44fd2065bf6a487bdd495a3c1c0415d26553 | fix: no more sound spam with some items
closes | [
{
"change_type": "MODIFY",
"diff": "@@ -194,9 +194,9 @@ export class AlarmService {\nif (alarmGroup !== undefined && !alarmGroup.enabled) {\nreturn of(null);\n}\n- const lastPlayed = localStorage.getItem('alarms:' + alarm.itemId);\n- // Don't play the alarm if it was played less than a minute ago\n- if (lastPlayed === null || Date.now() - +lastPlayed > 60000) {\n+ const lastPlayed = localStorage.getItem('alarms:lastPlayed');\n+ // Don't play the alarm if it was played less than half a minute ago\n+ if (lastPlayed === null || Date.now() - +lastPlayed > 30000) {\nthis.snack.open(this.translator.instant('ALARM.Spawned',\n{itemName: this.localizedData.getItem(alarm.itemId)[this.translator.currentLang]}),\nthis.translator.instant('ALARM.See_on_map'),\n@@ -221,6 +221,7 @@ export class AlarmService {\naudio.loop = false;\naudio.volume = this.settings.alarmVolume;\naudio.play();\n+ localStorage.setItem('alarms:lastPlayed', Date.now().toString());\nreturn this.mapService.getMapById(alarm.zoneId)\n.pipe(\nmap(mapData => this.mapService.getNearestAetheryte(mapData, {x: alarm.coords[0], y: alarm.coords[1]})),\n@@ -254,7 +255,6 @@ export class AlarmService {\n}\n})\n).subscribe(() => {\n- localStorage.setItem('alarms:' + alarm.itemId, Date.now().toString());\n}, err => {\n// If there's an error, it means that we don't have permission, that's not a problem but we want to catch it.\n});\n",
"new_path": "src/app/core/time/alarm.service.ts",
"old_path": "src/app/core/time/alarm.service.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: no more sound spam with some items
closes #397 | 1 | fix | null |
217,922 | 04.06.2018 14:57:20 | -7,200 | 9455a4e09257a1c7513b9452cab028b04831828d | feat: new checkbox to search for recipes only in items search page | [
{
"change_type": "MODIFY",
"diff": "@@ -115,13 +115,18 @@ export class DataService {\n* Fires a search request to the search api in order to get results based on filters.\n* @param {string} query\n* @param {SearchFilter[]} filters\n+ * @param onlyCraftable\n* @returns {Observable<Recipe[]>}\n*/\n- public searchRecipe(query: string, filters: SearchFilter[]): Observable<SearchResult[]> {\n+ public searchItem(query: string, filters: SearchFilter[], onlyCraftable: boolean): Observable<SearchResult[]> {\nlet params = new HttpParams()\n.set('type', 'item')\n.set('lang', this.i18n.currentLang);\n+ if (onlyCraftable) {\n+ params = params.set('craftable', '1');\n+ }\n+\nlet craftedByFilter: SearchFilter;\nif (query !== undefined) {\n",
"new_path": "src/app/core/api/data.service.ts",
"old_path": "src/app/core/api/data.service.ts"
},
{
"change_type": "MODIFY",
"diff": "<mat-hint align=\"end\">\n<small>{{'Data_from_gt' | translate}}</small>\n</mat-hint>\n+ <mat-checkbox matSuffix [(ngModel)]=\"onlyCraftable\" (ngModelChange)=\"doSearch()\" class=\"only-recipes\">\n+ {{'ITEMS.Only_recipes' | translate}}\n+ </mat-checkbox>\n</mat-form-field>\n</div>\n<mat-expansion-panel class=\"filters\" #filtersPanel>\n",
"new_path": "src/app/pages/recipes/recipes/recipes.component.html",
"old_path": "src/app/pages/recipes/recipes/recipes.component.html"
},
{
"change_type": "MODIFY",
"diff": "}\n}\n+.only-recipes {\n+ font-size: 14px;\n+}\n+\n.workshop-list {\npadding-left: 50px;\n}\n",
"new_path": "src/app/pages/recipes/recipes/recipes.component.scss",
"old_path": "src/app/pages/recipes/recipes/recipes.component.scss"
},
{
"change_type": "MODIFY",
"diff": "@@ -25,8 +25,7 @@ import {WorkshopService} from 'app/core/database/workshop.service';\nimport {Workshop} from '../../../model/other/workshop';\nimport {CraftingRotationService} from 'app/core/database/crafting-rotation.service';\nimport {CraftingRotation} from '../../../model/other/crafting-rotation';\n-import {debounceTime, distinctUntilChanged, filter, map, mergeMap, publishReplay, refCount} from 'rxjs/operators';\n-import {first, switchMap} from 'rxjs/operators';\n+import {debounceTime, distinctUntilChanged, filter, first, map, mergeMap, publishReplay, refCount, switchMap} from 'rxjs/operators';\nimport {SearchResult} from '../../../model/list/search-result';\ndeclare const ga: Function;\n@@ -43,6 +42,8 @@ export class RecipesComponent extends PageComponent implements OnInit {\n@ViewChild('filter')\nfilterElement: ElementRef;\n+ onlyCraftable = false;\n+\nfilters: SearchFilter[] = [\n{\nenabled: false,\n@@ -215,7 +216,7 @@ export class RecipesComponent extends PageComponent implements OnInit {\nthis.loading = false;\nreturn;\n}\n- this.subscriptions.push(this.db.searchRecipe(this.query, this.filters).subscribe(results => {\n+ this.subscriptions.push(this.db.searchItem(this.query, this.filters, this.onlyCraftable).subscribe(results => {\nthis.results = results;\nthis.loading = false;\n}));\n",
"new_path": "src/app/pages/recipes/recipes/recipes.component.ts",
"old_path": "src/app/pages/recipes/recipes/recipes.component.ts"
},
{
"change_type": "MODIFY",
"diff": "\"ITEMS\": {\n\"Title\": \"Items\",\n\"No_match\": \"No matching items\",\n- \"Item_name\": \"Item name\"\n+ \"Item_name\": \"Item name\",\n+ \"Only_recipes\": \"Only recipes\"\n},\n\"Download_desktop_app\": \"Download desktop app\",\n\"Delete\": \"Delete\",\n",
"new_path": "src/assets/i18n/en.json",
"old_path": "src/assets/i18n/en.json"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat: new checkbox to search for recipes only in items search page | 1 | feat | null |
730,413 | 04.06.2018 15:07:59 | 14,400 | befaf9e35231b8b3b462c2cca831ac0026888402 | feat(widget-message): load avatars from activities list | [
{
"change_type": "MODIFY",
"diff": "@@ -4,7 +4,7 @@ import {connect} from 'react-redux';\nimport {bindActionCreators} from 'redux';\nimport Dropzone from 'react-dropzone';\nimport classNames from 'classnames';\n-import {debounce, has, throttle} from 'lodash';\n+import {debounce, has, throttle, filter} from 'lodash';\nimport {autobind} from 'core-decorators';\nimport {constructFiles} from '@ciscospark/react-component-utils';\n@@ -90,14 +90,14 @@ export class MessageWidget extends Component {\n*/\nstatic getAvatarsFromParticipants(props) {\nconst {\n- participants,\nsparkInstance\n} = props;\n+ const participants = filter(props.activities, 'actor').map((activity) => activity.actor.id);\n+\nif (participants.length === 0) {\nreturn;\n}\n- const userIds = participants.map((p) => p.id);\n- props.fetchAvatarsForUsers(userIds, sparkInstance);\n+ props.fetchAvatarsForUsers(participants, sparkInstance);\n}\n/**\n@@ -294,7 +294,7 @@ export class MessageWidget extends Component {\n*/\nupdateScroll(firstActivity, previousFirstActivity, prevScrollTop) {\nconst {activityList} = this;\n-\n+ MessageWidget.getAvatarsFromParticipants(this.props);\nif (firstActivity && previousFirstActivity && firstActivity.id !== previousFirstActivity.id) {\nactivityList.setScrollTop(activityList.getScrollHeight() - this.scrollHeight + prevScrollTop);\n}\n",
"new_path": "packages/node_modules/@ciscospark/widget-message/src/container.js",
"old_path": "packages/node_modules/@ciscospark/widget-message/src/container.js"
}
] | JavaScript | MIT License | webex/react-widgets | feat(widget-message): load avatars from activities list | 1 | feat | widget-message |
730,413 | 04.06.2018 15:09:09 | 14,400 | e60c5666c3ca436dc5b3a6b320f3eb1953375246 | feat(react-component-people-list): use react-virtualized for rendering people list | [
{
"change_type": "MODIFY",
"diff": "// Jest Snapshot v1, https://goo.gl/fbAQLP\nexports[`PeopleList component renders a group of participants 1`] = `\n-<div>\n<div\n- className=\"ciscospark-people-group group\"\n+ style={\n+ Object {\n+ \"height\": \"100%\",\n+ \"width\": \"100%\",\n+ }\n+ }\n>\n- <h3\n- className=\"ciscospark-people-group-title title\"\n+ <AutoSizer\n+ disableHeight={false}\n+ disableWidth={false}\n+ onResize={[Function]}\n+ style={Object {}}\n>\n- Participants\n- </h3>\n- <Person\n- avatar=\"http://google.com/image.png\"\n- displayName=\"Dr Dre\"\n- emailAddress=\"dreday@deathrowrecords.net\"\n- id=\"1\"\n- isExternal={false}\n- isPending={false}\n- onClick={[Function]}\n- />\n- <Person\n- avatar=\"http://google.com/image-2.png\"\n- displayName=\"Jimmy Iovine\"\n- emailAddress=\"\"\n- id=\"2\"\n- isExternal={true}\n- isPending={false}\n- onClick={[Function]}\n- />\n- </div>\n+ [Function]\n+ </AutoSizer>\n</div>\n`;\nexports[`PeopleList component renders a list of participants without a group 1`] = `\n-<div>\n<div\n- className=\"ciscospark-people-group group\"\n+ style={\n+ Object {\n+ \"height\": \"100%\",\n+ \"width\": \"100%\",\n+ }\n+ }\n>\n- <Person\n- avatar=\"http://google.com/image.png\"\n- displayName=\"Dr Dre\"\n- emailAddress=\"\"\n- id=\"1\"\n- isExternal={false}\n- isPending={false}\n- onClick={[Function]}\n- />\n- <Person\n- avatar=\"http://google.com/image-2.png\"\n- displayName=\"Jimmy Iovine\"\n- emailAddress=\"\"\n- id=\"2\"\n- isExternal={true}\n- isPending={false}\n- onClick={[Function]}\n- />\n- </div>\n+ <AutoSizer\n+ disableHeight={false}\n+ disableWidth={false}\n+ onResize={[Function]}\n+ style={Object {}}\n+ >\n+ [Function]\n+ </AutoSizer>\n</div>\n`;\n",
"new_path": "packages/node_modules/@ciscospark/react-component-people-list/src/__snapshots__/index.test.js.snap",
"old_path": "packages/node_modules/@ciscospark/react-component-people-list/src/__snapshots__/index.test.js.snap"
},
{
"change_type": "MODIFY",
"diff": "+import 'react-virtualized/styles.css';\n+\nimport React from 'react';\nimport PropTypes from 'prop-types';\nimport classNames from 'classnames';\n+import {List, AutoSizer} from 'react-virtualized';\nimport Person from './list-item';\nimport styles from './styles.css';\n@@ -16,56 +19,108 @@ const propTypes = {\nisPending: PropTypes.bool\n}))\n})).isRequired,\n- onItemClick: PropTypes.func\n+ onItemClick: PropTypes.func,\n+ onDisplayUsers: PropTypes.func\n};\nconst defaultProps = {\n- onItemClick: () => {}\n+ onItemClick: () => {},\n+ onDisplayUsers: () => {}\n};\n-\nfunction PeopleList({\nitems,\n- onItemClick\n+ onItemClick,\n+ onDisplayUsers\n}) {\nif (!items || !items.length) {\nreturn null;\n}\n- function generateGroupList(people) {\n- return people.map((p) => {\n+ const totalRows = [];\n+\n+ items.forEach((item) => {\n+ // Header for item\n+ if (item.label) {\n+ totalRows.push({type: 'header', details: item.label});\n+ }\n+ // Rows for each person\n+ item.people.forEach((person) => {\n+ totalRows.push({type: 'person', details: person});\n+ });\n+ });\n+\n+ // disable react/prop-types because eslint thinks rowRenderer is the main render\n+ // eslint-disable-next-line react/prop-types\n+ function rowRenderer({key, index, style}) {\n+ if (totalRows[index].type === 'header') {\n+ return (\n+ <div style={style} className={classNames('ciscospark-people-group', styles.group)} key={totalRows[index].details}>\n+ {\n+ totalRows[index].details\n+ && <h3 className={classNames('ciscospark-people-group-title', styles.title)}>{totalRows[index].details}</h3>\n+ }\n+ </div>\n+ );\n+ }\n+\n+ const person = totalRows[index].details;\n+\nconst handleItemClick = () => {\n- onItemClick(p);\n+ onItemClick(person);\n};\nreturn (\n+ <div key={key} style={style}>\n<Person\n- displayName={p.displayName || p.name}\n- key={p.id}\n+ displayName={person.displayName || person.name}\n+ key={person.id}\nonClick={handleItemClick}\n- {...p}\n+ emailAddress={person.emailAddress}\n+ id={person.id}\n+ isExternal={person.isExternal}\n+ isPending={person.isPending}\n/>\n+ </div>\n);\n- });\n+ }\n+\n+ function onRowsRendered({startIndex, stopIndex}) {\n+ // gets users from displayed rows that are not labels\n+ const userIds = totalRows.slice(startIndex, stopIndex + 1).filter((row) => row.type === 'person').map((p) => p.details.id);\n+ onDisplayUsers(userIds);\n+ }\n+\n+ function rowHeight({index}) {\n+ // height for a header label (moderators, participants)\n+ if (totalRows[index].type === 'header') {\n+ return 38;\n+ }\n+ // height for a person item\n+ return 44;\n}\nreturn (\n- <div>\n- {\n- items.map((group) => (\n- <div className={classNames('ciscospark-people-group', styles.group)} key={group.label || '1'}>\n+ <div style={{height: '100%', width: '100%'}}>\n{\n- group.label\n- && <h3 className={classNames('ciscospark-people-group-title', styles.title)}>{group.label}</h3>\n- }\n- {group.people && group.people.length && generateGroupList(group.people)}\n- </div>\n- ))\n+ <AutoSizer>\n+ {({height, width}) => (\n+ <List\n+ height={height}\n+ rowCount={totalRows.length}\n+ rowHeight={rowHeight}\n+ rowRenderer={rowRenderer}\n+ width={width}\n+ onRowsRendered={onRowsRendered}\n+ />\n+ )}\n+ </AutoSizer>\n}\n</div>\n);\n}\n+\nPeopleList.propTypes = propTypes;\nPeopleList.defaultProps = defaultProps;\n",
"new_path": "packages/node_modules/@ciscospark/react-component-people-list/src/index.js",
"old_path": "packages/node_modules/@ciscospark/react-component-people-list/src/index.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -88,7 +88,7 @@ export class MessageWidget extends Component {\n* @param {Object} props\n*\n*/\n- static getAvatarsFromParticipants(props) {\n+ static getAvatarsFromActivityActors(props) {\nconst {\nsparkInstance\n} = props;\n@@ -274,7 +274,7 @@ export class MessageWidget extends Component {\nconst {activityCount} = nextProps;\nconst prevActivitiesCount = props.activityCount;\nif (activityCount && activityCount !== prevActivitiesCount) {\n- MessageWidget.getAvatarsFromParticipants(nextProps);\n+ MessageWidget.getAvatarsFromActivityActors(nextProps);\n}\nif (nextProps.participants) {\nconst userIds = nextProps.participants.map((p) => p.id);\n@@ -294,7 +294,7 @@ export class MessageWidget extends Component {\n*/\nupdateScroll(firstActivity, previousFirstActivity, prevScrollTop) {\nconst {activityList} = this;\n- MessageWidget.getAvatarsFromParticipants(this.props);\n+ MessageWidget.getAvatarsFromActivityActors(this.props);\nif (firstActivity && previousFirstActivity && firstActivity.id !== previousFirstActivity.id) {\nactivityList.setScrollTop(activityList.getScrollHeight() - this.scrollHeight + prevScrollTop);\n}\n",
"new_path": "packages/node_modules/@ciscospark/widget-message/src/container.js",
"old_path": "packages/node_modules/@ciscospark/widget-message/src/container.js"
},
{
"change_type": "MODIFY",
"diff": "+.addPartipicant {\n+ height: 100%;\n+ width: 100%;\n+}\n+\n.searchBar {\ndisplay: flex;\nheight: 40px;\n.results {\nborder-top: 1px solid #f5f5f6;\n+ height: 100%;\n+ width: 100%;\n}\n.resultsNone {\n",
"new_path": "packages/node_modules/@ciscospark/widget-roster/src/components/add-participant/styles.css",
"old_path": "packages/node_modules/@ciscospark/widget-roster/src/components/add-participant/styles.css"
},
{
"change_type": "MODIFY",
"diff": "@@ -56,10 +56,6 @@ export class RosterWidget extends Component {\n}\ncomponentWillUpdate(nextProps) {\n- this.props.fetchAvatarsForUsers(\n- nextProps.conversation.get('participants').map((user) => user.id),\n- this.props.sparkInstance\n- );\n// Fetch avatars for searched users\nif (nextProps.searchResults\n&& nextProps.searchResults !== this.props.searchResults\n@@ -69,6 +65,11 @@ export class RosterWidget extends Component {\n}\n}\n+ @autobind\n+ displayUsers(users) {\n+ this.props.fetchAvatarsForUsers(users, this.props.sparkInstance);\n+ }\n+\n@autobind\nhandleMenuClick() {\nthis.props.onClickMenu();\n@@ -153,7 +154,7 @@ export class RosterWidget extends Component {\nlet content;\nif (currentView === VIEW_ADD) {\ncontent = (\n- <div>\n+ <div className={classNames('ciscospark-roster-scrolling-list', styles.scrolling)}>\n<AddParticipant\nnoResultsMessage={this.formattedMessages.noResults}\nonAddPerson={this.handleAddPersonClick}\n@@ -189,18 +190,19 @@ export class RosterWidget extends Component {\n);\n}\ncontent = (\n- <div>\n+ <div className={classNames('ciscospark-roster-scrolling-list', styles.scrolling)}>\n{addPeopleButton}\n<PeopleList\nitems={participants.people}\nonItemClick={this.handleRosterEdit}\n+ onDisplayUsers={this.displayUsers}\n/>\n</div>\n);\n}\nmainArea = (\n- <div>\n+ <div className={classNames('ciscospark-roster-scrolling-list', styles.scrolling)}>\n{\nparticipants.hasExternalParticipants\n&& <ExternalParticipantMessage message={this.formattedMessages.externalParticipants} />\n",
"new_path": "packages/node_modules/@ciscospark/widget-roster/src/container.js",
"old_path": "packages/node_modules/@ciscospark/widget-roster/src/container.js"
},
{
"change_type": "MODIFY",
"diff": ".roster {\n- display: flex;\nheight: 100%;\n+ width: 100%;\nfont-family: CiscoSans, 'Helvetica Neue', Arial, sans-serif;\nflex-direction: column;\n}\n.scrolling {\n- flex: 1 1 auto;\n- overflow-y: auto;\n+ height: 100%;\n+ width: 100%;\n}\n.participantsSeparator {\n",
"new_path": "packages/node_modules/@ciscospark/widget-roster/src/styles.css",
"old_path": "packages/node_modules/@ciscospark/widget-roster/src/styles.css"
},
{
"change_type": "MODIFY",
"diff": "@@ -8,10 +8,10 @@ export const elements = {\npeopleButton: 'button[aria-label=\"People\"]',\nrosterTitle: '.ciscospark-widget-title',\nparticipantItem: '.ciscospark-participant-list-item',\n- rosterList: '.ciscospark-roster-scrolling-list',\n+ rosterList: '.ciscospark-people-list',\naddParticipantArea: '.ciscospark-roster-add-participant',\naddParticipantResultsArea: '.ciscospark-roster-add-participant-results',\n- addParticipantResultItem: '.ciscospark-people-list-item:nth-child(1)',\n+ addParticipantResultItem: '.ciscospark-people-list-name',\naddPeopleButton: '.ciscospark-roster-add-people',\nsearchInput: '.ciscospark-roster-add-participant-search-input',\ncloseSearchButton: 'button[aria-label=\"Close Search\"]'\n",
"new_path": "test/journeys/lib/test-helpers/space-widget/roster.js",
"old_path": "test/journeys/lib/test-helpers/space-widget/roster.js"
}
] | JavaScript | MIT License | webex/react-widgets | feat(react-component-people-list): use react-virtualized for rendering people list | 1 | feat | react-component-people-list |
791,674 | 04.06.2018 15:23:21 | 25,200 | df631a093a3dc9337fb142cb953e35963f4a53fa | core: support traces with TracingStartedInBrowser event | [
{
"change_type": "MODIFY",
"diff": "@@ -46,17 +46,37 @@ class TraceOfTab extends ComputedArtifact {\nreturn e.cat.includes('blink.user_timing') ||\ne.cat.includes('loading') ||\ne.cat.includes('devtools.timeline') ||\n- e.name === 'TracingStartedInPage';\n+ e.cat === '__metadata';\n})\n// @ts-ignore - stableSort added to Array by WebInspector.\n.stableSort((event0, event1) => event0.ts - event1.ts);\n+ // Find out the inspected page frame.\n+ /** @type {LH.TraceEvent|undefined} */\n+ let startedInPageEvt;\n+ const startedInBrowserEvt = keyEvents.find(e => e.name === 'TracingStartedInBrowser');\n+ if (startedInBrowserEvt && startedInBrowserEvt.args.data &&\n+ startedInBrowserEvt.args.data.frames) {\n+ const mainFrame = startedInBrowserEvt.args.data.frames.find(frame => !frame.parent);\n+ const pid = mainFrame && mainFrame.processId;\n+ const threadNameEvt = keyEvents.find(e => e.pid === pid && e.ph === 'M' &&\n+ e.cat === '__metadata' && e.name === 'thread_name' && e.args.name === 'CrRendererMain');\n+ startedInPageEvt = mainFrame && threadNameEvt ?\n+ Object.assign({}, startedInBrowserEvt, {\n+ pid, tid: threadNameEvt.tid, name: 'TracingStartedInPage',\n+ args: {data: {page: mainFrame.frame}}}) :\n+ undefined;\n+ }\n+ // Support legacy browser versions that do not emit TracingStartedInBrowser event.\n+ if (!startedInPageEvt) {\n// The first TracingStartedInPage in the trace is definitely our renderer thread of interest\n// Beware: the tracingStartedInPage event can appear slightly after a navigationStart\n- const startedInPageEvt = keyEvents.find(e => e.name === 'TracingStartedInPage');\n+ startedInPageEvt = keyEvents.find(e => e.name === 'TracingStartedInPage');\n+ }\nif (!startedInPageEvt) throw new LHError(LHError.errors.NO_TRACING_STARTED);\n// @ts-ignore - property chain exists for 'TracingStartedInPage' event.\nconst frameId = startedInPageEvt.args.data.page;\n+\n// Filter to just events matching the frame ID for sanity\nconst frameEvents = keyEvents.filter(e => e.args.frame === frameId);\n@@ -106,12 +126,12 @@ class TraceOfTab extends ComputedArtifact {\n// stable-sort events to keep them correctly nested.\n/** @type Array<LH.TraceEvent> */\nconst processEvents = trace.traceEvents\n- .filter(e => e.pid === startedInPageEvt.pid)\n+ .filter(e => e.pid === /** @type {LH.TraceEvent} */ (startedInPageEvt).pid)\n// @ts-ignore - stableSort added to Array by WebInspector.\n.stableSort((event0, event1) => event0.ts - event1.ts);\nconst mainThreadEvents = processEvents\n- .filter(e => e.tid === startedInPageEvt.tid);\n+ .filter(e => e.tid === /** @type {LH.TraceEvent} */ (startedInPageEvt).tid);\nconst traceEnd = trace.traceEvents.reduce((max, evt) => {\nreturn max.ts > evt.ts ? max : evt;\n",
"new_path": "lighthouse-core/gather/computed/trace-of-tab.js",
"old_path": "lighthouse-core/gather/computed/trace-of-tab.js"
},
{
"change_type": "MODIFY",
"diff": "\"tid\": 1295,\n\"ts\": 900000000000,\n\"ph\": \"X\",\n- \"cat\": \"toplevel\",\n+ \"cat\": \"devtools.timeline\",\n\"name\": \"TracingStartedInPage\",\n\"args\": {\n\"data\": {\n",
"new_path": "lighthouse-core/test/fixtures/traces/threeframes-blank_content_more.json",
"old_path": "lighthouse-core/test/fixtures/traces/threeframes-blank_content_more.json"
},
{
"change_type": "MODIFY",
"diff": "@@ -112,6 +112,55 @@ describe('Trace of Tab computed artifact:', () => {\nassert.equal(trace.firstMeaningfulPaintEvt, undefined, 'bad fmp');\n});\n+ it('handles traces with TracingStartedInBrowser events', async () => {\n+ const tracingStartedInBrowserTrace = {\n+ 'traceEvents': [{\n+ 'pid': 69850,\n+ 'tid': 69850,\n+ 'ts': 2193564729582,\n+ 'ph': 'I',\n+ 'cat': 'disabled-by-default-devtools.timeline',\n+ 'name': 'TracingStartedInBrowser',\n+ 'args': {'data': {\n+ 'frameTreeNodeId': 1,\n+ 'frames': [{\n+ 'frame': 'B192D1F3355A6F961EC8F0B01623C1FB',\n+ 'url': 'http://www.example.com/',\n+ 'name': '',\n+ 'processId': 69920,\n+ }],\n+ }},\n+ 'tts': 1085165,\n+ 's': 't',\n+ }, {\n+ 'pid': 69920,\n+ 'tid': 1,\n+ 'ts': 2193564790059,\n+ 'ph': 'R',\n+ 'cat': 'blink.user_timing',\n+ 'name': 'navigationStart',\n+ 'args': {\n+ 'frame': 'B192D1F3355A6F961EC8F0B01623C1FB',\n+ 'data': {\n+ 'documentLoaderURL': 'http://www.example.com/',\n+ 'isLoadingMainFrame': true,\n+ },\n+ },\n+ 'tts': 141371,\n+ }, {\n+ 'pid': 69920,\n+ 'tid': 1,\n+ 'ts': 0,\n+ 'ph': 'M',\n+ 'cat': '__metadata',\n+ 'name': 'thread_name',\n+ 'args': {'name': 'CrRendererMain'},\n+ }]};\n+ const trace = await traceOfTab.compute_(tracingStartedInBrowserTrace);\n+ assert.equal(trace.startedInPageEvt.ts, 2193564729582);\n+ assert.equal(trace.navigationStartEvt.ts, 2193564790059);\n+ });\n+\nit('stably sorts events', async () => {\nconst traceJson = fs.readFileSync(__dirname +\n'/../../fixtures/traces/tracingstarted-after-navstart.json', 'utf8');\n",
"new_path": "lighthouse-core/test/gather/computed/trace-of-tab-test.js",
"old_path": "lighthouse-core/test/gather/computed/trace-of-tab-test.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -137,6 +137,11 @@ declare global {\ncat: string;\nargs: {\ndata?: {\n+ frames?: {\n+ frame: string;\n+ parent?: string;\n+ processId?: number;\n+ }[];\npage?: string;\nreadyState?: number;\nrequestId?: string;\n@@ -148,6 +153,7 @@ declare global {\nurl?: string;\n};\nframe?: string;\n+ name?: string;\n};\npid: number;\ntid: number;\n",
"new_path": "typings/externs.d.ts",
"old_path": "typings/externs.d.ts"
}
] | JavaScript | Apache License 2.0 | googlechrome/lighthouse | core: support traces with TracingStartedInBrowser event (#5271) | 1 | core | null |
217,922 | 04.06.2018 17:42:43 | -7,200 | d387ee36abbe2426938aa7db84bc02836b52ac70 | fix: fixed an issue that prevented addition of some items
closes | [
{
"change_type": "MODIFY",
"diff": "@@ -21,6 +21,10 @@ export class VendorsExtractor extends AbstractExtractor<Vendor[]> {\nlet itemPartial = itemData.getPartial(item.id.toString(), 'item');\n// If we didn't find the item in partials, get it from ingredients\nif (itemPartial === undefined) {\n+ if (itemData.ingredients === undefined) {\n+ // if this has no partial nor ingredients, we can go to the next one.\n+ break;\n+ }\nitemPartial = itemData.getIngredient(item.id);\n} else {\n// Else, simply bind the obj property to the effective partial\n",
"new_path": "src/app/core/list/data/extractor/vendors-extractor.ts",
"old_path": "src/app/core/list/data/extractor/vendors-extractor.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: fixed an issue that prevented addition of some items
closes #396 | 1 | fix | null |
217,922 | 04.06.2018 21:21:05 | -7,200 | 22d5e9552f48679e366f37aa0a79c27e2d063f6a | fix: fixed a missing translation in sidebar | [
{
"change_type": "MODIFY",
"diff": "matTooltip=\"{{'ITEMS.Title' | translate}}\"\n[matTooltipDisabled]=\"!settings.compactSidebar\">\n<mat-icon matListIcon>search</mat-icon>\n- <span matLine *ngIf=\"!settings.compactSidebar\">{{'Recipes' | translate}}</span>\n+ <span matLine *ngIf=\"!settings.compactSidebar\">{{'ITEMS.Title' | translate}}</span>\n</mat-list-item>\n<mat-list-item routerLink=\"/rotations\" (click)=\"mobile ? sidenav.close() : null\"\nmatTooltipPosition=\"right\"\n",
"new_path": "src/app/app.component.html",
"old_path": "src/app/app.component.html"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: fixed a missing translation in sidebar | 1 | fix | null |
791,690 | 05.06.2018 03:46:51 | 25,200 | 4826a77fc3c522b34ca42083992d81adc48176d7 | core(traces): move findTracingStartedEvt to tracingProcessor
And add support of new traces to scripts/minify-trace.js | [
{
"change_type": "MODIFY",
"diff": "const ComputedArtifact = require('./computed-artifact');\nconst log = require('lighthouse-logger');\n+const TracingProcessor = require('../../lib/traces/tracing-processor');\nconst LHError = require('../../lib/errors');\nconst Sentry = require('../../lib/sentry');\n@@ -51,31 +52,8 @@ class TraceOfTab extends ComputedArtifact {\n// @ts-ignore - stableSort added to Array by WebInspector.\n.stableSort((event0, event1) => event0.ts - event1.ts);\n- // Find out the inspected page frame.\n- /** @type {LH.TraceEvent|undefined} */\n- let startedInPageEvt;\n- const startedInBrowserEvt = keyEvents.find(e => e.name === 'TracingStartedInBrowser');\n- if (startedInBrowserEvt && startedInBrowserEvt.args.data &&\n- startedInBrowserEvt.args.data.frames) {\n- const mainFrame = startedInBrowserEvt.args.data.frames.find(frame => !frame.parent);\n- const pid = mainFrame && mainFrame.processId;\n- const threadNameEvt = keyEvents.find(e => e.pid === pid && e.ph === 'M' &&\n- e.cat === '__metadata' && e.name === 'thread_name' && e.args.name === 'CrRendererMain');\n- startedInPageEvt = mainFrame && threadNameEvt ?\n- Object.assign({}, startedInBrowserEvt, {\n- pid, tid: threadNameEvt.tid, name: 'TracingStartedInPage',\n- args: {data: {page: mainFrame.frame}}}) :\n- undefined;\n- }\n- // Support legacy browser versions that do not emit TracingStartedInBrowser event.\n- if (!startedInPageEvt) {\n- // The first TracingStartedInPage in the trace is definitely our renderer thread of interest\n- // Beware: the tracingStartedInPage event can appear slightly after a navigationStart\n- startedInPageEvt = keyEvents.find(e => e.name === 'TracingStartedInPage');\n- }\n- if (!startedInPageEvt) throw new LHError(LHError.errors.NO_TRACING_STARTED);\n- // @ts-ignore - property chain exists for 'TracingStartedInPage' event.\n- const frameId = startedInPageEvt.args.data.page;\n+ // Find the inspected frame\n+ const {startedInPageEvt, frameId} = TracingProcessor.findTracingStartedEvt(keyEvents);\n// Filter to just events matching the frame ID for sanity\nconst frameEvents = keyEvents.filter(e => e.args.frame === frameId);\n",
"new_path": "lighthouse-core/gather/computed/trace-of-tab.js",
"old_path": "lighthouse-core/gather/computed/trace-of-tab.js"
},
{
"change_type": "MODIFY",
"diff": "const BASE_RESPONSE_LATENCY = 16;\nconst SCHEDULABLE_TASK_TITLE = 'TaskQueueManager::ProcessTaskFromWorkQueue';\nconst SCHEDULABLE_TASK_TITLE_ALT = 'ThreadControllerImpl::DoWork';\n+const LHError = require('../errors');\nclass TraceProcessor {\n/**\n@@ -179,6 +180,43 @@ class TraceProcessor {\nreturn topLevelEvents;\n}\n+ /**\n+ * @param {LH.TraceEvent[]} events\n+ * @return {{startedInPageEvt: LH.TraceEvent, frameId: string}}\n+ */\n+ static findTracingStartedEvt(events) {\n+ /** @type {LH.TraceEvent|undefined} */\n+ let startedInPageEvt;\n+\n+ // Prefer the newer TracingStartedInBrowser event first, if it exists\n+ const startedInBrowserEvt = events.find(e => e.name === 'TracingStartedInBrowser');\n+ if (startedInBrowserEvt && startedInBrowserEvt.args.data &&\n+ startedInBrowserEvt.args.data.frames) {\n+ const mainFrame = startedInBrowserEvt.args.data.frames.find(frame => !frame.parent);\n+ const pid = mainFrame && mainFrame.processId;\n+ const threadNameEvt = events.find(e => e.pid === pid && e.ph === 'M' &&\n+ e.cat === '__metadata' && e.name === 'thread_name' && e.args.name === 'CrRendererMain');\n+ startedInPageEvt = mainFrame && threadNameEvt ?\n+ Object.assign({}, startedInBrowserEvt, {\n+ pid, tid: threadNameEvt.tid, name: 'TracingStartedInPage',\n+ args: {data: {page: mainFrame.frame}}}) :\n+ undefined;\n+ }\n+\n+ // Support legacy browser versions that do not emit TracingStartedInBrowser event.\n+ if (!startedInPageEvt) {\n+ // The first TracingStartedInPage in the trace is definitely our renderer thread of interest\n+ // Beware: the tracingStartedInPage event can appear slightly after a navigationStart\n+ startedInPageEvt = events.find(e => e.name === 'TracingStartedInPage');\n+ }\n+\n+ if (!startedInPageEvt) throw new LHError(LHError.errors.NO_TRACING_STARTED);\n+\n+ // @ts-ignore - property chain exists for 'TracingStartedInPage' event.\n+ const frameId = /** @type {string} */ (startedInPageEvt.args.data.page);\n+ return {startedInPageEvt, frameId};\n+ }\n+\n/**\n* @param {LH.TraceEvent} evt\n* @return {boolean}\n",
"new_path": "lighthouse-core/lib/traces/tracing-processor.js",
"old_path": "lighthouse-core/lib/traces/tracing-processor.js"
},
{
"change_type": "MODIFY",
"diff": "const fs = require('fs');\nconst path = require('path');\n+const TracingProcessor = require('../../lib/traces/tracing-processor');\nif (process.argv.length !== 4) {\nconsole.error('Usage $0: <input file> <output file>');\n@@ -76,9 +77,7 @@ const traceEventsToKeepInProcess = new Set([\n* @param {LH.TraceEvent[]} events\n*/\nfunction filterOutUnnecessaryTasksByNameAndDuration(events) {\n- // TODO(phulce): update this once https://github.com/GoogleChrome/lighthouse/pull/5271 lands\n- const startedInPageEvt = events.find(evt => evt.name === 'TracingStartedInPage');\n- if (!startedInPageEvt) throw new Error('Could not find TracingStartedInPage');\n+ const {startedInPageEvt} = TracingProcessor.findTracingStartedEvt(events);\nreturn events.filter(evt => {\nif (toplevelTaskNames.has(evt.name) && evt.dur < 1000) return false;\n",
"new_path": "lighthouse-core/scripts/lantern/minify-trace.js",
"old_path": "lighthouse-core/scripts/lantern/minify-trace.js"
}
] | JavaScript | Apache License 2.0 | googlechrome/lighthouse | core(traces): move findTracingStartedEvt to tracingProcessor
And add support of new traces to scripts/minify-trace.js | 1 | core | traces |
807,942 | 05.06.2018 06:40:21 | -28,800 | 1f885f1288f58da6e59261ac6c859f2507f12e3b | docs: Update `--npm-client` details [skip ci] | [
{
"change_type": "MODIFY",
"diff": "@@ -1041,8 +1041,12 @@ $ lerna bootstrap --hoist --nohoist=babel-*\n#### --npm-client [client]\n-Install external dependencies using `[client] install`. Must be an executable\n-that knows how to install npm dependencies.\n+This will apply to actions below:\n+* Install external dependencies using `[client] install`\n+* Publish packages with `[client] publish`\n+* Run scripts with `[client] run [command]`\n+\n+Must be an executable that knows how to install npm dependencies, publish packages, and run scripts.\n```sh\n$ lerna bootstrap --npm-client=yarn\n",
"new_path": "README.md",
"old_path": "README.md"
}
] | JavaScript | MIT License | lerna/lerna | docs: Update `--npm-client` details (#1442) [skip ci] | 1 | docs | null |
217,922 | 05.06.2018 12:26:29 | -7,200 | 9db17c95f5bc13f23dfbebdd3d67e21e16f6a8b2 | feat(simulator): crafter stats now shown in main panel, for easier screenshots | [
{
"change_type": "MODIFY",
"diff": "<mat-card-subtitle *ngIf=\"itemId !== undefined\">\n<span *ngIf=\"recipe$ | async as recipeData\">{{recipeData.lvl}} {{getStars(recipeData.stars)}}</span>\n</mat-card-subtitle>\n+ <div class=\"stats\">\n+ {{'SIMULATOR.CONFIGURATION.Craftsmanship' | translate}}: {{simulation.crafterStats.craftsmanship}}\n+ {{'SIMULATOR.CONFIGURATION.Control' | translate}}: {{simulation.crafterStats._control}}\n+\n+ </div>\n<div class=\"steps\">\n{{'SIMULATOR.Step_counter' | translate}}\n<mat-form-field *ngIf=\"snapshotMode\" class=\"snapshot-input\">\n",
"new_path": "src/app/pages/simulator/components/simulator/simulator.component.html",
"old_path": "src/app/pages/simulator/components/simulator/simulator.component.html"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat(simulator): crafter stats now shown in main panel, for easier screenshots | 1 | feat | simulator |
217,922 | 05.06.2018 12:36:58 | -7,200 | b0e7089dd8c8a3719be0f625ac812aa16ca5605e | chore: [WIP] first part of recipe change dialog box in simulator | [
{
"change_type": "ADD",
"diff": "+<p>\n+ recipe-choice-popup works!\n+</p>\n",
"new_path": "src/app/pages/simulator/components/recipe-choice-popup/recipe-choice-popup.component.html",
"old_path": null
},
{
"change_type": "ADD",
"diff": "",
"new_path": "src/app/pages/simulator/components/recipe-choice-popup/recipe-choice-popup.component.scss",
"old_path": "src/app/pages/simulator/components/recipe-choice-popup/recipe-choice-popup.component.scss"
},
{
"change_type": "ADD",
"diff": "+import {Component, ElementRef, OnDestroy, ViewChild} from '@angular/core';\n+import {debounceTime, distinctUntilChanged, takeUntil} from 'rxjs/operators';\n+import {fromEvent, Subject} from 'rxjs/index';\n+import {Recipe} from '../../../../model/list/recipe';\n+\n+@Component({\n+ selector: 'app-recipe-choice-popup',\n+ templateUrl: './recipe-choice-popup.component.html',\n+ styleUrls: ['./recipe-choice-popup.component.scss']\n+})\n+export class RecipeChoicePopupComponent implements OnDestroy {\n+\n+ results: Recipe[] = [];\n+\n+ @ViewChild('filter')\n+ filterElement: ElementRef;\n+\n+ onDestroy$: Subject<void> = new Subject<void>();\n+\n+ filterValue: string;\n+\n+ constructor() {\n+ fromEvent(this.filterElement.nativeElement, 'keyup')\n+ .pipe(\n+ takeUntil(this.onDestroy$),\n+ debounceTime(500),\n+ distinctUntilChanged()\n+ ).subscribe(() => {\n+ this.doSearch();\n+ })\n+ }\n+\n+ private doSearch(): void {\n+\n+ }\n+\n+ ngOnDestroy(): void {\n+ this.onDestroy$.next();\n+ }\n+\n+}\n",
"new_path": "src/app/pages/simulator/components/recipe-choice-popup/recipe-choice-popup.component.ts",
"old_path": null
},
{
"change_type": "MODIFY",
"diff": "</a>\n<mat-card-title *ngIf=\"itemId !== undefined\">\n{{itemId | itemName | i18n}}\n+ <button mat-icon-button (click)=\"changeRecipe()\">\n+ <mat-icon>swap_horiz</mat-icon>\n+ </button>\n</mat-card-title>\n<mat-card-subtitle *ngIf=\"itemId !== undefined\">\n<span *ngIf=\"recipe$ | async as recipeData\">{{recipeData.lvl}} {{getStars(recipeData.stars)}}</span>\n",
"new_path": "src/app/pages/simulator/components/simulator/simulator.component.html",
"old_path": "src/app/pages/simulator/components/simulator/simulator.component.html"
},
{
"change_type": "MODIFY",
"diff": "@@ -38,6 +38,8 @@ import {CraftingJob} from '../../model/crafting-job.enum';\nimport {StepByStepReportPopupComponent} from '../step-by-step-report-popup/step-by-step-report-popup.component';\nimport {RotationNamePopupComponent} from '../rotation-name-popup/rotation-name-popup.component';\nimport {CraftingRotationService} from '../../../../core/database/crafting-rotation.service';\n+import {RecipeChoicePopupComponent} from '../recipe-choice-popup/recipe-choice-popup.component';\n+import {Router} from '@angular/router';\n@Component({\nselector: 'app-simulator',\n@@ -257,7 +259,8 @@ export class SimulatorComponent implements OnInit, OnDestroy {\nprivate dataService: DataService, private htmlTools: HtmlToolsService, private dialog: MatDialog,\nprivate pendingChanges: PendingChangesService, private localizedDataService: LocalizedDataService,\nprivate translate: TranslateService, consumablesService: ConsumablesService, private i18nTools: I18nToolsService,\n- private snack: MatSnackBar, private cd: ChangeDetectorRef, rotationsService: CraftingRotationService) {\n+ private snack: MatSnackBar, private cd: ChangeDetectorRef, rotationsService: CraftingRotationService,\n+ private router: Router) {\nthis.availableRotations$ = this.userService.getUserData()\n.pipe(\n@@ -539,6 +542,15 @@ export class SimulatorComponent implements OnInit, OnDestroy {\n}\n}\n+ changeRecipe(): void {\n+ this.dialog.open(RecipeChoicePopupComponent).afterClosed()\n+ .pipe(\n+ filter(res => res !== undefined && res !== null && res !== '')\n+ ).subscribe(result => {\n+ this.router.navigate(['simulator', result.itemId, result.recipeId, this.rotation.$key]);\n+ });\n+ }\n+\neditRotationName(rotation: CraftingRotation): void {\nthis.dialog.open(RotationNamePopupComponent, {data: rotation})\n.afterClosed()\n",
"new_path": "src/app/pages/simulator/components/simulator/simulator.component.ts",
"old_path": "src/app/pages/simulator/components/simulator/simulator.component.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -24,7 +24,8 @@ import {\nMatExpansionModule,\nMatIconModule,\nMatInputModule,\n- MatListModule, MatMenuModule,\n+ MatListModule,\n+ MatMenuModule,\nMatProgressBarModule,\nMatProgressSpinnerModule,\nMatSelectModule,\n@@ -41,6 +42,7 @@ import {ImportMacroPopupComponent} from './components/import-macro-popup/import-\nimport {ConsumablesService} from './model/consumables.service';\nimport {RotationNamePopupComponent} from './components/rotation-name-popup/rotation-name-popup.component';\nimport {StepByStepReportPopupComponent} from './components/step-by-step-report-popup/step-by-step-report-popup.component';\n+import {RecipeChoicePopupComponent} from './components/recipe-choice-popup/recipe-choice-popup.component';\nconst routes: Routes = [\n{\n@@ -121,7 +123,8 @@ const routes: Routes = [\nMacroPopupComponent,\nSimulationMinStatsPopupComponent,\nRotationNamePopupComponent,\n- StepByStepReportPopupComponent\n+ StepByStepReportPopupComponent,\n+ RecipeChoicePopupComponent\n],\nentryComponents: [\nImportRotationPopupComponent,\n@@ -129,7 +132,8 @@ const routes: Routes = [\nMacroPopupComponent,\nSimulationMinStatsPopupComponent,\nRotationNamePopupComponent,\n- StepByStepReportPopupComponent\n+ StepByStepReportPopupComponent,\n+ RecipeChoicePopupComponent\n],\nproviders: [\nCraftingActionsRegistry,\n",
"new_path": "src/app/pages/simulator/simulator.module.ts",
"old_path": "src/app/pages/simulator/simulator.module.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | chore: [WIP] first part of recipe change dialog box in simulator
#395 | 1 | chore | null |
730,429 | 05.06.2018 12:37:05 | 14,400 | 3f11f7f9c941fae152e1fce99e9cef7f19c8926e | fix(icon): add missing download icon | [
{
"change_type": "MODIFY",
"diff": "@@ -21,6 +21,7 @@ export const ICONS = {\nICON_TYPE_DELETE: 'ICON_TYPE_DELETE',\nICON_TYPE_DND: 'ICON_TYPE_DND',\nICON_TYPE_DOCUMENT: 'ICON_TYPE_DOCUMENT',\n+ ICON_TYPE_DOWNLOAD: 'ICON_TYPE_DOWNLOAD',\nICON_TYPE_EXIT: 'ICON_TYPE_EXIT',\nICON_TYPE_EXTERNAL_USER: 'ICON_TYPE_EXTERNAL_USER',\nICON_TYPE_EXTERNAL_USER_OUTLINE: 'ICON_TYPE_EXTERNAL_USER_OUTLINE',\n@@ -51,6 +52,7 @@ const paths = {\nC6.3,5,5,6.3,5,8c0,0.6,0.2,1.2,0.6,1.7l4.2-4.2C9.2,5.2,8.6,5,8,5z M8,12c-2.2,0-4-1.8-4-4s1.8-4,4-4s4,1.8,4,4S10.2,12,8,12z`,\nICON_TYPE_DOCUMENT: `M21,1L21,1l0,8c0,1.1,0.9,2,2,2v0h9c0-0.5-0.2-1-0.6-1.4l-9-9C22,0.2,21.5,0,21,0h0V1z\nM31,13L31,13l-8,0c-2.2,0-4-1.8-4-4v0h0V0H8C5.8,0,4,1.8,4,4v28c0,2.2,1.8,4,4,4h20c2.2,0,4-1.8,4-4V13H31z`,\n+ ICON_TYPE_DOWNLOAD: 'M6.1459,10.8529 C6.1919,10.8989 6.2479,10.9359 6.3089,10.9619 C6.3699,10.9869 6.4349,10.9999 6.4999,10.9999 C6.5649,10.9999 6.6299,10.9869 6.6909,10.9619 C6.7529,10.9359 6.8079,10.8989 6.8539,10.8529 L10.8539,6.8539 C11.0489,6.6579 11.0489,6.3419 10.8539,6.1469 C10.6579,5.9509 10.3419,5.9509 10.1469,6.1469 L6.9999,9.2929 L6.9999,0.4999 C6.9999,0.2239 6.7759,-0.0001 6.4999,-0.0001 C6.2239,-0.0001 5.9999,0.2239 5.9999,0.4999 L5.9999,9.2929 L2.8539,6.1469 C2.6579,5.9509 2.3419,5.9509 2.1469,6.1469 C1.9509,6.3419 1.9509,6.6579 2.1469,6.8539 L6.1459,10.8529 Z M12.5,13 L0.5,13 C0.224,13 0,13.224 0,13.5 C0,13.776 0.224,14 0.5,14 L12.5,14 C12.776,14 13,13.776 13,13.5 C13,13.224 12.776,13 12.5,13 Z',\nICON_TYPE_EXIT: 'M8.70725,8.00025 L15.85325,0.85425 C16.04925,0.65825 16.04925,0.34225 15.85325,0.14625 C15.65825,-0.04875 15.34225,-0.04875 15.14625,0.14625 L8.00025,7.29325 L0.85325,0.14625 C0.65825,-0.04875 0.34225,-0.04875 0.14625,0.14625 C-0.04875,0.34225 -0.04875,0.65825 0.14625,0.85425 L7.29325,8.00025 L0.14625,15.14625 C-0.04875,15.34225 -0.04875,15.65825 0.14625,15.85425 C0.24425,15.95125 0.37225,16.00025 0.50025,16.00025 C0.62825,16.00025 0.75625,15.95125 0.85325,15.85425 L8.00025,8.70725 L15.14625,15.85425 C15.24425,15.95125 15.37225,16.00025 15.50025,16.00025 C15.62825,16.00025 15.75625,15.95125 15.85325,15.85425 C16.04925,15.65825 16.04925,15.34225 15.85325,15.14625 L8.70725,8.00025 Z',\nICON_TYPE_EXTERNAL_USER: 'M13.4996809,7 C13.1606809,7 12.8336809,7.044 12.5166809,7.115 C12.8236809,6.473 12.9996809,5.759 12.9996809,5 C12.9996809,2.243 10.7566809,8.8817842e-16 7.99968089,8.8817842e-16 C5.24268089,8.8817842e-16 2.99968089,2.243 2.99968089,5 C2.99968089,6.641 3.80568089,8.089 5.03168089,9 L4.70268089,9 C2.74568089,9 1.04968089,10.405 0.578680889,12.415 L0.027680889,14.764 C-0.044319111,15.073 0.025680889,15.389 0.219680889,15.633 C0.404680889,15.866 0.677680889,16 0.969680889,16 L13.4786809,16 L13.4786809,15.998 C13.4856809,15.998 13.4926809,16 13.4996809,16 C15.9846809,16 17.9996809,13.985 17.9996809,11.5 C17.9996809,9.015 15.9846809,7 13.4996809,7 Z M13.4996809,15 C11.5696809,15 9.99968089,13.43 9.99968089,11.5 C9.99968089,9.57 11.5696809,8 13.4996809,8 C15.4296809,8 16.9996809,9.57 16.9996809,11.5 C16.9996809,13.43 15.4296809,15 13.4996809,15 Z M13.4996809,11 C13.2246809,11 12.9996809,11.225 12.9996809,11.5 L12.9996809,13.5 C12.9996809,13.775 13.2246809,14 13.4996809,14 C13.7746809,14 13.9996809,13.775 13.9996809,13.5 L13.9996809,11.5 C13.9996809,11.225 13.7746809,11 13.4996809,11 Z M13.4996809,9 C13.2236809,9 12.9996809,9.224 12.9996809,9.5 C12.9996809,9.776 13.2236809,10 13.4996809,10 C13.7756809,10 13.9996809,9.776 13.9996809,9.5 C13.9996809,9.224 13.7756809,9 13.4996809,9 Z M1.00168089,14.993 L1.55268089,12.644 C1.91768089,11.087 3.21168089,10 4.70268089,10 L9.27468089,10 C9.10768089,10.472 8.99968089,10.971 8.99968089,11.5 C8.99968089,12.922 9.67168089,14.174 10.7006809,14.998 L1.00168089,14.993 Z M3.99968089,5 C3.99968089,2.794 5.79368089,1 7.99968089,1 C10.2056809,1 11.9996809,2.794 11.9996809,5 C11.9996809,7.206 10.2056809,9 7.99968089,9 C5.79368089,9 3.99968089,7.206 3.99968089,5 Z',\nICON_TYPE_EXTERNAL_USER_OUTLINE: 'M17.8102622,13.897 C18.0642419,14.338 18.063242,14.866 17.8072624,15.308 C17.5572823,15.742 17.1113178,16 16.6153574,16 L10.2938609,16 L8.38301312,16 L0.969603653,16 C0.677626911,16 0.404648656,15.866 0.219663391,15.633 C0.0256788435,15.389 -0.044315581,15.072 0.0276786842,14.764 L0.578634797,12.415 C1.04959728,10.405 2.74646211,9 4.70330624,9 L5.03228003,9 C3.80637768,8.088 3.00044188,6.641 3.00044188,4.999 C3.00044188,2.243 5.24326323,0 8.00004363,0 C10.7558241,0 12.9986455,2.243 12.9986455,4.999 C12.9986455,5.376 12.9436498,5.737 12.8636562,6.088 C13.2016293,6.172 13.5086048,6.374 13.6935901,6.697 L13.6935901,6.698 L17.8102622,13.897 Z M16.9423313,14.807 C17.0173253,14.678 17.0173253,14.523 16.9433312,14.394 L12.8266592,7.195 C12.7256672,7.019 12.5636801,7 12.4996852,7 C12.4346904,7 12.2727033,7.019 12.1717113,7.195 L8.05603917,14.393 C7.98104514,14.524 7.98204506,14.678 8.05603917,14.808 C8.08903654,14.864 8.18802865,14.991 8.37301392,14.997 L10.2938609,14.998 L10.2938609,15 L16.6153574,15 C16.8093419,15 16.9093339,14.866 16.9423313,14.807 Z M12.4992852,9.0004 C12.7752632,9.0004 12.9992454,9.2244 12.9992454,9.5004 L12.9992454,11.5004 C12.9992454,11.7764 12.7752632,12.0004 12.4992852,12.0004 C12.2233072,12.0004 11.9993251,11.7764 11.9993251,11.5004 L11.9993251,9.5004 C11.9993251,9.2244 12.2233072,9.0004 12.4992852,9.0004 Z M1.55255722,12.644 L1.0016011,14.993 L7.06111842,14.996 C6.9521271,14.631 6.99212392,14.238 7.18910822,13.896 L9.41593084,10 L4.70330624,10 C3.212425,10 1.91752814,11.087 1.55255722,12.644 Z M4.00036223,4.999 C4.00036223,7.205 5.79421934,8.999 8.00004363,8.999 C8.95496756,8.999 9.8218985,8.649 10.5098437,8.088 L11.3047804,6.698 C11.422771,6.492 11.5927574,6.339 11.7857421,6.23 C11.912732,5.84 11.9987251,5.431 11.9987251,4.999 C11.9987251,2.794 10.204868,1 8.00004363,1 C5.79421934,1 4.00036223,2.794 4.00036223,4.999 Z M12.4992852,13.0004 C12.7752632,13.0004 12.9992454,13.2244 12.9992454,13.5004 C12.9992454,13.7764 12.7752632,14.0004 12.4992852,14.0004 C12.2233072,14.0004 11.9993251,13.7764 11.9993251,13.5004 C11.9993251,13.2244 12.2233072,13.0004 12.4992852,13.0004 Z',\n@@ -91,6 +93,7 @@ const paths = {\nconst sizes = {\nICON_TYPE_DELETE: 12,\nICON_TYPE_DND: 16,\n+ ICON_TYPE_DOWNLOAD: 16,\nICON_TYPE_EXIT: 20,\nICON_TYPE_EXTERNAL_USER: 18,\nICON_TYPE_EXTERNAL_USER_OUTLINE: 18,\n@@ -104,6 +107,7 @@ const sizes = {\n};\nconst transforms = {\n+ ICON_TYPE_DOWNLOAD: 'translate(2.000000, 1.000000)',\nICON_TYPE_EXIT: 'translate(2.000000, 2.000000)',\nICON_TYPE_PARTICIPANT_LIST: 'translate(1.000000, 3.000000)',\nICON_TYPE_RIGHT_ARROW: 'translate(3.000000, 1.000000)',\n",
"new_path": "packages/node_modules/@ciscospark/react-component-icon/src/index.js",
"old_path": "packages/node_modules/@ciscospark/react-component-icon/src/index.js"
}
] | JavaScript | MIT License | webex/react-widgets | fix(icon): add missing download icon | 1 | fix | icon |
730,429 | 05.06.2018 12:37:31 | 14,400 | 2d49de79d5d0674cc8eceb93afb188e6816ca165 | feat(samples): add download icon | [
{
"change_type": "MODIFY",
"diff": "@@ -70,6 +70,13 @@ function BasicComponents() {\ntype={ICONS.ICON_TYPE_DOCUMENT}\n/>\n</div>\n+ <div style={{height: '25px', width: '25px', backgroundColor: 'blueviolet'}}>\n+ <Icon\n+ color=\"white\"\n+ title=\"Download\"\n+ type={ICONS.ICON_TYPE_DOWNLOAD}\n+ />\n+ </div>\n<div style={{height: '25px', width: '25px', backgroundColor: 'blueviolet'}}>\n<Icon\ncolor=\"white\"\n",
"new_path": "samples/BasicComponents.js",
"old_path": "samples/BasicComponents.js"
}
] | JavaScript | MIT License | webex/react-widgets | feat(samples): add download icon | 1 | feat | samples |
730,429 | 05.06.2018 12:56:52 | 14,400 | 41f0dfaabd3fd725d139688beca0576cc2d9e303 | style(activity-share-file): style download icon properly | [
{
"change_type": "MODIFY",
"diff": "@@ -75,7 +75,36 @@ exports[`ActivityShareFile component renders properly 1`] = `\nonClick={[Function]}\nonKeyPress={[Function]}\n>\n-\n+ <div\n+ className=\"ciscospark-button-icon buttonIcon\"\n+ >\n+ <div\n+ className=\"ciscospark-icon\"\n+ title=\"Download this file\"\n+ >\n+ <svg\n+ height=\"100%\"\n+ style={\n+ Object {\n+ \"display\": \"inline-block\",\n+ \"verticalAlign\": \"middle\",\n+ }\n+ }\n+ viewBox=\"0 0 16 16\"\n+ width=\"100%\"\n+ >\n+ <path\n+ d=\"M6.1459,10.8529 C6.1919,10.8989 6.2479,10.9359 6.3089,10.9619 C6.3699,10.9869 6.4349,10.9999 6.4999,10.9999 C6.5649,10.9999 6.6299,10.9869 6.6909,10.9619 C6.7529,10.9359 6.8079,10.8989 6.8539,10.8529 L10.8539,6.8539 C11.0489,6.6579 11.0489,6.3419 10.8539,6.1469 C10.6579,5.9509 10.3419,5.9509 10.1469,6.1469 L6.9999,9.2929 L6.9999,0.4999 C6.9999,0.2239 6.7759,-0.0001 6.4999,-0.0001 C6.2239,-0.0001 5.9999,0.2239 5.9999,0.4999 L5.9999,9.2929 L2.8539,6.1469 C2.6579,5.9509 2.3419,5.9509 2.1469,6.1469 C1.9509,6.3419 1.9509,6.6579 2.1469,6.8539 L6.1459,10.8529 Z M12.5,13 L0.5,13 C0.224,13 0,13.224 0,13.5 C0,13.776 0.224,14 0.5,14 L12.5,14 C12.776,14 13,13.776 13,13.5 C13,13.224 12.776,13 12.5,13 Z\"\n+ style={\n+ Object {\n+ \"fill\": \"black\",\n+ }\n+ }\n+ transform=\"translate(2.000000, 1.000000)\"\n+ />\n+ </svg>\n+ </div>\n+ </div>\n</button>\n",
"new_path": "packages/node_modules/@ciscospark/react-component-activity-share-file/src/__snapshots__/index.test.js.snap",
"old_path": "packages/node_modules/@ciscospark/react-component-activity-share-file/src/__snapshots__/index.test.js.snap"
},
{
"change_type": "MODIFY",
"diff": "@@ -58,6 +58,7 @@ function ActivityShareFile(props) {\n<div className={classNames('ciscospark-share-action-item', styles.shareActionItem)}>\n<Button\nbuttonClassName={styles.downloadButton}\n+ iconColor=\"black\"\niconType={ICONS.ICON_TYPE_DOWNLOAD}\nonClick={handleDownloadClick}\ntitle=\"Download this file\"\n",
"new_path": "packages/node_modules/@ciscospark/react-component-activity-share-file/src/index.js",
"old_path": "packages/node_modules/@ciscospark/react-component-activity-share-file/src/index.js"
},
{
"change_type": "MODIFY",
"diff": "-.share-item {\n+.shareItem {\nposition: relative;\ndisplay: flex;\nheight: 60px;\nbackground-color: #ebebec;\nborder: 1px solid #ebebec;\nborder-radius: 4px;\n+ justify-content: space-between;\n}\n-.file-icon {\n- display: flex;\n- width: 60px;\n- height: 60px;\n- padding: 15px;\n- font-size: 30px;\n- text-align: center;\n- flex: 0;\n+.fileIcon {\n+ width: 40px;\n+ height: 40px;\n+ font-size: 40px;\n}\n.meta {\nmax-width: 200px;\n}\n-.file-info {\n+.fileInfo {\nmargin: auto 0;\nfont-size: 12px;\nvertical-align: center;\nwidth: 100%;\n}\n-.file-name {\n+.fileName {\noverflow: hidden;\ntext-overflow: ellipsis;\nwhite-space: nowrap;\n}\n-.file-props {\n+.fileProps {\ncolor: #aeaeaf;\n}\n-.share-actions {\n- padding: 16px;\n- font-size: 22px;\n+.shareActions {\nflex: 0;\n+ height: 100%;\n+ width: 55px;\n}\n-.file-type {\n+.fileType {\nmargin-left: 5px;\n}\n",
"new_path": "packages/node_modules/@ciscospark/react-component-activity-share-file/src/styles.css",
"old_path": "packages/node_modules/@ciscospark/react-component-activity-share-file/src/styles.css"
}
] | JavaScript | MIT License | webex/react-widgets | style(activity-share-file): style download icon properly | 1 | style | activity-share-file |
730,429 | 05.06.2018 12:57:10 | 14,400 | 22613b03dbbc3f39e38e7fa7b681651082c779bf | style(activity-share-thumbnail): style download icon properly | [
{
"change_type": "MODIFY",
"diff": "@@ -53,7 +53,36 @@ exports[`ActivityShareThumbnail post component renders loaded thumbnail properly\nonClick={[Function]}\nonKeyPress={[Function]}\n>\n-\n+ <div\n+ className=\"ciscospark-button-icon buttonIcon\"\n+ >\n+ <div\n+ className=\"ciscospark-icon\"\n+ title=\"Download this file\"\n+ >\n+ <svg\n+ height=\"100%\"\n+ style={\n+ Object {\n+ \"display\": \"inline-block\",\n+ \"verticalAlign\": \"middle\",\n+ }\n+ }\n+ viewBox=\"0 0 16 16\"\n+ width=\"100%\"\n+ >\n+ <path\n+ d=\"M6.1459,10.8529 C6.1919,10.8989 6.2479,10.9359 6.3089,10.9619 C6.3699,10.9869 6.4349,10.9999 6.4999,10.9999 C6.5649,10.9999 6.6299,10.9869 6.6909,10.9619 C6.7529,10.9359 6.8079,10.8989 6.8539,10.8529 L10.8539,6.8539 C11.0489,6.6579 11.0489,6.3419 10.8539,6.1469 C10.6579,5.9509 10.3419,5.9509 10.1469,6.1469 L6.9999,9.2929 L6.9999,0.4999 C6.9999,0.2239 6.7759,-0.0001 6.4999,-0.0001 C6.2239,-0.0001 5.9999,0.2239 5.9999,0.4999 L5.9999,9.2929 L2.8539,6.1469 C2.6579,5.9509 2.3419,5.9509 2.1469,6.1469 C1.9509,6.3419 1.9509,6.6579 2.1469,6.8539 L6.1459,10.8529 Z M12.5,13 L0.5,13 C0.224,13 0,13.224 0,13.5 C0,13.776 0.224,14 0.5,14 L12.5,14 C12.776,14 13,13.776 13,13.5 C13,13.224 12.776,13 12.5,13 Z\"\n+ style={\n+ Object {\n+ \"fill\": \"white\",\n+ }\n+ }\n+ transform=\"translate(2.000000, 1.000000)\"\n+ />\n+ </svg>\n+ </div>\n+ </div>\n</button>\n@@ -120,7 +149,36 @@ exports[`ActivityShareThumbnail post component renders loading state properly 1`\nonClick={[Function]}\nonKeyPress={[Function]}\n>\n-\n+ <div\n+ className=\"ciscospark-button-icon buttonIcon\"\n+ >\n+ <div\n+ className=\"ciscospark-icon\"\n+ title=\"Download this file\"\n+ >\n+ <svg\n+ height=\"100%\"\n+ style={\n+ Object {\n+ \"display\": \"inline-block\",\n+ \"verticalAlign\": \"middle\",\n+ }\n+ }\n+ viewBox=\"0 0 16 16\"\n+ width=\"100%\"\n+ >\n+ <path\n+ d=\"M6.1459,10.8529 C6.1919,10.8989 6.2479,10.9359 6.3089,10.9619 C6.3699,10.9869 6.4349,10.9999 6.4999,10.9999 C6.5649,10.9999 6.6299,10.9869 6.6909,10.9619 C6.7529,10.9359 6.8079,10.8989 6.8539,10.8529 L10.8539,6.8539 C11.0489,6.6579 11.0489,6.3419 10.8539,6.1469 C10.6579,5.9509 10.3419,5.9509 10.1469,6.1469 L6.9999,9.2929 L6.9999,0.4999 C6.9999,0.2239 6.7759,-0.0001 6.4999,-0.0001 C6.2239,-0.0001 5.9999,0.2239 5.9999,0.4999 L5.9999,9.2929 L2.8539,6.1469 C2.6579,5.9509 2.3419,5.9509 2.1469,6.1469 C1.9509,6.3419 1.9509,6.6579 2.1469,6.8539 L6.1459,10.8529 Z M12.5,13 L0.5,13 C0.224,13 0,13.224 0,13.5 C0,13.776 0.224,14 0.5,14 L12.5,14 C12.776,14 13,13.776 13,13.5 C13,13.224 12.776,13 12.5,13 Z\"\n+ style={\n+ Object {\n+ \"fill\": \"white\",\n+ }\n+ }\n+ transform=\"translate(2.000000, 1.000000)\"\n+ />\n+ </svg>\n+ </div>\n+ </div>\n</button>\n@@ -232,7 +290,36 @@ exports[`ActivityShareThumbnail post component renders thumbnail properly 1`] =\nonClick={[Function]}\nonKeyPress={[Function]}\n>\n-\n+ <div\n+ className=\"ciscospark-button-icon buttonIcon\"\n+ >\n+ <div\n+ className=\"ciscospark-icon\"\n+ title=\"Download this file\"\n+ >\n+ <svg\n+ height=\"100%\"\n+ style={\n+ Object {\n+ \"display\": \"inline-block\",\n+ \"verticalAlign\": \"middle\",\n+ }\n+ }\n+ viewBox=\"0 0 16 16\"\n+ width=\"100%\"\n+ >\n+ <path\n+ d=\"M6.1459,10.8529 C6.1919,10.8989 6.2479,10.9359 6.3089,10.9619 C6.3699,10.9869 6.4349,10.9999 6.4999,10.9999 C6.5649,10.9999 6.6299,10.9869 6.6909,10.9619 C6.7529,10.9359 6.8079,10.8989 6.8539,10.8529 L10.8539,6.8539 C11.0489,6.6579 11.0489,6.3419 10.8539,6.1469 C10.6579,5.9509 10.3419,5.9509 10.1469,6.1469 L6.9999,9.2929 L6.9999,0.4999 C6.9999,0.2239 6.7759,-0.0001 6.4999,-0.0001 C6.2239,-0.0001 5.9999,0.2239 5.9999,0.4999 L5.9999,9.2929 L2.8539,6.1469 C2.6579,5.9509 2.3419,5.9509 2.1469,6.1469 C1.9509,6.3419 1.9509,6.6579 2.1469,6.8539 L6.1459,10.8529 Z M12.5,13 L0.5,13 C0.224,13 0,13.224 0,13.5 C0,13.776 0.224,14 0.5,14 L12.5,14 C12.776,14 13,13.776 13,13.5 C13,13.224 12.776,13 12.5,13 Z\"\n+ style={\n+ Object {\n+ \"fill\": \"white\",\n+ }\n+ }\n+ transform=\"translate(2.000000, 1.000000)\"\n+ />\n+ </svg>\n+ </div>\n+ </div>\n</button>\n",
"new_path": "packages/node_modules/@ciscospark/react-component-activity-share-thumbnail/src/__snapshots__/index.test.js.snap",
"old_path": "packages/node_modules/@ciscospark/react-component-activity-share-thumbnail/src/__snapshots__/index.test.js.snap"
},
{
"change_type": "MODIFY",
"diff": "}\n.shareActionItem {\n- flex: 0;\n+ height: 60px;\n+ width: 60px;\n}\n.shareActionItem:hover {\nbackground-color: #343537;\n}\n-\n-.shareActionItem .downloadButton {\n- padding: 14px;\n- font-size: 18px;\n-}\n",
"new_path": "packages/node_modules/@ciscospark/react-component-activity-share-thumbnail/src/styles.css",
"old_path": "packages/node_modules/@ciscospark/react-component-activity-share-thumbnail/src/styles.css"
}
] | JavaScript | MIT License | webex/react-widgets | style(activity-share-thumbnail): style download icon properly | 1 | style | activity-share-thumbnail |
730,429 | 05.06.2018 12:57:57 | 14,400 | 7e449606271bff513cae695b8d954614c1156991 | refactor(container-file-downloader): use selector for mapping props | [
{
"change_type": "MODIFY",
"diff": "@@ -7,6 +7,8 @@ import {autobind} from 'core-decorators';\nimport {bufferToBlob, getDisplayName} from '@ciscospark/react-component-utils';\nimport {retrieveSharedFile} from '@ciscospark/redux-module-share';\n+import getContainerProps from './selectors';\n+\n// eslint-disable-next-line no-warning-comments\n// TODO: Rename this project to react-hoc-file-downloader\n@@ -85,10 +87,7 @@ function injectFileDownloader(WrappedComponent) {\nFileDownloader.WrappedComponent = WrappedComponent;\nreturn connect(\n- (state) => ({\n- share: state.share,\n- spark: state.spark.get('spark')\n- }),\n+ getContainerProps,\n(dispatch) => bindActionCreators({\nretrieveSharedFile\n}, dispatch)\n",
"new_path": "packages/node_modules/@ciscospark/react-container-file-downloader/src/index.js",
"old_path": "packages/node_modules/@ciscospark/react-container-file-downloader/src/index.js"
},
{
"change_type": "ADD",
"diff": "+import {createSelector} from 'reselect';\n+\n+const getSpark = (state, ownProps) => ownProps.sparkInstance || state.spark.get('spark');\n+const getShare = (state) => state.share;\n+\n+const getContainerProps = createSelector(\n+ [getSpark, getShare],\n+ (spark, share) => (\n+ {\n+ share,\n+ spark\n+ }\n+ )\n+);\n+\n+export default getContainerProps;\n",
"new_path": "packages/node_modules/@ciscospark/react-container-file-downloader/src/selectors.js",
"old_path": null
}
] | JavaScript | MIT License | webex/react-widgets | refactor(container-file-downloader): use selector for mapping props | 1 | refactor | container-file-downloader |
679,913 | 05.06.2018 14:47:08 | -3,600 | de48e13407fde97ade7abc24514ecd0adb1aa773 | build: add yarn bootstrap | [
{
"change_type": "MODIFY",
"diff": "\"webpack-dev-server\": \"^3.1.4\"\n},\n\"scripts\": {\n+ \"bootstrap\": \"lerna bootstrap\",\n\"build\": \"yarn install && lerna -v && lerna bootstrap && lerna run build --sort\",\n\"cover\": \"lerna run cover\",\n\"depgraph\": \"scripts/depgraph && git add assets/deps.png && git commit -m 'docs: update dep graph' && git push\",\n",
"new_path": "package.json",
"old_path": "package.json"
}
] | TypeScript | Apache License 2.0 | thi-ng/umbrella | build: add yarn bootstrap | 1 | build | null |
730,429 | 05.06.2018 15:34:56 | 14,400 | 9ed88613ab6802917003cc60987faf163e6b93ad | style(people-list): use flexbox to grow height | [
{
"change_type": "MODIFY",
"diff": "exports[`PeopleList component renders a group of participants 1`] = `\n<div\n- style={\n- Object {\n- \"height\": \"100%\",\n- \"width\": \"100%\",\n- }\n- }\n+ className=\"ciscospark-people-list list\"\n>\n<AutoSizer\ndisableHeight={false}\n@@ -22,12 +17,7 @@ exports[`PeopleList component renders a group of participants 1`] = `\nexports[`PeopleList component renders a list of participants without a group 1`] = `\n<div\n- style={\n- Object {\n- \"height\": \"100%\",\n- \"width\": \"100%\",\n- }\n- }\n+ className=\"ciscospark-people-list list\"\n>\n<AutoSizer\ndisableHeight={false}\n",
"new_path": "packages/node_modules/@ciscospark/react-component-people-list/src/__snapshots__/index.test.js.snap",
"old_path": "packages/node_modules/@ciscospark/react-component-people-list/src/__snapshots__/index.test.js.snap"
},
{
"change_type": "MODIFY",
"diff": "@@ -101,7 +101,7 @@ function PeopleList({\n}\nreturn (\n- <div style={{height: '100%', width: '100%'}}>\n+ <div className={classNames('ciscospark-people-list', styles.list)}>\n{\n<AutoSizer>\n{({height, width}) => (\n",
"new_path": "packages/node_modules/@ciscospark/react-component-people-list/src/index.js",
"old_path": "packages/node_modules/@ciscospark/react-component-people-list/src/index.js"
},
{
"change_type": "MODIFY",
"diff": "color: #4f5051;\nbackground: #f5f5f6;\n}\n+\n+.list {\n+ flex: 1 1 auto;\n+}\n",
"new_path": "packages/node_modules/@ciscospark/react-component-people-list/src/styles.css",
"old_path": "packages/node_modules/@ciscospark/react-component-people-list/src/styles.css"
}
] | JavaScript | MIT License | webex/react-widgets | style(people-list): use flexbox to grow height | 1 | style | people-list |
730,429 | 05.06.2018 15:35:26 | 14,400 | 872dbaaf249108207e18485f7d7cf598db3a6117 | style(widget-roster): use flexbox to grow height | [
{
"change_type": "MODIFY",
"diff": "@@ -74,7 +74,7 @@ function AddParticipant({\n}\nelse if (searchResults.results && searchResults.results.length) {\nresults = (\n- <div className={classNames(`${baseClassPrefix}-results`, styles.results)}>\n+ <div className={classNames(`${baseClassPrefix}-results`, styles.results, styles.fullHeight)}>\n<PeopleList\nitems={[{people: searchResults.results}]}\nonItemClick={handleClick}\n",
"new_path": "packages/node_modules/@ciscospark/widget-roster/src/components/add-participant/index.js",
"old_path": "packages/node_modules/@ciscospark/widget-roster/src/components/add-participant/index.js"
},
{
"change_type": "MODIFY",
"diff": ".addPartipicant {\n- height: 100%;\n- width: 100%;\n+ display: flex;\n+ flex: 1 1 auto;\n+ flex-direction: column;\n}\n.searchBar {\n.item {\ncursor: pointer;\n}\n+\n+.fullHeight {\n+ display: flex;\n+ flex: 1 1 auto;\n+ flex-direction: column;\n+}\n",
"new_path": "packages/node_modules/@ciscospark/widget-roster/src/components/add-participant/styles.css",
"old_path": "packages/node_modules/@ciscospark/widget-roster/src/components/add-participant/styles.css"
},
{
"change_type": "MODIFY",
"diff": "@@ -154,7 +154,7 @@ export class RosterWidget extends Component {\nlet content;\nif (currentView === VIEW_ADD) {\ncontent = (\n- <div className={classNames('ciscospark-roster-scrolling-list', styles.scrolling)}>\n+ <div className={classNames('ciscospark-roster-add-participant-list', styles.fullHeight)}>\n<AddParticipant\nnoResultsMessage={this.formattedMessages.noResults}\nonAddPerson={this.handleAddPersonClick}\n@@ -190,7 +190,7 @@ export class RosterWidget extends Component {\n);\n}\ncontent = (\n- <div className={classNames('ciscospark-roster-scrolling-list', styles.scrolling)}>\n+ <div className={classNames('ciscospark-roster-people-list', styles.fullHeight)}>\n{addPeopleButton}\n<PeopleList\nitems={participants.people}\n@@ -202,7 +202,7 @@ export class RosterWidget extends Component {\n}\nmainArea = (\n- <div className={classNames('ciscospark-roster-scrolling-list', styles.scrolling)}>\n+ <div className={classNames('ciscospark-roster-main-area-participants', styles.fullHeight)}>\n{\nparticipants.hasExternalParticipants\n&& <ExternalParticipantMessage message={this.formattedMessages.externalParticipants} />\n@@ -218,7 +218,7 @@ export class RosterWidget extends Component {\nonMenuClick={this.handleMenuClick}\ntitle={`People (${participants.count ? participants.count : null})`}\n/>\n- <div className={classNames('ciscospark-roster-scrolling-list', styles.scrolling)}>\n+ <div className={classNames('ciscospark-roster-main-area', styles.fullHeight)}>\n{mainArea}\n</div>\n{\n",
"new_path": "packages/node_modules/@ciscospark/widget-roster/src/container.js",
"old_path": "packages/node_modules/@ciscospark/widget-roster/src/container.js"
},
{
"change_type": "MODIFY",
"diff": ".roster {\n+ display: flex;\nheight: 100%;\nwidth: 100%;\nfont-family: CiscoSans, 'Helvetica Neue', Arial, sans-serif;\nflex-direction: column;\n}\n+.fullHeight {\n+ display: flex;\n+ flex: 1 1 auto;\n+ flex-direction: column;\n+}\n+\n.scrolling {\n- height: 100%;\n- width: 100%;\n+ display: flex;\n+ flex: 1 1 auto;\n+ flex-direction: column;\n}\n.participantsSeparator {\n",
"new_path": "packages/node_modules/@ciscospark/widget-roster/src/styles.css",
"old_path": "packages/node_modules/@ciscospark/widget-roster/src/styles.css"
}
] | JavaScript | MIT License | webex/react-widgets | style(widget-roster): use flexbox to grow height | 1 | style | widget-roster |
730,429 | 05.06.2018 15:36:03 | 14,400 | 7e6cb97804239368592ed6d9d632f7addf0418e2 | fix(widget-roster): get proper loading state of search | [
{
"change_type": "MODIFY",
"diff": "@@ -42,7 +42,7 @@ const getSearchResults = createSelector(\n],\n(search, widgetRoster, currentUser) => {\nconst searchTerm = widgetRoster.get('searchTerm');\n- if (searchTerm && search.hasIn(['searchResults', searchTerm, 'results'])) {\n+ if (searchTerm && search.hasIn(['searchResults', searchTerm])) {\nconst searchResults = search.getIn(['searchResults', searchTerm]).toJS();\nconst results = [];\nif (searchResults.results) {\n",
"new_path": "packages/node_modules/@ciscospark/widget-roster/src/selector.js",
"old_path": "packages/node_modules/@ciscospark/widget-roster/src/selector.js"
}
] | JavaScript | MIT License | webex/react-widgets | fix(widget-roster): get proper loading state of search | 1 | fix | widget-roster |
730,413 | 05.06.2018 16:32:01 | 14,400 | d889221904cb2858be054cec0259e4b82869f7a2 | style(widget-recents): eslint sort-comp errors | [
{
"change_type": "MODIFY",
"diff": "@@ -52,19 +52,6 @@ const defaultProps = {\nexport class MessageComposer extends Component {\n- static renderSuggestion(entry, search, highlightedDisplay) {\n- return (\n- <div className={mentionStyles.content}>\n- <div className={mentionStyles.avatar}>\n- <PresenceAvatar avatarId={entry.id} name={entry.display} />\n- </div>\n- <div className={mentionStyles.highlightedDisplay}>\n- {highlightedDisplay}\n- </div>\n- </div>\n- );\n- }\n-\nconstructor(props) {\nsuper(props);\nthis.timerId = 0;\n@@ -188,6 +175,18 @@ export class MessageComposer extends Component {\nreturn participants;\n}\n+ static renderSuggestion(entry, search, highlightedDisplay) {\n+ return (\n+ <div className={mentionStyles.content}>\n+ <div className={mentionStyles.avatar}>\n+ <PresenceAvatar avatarId={entry.id} name={entry.display} />\n+ </div>\n+ <div className={mentionStyles.highlightedDisplay}>\n+ {highlightedDisplay}\n+ </div>\n+ </div>\n+ );\n+ }\nrender() {\nlet text;\n",
"new_path": "packages/node_modules/@ciscospark/react-container-message-composer/src/container.js",
"old_path": "packages/node_modules/@ciscospark/react-container-message-composer/src/container.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -42,19 +42,6 @@ const defaultProps = {\n};\nclass SparkComponent extends Component {\n- static setupDevice(spark, props) {\n- const {\n- authenticated,\n- registered,\n- registerError,\n- registering\n- } = props.spark.get('status').toJS();\n-\n- if (authenticated && !registered && !registering && !registerError) {\n- props.registerDevice(spark);\n- }\n- }\n-\nstatic listenToSparkEvents(spark, props) {\nconst {metrics} = props;\nspark.listenToAndRun(spark, 'change:canAuthorize', () => {\n@@ -114,6 +101,19 @@ class SparkComponent extends Component {\nreturn nextProps.spark !== props.spark;\n}\n+ static setupDevice(spark, props) {\n+ const {\n+ authenticated,\n+ registered,\n+ registerError,\n+ registering\n+ } = props.spark.get('status').toJS();\n+\n+ if (authenticated && !registered && !registering && !registerError) {\n+ props.registerDevice(spark);\n+ }\n+ }\n+\nrender() {\nreturn null;\n}\n",
"new_path": "packages/node_modules/@ciscospark/react-redux-spark/src/component.js",
"old_path": "packages/node_modules/@ciscospark/react-redux-spark/src/component.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -81,25 +81,6 @@ import {handleConversationActivityEvent} from './helpers';\n* @extends Component\n*/\nexport class MessageWidget extends Component {\n- /**\n- * Processes the activities and fetches avatars for users\n- * that have not been fetched yet\n- *\n- * @param {Object} props\n- *\n- */\n- static getAvatarsFromActivityActors(props) {\n- const {\n- sparkInstance\n- } = props;\n- const participants = filter(props.activities, 'actor').map((activity) => activity.actor.id);\n-\n- if (participants.length === 0) {\n- return;\n- }\n- props.fetchAvatarsForUsers(participants, sparkInstance);\n- }\n-\n/**\n* Check if activity list should scroll to bottom\n*\n@@ -219,6 +200,25 @@ export class MessageWidget extends Component {\nthis.props.unsubscribeFromPresenceUpdates(this.props.participants.map((p) => p.id), this.props.sparkInstance);\n}\n+ /**\n+ * Processes the activities and fetches avatars for users\n+ * that have not been fetched yet\n+ *\n+ * @param {Object} props\n+ *\n+ */\n+ static getAvatarsFromActivityActors(props) {\n+ const {\n+ sparkInstance\n+ } = props;\n+ const participants = filter(props.activities, 'actor').map((activity) => activity.actor.id);\n+\n+ if (participants.length === 0) {\n+ return;\n+ }\n+ props.fetchAvatarsForUsers(participants, sparkInstance);\n+ }\n+\n/**\n* Gets the non-current user of a conversation\n",
"new_path": "packages/node_modules/@ciscospark/widget-message/src/container.js",
"old_path": "packages/node_modules/@ciscospark/widget-message/src/container.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -84,6 +84,48 @@ export const ownPropTypes = {\n};\nexport class RecentsWidget extends Component {\n+ static checkForMercuryErrors(props) {\n+ const {\n+ errors,\n+ intl,\n+ mercuryStatus\n+ } = props;\n+ // Add Mercury disconnect error\n+ const mercuryError = 'mercury.disconnect';\n+ const isMercuryConnected = mercuryStatus.connected;\n+ const isMercuryDisconnected = !isMercuryConnected && mercuryStatus.hasConnected;\n+ const hasError = errors.get('hasError');\n+ const hasMercuryError = errors.get('errors').has(mercuryError);\n+ const hasNoMercuryError = !hasError || !hasMercuryError;\n+ if (isMercuryDisconnected && hasNoMercuryError) {\n+ // Create UI Error\n+ const {formatMessage} = intl;\n+ props.addError({\n+ id: mercuryError,\n+ displayTitle: formatMessage(messages.errorConnection),\n+ displaySubtitle: formatMessage(messages.reconnecting),\n+ temporary: true\n+ });\n+ }\n+ if (isMercuryConnected && hasMercuryError) {\n+ props.removeError(mercuryError);\n+ }\n+ }\n+\n+ componentWillReceiveProps(nextProps) {\n+ RecentsWidget.checkForMercuryErrors(nextProps);\n+ RecentsWidget.setup(nextProps);\n+ this.addListeners(nextProps);\n+ this.fetchAllAvatars(nextProps);\n+ }\n+\n+ shouldComponentUpdate(nextProps) {\n+ return nextProps.spacesList !== this.props.spacesList\n+ || nextProps.errors !== this.props.errors\n+ || nextProps.widgetRecents !== this.props.widgetRecents\n+ || nextProps.incomingCall !== this.props.incomingCall;\n+ }\n+\n@autobind\nstatic setup(props) {\nconst {\n@@ -181,48 +223,6 @@ export class RecentsWidget extends Component {\nprops.updateWidgetStatus({hasFetchedFeatureFlags: true, isFetchingFeatureFlags: false});\n}\n- static checkForMercuryErrors(props) {\n- const {\n- errors,\n- intl,\n- mercuryStatus\n- } = props;\n- // Add Mercury disconnect error\n- const mercuryError = 'mercury.disconnect';\n- const isMercuryConnected = mercuryStatus.connected;\n- const isMercuryDisconnected = !isMercuryConnected && mercuryStatus.hasConnected;\n- const hasError = errors.get('hasError');\n- const hasMercuryError = errors.get('errors').has(mercuryError);\n- const hasNoMercuryError = !hasError || !hasMercuryError;\n- if (isMercuryDisconnected && hasNoMercuryError) {\n- // Create UI Error\n- const {formatMessage} = intl;\n- props.addError({\n- id: mercuryError,\n- displayTitle: formatMessage(messages.errorConnection),\n- displaySubtitle: formatMessage(messages.reconnecting),\n- temporary: true\n- });\n- }\n- if (isMercuryConnected && hasMercuryError) {\n- props.removeError(mercuryError);\n- }\n- }\n-\n- componentWillReceiveProps(nextProps) {\n- RecentsWidget.checkForMercuryErrors(nextProps);\n- RecentsWidget.setup(nextProps);\n- this.addListeners(nextProps);\n- this.fetchAllAvatars(nextProps);\n- }\n-\n- shouldComponentUpdate(nextProps) {\n- return nextProps.spacesList !== this.props.spacesList\n- || nextProps.errors !== this.props.errors\n- || nextProps.widgetRecents !== this.props.widgetRecents\n- || nextProps.incomingCall !== this.props.incomingCall;\n- }\n-\n@autobind\ngetSpaceFromCall(call) {\nreturn this.props.spaces.get(call.instance.locus.conversationUrl.split('/').pop());\n",
"new_path": "packages/node_modules/@ciscospark/widget-recents/src/container.js",
"old_path": "packages/node_modules/@ciscospark/widget-recents/src/container.js"
}
] | JavaScript | MIT License | webex/react-widgets | style(widget-recents): eslint sort-comp errors | 1 | style | widget-recents |
573,190 | 05.06.2018 16:55:05 | 25,200 | 39bb37eedd112e9e2530b8af0c3fc9a0e1b61066 | style: fix failing check-style | [
{
"change_type": "MODIFY",
"diff": "@@ -257,9 +257,12 @@ describe('JSON body parser', function() {\n'\\r\\n' +\n'{\"foo\":\"bar\"}';\n- var client = net.connect({ host: '127.0.0.1', port: PORT }, function() {\n+ var client = net.connect(\n+ { host: '127.0.0.1', port: PORT },\n+ function() {\nclient.write(request);\n- });\n+ }\n+ );\nclient.once('data', function(data) {\nclient.end();\n});\n@@ -290,9 +293,12 @@ describe('JSON body parser', function() {\n'\\r\\n' +\n'{\"foo\":\"bar\"}';\n- var client = net.connect({ host: '127.0.0.1', port: PORT }, function() {\n+ var client = net.connect(\n+ { host: '127.0.0.1', port: PORT },\n+ function() {\nclient.write(request);\n- });\n+ }\n+ );\nclient.once('data', function(data) {\nclient.end();\n",
"new_path": "test/plugins/jsonBodyParser.test.js",
"old_path": "test/plugins/jsonBodyParser.test.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -321,11 +321,17 @@ describe('static resource plugin', function() {\n});\n});\n- socket.connect({ host: '127.0.0.1', port: PORT }, function() {\n- socket.write(RAW_REQUEST, 'utf-8', function(err2, data) {\n+ socket.connect(\n+ { host: '127.0.0.1', port: PORT },\n+ function() {\n+ socket.write(RAW_REQUEST, 'utf-8', function(\n+ err2,\n+ data\n+ ) {\nassert.ifError(err2);\n});\n- });\n+ }\n+ );\n});\n}\n);\n@@ -363,12 +369,18 @@ describe('static resource plugin', function() {\n});\nvar socket = new net.Socket();\n- socket.connect({ host: '127.0.0.1', port: PORT }, function() {\n- socket.write(RAW_REQUEST, 'utf-8', function(err2, data) {\n+ socket.connect(\n+ { host: '127.0.0.1', port: PORT },\n+ function() {\n+ socket.write(RAW_REQUEST, 'utf-8', function(\n+ err2,\n+ data\n+ ) {\nassert.ifError(err2);\nsocket.end();\n});\n- });\n+ }\n+ );\n});\n}\n);\n",
"new_path": "test/plugins/static.test.js",
"old_path": "test/plugins/static.test.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -396,15 +396,13 @@ test('PATCH ok', function(t) {\nmethod: 'PATCH',\nagent: false\n};\n- http\n- .request(opts, function(res) {\n+ http.request(opts, function(res) {\nt.equal(res.statusCode, 200);\nres.on('end', function() {\nt.end();\n});\nres.resume();\n- })\n- .end();\n+ }).end();\n});\ntest('HEAD ok', function(t) {\n@@ -423,8 +421,7 @@ test('HEAD ok', function(t) {\nmethod: 'HEAD',\nagent: false\n};\n- http\n- .request(opts, function(res) {\n+ http.request(opts, function(res) {\nt.equal(res.statusCode, 200);\nres.on('data', function(chunk) {\nt.fail('Data was sent on HEAD');\n@@ -432,8 +429,7 @@ test('HEAD ok', function(t) {\nres.on('end', function() {\nt.end();\n});\n- })\n- .end();\n+ }).end();\n});\ntest('DELETE ok', function(t) {\n@@ -452,15 +448,13 @@ test('DELETE ok', function(t) {\nmethod: 'DELETE',\nagent: false\n};\n- http\n- .request(opts, function(res) {\n+ http.request(opts, function(res) {\nt.equal(res.statusCode, 204);\nres.on('data', function(chunk) {\nt.fail('Data was sent on 204');\n});\nt.end();\n- })\n- .end();\n+ }).end();\n});\ntest('OPTIONS', function(t) {\n@@ -480,12 +474,10 @@ test('OPTIONS', function(t) {\nmethod: 'OPTIONS',\nagent: false\n};\n- http\n- .request(opts, function(res) {\n+ http.request(opts, function(res) {\nt.equal(res.statusCode, 200);\nt.end();\n- })\n- .end();\n+ }).end();\n});\ntest('RegExp ok', function(t) {\n@@ -544,8 +536,7 @@ test('GH-56 streaming with filed (download)', function(t) {\nmethod: 'GET',\nagent: false\n};\n- http\n- .request(opts, function(res) {\n+ http.request(opts, function(res) {\nt.equal(res.statusCode, 200);\nvar body = '';\nres.setEncoding('utf8');\n@@ -556,8 +547,7 @@ test('GH-56 streaming with filed (download)', function(t) {\nt.ok(body.length > 0);\nt.end();\n});\n- })\n- .end();\n+ }).end();\n});\ntest('GH-63 res.send 204 is sending a body', function(t) {\n@@ -577,8 +567,7 @@ test('GH-63 res.send 204 is sending a body', function(t) {\n}\n};\n- http\n- .request(opts, function(res) {\n+ http.request(opts, function(res) {\nt.equal(res.statusCode, 204);\nvar body = '';\nres.setEncoding('utf8');\n@@ -589,8 +578,7 @@ test('GH-63 res.send 204 is sending a body', function(t) {\nt.notOk(body);\nt.end();\n});\n- })\n- .end();\n+ }).end();\n});\ntest('GH-64 prerouting chain', function(t) {\n@@ -615,8 +603,7 @@ test('GH-64 prerouting chain', function(t) {\naccept: 'text/plain'\n}\n};\n- http\n- .request(opts, function(res) {\n+ http.request(opts, function(res) {\nt.equal(res.statusCode, 200);\nvar body = '';\nres.setEncoding('utf8');\n@@ -627,8 +614,7 @@ test('GH-64 prerouting chain', function(t) {\nt.equal(body, '\"mark\"');\nt.end();\n});\n- })\n- .end();\n+ }).end();\n});\ntest('GH-64 prerouting chain with error', function(t) {\n@@ -723,8 +709,7 @@ test('GH-180 can parse DELETE body', function(t) {\n'transfer-encoding': 'chunked'\n}\n};\n- http\n- .request(opts, function(res) {\n+ http.request(opts, function(res) {\nt.equal(res.statusCode, 200);\nres.setEncoding('utf8');\nres.body = '';\n@@ -735,8 +720,7 @@ test('GH-180 can parse DELETE body', function(t) {\nt.equal(res.body, '{\"param1\":1234}');\nt.end();\n});\n- })\n- .end('{\"param1\": 1234}');\n+ }).end('{\"param1\": 1234}');\n});\ntest('returning error from a handler (with domains)', function(t) {\n",
"new_path": "test/server.test.js",
"old_path": "test/server.test.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -53,9 +53,12 @@ before(function(cb) {\n});\nSERVER.listen(PORT, '127.0.0.1', function() {\nPORT = SERVER.address().port;\n- CLIENT = http2.connect('https://127.0.0.1:' + PORT, {\n+ CLIENT = http2.connect(\n+ 'https://127.0.0.1:' + PORT,\n+ {\nrejectUnauthorized: false\n- });\n+ }\n+ );\ncb();\n});\n",
"new_path": "test/serverHttp2.test.js",
"old_path": "test/serverHttp2.test.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -304,7 +304,12 @@ test('GET with upgrade headers', function(t) {\nt.equal(typeof socket, 'object');\nt.ok(Buffer.isBuffer(head), 'head is Buffer');\nt.doesNotThrow(function() {\n- var shed = WATERSHED.connect(res, socket, head, wskey);\n+ var shed = WATERSHED.connect(\n+ res,\n+ socket,\n+ head,\n+ wskey\n+ );\nSHEDLIST.push(shed);\nshed.end('ok, done');\nshed.on('error', function(err3) {\n@@ -375,7 +380,12 @@ test('GET with some websocket traffic', function(t) {\nt.equal(typeof socket, 'object');\nt.ok(Buffer.isBuffer(head), 'head is Buffer');\nt.doesNotThrow(function() {\n- var shed = WATERSHED.connect(res, socket, head, wskey);\n+ var shed = WATERSHED.connect(\n+ res,\n+ socket,\n+ head,\n+ wskey\n+ );\nSHEDLIST.push(shed);\nshed.on('error', function(err3) {\nt.ifError(err3);\n",
"new_path": "test/upgrade.test.js",
"old_path": "test/upgrade.test.js"
}
] | JavaScript | MIT License | restify/node-restify | style: fix failing check-style (#1671) | 1 | style | null |
730,429 | 05.06.2018 17:09:30 | 14,400 | 7818749b5ef72eeb9617ed3298613c27ae6c08cb | refactor(file-uploader): use reselect to get data from store | [
{
"change_type": "MODIFY",
"diff": "@@ -9,6 +9,8 @@ import {addFiles, removeFile} from '@ciscospark/redux-module-activity';\nimport AddFileButton from '@ciscospark/react-component-add-file-button';\nimport FileStagingArea from '@ciscospark/react-component-file-staging-area';\n+import getContainerProps from './selectors';\n+\nimport styles from './styles.css';\nconst injectedPropTypes = {\n@@ -89,11 +91,7 @@ export class FileUploader extends Component {\nFileUploader.propTypes = propTypes;\nexport default connect(\n- (state) => ({\n- activity: state.activity,\n- conversation: state.conversation,\n- spark: state.spark.get('spark')\n- }),\n+ getContainerProps,\n(dispatch) => bindActionCreators({\naddFiles,\nremoveFile\n",
"new_path": "packages/node_modules/@ciscospark/react-container-file-uploader/src/index.js",
"old_path": "packages/node_modules/@ciscospark/react-container-file-uploader/src/index.js"
},
{
"change_type": "ADD",
"diff": "+import {createSelector} from 'reselect';\n+\n+const getSpark = (state, ownProps) => ownProps.sparkInstance || state.spark.get('spark');\n+const getConversation = (state) => state.conversation;\n+const getActivity = (state) => state.activity;\n+\n+const getContainerProps = createSelector(\n+ [getSpark, getConversation, getActivity],\n+ (spark, conversation, activity) => (\n+ {\n+ spark,\n+ conversation,\n+ activity\n+ }\n+ )\n+);\n+\n+export default getContainerProps;\n",
"new_path": "packages/node_modules/@ciscospark/react-container-file-uploader/src/selectors.js",
"old_path": null
}
] | JavaScript | MIT License | webex/react-widgets | refactor(file-uploader): use reselect to get data from store | 1 | refactor | file-uploader |
217,922 | 05.06.2018 18:43:38 | -7,200 | 87a2a28ef14223a813a340f5710758968ae3340a | feat: you can now change recipe from the simulator page
closes | [
{
"change_type": "MODIFY",
"diff": "-<p>\n- recipe-choice-popup works!\n+<div class=\"input-container compact\">\n+ <mat-form-field>\n+ <mat-icon matPrefix>search</mat-icon>\n+ <input class=\"filter\" [(ngModel)]=\"query\" matInput placeholder=\"{{'ITEMS.Item_name' | translate}}\" #filter>\n+ </mat-form-field>\n+</div>\n+\n+<mat-list *ngIf=\"results.length > 0\">\n+ <mat-list-item *ngFor=\"let item of results\" class=\"recipes-list-row\">\n+ <a mat-list-avatar href=\"{{item.itemId | itemLink | i18n}}\" target=\"_blank\">\n+ <img mat-list-avatar [appXivdbTooltip]=\"item.itemId\" src=\"{{item.icon | icon}}\"\n+ alt=\"{{item.itemId | itemName | i18n}}\">\n+ </a>\n+ <h4 mat-line>{{item.itemId | itemName | i18n}}</h4>\n+ <p mat-line *ngIf=\"item.job !== undefined && getJob(item.job).abbreviation !== 'ADV'\">\n+ <img src=\"https://www.garlandtools.org/db/images/{{getJob(item.job).abbreviation}}.png\"\n+ alt=\"getJob(item.job)?.abbreviation\" class=\"crafted-by\"> {{item.lvl}} <span\n+ [innerHtml]=\"getStars(item.stars)\"></span>\n</p>\n+ <button mat-mini-fab [mat-dialog-close]=\"{itemId: item.itemId, recipeId: item.recipeId}\" class=\"gavel-button\">\n+ <mat-icon>gavel</mat-icon>\n+ </button>\n+ </mat-list-item>\n+</mat-list>\n+\n+<div *ngIf=\"results.length === 0 || results === null\">\n+ <h4 class=\"no-recipe\">{{'ITEMS.No_match' | translate}}</h4>\n+</div>\n",
"new_path": "src/app/pages/simulator/components/recipe-choice-popup/recipe-choice-popup.component.html",
"old_path": "src/app/pages/simulator/components/recipe-choice-popup/recipe-choice-popup.component.html"
},
{
"change_type": "MODIFY",
"diff": "+.crafted-by {\n+ height: 25px;\n+ vertical-align: middle;\n+}\n+\n+.gavel-button {\n+ margin-left: 15px;\n+}\n",
"new_path": "src/app/pages/simulator/components/recipe-choice-popup/recipe-choice-popup.component.scss",
"old_path": "src/app/pages/simulator/components/recipe-choice-popup/recipe-choice-popup.component.scss"
},
{
"change_type": "MODIFY",
"diff": "-import {Component, ElementRef, OnDestroy, ViewChild} from '@angular/core';\n-import {debounceTime, distinctUntilChanged, takeUntil} from 'rxjs/operators';\n+import {Component, ElementRef, OnDestroy, OnInit, ViewChild} from '@angular/core';\n+import {debounceTime, distinctUntilChanged, first, takeUntil} from 'rxjs/operators';\nimport {fromEvent, Subject} from 'rxjs/index';\nimport {Recipe} from '../../../../model/list/recipe';\n+import {DataService} from '../../../../core/api/data.service';\n+import {GarlandToolsService} from '../../../../core/api/garland-tools.service';\n+import {HtmlToolsService} from '../../../../core/tools/html-tools.service';\n@Component({\nselector: 'app-recipe-choice-popup',\ntemplateUrl: './recipe-choice-popup.component.html',\nstyleUrls: ['./recipe-choice-popup.component.scss']\n})\n-export class RecipeChoicePopupComponent implements OnDestroy {\n+export class RecipeChoicePopupComponent implements OnDestroy, OnInit {\nresults: Recipe[] = [];\n@@ -17,25 +20,50 @@ export class RecipeChoicePopupComponent implements OnDestroy {\nonDestroy$: Subject<void> = new Subject<void>();\n- filterValue: string;\n+ query: string;\n- constructor() {\n- fromEvent(this.filterElement.nativeElement, 'keyup')\n- .pipe(\n- takeUntil(this.onDestroy$),\n- debounceTime(500),\n- distinctUntilChanged()\n- ).subscribe(() => {\n- this.doSearch();\n- })\n+ constructor(private dataService: DataService, private gt: GarlandToolsService, private htmlTools: HtmlToolsService) {\n}\nprivate doSearch(): void {\n+ this.dataService.searchItem(this.query, [], true)\n+ .pipe(first())\n+ .subscribe(results => {\n+ this.results = <Recipe[]>results;\n+ })\n+ }\n+ /**\n+ * Gets job informations from a given job id.\n+ * @param {number} id\n+ * @returns {any}\n+ */\n+ getJob(id: number): any {\n+ return this.gt.getJob(id);\n+ }\n+\n+ /**\n+ * Generates star html string for recipes with stars.\n+ * @param {number} nb\n+ * @returns {string}\n+ */\n+ getStars(nb: number): string {\n+ return this.htmlTools.generateStars(nb);\n}\nngOnDestroy(): void {\nthis.onDestroy$.next();\n}\n+ ngOnInit(): void {\n+ fromEvent(this.filterElement.nativeElement, 'keyup')\n+ .pipe(\n+ takeUntil(this.onDestroy$),\n+ debounceTime(500),\n+ distinctUntilChanged()\n+ ).subscribe(() => {\n+ this.doSearch();\n+ });\n+ }\n+\n}\n",
"new_path": "src/app/pages/simulator/components/recipe-choice-popup/recipe-choice-popup.component.ts",
"old_path": "src/app/pages/simulator/components/recipe-choice-popup/recipe-choice-popup.component.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -547,7 +547,11 @@ export class SimulatorComponent implements OnInit, OnDestroy {\n.pipe(\nfilter(res => res !== undefined && res !== null && res !== '')\n).subscribe(result => {\n- this.router.navigate(['simulator', result.itemId, result.recipeId, this.rotation.$key]);\n+ const path = ['simulator', result.itemId, result.recipeId];\n+ if (this.rotation.$key !== undefined) {\n+ path.push(this.rotation.$key);\n+ }\n+ this.router.navigate(path);\n});\n}\n",
"new_path": "src/app/pages/simulator/components/simulator/simulator.component.ts",
"old_path": "src/app/pages/simulator/components/simulator/simulator.component.ts"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat: you can now change recipe from the simulator page
closes #395 | 1 | feat | null |
791,883 | 05.06.2018 19:15:49 | -7,200 | 8f23052b26c9bf495797bd586997c2574ce70b7e | core: handle DOM.resolveNode errors | [
{
"change_type": "MODIFY",
"diff": "@@ -54,7 +54,14 @@ class EventListeners extends Gatherer {\npromise = driver.sendCommand('DOM.resolveNode', {\nnodeId: nodeIdOrObject,\nobjectGroup: 'event-listeners-gatherer', // populates event handler info.\n- }).then(result => result.object);\n+ })\n+ .then(result => result.object)\n+ .catch(() => {\n+ return {\n+ objectId: null,\n+ description: '',\n+ };\n+ });\n}\nreturn promise.then(obj => {\n",
"new_path": "lighthouse-core/gather/gatherers/dobetterweb/all-event-listeners.js",
"old_path": "lighthouse-core/gather/gatherers/dobetterweb/all-event-listeners.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -63,7 +63,8 @@ class Element {\nreturn null;\n}\nreturn this.driver.getObjectProperty(resp.object.objectId, propName);\n- });\n+ })\n+ .catch(() => null);\n}\n}\n",
"new_path": "lighthouse-core/lib/element.js",
"old_path": "lighthouse-core/lib/element.js"
}
] | JavaScript | Apache License 2.0 | googlechrome/lighthouse | core: handle DOM.resolveNode errors (#5427) | 1 | core | null |
217,922 | 05.06.2018 23:04:52 | -7,200 | 36d77b2add7eaec121cf61bb164b9e08dc128ecc | fix: only show recipe swap button if a rotation is set and pure (saved) | [
{
"change_type": "MODIFY",
"diff": "</a>\n<mat-card-title *ngIf=\"itemId !== undefined\">\n{{itemId | itemName | i18n}}\n- <button mat-icon-button (click)=\"changeRecipe()\">\n+ <button mat-icon-button (click)=\"changeRecipe()\" *ngIf=\"rotation !== undefined && !dirty\">\n<mat-icon>swap_horiz</mat-icon>\n</button>\n</mat-card-title>\n<div class=\"stats\">\n{{'SIMULATOR.CONFIGURATION.Craftsmanship' | translate}}: {{simulation.crafterStats.craftsmanship}}\n{{'SIMULATOR.CONFIGURATION.Control' | translate}}: {{simulation.crafterStats._control}}\n-\n</div>\n<div class=\"steps\">\n{{'SIMULATOR.Step_counter' | translate}}\n",
"new_path": "src/app/pages/simulator/components/simulator/simulator.component.html",
"old_path": "src/app/pages/simulator/components/simulator/simulator.component.html"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | fix: only show recipe swap button if a rotation is set and pure (saved) | 1 | fix | null |
730,412 | 05.06.2018 23:37:08 | 0 | 016764b76c22698449d783c2dbf56d7898e6934b | chore(release): 0.1.305 | [
{
"change_type": "MODIFY",
"diff": "All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.\n+<a name=\"0.1.305\"></a>\n+## [0.1.305](https://github.com/webex/react-ciscospark/compare/v0.1.304...v0.1.305) (2018-06-05)\n+\n+\n+### Bug Fixes\n+\n+* **widget-roster:** external participant message height and width are not specified ([da54601](https://github.com/webex/react-ciscospark/commit/da54601))\n+* **widget-roster:** get proper loading state of search ([7e6cb97](https://github.com/webex/react-ciscospark/commit/7e6cb97))\n+\n+\n+### Features\n+\n+* **react-component-people-list:** use react-virtualized for rendering people list ([e60c566](https://github.com/webex/react-ciscospark/commit/e60c566))\n+* **widget-message:** load avatars from activities list ([befaf9e](https://github.com/webex/react-ciscospark/commit/befaf9e))\n+\n+\n+\n<a name=\"0.1.304\"></a>\n## [0.1.304](https://github.com/webex/react-ciscospark/compare/v0.1.303...v0.1.304) (2018-06-01)\n",
"new_path": "CHANGELOG.md",
"old_path": "CHANGELOG.md"
},
{
"change_type": "MODIFY",
"diff": "{\n\"name\": \"@ciscospark/react-ciscospark\",\n- \"version\": \"0.1.304\",\n+ \"version\": \"0.1.305\",\n\"description\": \"The Cisco Spark for React library allows developers to easily incorporate Spark functionality into an application.\",\n\"scripts\": {\n\"build\": \"./scripts/build/index.js\",\n",
"new_path": "package.json",
"old_path": "package.json"
}
] | JavaScript | MIT License | webex/react-widgets | chore(release): 0.1.305 | 1 | chore | release |
724,048 | 06.06.2018 00:31:22 | 25,200 | 1ad53de8958e4b88d5e53a674dab20a6adeaae43 | docs: fix spelling of component in shallowMount.md | [
{
"change_type": "MODIFY",
"diff": "- `{Object} context`\n- `{Array<Component|Object>|Component} children`\n- `{Object} slots`\n- - `{Array<Componet|Object>|Component|String} default`\n- - `{Array<Componet|Object>|Component|String} named`\n+ - `{Array<Component|Object>|Component|String} default`\n+ - `{Array<Component|Object>|Component|String} named`\n- `{Object} mocks`\n- `{Object|Array<string>} stubs`\n- `{Vue} localVue`\n",
"new_path": "docs/api/shallowMount.md",
"old_path": "docs/api/shallowMount.md"
},
{
"change_type": "MODIFY",
"diff": "- `{Object} context`\n- `{Array<Component|Object>|Component} children`\n- `{Object} slots`\n- - `{Array<Componet|Object>|Component|String} default`\n- - `{Array<Componet|Object>|Component|String} named`\n+ - `{Array<Component|Object>|Component|String} default`\n+ - `{Array<Component|Object>|Component|String} named`\n- `{Object} mocks`\n- `{Object|Array<string>} stubs`\n- `{Vue} localVue`\n",
"new_path": "docs/ja/api/shallowMount.md",
"old_path": "docs/ja/api/shallowMount.md"
},
{
"change_type": "MODIFY",
"diff": "- `{Object} context`\n- `{Array<Component|Object>|Component} children`\n- `{Object} slots`\n- - `{Array<Componet|Object>|Component|String} default`\n- - `{Array<Componet|Object>|Component|String} named`\n+ - `{Array<Component|Object>|Component|String} default`\n+ - `{Array<Component|Object>|Component|String} named`\n- `{Object} mocks`\n- `{Object|Array<string>} stubs`\n- `{Vue} localVue`\n",
"new_path": "docs/zh/api/shallowMount.md",
"old_path": "docs/zh/api/shallowMount.md"
}
] | JavaScript | MIT License | vuejs/vue-test-utils | docs: fix spelling of component in shallowMount.md (#683) | 1 | docs | null |
679,913 | 06.06.2018 02:55:12 | -3,600 | be21c4c20a5cb8e3885cfcb3501b876cb373900d | feat(rstream-graph): update NodeOutput, support multiple handlers
extract prepareNodeOutputs() | [
{
"change_type": "MODIFY",
"diff": "@@ -96,4 +96,7 @@ export interface NodeInput {\nxform?: Transducer<any, any>;\n}\n-export type NodeOutput = Path | ((node: ISubscribable<any>) => void);\n+export type NodeOutput =\n+ Path |\n+ ((node: ISubscribable<any>) => void) |\n+ IObjectOf<Path | ((node: ISubscribable<any>) => void)>;\n",
"new_path": "packages/rstream-graph/src/api.ts",
"old_path": "packages/rstream-graph/src/api.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -11,7 +11,7 @@ import { fromView } from \"@thi.ng/rstream/from/view\";\nimport { StreamSync, sync } from \"@thi.ng/rstream/stream-sync\";\nimport { Transducer } from \"@thi.ng/transducers/api\";\n-import { GraphSpec, NodeFactory, NodeSpec } from \"./api\";\n+import { GraphSpec, NodeFactory, NodeSpec, NodeOutput } from \"./api\";\n/**\n* Dataflow graph initialization function. Takes an object of\n@@ -67,16 +67,33 @@ const nodeFromSpec = (state: IAtom<any>, spec: NodeSpec, id: string) => (resolve\nsrc[id] = s;\n}\nconst node = spec.fn(src, id);\n- if (spec.out) {\n- if (isFunction(spec.out)) {\n- spec.out(node);\n+ prepareNodeOutputs(spec.out, node, state, id);\n+ return node;\n+};\n+\n+const prepareNodeOutputs = (out: NodeOutput, node: ISubscribable<any>, state: IAtom<any>, id: string) => {\n+ if (out) {\n+ if (isFunction(out)) {\n+ out(node);\n+ }\n+ else if (isPlainObject(out)) {\n+ for (let oid in out) {\n+ const o = out[oid];\n+ if (isFunction(o)) {\n+ o(node);\n} else {\n+ ((path, oid) => node.subscribe({\n+ next: (x) => state.resetIn(path, x[oid])\n+ }, `out-${id}-${oid}`))(o, oid);\n+ }\n+ }\n+ }\n+ else {\n((path) => node.subscribe({\nnext: (x) => state.resetIn(path, x)\n- }, `out-${id}`))(spec.out);\n+ }, `out-${id}`))(out);\n}\n}\n- return node;\n};\nexport const addNode = (graph: IObjectOf<ISubscribable<any>>, state: IAtom<any>, id: string, spec: NodeSpec) =>\n",
"new_path": "packages/rstream-graph/src/graph.ts",
"old_path": "packages/rstream-graph/src/graph.ts"
}
] | TypeScript | Apache License 2.0 | thi-ng/umbrella | feat(rstream-graph): update NodeOutput, support multiple handlers
- extract prepareNodeOutputs() | 1 | feat | rstream-graph |
217,922 | 06.06.2018 08:26:49 | -7,200 | 6810053a986b6b50948f610e09e861081fe15947 | chore: disconnected gt.data.core.js file from the app | [
{
"change_type": "MODIFY",
"diff": "@@ -28,6 +28,7 @@ import {Observable, Subscription} from 'rxjs';\nimport {debounceTime, distinctUntilChanged, filter, first, map} from 'rxjs/operators';\nimport {PlatformService} from './core/tools/platform.service';\nimport {IpcService} from './core/electron/ipc.service';\n+import {GarlandToolsService} from './core/api/garland-tools.service';\ndeclare const ga: Function;\n@@ -97,7 +98,10 @@ export class AppComponent implements OnInit {\npublic cd: ChangeDetectorRef,\nprivate pendingChangesService: PendingChangesService,\npublic platformService: PlatformService,\n- private ipc: IpcService) {\n+ private ipc: IpcService,\n+ private gt: GarlandToolsService) {\n+\n+ this.gt.preload();\nsettings.themeChange$.subscribe(change => {\noverlayContainer.getContainerElement().classList.remove(`${change.previous}-theme`);\n",
"new_path": "src/app/app.component.ts",
"old_path": "src/app/app.component.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -2,6 +2,7 @@ import {Injectable} from '@angular/core';\nimport {GarlandToolsData} from '../../model/list/garland-tools-data';\nimport {Item} from '../../model/garland-tools/item';\nimport {NgSerializerService} from '@kaiu/ng-serializer';\n+import {HttpClient} from '@angular/common/http';\n@Injectable()\nexport class GarlandToolsService {\n@@ -9,7 +10,14 @@ export class GarlandToolsService {\nprivate gt: GarlandToolsData = (<any>window).gt;\nprivate gItemIndex: any[] = (<any>window).gItemIndex;\n- constructor(private serializer: NgSerializerService) {\n+ constructor(private serializer: NgSerializerService, private http: HttpClient) {\n+ }\n+\n+ public preload(): void {\n+ if (this.gt.jobCategories === undefined) {\n+ this.http.get<GarlandToolsData>('http://www.garlandtools.org/db/doc/core/en/2/data.json')\n+ .subscribe(data => this.gt = Object.assign(this.gt, data));\n+ }\n}\n/**\n",
"new_path": "src/app/core/api/garland-tools.service.ts",
"old_path": "src/app/core/api/garland-tools.service.ts"
},
{
"change_type": "MODIFY",
"diff": "}\n};\n</script>\n- <script src=\"https://www.garlandtools.org/db/js/gt.data.core.js\"></script>\n<script src=\"https://www.garlandtools.org/bell/nodes.js\"></script>\n<!-- Fishing spots backup from garlandtools -->\n<script>\n",
"new_path": "src/index.html",
"old_path": "src/index.html"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | chore: disconnected gt.data.core.js file from the app | 1 | chore | null |
217,922 | 06.06.2018 11:50:32 | -7,200 | 68ad38552f191d790fb087b790ca1f5c79bfff4e | feat(desktop): better flow for auto updater | [
{
"change_type": "ADD",
"diff": "+owner: Supamiu\n+repo: ffxiv-teamcraft\n+provider: github\n",
"new_path": "dev-app-update.yml",
"old_path": null
},
{
"change_type": "MODIFY",
"diff": "-const {app, ipcMain, BrowserWindow, Tray, nativeImage} = require('electron');\n+const {app, ipcMain, BrowserWindow, Tray, nativeImage, dialog} = require('electron');\nconst {autoUpdater} = require('electron-updater');\nconst path = require('path');\nconst Config = require('electron-config');\nconst config = new Config();\n+const isDev = require('electron-is-dev');\nconst electronOauth2 = require('electron-oauth2');\n@@ -10,6 +11,8 @@ let win;\nlet tray;\nlet nativeIcon;\n+let updateInterval;\n+\nlet openedOverlays = {};\nconst shouldQuit = app.makeSingleInstance(function (commandLine, workingDirectory) {\n@@ -20,6 +23,10 @@ const shouldQuit = app.makeSingleInstance(function (commandLine, workingDirector\n}\n});\n+if (isDev) {\n+ autoUpdater.updateConfigPath = path.join(__dirname, 'dev-app-update.yml');\n+}\n+\nif (shouldQuit) {\napp.quit();\nreturn;\n@@ -45,7 +52,13 @@ function createWindow() {\nwin = null\n});\n- win.once('ready-to-show', win.show);\n+ win.once('ready-to-show', () => {\n+ win.show();\n+ autoUpdater.checkForUpdates();\n+ updateInterval = setInterval(() => {\n+ autoUpdater.checkForUpdates();\n+ }, 300000);\n+ });\n// save window size and position\nwin.on('close', () => {\n@@ -79,13 +92,10 @@ function createWindow() {\ntray.on('balloon-click', () => {\n!win.isVisible() ? win.show() : null;\n});\n-\n- autoUpdater.checkForUpdatesAndNotify();\n}\n// Create window on electron intialization\napp.on('ready', () => {\n- autoUpdater.checkForUpdatesAndNotify();\ncreateWindow();\n});\n@@ -105,6 +115,21 @@ app.on('activate', function () {\n}\n});\n+autoUpdater.on('update-downloaded', () => {\n+ dialog.showMessageBox({\n+ type: 'info',\n+ title: 'Update available',\n+ message: 'An update is available and downloaded, install now?',\n+ buttons: ['Yes', 'No']\n+ }, (buttonIndex) => {\n+ if (buttonIndex === 0) {\n+ autoUpdater.quitAndInstall();\n+ } else {\n+ clearInterval(updateInterval);\n+ }\n+ });\n+});\n+\nconst googleOauthConfig = {\nclientId: '1082504004791-u79p0kbo22kqn07b97qjsskllgro50o6.apps.googleusercontent.com',\nclientSecret: 'VNQtDrv0NQbMqxjQ2o8ZTtai',\n@@ -158,6 +183,10 @@ ipcMain.on('notification', (event, config) => {\ntray.displayBalloon(config);\n});\n+ipcMain.on('run-update', () => {\n+ autoUpdater.quitAndInstall();\n+});\n+\nipcMain.on('overlay', (event, url) => {\nlet opts = {\nshow: false,\n@@ -174,7 +203,6 @@ ipcMain.on('overlay', (event, url) => {\noverlay.once('ready-to-show', overlay.show);\n-\n// save window size and position\noverlay.on('close', () => {\nconfig.set(`overlay:${url}:bounds`, overlay.getBounds());\n",
"new_path": "main.js",
"old_path": "main.js"
},
{
"change_type": "MODIFY",
"diff": "\"zone.js\": \"^0.8.26\"\n},\n\"devDependencies\": {\n- \"@angular/compiler-cli\": \"6.0.1\",\n\"@angular-devkit/build-angular\": \"~0.6.1\",\n- \"typescript\": \">=2.7.2 <2.8.0\",\n\"@angular/cli\": \"^6.0.1\",\n+ \"@angular/compiler-cli\": \"6.0.1\",\n\"@biesbjerg/ngx-translate-extract\": \"^2.3.4\",\n\"@firebase/auth-types\": \"^0.3.2\",\n\"@types/electron\": \"^1.6.10\",\n\"del-cli\": \"^1.1.0\",\n\"electron\": \"^1.8.7\",\n\"electron-builder\": \"^20.13.3\",\n+ \"electron-is-dev\": \"^0.3.0\",\n\"electron-reload\": \"^1.2.2\",\n\"express\": \"^4.16.3\",\n\"husky\": \"^0.14.3\",\n\"standard-version\": \"^4.2.0\",\n\"ts-node\": \"~6.0.3\",\n\"tslint\": \"^5.10.0\",\n+ \"typescript\": \">=2.7.2 <2.8.0\",\n\"validate-commit-msg\": \"^2.14.0\"\n},\n\"config\": {\n",
"new_path": "package.json",
"old_path": "package.json"
}
] | TypeScript | MIT License | ffxiv-teamcraft/ffxiv-teamcraft | feat(desktop): better flow for auto updater | 1 | feat | desktop |
679,913 | 06.06.2018 12:00:52 | -3,600 | dc6e0acc9229444f2b95bd1e1320a9561a9019c7 | refactor(resolve-map): export absPath(), add LookupPath type alias | [
{
"change_type": "MODIFY",
"diff": "@@ -7,6 +7,8 @@ import { getIn, mutIn } from \"@thi.ng/paths\";\nconst SEMAPHORE = Symbol(\"SEMAPHORE\");\n+export type LookupPath = PropertyKey[];\n+\n/**\n* Visits all key-value pairs in depth-first order for given object or\n* array, expands any reference values, mutates the original object and\n@@ -63,13 +65,13 @@ const SEMAPHORE = Symbol(\"SEMAPHORE\");\n*\n* @param obj\n*/\n-export const resolveMap = (obj: any, root?: any, path: PropertyKey[] = [], resolved: any = {}) => {\n+export const resolveMap = (obj: any, root?: any, path: LookupPath = [], resolved: any = {}) => {\nroot = root || obj;\nfor (let k in obj) {\n_resolve(root, [...path, k], resolved);\n}\nreturn obj;\n-}\n+};\n/**\n* Like `resolveMap`, but for arrays.\n@@ -79,15 +81,15 @@ export const resolveMap = (obj: any, root?: any, path: PropertyKey[] = [], resol\n* @param path\n* @param resolved\n*/\n-const resolveArray = (arr: any[], root?: any, path: PropertyKey[] = [], resolved: any = {}) => {\n+const resolveArray = (arr: any[], root?: any, path: LookupPath = [], resolved: any = {}) => {\nroot = root || arr;\nfor (let k = 0, n = arr.length; k < n; k++) {\n_resolve(root, [...path, k], resolved);\n}\nreturn arr;\n-}\n+};\n-const _resolve = (root: any, path: PropertyKey[], resolved: any) => {\n+const _resolve = (root: any, path: LookupPath, resolved: any) => {\nlet v = getIn(root, path), rv = SEMAPHORE;\nconst pp = path.join(\"/\");\nif (!resolved[pp]) {\n@@ -107,9 +109,17 @@ const _resolve = (root: any, path: PropertyKey[], resolved: any) => {\nresolved[pp] = true;\n}\nreturn v;\n-}\n+};\n-const absPath = (curr: PropertyKey[], q: string, idx = 1): PropertyKey[] => {\n+/**\n+ * Takes the path for the current key and a lookup path string. Converts\n+ * the possibly relative lookup path into its absolute form.\n+ *\n+ * @param curr\n+ * @param q\n+ * @param idx\n+ */\n+export const absPath = (curr: LookupPath, q: string, idx = 1): PropertyKey[] => {\nif (q.charAt(idx) === \"/\") {\nreturn q.substr(idx + 1).split(\"/\");\n}\n@@ -125,4 +135,4 @@ const absPath = (curr: PropertyKey[], q: string, idx = 1): PropertyKey[] => {\n}\n!curr.length && illegalArgs(`invalid lookup path`);\nreturn curr;\n-}\n+};\n",
"new_path": "packages/resolve-map/src/index.ts",
"old_path": "packages/resolve-map/src/index.ts"
}
] | TypeScript | Apache License 2.0 | thi-ng/umbrella | refactor(resolve-map): export absPath(), add LookupPath type alias | 1 | refactor | resolve-map |
730,429 | 06.06.2018 12:33:58 | 14,400 | dc3d285cbea3d9e306879a7ce81309bf2b4f5aab | feat(all): remove group calling feature flag | [
{
"change_type": "MODIFY",
"diff": "@@ -2,7 +2,6 @@ import {Map} from 'immutable';\nexport const STORE_FEATURE = 'features/STORE_FEATURE';\n-export const FEATURE_GROUP_CALLING = 'js-widgets-group-calling';\nexport const FEATURE_MENTIONS = 'js-widgets-mentions';\nexport const FEATURE_ROSTER = 'js-widgets-roster';\n",
"new_path": "packages/node_modules/@ciscospark/redux-module-features/src/index.js",
"old_path": "packages/node_modules/@ciscospark/redux-module-features/src/index.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -6,10 +6,6 @@ import classNames from 'classnames';\nimport {autobind} from 'core-decorators';\nimport {addError, removeError} from '@ciscospark/redux-module-errors';\n-import {\n- getFeature,\n- FEATURE_GROUP_CALLING\n-} from '@ciscospark/redux-module-features';\nimport {\ncheckWebRTCSupport,\ndeclineIncomingCall,\n@@ -49,7 +45,6 @@ import {\nconst injectedPropTypes = {\nerrors: PropTypes.object.isRequired,\n- hasGroupCalling: PropTypes.bool,\nincomingCall: PropTypes.object,\nmedia: PropTypes.object.isRequired,\nmercuryStatus: PropTypes.object.isRequired,\n@@ -71,7 +66,6 @@ const injectedPropTypes = {\nfetchSpace: PropTypes.func.isRequired,\nfetchSpaces: PropTypes.func.isRequired,\nfetchTeams: PropTypes.func.isRequired,\n- getFeature: PropTypes.func.isRequired,\nremoveError: PropTypes.func.isRequired,\nremoveSpace: PropTypes.func.isRequired,\nupdateSpaceRead: PropTypes.func.isRequired,\n@@ -126,7 +120,6 @@ export class RecentsWidget extends Component {\n|| nextProps.incomingCall !== this.props.incomingCall;\n}\n- @autobind\nstatic setup(props) {\nconst {\nerrors,\n@@ -161,8 +154,6 @@ export class RecentsWidget extends Component {\n}\nelse if (sparkInstance && sparkState.authenticated && sparkState.registered) {\n- RecentsWidget.getFeatureFlags(props);\n-\n// Setup Web Sockets\nif (!mercuryStatus.hasConnected\n&& !mercuryStatus.connecting\n@@ -211,18 +202,6 @@ export class RecentsWidget extends Component {\n}\n}\n- @autobind\n- static getFeatureFlags(props) {\n- const {\n- widgetStatus\n- } = props;\n- if (widgetStatus.hasFetchedFeatureFlags || widgetStatus.isFetchingFeatureFlags) {\n- return;\n- }\n- props.getFeature('developer', FEATURE_GROUP_CALLING, props.sparkInstance);\n- props.updateWidgetStatus({hasFetchedFeatureFlags: true, isFetchingFeatureFlags: false});\n- }\n-\n@autobind\ngetSpaceFromCall(call) {\nreturn this.props.spaces.get(call.instance.locus.conversationUrl.split('/').pop());\n@@ -422,13 +401,11 @@ export class RecentsWidget extends Component {\nhandleEvent\n} = this;\nconst {\n- hasGroupCalling,\nspaces\n} = props;\nconst space = spaces.get(call.locus.conversationUrl.split('/').pop());\n// Only provide event if the call is direct\n- if (hasGroupCalling || space.type === 'direct') {\ncall.acknowledge()\n.then(() => {\nconst removeIncoming = () => call.hangup().then(props.deleteIncomingCall);\n@@ -450,7 +427,6 @@ export class RecentsWidget extends Component {\nhandleEvent(eventNames.CALLS_CREATED, constructCallEventData(call, space));\n});\n}\n- }\n@autobind\nhandleSpaceClick(spaceId) {\n@@ -551,7 +527,6 @@ export class RecentsWidget extends Component {\nconst {props} = this;\nconst {\nerrors,\n- hasGroupCalling,\nmedia,\nspacesList,\ncurrentUser,\n@@ -597,7 +572,7 @@ export class RecentsWidget extends Component {\n<SpacesList\ncurrentUser={currentUser}\nformatMessage={formatMessage}\n- hasCalling={hasGroupCalling}\n+ hasCalling\nisLoadingMore={isFetchingSpaces}\nonCallClick={handleCallClick}\nonClick={this.handleSpaceClick}\n@@ -645,7 +620,6 @@ export default connect(\nfetchSpace,\nfetchSpaces,\nfetchTeams,\n- getFeature,\nremoveError,\nremoveSpace,\nupdateSpaceRead,\n",
"new_path": "packages/node_modules/@ciscospark/widget-recents/src/container.js",
"old_path": "packages/node_modules/@ciscospark/widget-recents/src/container.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -2,14 +2,12 @@ import {createSelector} from 'reselect';\nimport moment from 'moment';\nimport {OrderedMap} from 'immutable';\nimport {formatDate} from '@ciscospark/react-component-utils';\n-import {FEATURE_GROUP_CALLING} from '@ciscospark/redux-module-features';\nconst getWidget = (state) => state.widgetRecents;\nconst getSpark = (state) => state.spark;\nconst getCurrentUser = (state, ownProps) => ownProps.currentUser;\nconst getAvatars = (state) => state.avatar;\nconst getTeams = (state) => state.teams.get('byId');\n-const getFeatures = (state) => state.features;\nconst getSpaces = (state) => state.spaces.get('byId');\nconst getUsers = (state) => state.users.get('byId');\nconst getActivities = (state) => state.activities.get('byId');\n@@ -152,7 +150,6 @@ const getRecentsWidgetProps = createSelector(\ngetWidget,\ngetRecentSpacesWithDetail,\ngetSpark,\n- getFeatures,\ngetSpaces,\ngetIncomingCall,\ngetMercuryStatus\n@@ -161,7 +158,6 @@ const getRecentsWidgetProps = createSelector(\nwidget,\nspacesList,\nspark,\n- features,\nspaces,\nincomingCall,\nmercuryStatus\n@@ -171,7 +167,6 @@ const getRecentsWidgetProps = createSelector(\nlastActivityDate = spacesList.last().lastActivityTimestamp;\n}\nconst spacesListArray = spacesList.toArray();\n- const hasGroupCalling = features.getIn(['items', FEATURE_GROUP_CALLING]);\nreturn {\nwidgetStatus: widget.get('status').toJS(),\nsparkState: spark.get('status').toJS(),\n@@ -179,7 +174,6 @@ const getRecentsWidgetProps = createSelector(\nwidgetRecents: widget,\nspaces,\nspacesList: spacesListArray,\n- hasGroupCalling,\nlastActivityDate,\nincomingCall,\nmercuryStatus: mercuryStatus.toJS()\n",
"new_path": "packages/node_modules/@ciscospark/widget-recents/src/selector.js",
"old_path": "packages/node_modules/@ciscospark/widget-recents/src/selector.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -18,7 +18,6 @@ import FilesWidget from '@ciscospark/widget-files';\nimport {ICONS} from '@ciscospark/react-component-icon';\nimport {\ngetFeature,\n- FEATURE_GROUP_CALLING,\nFEATURE_ROSTER\n} from '@ciscospark/redux-module-features';\n@@ -188,26 +187,7 @@ export default compose(\niconClassName: ICONS.ICON_TYPE_VIDEO_OUTLINE,\ncomponent: MeetWidget,\nspaceTypes: ['direct', 'group'],\n- type: ACTIVITY_TYPE_PRIMARY,\n- feature: {\n- type: 'developer',\n- key: FEATURE_GROUP_CALLING\n- }\n- },\n- {\n- displayName: 'Call',\n- name: 'meet',\n- buttonClassName: styles.meetButton,\n- iconClassName: ICONS.ICON_TYPE_VIDEO_OUTLINE,\n- component: MeetWidget,\n- spaceTypes: ['direct'],\n- type: ACTIVITY_TYPE_PRIMARY,\n- feature: {\n- type: 'developer',\n- key: FEATURE_GROUP_CALLING,\n- // Hide this option if feature flag is set\n- hide: true\n- }\n+ type: ACTIVITY_TYPE_PRIMARY\n},\n{\ndisplayName: 'People',\n",
"new_path": "packages/node_modules/@ciscospark/widget-space/src/enhancers/activity-menu.js",
"old_path": "packages/node_modules/@ciscospark/widget-space/src/enhancers/activity-menu.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -2,7 +2,6 @@ import {assert} from 'chai';\nimport {elements as mainElements} from './main';\nimport {elements as rosterElements} from './roster';\n-import {elements as meetElements} from './meet';\n/**\n*\n@@ -28,25 +27,4 @@ export default function featureFlagTests(browserWithAllTheFeatures, browserWithN\nbrowserWithNoFeatures.click(mainElements.exitButton);\n});\n});\n-\n- describe('Group Calling Feature Flag', () => {\n- it('has a call option for user with feature flag', () => {\n- browserWithAllTheFeatures.click(mainElements.menuButton);\n- browserWithAllTheFeatures.waitForVisible(mainElements.activityMenu);\n- assert.isTrue(\n- browserWithAllTheFeatures\n- .element(mainElements.controlsContainer)\n- .element(meetElements.callButton)\n- .isVisible()\n- );\n- browserWithAllTheFeatures.click(mainElements.exitButton);\n- });\n-\n- it('does not have a call option for user without flag', () => {\n- browserWithNoFeatures.click(mainElements.menuButton);\n- browserWithNoFeatures.waitForVisible(mainElements.activityMenu);\n- assert.isFalse(browserWithNoFeatures.isVisible(meetElements.callButton));\n- browserWithNoFeatures.click(mainElements.exitButton);\n- });\n- });\n}\n",
"new_path": "test/journeys/lib/test-helpers/space-widget/featureFlags.js",
"old_path": "test/journeys/lib/test-helpers/space-widget/featureFlags.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -6,8 +6,6 @@ import {moveMouse} from '../';\nimport {switchToMeet} from './main';\n-export const FEATURE_FLAG_GROUP_CALLING = 'js-widgets-group-calling';\n-\nexport const elements = {\ncallContainer: '.call-container',\nmeetWidget: '.ciscospark-meet-wrapper',\n",
"new_path": "test/journeys/lib/test-helpers/space-widget/meet.js",
"old_path": "test/journeys/lib/test-helpers/space-widget/meet.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -3,11 +3,10 @@ import {assert} from 'chai';\nimport testUsers from '@ciscospark/test-helper-test-users';\nimport '@ciscospark/plugin-logger';\nimport '@ciscospark/internal-plugin-conversation';\n-import '@ciscospark/internal-plugin-feature';\nimport CiscoSpark from '@ciscospark/spark-core';\nimport {jobNames, moveMouse, renameJob, updateJobStatus} from '../../../lib/test-helpers';\n-import {FEATURE_FLAG_GROUP_CALLING, elements as meetElements, hangup} from '../../../lib/test-helpers/space-widget/meet';\n+import {elements as meetElements, hangup} from '../../../lib/test-helpers/space-widget/meet';\nimport {\ncreateSpaceAndPost,\ndisplayAndReadIncomingMessage,\n@@ -53,7 +52,6 @@ describe('Widget Recents: Data API', () => {\n}\n});\nreturn marty.spark.internal.device.register()\n- .then(() => marty.spark.internal.feature.setFeature('developer', FEATURE_FLAG_GROUP_CALLING, true))\n.then(() => marty.spark.internal.mercury.connect());\n}));\n",
"new_path": "test/journeys/specs/recents/dataApi/basic.js",
"old_path": "test/journeys/specs/recents/dataApi/basic.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -2,7 +2,6 @@ import {assert} from 'chai';\nimport testUsers from '@ciscospark/test-helper-test-users';\nimport '@ciscospark/plugin-logger';\n-import '@ciscospark/internal-plugin-feature';\nimport CiscoSpark from '@ciscospark/spark-core';\nimport '@ciscospark/internal-plugin-conversation';\n@@ -11,7 +10,7 @@ import {runAxe} from '../../../lib/axe';\nimport {clearEventLog, getEventLog} from '../../../lib/events';\nimport {jobNames, moveMouse, renameJob, updateJobStatus} from '../../../lib/test-helpers';\n-import {FEATURE_FLAG_GROUP_CALLING, elements as meetElements, hangup} from '../../../lib/test-helpers/space-widget/meet';\n+import {elements as meetElements, hangup} from '../../../lib/test-helpers/space-widget/meet';\nimport {\ncreateSpaceAndPost,\ndisplayAndReadIncomingMessage,\n@@ -54,7 +53,6 @@ describe('Widget Recents', () => {\n}\n});\nreturn marty.spark.internal.device.register()\n- .then(() => marty.spark.internal.feature.setFeature('developer', FEATURE_FLAG_GROUP_CALLING, true))\n.then(() => marty.spark.internal.mercury.connect());\n}));\n",
"new_path": "test/journeys/specs/recents/global/basic.js",
"old_path": "test/journeys/specs/recents/global/basic.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -6,7 +6,7 @@ import CiscoSpark from '@ciscospark/spark-core';\nimport {switchToMeet} from '../../../lib/test-helpers/space-widget/main';\nimport {updateJobStatus} from '../../../lib/test-helpers';\nimport {FEATURE_FLAG_ROSTER} from '../../../lib/test-helpers/space-widget/roster';\n-import {elements, declineIncomingCallTest, hangupDuringCallTest, FEATURE_FLAG_GROUP_CALLING} from '../../../lib/test-helpers/space-widget/meet';\n+import {elements, declineIncomingCallTest, hangupDuringCallTest} from '../../../lib/test-helpers/space-widget/meet';\ndescribe('Widget Space: Data API', () => {\nconst browserLocal = browser.select('browserLocal');\n@@ -35,8 +35,7 @@ describe('Widget Space: Data API', () => {\n}\n});\nreturn marty.spark.internal.mercury.connect()\n- .then(() => marty.spark.internal.feature.setFeature('developer', FEATURE_FLAG_ROSTER, true))\n- .then(() => marty.spark.internal.feature.setFeature('developer', FEATURE_FLAG_GROUP_CALLING, true));\n+ .then(() => marty.spark.internal.feature.setFeature('developer', FEATURE_FLAG_ROSTER, true));\n}));\nbefore('create docbrown', () => testUsers.create({count: 1, config: {displayName: 'Emmett Brown'}})\n@@ -53,8 +52,7 @@ describe('Widget Space: Data API', () => {\n}\n});\nreturn docbrown.spark.internal.device.register()\n- .then(() => docbrown.spark.internal.feature.setFeature('developer', FEATURE_FLAG_ROSTER, true))\n- .then(() => docbrown.spark.internal.feature.setFeature('developer', FEATURE_FLAG_GROUP_CALLING, true));\n+ .then(() => docbrown.spark.internal.feature.setFeature('developer', FEATURE_FLAG_ROSTER, true));\n}));\nbefore('create lorraine', () => testUsers.create({count: 1, config: {displayName: 'Lorraine Baines'}})\n",
"new_path": "test/journeys/specs/space/dataApi/meet.js",
"old_path": "test/journeys/specs/space/dataApi/meet.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -7,7 +7,6 @@ import testUsers from '@ciscospark/test-helper-test-users';\nimport {updateJobStatus} from '../../lib/test-helpers';\nimport featureFlagTests from '../../lib/test-helpers/space-widget/featureFlags';\nimport {FEATURE_FLAG_ROSTER} from '../../lib/test-helpers/space-widget/roster';\n-import {FEATURE_FLAG_GROUP_CALLING} from '../../lib/test-helpers/space-widget/meet';\ndescribe('Widget Space Feature Flags', () => {\n@@ -34,8 +33,7 @@ describe('Widget Space Feature Flags', () => {\n}\n});\nreturn userWithAllTheFeatures.spark.internal.device.register()\n- .then(() => userWithAllTheFeatures.spark.internal.feature.setFeature('developer', FEATURE_FLAG_ROSTER, true))\n- .then(() => userWithAllTheFeatures.spark.internal.feature.setFeature('developer', FEATURE_FLAG_GROUP_CALLING, true));\n+ .then(() => userWithAllTheFeatures.spark.internal.feature.setFeature('developer', FEATURE_FLAG_ROSTER, true));\n}),\ntestUsers.create({count: 2, config: {displayName: 'No Features'}})\n.then((users) => {\n@@ -51,8 +49,7 @@ describe('Widget Space Feature Flags', () => {\n}\n});\nreturn userWithNoFeatures1.spark.internal.device.register()\n- .then(() => userWithNoFeatures1.spark.internal.feature.setFeature('developer', FEATURE_FLAG_ROSTER, false))\n- .then(() => userWithNoFeatures1.spark.internal.feature.setFeature('developer', FEATURE_FLAG_GROUP_CALLING, false));\n+ .then(() => userWithNoFeatures1.spark.internal.feature.setFeature('developer', FEATURE_FLAG_ROSTER, false));\n})\n]));\n",
"new_path": "test/journeys/specs/space/featureFlags.js",
"old_path": "test/journeys/specs/space/featureFlags.js"
},
{
"change_type": "MODIFY",
"diff": "@@ -7,7 +7,7 @@ import {updateJobStatus} from '../../../lib/test-helpers';\nimport {switchToMeet} from '../../../lib/test-helpers/space-widget/main';\nimport {clearEventLog} from '../../../lib/events';\nimport {FEATURE_FLAG_ROSTER} from '../../../lib/test-helpers/space-widget/roster';\n-import {elements, declineIncomingCallTest, hangupDuringCallTest, callEventTest, FEATURE_FLAG_GROUP_CALLING} from '../../../lib/test-helpers/space-widget/meet';\n+import {elements, declineIncomingCallTest, hangupDuringCallTest, callEventTest} from '../../../lib/test-helpers/space-widget/meet';\ndescribe('Widget Space', () => {\nconst browserLocal = browser.select('browserLocal');\n@@ -36,8 +36,7 @@ describe('Widget Space', () => {\n}\n});\nreturn marty.spark.internal.mercury.connect()\n- .then(() => marty.spark.internal.feature.setFeature('developer', FEATURE_FLAG_ROSTER, true))\n- .then(() => marty.spark.internal.feature.setFeature('developer', FEATURE_FLAG_GROUP_CALLING, true));\n+ .then(() => marty.spark.internal.feature.setFeature('developer', FEATURE_FLAG_ROSTER, true));\n}));\nbefore('create docbrown', () => testUsers.create({count: 1, config: {displayName: 'Emmett Brown'}})\n@@ -54,8 +53,7 @@ describe('Widget Space', () => {\n}\n});\nreturn docbrown.spark.internal.device.register()\n- .then(() => docbrown.spark.internal.feature.setFeature('developer', FEATURE_FLAG_ROSTER, true))\n- .then(() => docbrown.spark.internal.feature.setFeature('developer', FEATURE_FLAG_GROUP_CALLING, true));\n+ .then(() => docbrown.spark.internal.feature.setFeature('developer', FEATURE_FLAG_ROSTER, true));\n}));\nbefore('create lorraine', () => testUsers.create({count: 1, config: {displayName: 'Lorraine Baines'}})\n",
"new_path": "test/journeys/specs/space/global/meet.js",
"old_path": "test/journeys/specs/space/global/meet.js"
}
] | JavaScript | MIT License | webex/react-widgets | feat(all): remove group calling feature flag | 1 | feat | all |
679,913 | 06.06.2018 13:38:30 | -3,600 | f2e0df251fbd35e5687cf20b7c7eb940e4498bcd | feat(rstream-graph): add full/optional support for multiple node outputs
BREAKING CHANGE: update NodeSpec format & graph initialization
add new types/interfaces
non-destructive initGraph() behavior
update & refactor nodeFromSpec()
update addNode/removeNode()
update tests & docs | [
{
"change_type": "MODIFY",
"diff": "@@ -7,7 +7,17 @@ import { Transducer } from \"@thi.ng/transducers/api\";\n* A function which constructs and returns an `ISubscribable` using\n* given object of inputs and node ID. See `node()` and `node1()`.\n*/\n-export type NodeFactory<T> = (src: IObjectOf<ISubscribable<any>>, id: string) => ISubscribable<T>;\n+export type NodeFactory<T> = (src: NodeInputs, id: string) => ISubscribable<T>;\n+\n+export type NodeInputs = IObjectOf<ISubscribable<any>>;\n+export type NodeOutputs = IObjectOf<ISubscribable<any>>;\n+export type Graph = IObjectOf<Node>;\n+\n+export interface Node {\n+ ins: NodeInputs;\n+ outs: NodeOutputs;\n+ node: ISubscribable<any>;\n+}\n/**\n* A dataflow graph spec is simply an object where keys are node names\n@@ -18,8 +28,8 @@ export type NodeFactory<T> = (src: IObjectOf<ISubscribable<any>>, id: string) =>\n*/\nexport type GraphSpec = IObjectOf<\nNodeSpec |\n- ISubscribable<any> |\n- ((resolve: (path: string) => any) => ISubscribable<any>)>;\n+ Node |\n+ ((resolve: (path: string) => any) => Node)>;\n/**\n* Specification for a single \"node\" in the dataflow graph. Nodes here\n@@ -33,13 +43,13 @@ export type GraphSpec = IObjectOf<\n* are implemented as `StreamSync` instances and the input IDs are used\n* to locally rename input streams within the `StreamSync` container.\n*\n- * See `initGraph` and `nodeFromSpec` for more details (in\n- * /src/nodes.ts)\n+ * Alo see `initGraph` and `nodeFromSpec` (in /src/nodes.ts) for more\n+ * details how these specs are compiled into stream constructs.\n*/\nexport interface NodeSpec {\nfn: NodeFactory<any>;\n- ins: IObjectOf<NodeInput>;\n- out?: NodeOutput;\n+ ins: IObjectOf<NodeInputSpec>;\n+ outs?: IObjectOf<NodeOutputSpec>;\n}\n/**\n@@ -88,7 +98,7 @@ export interface NodeSpec {\n* If the optional `xform` is given, a subscription with the transducer\n* is added to the input and then used as input instead.\n*/\n-export interface NodeInput {\n+export interface NodeInputSpec {\nid?: string;\npath?: Path;\nstream?: string | ((resolve) => ISubscribable<any>);\n@@ -96,7 +106,6 @@ export interface NodeInput {\nxform?: Transducer<any, any>;\n}\n-export type NodeOutput =\n- Path |\n- ((node: ISubscribable<any>) => void) |\n- IObjectOf<Path | ((node: ISubscribable<any>) => void)>;\n+export type NodeOutputSpec = Path | NodeOutputFn;\n+\n+export type NodeOutputFn = (node: ISubscribable<any>, id: PropertyKey) => ISubscribable<any>;\n",
"new_path": "packages/rstream-graph/src/api.ts",
"old_path": "packages/rstream-graph/src/api.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -4,107 +4,185 @@ import { isFunction } from \"@thi.ng/checks/is-function\";\nimport { isPlainObject } from \"@thi.ng/checks/is-plain-object\";\nimport { isString } from \"@thi.ng/checks/is-string\";\nimport { illegalArgs } from \"@thi.ng/errors/illegal-arguments\";\n-import { resolveMap } from \"@thi.ng/resolve-map\";\n+import { getIn } from \"@thi.ng/paths\";\n+import { absPath, resolveMap } from \"@thi.ng/resolve-map\";\nimport { ISubscribable } from \"@thi.ng/rstream/api\";\nimport { fromIterableSync } from \"@thi.ng/rstream/from/iterable\";\nimport { fromView } from \"@thi.ng/rstream/from/view\";\nimport { StreamSync, sync } from \"@thi.ng/rstream/stream-sync\";\nimport { Transducer } from \"@thi.ng/transducers/api\";\n-import { GraphSpec, NodeFactory, NodeSpec, NodeOutput } from \"./api\";\n+import {\n+ Graph,\n+ GraphSpec,\n+ NodeFactory,\n+ NodeInputs,\n+ NodeInputSpec,\n+ NodeOutputs,\n+ NodeOutputSpec,\n+ NodeSpec\n+} from \"./api\";\n/**\n- * Dataflow graph initialization function. Takes an object of\n- * NodeSpec's, calls `nodeFromSpec` for each and then recursively\n- * resolves references via `@thi.ng/resolve-map/resolveMap`. Returns\n- * updated graph object (mutates in-place, original specs are replaced\n- * by stream constructs).\n+ * Dataflow graph initialization function. Takes a state Atom (or `null`\n+ * if not needed) and an object of `NodeSpec` values or functions\n+ * returning `Node` objects. Calls `nodeFromSpec` for each spec and then\n+ * recursively resolves references via thi.ng/resolve-map `resolveMap`.\n+ * Returns new initialized graph object of `Node` objects and\n+ * `@thi.ng/rstream` stream constructs. Does NOT mutate original\n+ * `GraphSpec` object.\n*\n* @param state\n- * @param nodes\n+ * @param spec\n*/\n-export const initGraph = (state: IAtom<any>, nodes: GraphSpec): IObjectOf<ISubscribable<any>> => {\n- for (let id in nodes) {\n- const n = nodes[id];\n- if (isPlainObject(n)) {\n- (<any>nodes)[id] = nodeFromSpec(state, <NodeSpec>nodes[id], id);\n+export const initGraph = (state: IAtom<any>, spec: GraphSpec): Graph => {\n+ const res: Graph = {}\n+ for (let id in spec) {\n+ const n = spec[id];\n+ if (isNodeSpec(n)) {\n+ res[id] = <any>nodeFromSpec(state, <NodeSpec>spec[id], id);\n+ } else {\n+ res[id] = <any>n;\n}\n}\n- return resolveMap(nodes);\n+ return resolveMap(res);\n};\n+const isNodeSpec = (x: any): x is NodeSpec =>\n+ isPlainObject(x) && isFunction((<any>x).fn);\n+\n/**\n- * Transforms a single NodeSpec into a lookup function for `resolveMap`\n- * (which is called from `initGraph`). When that function is called,\n- * recursively resolves all specified input streams and calls this\n- * spec's `fn` to produce a new stream from these inputs. If the spec\n- * includes the optional `out` key, it also executes the provided\n- * function, or if the value is a string, adds a subscription to this\n- * node's result stream which then updates the provide state atom at the\n- * path defined by `out`. Returns an ISubscribable.\n+ * Transforms a single `NodeSpec` into a lookup function for\n+ * `resolveMap` (which is called from `initGraph`). When that function\n+ * is called, recursively resolves all specified input streams and calls\n+ * this spec's `fn` to produce a new stream from these inputs.\n+ *\n+ * If the spec includes the optional `outs` keys, it also creates the\n+ * subscriptions for each of the given output keys, which then can be\n+ * used as inputs by other nodes. Each value in the `outs` subspec can\n+ * be a function or state path (string/number/array, see thi.ng/paths).\n+ * Functions are called with this node's constructed stream/subscribable\n+ * and the output id and must return a new `ISubscribable`. For path\n+ * values a subscription is added to this node's result stream which\n+ * then updates the provided state atom at the path given.\n+ *\n+ * Non-function output specs subs assume the raw node output value is an\n+ * object from which the different output keys are being extracted.\n+ * The special `*` output key can be used to handle the entire node\n+ * output value.\n+ *\n+ * ```\n+ * out: {\n+ * // fn output spec\n+ * // creates new sub which uses `pick` transducer to\n+ * // select key `a` from main node output\n+ * a: (node, id) => node.subscribe({}, pick(id)),\n+ *\n+ * // yields sub of `b` key's values extracted from main output\n+ * // and also stores them at given path in state atom\n+ * b: \"foo.b\"\n+ *\n+ * // yields sub with same value as main node output and\n+ * // stores vals in state atom at given path\n+ * \"*\": \"foo.main\"\n+ * }\n+ * ```\n*\n* See `api.ts` for further details and possible spec variations.\n*\n+ * @param state\n* @param spec\n+ * @param id\n*/\nconst nodeFromSpec = (state: IAtom<any>, spec: NodeSpec, id: string) => (resolve) => {\n- const src: IObjectOf<ISubscribable<any>> = {};\n- for (let id in spec.ins) {\n+ const ins = prepareNodeInputs(spec.ins, state, resolve);\n+ const node = spec.fn(ins, id);\n+ const outs = prepareNodeOutputs(spec.outs, node, state, id);\n+ return { ins, node, outs };\n+};\n+\n+const prepareNodeInputs = (ins: IObjectOf<NodeInputSpec>, state: IAtom<any>, resolve: (x: string) => any) => {\n+ const res: NodeInputs = {};\n+ if (!ins) return res;\n+ for (let id in ins) {\nlet s;\n- const i = spec.ins[id];\n+ const i = ins[id];\nif (i.path) {\ns = fromView(state, i.path);\n- } else if (i.stream) {\n+ }\n+ else if (i.stream) {\ns = isString(i.stream) ? resolve(i.stream) : i.stream(resolve);\n- } else if (i.const) {\n+ }\n+ else if (i.const) {\ns = fromIterableSync([isFunction(i.const) ? i.const(resolve) : i.const]);\n- } else {\n+ }\n+ else {\nillegalArgs(`invalid node input: ${id}`);\n}\nif (i.xform) {\ns = s.subscribe(i.xform, id);\n}\n- src[id] = s;\n+ res[id] = s;\n+ }\n+ return res;\n}\n- const node = spec.fn(src, id);\n- prepareNodeOutputs(spec.out, node, state, id);\n- return node;\n-};\n-const prepareNodeOutputs = (out: NodeOutput, node: ISubscribable<any>, state: IAtom<any>, id: string) => {\n- if (out) {\n- if (isFunction(out)) {\n- out(node);\n- }\n- else if (isPlainObject(out)) {\n- for (let oid in out) {\n- const o = out[oid];\n+const prepareNodeOutputs = (outs: IObjectOf<NodeOutputSpec>, node: ISubscribable<any>, state: IAtom<any>, nodeID: string) => {\n+ const res: NodeOutputs = {};\n+ if (!outs) return res;\n+ for (let id in outs) {\n+ const o = outs[id];\nif (isFunction(o)) {\n- o(node);\n- } else {\n- ((path, oid) => node.subscribe({\n- next: (x) => state.resetIn(path, x[oid])\n- }, `out-${id}-${oid}`))(o, oid);\n- }\n- }\n- }\n- else {\n- ((path) => node.subscribe({\n+ res[id] = o(node, id);\n+ } else if (id == \"*\") {\n+ res[id] = ((path) => node.subscribe({\nnext: (x) => state.resetIn(path, x)\n- }, `out-${id}`))(out);\n+ }, `out-${nodeID}`))(o);\n+ } else {\n+ res[id] = ((path, id) => node.subscribe({\n+ next: (x) => state.resetIn(path, x[id])\n+ }, `out-${nodeID}-${id}`))(o, id);\n}\n}\n+ return res;\n};\n-export const addNode = (graph: IObjectOf<ISubscribable<any>>, state: IAtom<any>, id: string, spec: NodeSpec) =>\n- graph[id] = nodeFromSpec(state, spec, id)((nodeID) => graph[nodeID]);\n-\n-export const removeNode = (graph: IObjectOf<ISubscribable<any>>, id: string) => {\n+/**\n+ * Compiles given `NodeSpec` and adds it to graph. Returns compiled\n+ * `Node` object for the given spec. Throws error if the graph already\n+ * contains a node with given `id`.\n+ *\n+ * @param graph\n+ * @param state\n+ * @param id\n+ * @param spec\n+ */\n+export const addNode = (graph: Graph, state: IAtom<any>, id: string, spec: NodeSpec) => {\nif (graph[id]) {\n- graph[id].unsubscribe();\n+ illegalArgs(`graph already contains a node with ID: ${id}`);\n+ }\n+ graph[id] = nodeFromSpec(state, spec, id)((path) => getIn(graph, absPath([id], path)));\n+}\n+\n+/**\n+ * Calls `.unsubscribe()` on given node and all of its outputs, then\n+ * removes it from graph. Returns `false` if no node exists for given\n+ * `id`.\n+ *\n+ * @param graph\n+ * @param id\n+ */\n+export const removeNode = (graph: Graph, id: string) => {\n+ const node = graph[id];\n+ if (node) {\n+ node.node.unsubscribe();\n+ for (let id in node.outs) {\n+ node.outs[id].unsubscribe();\n+ }\ndelete graph[id];\nreturn true;\n}\n+ return false;\n};\n/**\n@@ -133,7 +211,9 @@ export const node = (xform: Transducer<IObjectOf<any>, any>, inputIDs?: string[]\nexport const node1 = (xform?: Transducer<any, any>, inputID = \"src\"): NodeFactory<any> =>\n(src: IObjectOf<ISubscribable<any>>, id: string): ISubscribable<any> => {\nensureInputs(src, [inputID], id);\n- return xform ? src[inputID].subscribe(xform, id) : src[inputID].subscribe(null, id);\n+ return xform ?\n+ src[inputID].subscribe(xform, id) :\n+ src[inputID].subscribe(null, id);\n};\n/**\n",
"new_path": "packages/rstream-graph/src/graph.ts",
"old_path": "packages/rstream-graph/src/graph.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -10,28 +10,65 @@ describe(\"rstream-graph\", () => {\nconst acc = [];\nconst state = new Atom({ a: 1, b: 2 });\nconst graph = rsg.initGraph(state, {\n- foo: rs.fromIterable([2]),\n- bar: ($) => $(\"foo\").transform(map((x: number) => x * 10)),\n+ foo: () => ({\n+ node: rs.fromIterable([2]),\n+ ins: {},\n+ outs: {}\n+ }),\n+ bar: ($) => ({\n+ node: $(\"/foo/node\").transform(map((x: number) => x * 10)),\n+ ins: {},\n+ outs: {}\n+ }),\nadd: {\nfn: rsg.add,\nins: {\na: { path: \"a\" },\nb: { path: \"b\" }\n},\n+ outs: {\n+ alt: (n) => n.subscribe({}) // identical to main out, testing only\n+ }\n},\nmul: {\nfn: rsg.mul,\nins: {\n- a: { stream: \"add\" },\n+ a: { stream: \"/add/outs/alt\" },\nb: { stream: () => rs.fromIterable([10, 20, 30]) },\n- c: { stream: \"bar\" }\n+ c: { stream: \"/bar/node\" }\n+ },\n+ outs: {\n+ baz: (n, id) => n.subscribe({ next: (x) => state.resetIn([\"foo\", id], x) })\n+ }\n+ },\n+ res: {\n+ ins: {\n+ src: { stream: \"/mul/node\" }\n},\n+ fn: rsg.node1(map((x: number) => ({ x: x, x2: x * 2 }))),\n+ outs: {\n+ \"*\": \"res\"\n+ }\n+ },\n+ res2: {\n+ ins: {\n+ src: { stream: \"/res/node\" }\n+ },\n+ fn: rsg.node1(),\n+ outs: {\n+ x: \"res2.x\",\n+ }\n}\n});\n- graph.mul.subscribe({ next: (x) => acc.push(x) });\n+ graph.mul.node.subscribe({ next: (x) => acc.push(x) });\nsetTimeout(() => {\nstate.resetIn(\"a\", 10);\n+ console.log(graph);\nassert.deepEqual(acc, [600, 1200, 1800, 7200]);\n+ assert.deepEqual(\n+ state.deref(),\n+ { a: 10, b: 2, foo: { baz: 7200 }, res: { x: 7200, x2: 14400 }, res2: { x: 7200 } }\n+ );\ndone();\n}, 10);\n});\n",
"new_path": "packages/rstream-graph/test/index.ts",
"old_path": "packages/rstream-graph/test/index.ts"
}
] | TypeScript | Apache License 2.0 | thi-ng/umbrella | feat(rstream-graph): add full/optional support for multiple node outputs
BREAKING CHANGE: update NodeSpec format & graph initialization
- add new types/interfaces
- non-destructive initGraph() behavior
- update & refactor nodeFromSpec()
- update addNode/removeNode()
- update tests & docs | 1 | feat | rstream-graph |
679,913 | 06.06.2018 14:36:36 | -3,600 | 558f4f8cbe3a843bc107a213e0dfa1c7de28a913 | fix(resolve-map): add private _resolveDeep
fixes resolution issue if a function dynamically created deep values | [
{
"change_type": "MODIFY",
"diff": "@@ -81,7 +81,7 @@ export const resolveMap = (obj: any, root?: any, path: LookupPath = [], resolved\n* @param path\n* @param resolved\n*/\n-const resolveArray = (arr: any[], root?: any, path: LookupPath = [], resolved: any = {}) => {\n+const _resolveArray = (arr: any[], root?: any, path: LookupPath = [], resolved: any = {}) => {\nroot = root || arr;\nfor (let k = 0, n = arr.length; k < n; k++) {\n_resolve(root, [...path, k], resolved);\n@@ -90,7 +90,8 @@ const resolveArray = (arr: any[], root?: any, path: LookupPath = [], resolved: a\n};\nconst _resolve = (root: any, path: LookupPath, resolved: any) => {\n- let v = getIn(root, path), rv = SEMAPHORE;\n+ let rv = SEMAPHORE;\n+ let v = getIn(root, path);\nconst pp = path.join(\"/\");\nif (!resolved[pp]) {\nif (isString(v) && v.charAt(0) === \"@\") {\n@@ -98,9 +99,9 @@ const _resolve = (root: any, path: LookupPath, resolved: any) => {\n} else if (isPlainObject(v)) {\nresolveMap(v, root, path, resolved);\n} else if (isArray(v)) {\n- resolveArray(v, root, path, resolved);\n+ _resolveArray(v, root, path, resolved);\n} else if (isFunction(v)) {\n- rv = v((p: string) => _resolve(root, absPath(path, p, 0), resolved));\n+ rv = v((p: string) => _resolveDeep(root, absPath(path, p, 0), resolved));\n}\nif (rv !== SEMAPHORE) {\nmutIn(root, path, rv);\n@@ -111,6 +112,29 @@ const _resolve = (root: any, path: LookupPath, resolved: any) => {\nreturn v;\n};\n+/**\n+ * Repeatedly calls `_resolve` stepwise descending along given path.\n+ * This is to ensure resolution of deep values created by functions at\n+ * parent tree levels. E.g. given:\n+ *\n+ * ```\n+ * {a: () => ({b: {c: 1}}), d: ($) => $(\"/a/b/c\") }\n+ * =>\n+ * { a: { b: { c: 1 } }, d: 1 }\n+ * ```\n+ *\n+ * @param root\n+ * @param path\n+ * @param resolved\n+ */\n+const _resolveDeep = (root: any, path: LookupPath, resolved: any) => {\n+ let v;\n+ for (let i = 1, n = path.length; i <= n; i++) {\n+ v = _resolve(root, path.slice(0, i), resolved);\n+ }\n+ return v;\n+};\n+\n/**\n* Takes the path for the current key and a lookup path string. Converts\n* the possibly relative lookup path into its absolute form.\n",
"new_path": "packages/resolve-map/src/index.ts",
"old_path": "packages/resolve-map/src/index.ts"
}
] | TypeScript | Apache License 2.0 | thi-ng/umbrella | fix(resolve-map): add private _resolveDeep
- fixes resolution issue if a function dynamically created deep values | 1 | fix | resolve-map |
679,913 | 06.06.2018 14:37:40 | -3,600 | 1a09b61ef178a48e09b8b84b19f0afd1e019d202 | minor(rstream-graph): minor fix exported types | [
{
"change_type": "MODIFY",
"diff": "@@ -15,6 +15,7 @@ import { Transducer } from \"@thi.ng/transducers/api\";\nimport {\nGraph,\nGraphSpec,\n+ Node,\nNodeFactory,\nNodeInputs,\nNodeInputSpec,\n@@ -67,15 +68,15 @@ const isNodeSpec = (x: any): x is NodeSpec =>\n* then updates the provided state atom at the path given.\n*\n* Non-function output specs subs assume the raw node output value is an\n- * object from which the different output keys are being extracted.\n- * The special `*` output key can be used to handle the entire node\n- * output value.\n+ * object from which the different output keys are being extracted. The\n+ * special `*` output key can be used to handle the entire node output\n+ * value. This is useful/required for non-object node result values.\n*\n* ```\n* out: {\n* // fn output spec\n* // creates new sub which uses `pick` transducer to\n- * // select key `a` from main node output\n+ * // select key `a` from main node output (assumed to be object)\n* a: (node, id) => node.subscribe({}, pick(id)),\n*\n* // yields sub of `b` key's values extracted from main output\n@@ -94,7 +95,8 @@ const isNodeSpec = (x: any): x is NodeSpec =>\n* @param spec\n* @param id\n*/\n-const nodeFromSpec = (state: IAtom<any>, spec: NodeSpec, id: string) => (resolve) => {\n+const nodeFromSpec = (state: IAtom<any>, spec: NodeSpec, id: string) =>\n+ (resolve) => {\nconst ins = prepareNodeInputs(spec.ins, state, resolve);\nconst node = spec.fn(ins, id);\nconst outs = prepareNodeOutputs(spec.outs, node, state, id);\n@@ -157,11 +159,13 @@ const prepareNodeOutputs = (outs: IObjectOf<NodeOutputSpec>, node: ISubscribable\n* @param id\n* @param spec\n*/\n-export const addNode = (graph: Graph, state: IAtom<any>, id: string, spec: NodeSpec) => {\n+export const addNode = (graph: Graph, state: IAtom<any>, id: string, spec: NodeSpec): Node => {\nif (graph[id]) {\nillegalArgs(`graph already contains a node with ID: ${id}`);\n}\n- graph[id] = nodeFromSpec(state, spec, id)((path) => getIn(graph, absPath([id], path)));\n+ return graph[id] = nodeFromSpec(state, spec, id)(\n+ (path) => getIn(graph, absPath([id], path))\n+ );\n}\n/**\n",
"new_path": "packages/rstream-graph/src/graph.ts",
"old_path": "packages/rstream-graph/src/graph.ts"
}
] | TypeScript | Apache License 2.0 | thi-ng/umbrella | minor(rstream-graph): minor fix exported types | 1 | minor | rstream-graph |
679,913 | 06.06.2018 14:38:11 | -3,600 | dd2cbd44d21d3041aae30334b2207d18467e3497 | refactor(examples): update rstream-graph examples | [
{
"change_type": "MODIFY",
"diff": "@@ -59,7 +59,7 @@ const graph = initGraph(db, {\nmpos: {\nfn: extract([1, \"pos\"]),\nins: { src: { stream: () => gestures } },\n- out: \"mpos\"\n+ outs: { \"*\": \"mpos\" }\n},\n// extracts last click position from gesture tuple\n@@ -68,7 +68,7 @@ const graph = initGraph(db, {\nclickpos: {\nfn: extract([1, \"click\"]),\nins: { src: { stream: () => gestures } },\n- out: \"clickpos\"\n+ outs: { \"*\": \"clickpos\" }\n},\n// extracts & computes length of `delta` vector in gesture tuple\n@@ -83,7 +83,7 @@ const graph = initGraph(db, {\n}\n)),\nins: { src: { stream: () => gestures } },\n- out: \"dist\"\n+ outs: { \"*\": \"dist\" }\n},\n// combines `clickpos`, `dist` and `color` streams to produce a\n@@ -101,11 +101,11 @@ const graph = initGraph(db, {\nundefined\n)),\nins: {\n- click: { stream: \"clickpos\" },\n- radius: { stream: \"radius\" },\n- color: { stream: \"color\" },\n+ click: { stream: \"/clickpos/node\" },\n+ radius: { stream: \"/radius/node\" },\n+ color: { stream: \"/color/node\" },\n},\n- out: \"circle\"\n+ outs: { \"*\": \"circle\" }\n},\n// produces a new random color for each new drag gesture (and\n@@ -119,8 +119,8 @@ const graph = initGraph(db, {\ndedupe(equiv),\nmap((x) => x && colors.next().value)\n)),\n- ins: { src: { stream: \"clickpos\" } },\n- out: \"color\"\n+ ins: { src: { stream: \"/clickpos/node\" } },\n+ outs: { \"*\": \"color\" }\n},\n// transforms a `requestAnimationFrame` event stream (frame counter @ 60fps)\n@@ -128,7 +128,7 @@ const graph = initGraph(db, {\nsine: {\nfn: node1(map((x: number) => 0.8 + 0.2 * Math.sin(x * 0.05))),\nins: { src: { stream: () => raf } },\n- out: \"sin\"\n+ outs: { \"*\": \"sin\" }\n},\n// multiplies `dist` and `sine` streams to produce an animated\n@@ -136,10 +136,10 @@ const graph = initGraph(db, {\nradius: {\nfn: mul,\nins: {\n- a: { stream: \"sine\" },\n- b: { stream: \"dist\" }\n+ a: { stream: \"/sine/node\" },\n+ b: { stream: \"/dist/node\" }\n},\n- out: \"radius\"\n+ outs: { \"*\": \"radius\" }\n}\n});\n@@ -152,7 +152,7 @@ start(\"app\", () =>\n// since all @thi.ng/rstream subscriptions implement the\n// @thi.ng/api/IDeref interface (like several other types, e.g.\n// @thi.ng/atom's Atom, Cursor, View etc.)\n- graph.circle\n+ graph.circle.node\n]);\n// create a GraphViz DOT file of the entire dataflow graph\n",
"new_path": "examples/rstream-dataflow/src/index.ts",
"old_path": "examples/rstream-dataflow/src/index.ts"
},
{
"change_type": "MODIFY",
"diff": "@@ -32,23 +32,25 @@ export function initDataflow(bus: EventBus) {\nrotation: {\nfn: rotate,\nins: {\n- shapes: { stream: \"grid\" },\n+ shapes: { stream: \"/grid/node\" },\ntheta: { path: paths.THETA },\n},\n},\nsvg: {\nfn: createSVG,\nins: {\n- shapes: { stream: \"rotation\" },\n+ shapes: { stream: \"/rotation/node\" },\ncols: { path: paths.COLS },\nrows: { path: paths.ROWS },\nstroke: { path: paths.STROKE },\n},\n// dispatch SVG result doc as event\n- out: (node) => node.subscribe({\n+ outs: {\n+ \"*\": (node) => node.subscribe({\nnext: (svg) => bus.dispatch([ev.UPDATE_SVG, svg])\n})\n}\n+ }\n});\nreturn graph;\n};\n",
"new_path": "examples/rstream-grid/src/dataflow.ts",
"old_path": "examples/rstream-grid/src/dataflow.ts"
}
] | TypeScript | Apache License 2.0 | thi-ng/umbrella | refactor(examples): update rstream-graph examples | 1 | refactor | examples |
679,913 | 06.06.2018 15:19:22 | -3,600 | 48c796f5cb7cdefe7f86a876c7829410158f4c06 | fix(resolve-map): also use _resolvePath for plain lookups, optimize
rename _resolveDeep => _resolvePath
update docs | [
{
"change_type": "MODIFY",
"diff": "@@ -93,15 +93,16 @@ const _resolve = (root: any, path: LookupPath, resolved: any) => {\nlet rv = SEMAPHORE;\nlet v = getIn(root, path);\nconst pp = path.join(\"/\");\n+ console.log(\"resolve\", pp, resolved[pp]);\nif (!resolved[pp]) {\n- if (isString(v) && v.charAt(0) === \"@\") {\n- rv = _resolve(root, absPath(path, v), resolved);\n- } else if (isPlainObject(v)) {\n+ if (isPlainObject(v)) {\nresolveMap(v, root, path, resolved);\n} else if (isArray(v)) {\n_resolveArray(v, root, path, resolved);\n+ } else if (isString(v) && v.charAt(0) === \"@\") {\n+ rv = _resolvePath(root, absPath(path, v), resolved);\n} else if (isFunction(v)) {\n- rv = v((p: string) => _resolveDeep(root, absPath(path, p, 0), resolved));\n+ rv = v((p: string) => _resolvePath(root, absPath(path, p, 0), resolved));\n}\nif (rv !== SEMAPHORE) {\nmutIn(root, path, rv);\n@@ -113,12 +114,16 @@ const _resolve = (root: any, path: LookupPath, resolved: any) => {\n};\n/**\n- * Repeatedly calls `_resolve` stepwise descending along given path.\n- * This is to ensure resolution of deep values created by functions at\n- * parent tree levels. E.g. given:\n+ * If the value at given path is still unresolved, repeatedly calls\n+ * `_resolve` by stepwise descending along given path and returns final\n+ * value. This is to ensure full resolution of deeper values created by\n+ * functions at intermediate tree levels. If the path is already marked\n+ * as resolved, returns its value.\n+ *\n+ * E.g. given:\n*\n* ```\n- * {a: () => ({b: {c: 1}}), d: ($) => $(\"/a/b/c\") }\n+ * {a: () => ({b: {c: 1}}), d: \"@/a/b/c\" }\n* =>\n* { a: { b: { c: 1 } }, d: 1 }\n* ```\n@@ -127,7 +132,10 @@ const _resolve = (root: any, path: LookupPath, resolved: any) => {\n* @param path\n* @param resolved\n*/\n-const _resolveDeep = (root: any, path: LookupPath, resolved: any) => {\n+const _resolvePath = (root: any, path: LookupPath, resolved: any) => {\n+ if (resolved[path.join(\"/\")]) {\n+ return getIn(root, path);\n+ }\nlet v;\nfor (let i = 1, n = path.length; i <= n; i++) {\nv = _resolve(root, path.slice(0, i), resolved);\n@@ -140,23 +148,23 @@ const _resolveDeep = (root: any, path: LookupPath, resolved: any) => {\n* the possibly relative lookup path into its absolute form.\n*\n* @param curr\n- * @param q\n+ * @param path\n* @param idx\n*/\n-export const absPath = (curr: LookupPath, q: string, idx = 1): PropertyKey[] => {\n- if (q.charAt(idx) === \"/\") {\n- return q.substr(idx + 1).split(\"/\");\n+export const absPath = (curr: LookupPath, path: string, idx = 1): PropertyKey[] => {\n+ if (path.charAt(idx) === \"/\") {\n+ return path.substr(idx + 1).split(\"/\");\n}\ncurr = curr.slice(0, curr.length - 1);\n- const sub = q.substr(idx).split(\"/\");\n+ const sub = path.substr(idx).split(\"/\");\nfor (let i = 0, n = sub.length; i < n; i++) {\nif (sub[i] === \"..\") {\n- !curr.length && illegalArgs(`invalid lookup path`);\n+ !curr.length && illegalArgs(`invalid lookup path: ${path}`);\ncurr.pop();\n} else {\nreturn curr.concat(sub.slice(i));\n}\n}\n- !curr.length && illegalArgs(`invalid lookup path`);\n+ !curr.length && illegalArgs(`invalid lookup path: ${path}`);\nreturn curr;\n};\n",
"new_path": "packages/resolve-map/src/index.ts",
"old_path": "packages/resolve-map/src/index.ts"
}
] | TypeScript | Apache License 2.0 | thi-ng/umbrella | fix(resolve-map): also use _resolvePath for plain lookups, optimize
- rename _resolveDeep => _resolvePath
- update docs | 1 | fix | resolve-map |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.