commit_message
stringlengths 3
2.32k
| diff
stringlengths 186
49.5k
| concern_count
int64 1
5
| shas
stringlengths 44
220
| types
stringlengths 6
45
|
|---|---|---|---|---|
offset tests for min and max read cursors,add documentation to use react-native-paper with CRA (#874)
|
["diff --git a/storage/reads/array_cursor_test.go b/storage/reads/array_cursor_test.go\nindex 7c7ad0c..c1e6ff9 100644\n--- a/storage/reads/array_cursor_test.go\n+++ b/storage/reads/array_cursor_test.go\n@@ -1541,6 +1541,34 @@ func TestWindowMinArrayCursor(t *testing.T) {\n \t\t\t},\n \t\t},\n \t\t{\n+\t\t\tname: \"window offset\",\n+\t\t\tevery: time.Hour,\n+\t\t\toffset: 30 * time.Minute,\n+\t\t\tinputArrays: []*cursors.IntegerArray{\n+\t\t\t\tmakeIntegerArray(\n+\t\t\t\t\t16,\n+\t\t\t\t\tmustParseTime(\"2010-01-01T00:00:00Z\"), 15*time.Minute,\n+\t\t\t\t\tfunc(i int64) int64 {\n+\t\t\t\t\t\tbase := (i / 4) * 100\n+\t\t\t\t\t\tm := (i % 4) * 15\n+\t\t\t\t\t\treturn base + m\n+\t\t\t\t\t},\n+\t\t\t\t),\n+\t\t\t},\n+\t\t\twant: []*cursors.IntegerArray{\n+\t\t\t\t{\n+\t\t\t\t\tTimestamps: []int64{\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T00:00:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T00:30:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T01:30:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T02:30:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T03:30:00Z\").UnixNano(),\n+\t\t\t\t\t},\n+\t\t\t\t\tValues: []int64{0, 30, 130, 230, 330},\n+\t\t\t\t},\n+\t\t\t},\n+\t\t},\n+\t\t{\n \t\t\tname: \"window desc values\",\n \t\t\tevery: time.Hour,\n \t\t\tinputArrays: []*cursors.IntegerArray{\n@@ -1560,6 +1588,34 @@ func TestWindowMinArrayCursor(t *testing.T) {\n \t\t\t},\n \t\t},\n \t\t{\n+\t\t\tname: \"window offset desc values\",\n+\t\t\tevery: time.Hour,\n+\t\t\toffset: 30 * time.Minute,\n+\t\t\tinputArrays: []*cursors.IntegerArray{\n+\t\t\t\tmakeIntegerArray(\n+\t\t\t\t\t16,\n+\t\t\t\t\tmustParseTime(\"2010-01-01T00:00:00Z\"), 15*time.Minute,\n+\t\t\t\t\tfunc(i int64) int64 {\n+\t\t\t\t\t\tbase := (i / 4) * 100\n+\t\t\t\t\t\tm := 60 - (i%4)*15\n+\t\t\t\t\t\treturn base + m\n+\t\t\t\t\t},\n+\t\t\t\t),\n+\t\t\t},\n+\t\t\twant: []*cursors.IntegerArray{\n+\t\t\t\t{\n+\t\t\t\t\tTimestamps: []int64{\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T00:15:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T00:45:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T01:45:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T02:45:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T03:45:00Z\").UnixNano(),\n+\t\t\t\t\t},\n+\t\t\t\t\tValues: []int64{45, 15, 115, 215, 315},\n+\t\t\t\t},\n+\t\t\t},\n+\t\t},\n+\t\t{\n \t\t\tname: \"window min int\",\n \t\t\tevery: time.Hour,\n \t\t\tinputArrays: []*cursors.IntegerArray{\n@@ -1693,6 +1749,34 @@ func TestWindowMaxArrayCursor(t *testing.T) {\n \t\t\t},\n \t\t},\n \t\t{\n+\t\t\tname: \"window offset\",\n+\t\t\tevery: time.Hour,\n+\t\t\toffset: 30 * time.Minute,\n+\t\t\tinputArrays: []*cursors.IntegerArray{\n+\t\t\t\tmakeIntegerArray(\n+\t\t\t\t\t16,\n+\t\t\t\t\tmustParseTime(\"2010-01-01T00:00:00Z\"), 15*time.Minute,\n+\t\t\t\t\tfunc(i int64) int64 {\n+\t\t\t\t\t\tbase := (i / 4) * 100\n+\t\t\t\t\t\tm := (i % 4) * 15\n+\t\t\t\t\t\treturn base + m\n+\t\t\t\t\t},\n+\t\t\t\t),\n+\t\t\t},\n+\t\t\twant: []*cursors.IntegerArray{\n+\t\t\t\t{\n+\t\t\t\t\tTimestamps: []int64{\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T00:15:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T01:15:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T02:15:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T03:15:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T03:45:00Z\").UnixNano(),\n+\t\t\t\t\t},\n+\t\t\t\t\tValues: []int64{15, 115, 215, 315, 345},\n+\t\t\t\t},\n+\t\t\t},\n+\t\t},\n+\t\t{\n \t\t\tname: \"window desc values\",\n \t\t\tevery: time.Hour,\n \t\t\tinputArrays: []*cursors.IntegerArray{\n@@ -1712,6 +1796,34 @@ func TestWindowMaxArrayCursor(t *testing.T) {\n \t\t\t},\n \t\t},\n \t\t{\n+\t\t\tname: \"window offset desc values\",\n+\t\t\tevery: time.Hour,\n+\t\t\toffset: 30 * time.Minute,\n+\t\t\tinputArrays: []*cursors.IntegerArray{\n+\t\t\t\tmakeIntegerArray(\n+\t\t\t\t\t16,\n+\t\t\t\t\tmustParseTime(\"2010-01-01T00:00:00Z\"), 15*time.Minute,\n+\t\t\t\t\tfunc(i int64) int64 {\n+\t\t\t\t\t\tbase := (i / 4) * 100\n+\t\t\t\t\t\tm := 60 - (i%4)*15\n+\t\t\t\t\t\treturn base + m\n+\t\t\t\t\t},\n+\t\t\t\t),\n+\t\t\t},\n+\t\t\twant: []*cursors.IntegerArray{\n+\t\t\t\t{\n+\t\t\t\t\tTimestamps: []int64{\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T00:00:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T01:00:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T02:00:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T03:00:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T03:30:00Z\").UnixNano(),\n+\t\t\t\t\t},\n+\t\t\t\t\tValues: []int64{60, 160, 260, 360, 330},\n+\t\t\t\t},\n+\t\t\t},\n+\t\t},\n+\t\t{\n \t\t\tname: \"window min int\",\n \t\t\tevery: time.Hour,\n \t\t\tinputArrays: []*cursors.IntegerArray{\n", "diff --git a/docs/pages/4.react-native-web.md b/docs/pages/4.react-native-web.md\nindex 69e4e52..8d6ae2a 100644\n--- a/docs/pages/4.react-native-web.md\n+++ b/docs/pages/4.react-native-web.md\n@@ -16,6 +16,63 @@ To install `react-native-web`, run:\n yarn add react-native-web react-dom react-art\n ```\n \n+### Using CRA ([Create React App](https://github.com/facebook/create-react-app))\n+\n+Install [`react-app-rewired`](https://github.com/timarney/react-app-rewired) to override `webpack` configuration:\n+\n+```sh\n+yarn add --dev react-app-rewired\n+```\n+\n+[Configure `babel-loader`](#2-configure-babel-loader) using a new file called `config-overrides.js`:\n+\n+```js\n+module.exports = function override(config, env) {\n+ config.module.rules.push({\n+ test: /\\.js$/,\n+ exclude: /node_modules[/\\\\](?!react-native-paper|react-native-vector-icons|react-native-safe-area-view)/,\n+ use: {\n+ loader: \"babel-loader\",\n+ options: {\n+ // Disable reading babel configuration\n+ babelrc: false,\n+ configFile: false,\n+\n+ // The configration for compilation\n+ presets: [\n+ [\"@babel/preset-env\", { useBuiltIns: \"usage\" }],\n+ \"@babel/preset-react\",\n+ \"@babel/preset-flow\"\n+ ],\n+ plugins: [\n+ \"@babel/plugin-proposal-class-properties\",\n+ \"@babel/plugin-proposal-object-rest-spread\"\n+ ]\n+ }\n+ }\n+ });\n+\n+ return config;\n+};\n+```\n+\n+Change your script in `package.json`:\n+\n+```diff\n+/* package.json */\n+\n+ \"scripts\": {\n+- \"start\": \"react-scripts start\",\n++ \"start\": \"react-app-rewired start\",\n+- \"build\": \"react-scripts build\",\n++ \"build\": \"react-app-rewired build\",\n+- \"test\": \"react-scripts test --env=jsdom\",\n++ \"test\": \"react-app-rewired test --env=jsdom\"\n+}\n+```\n+\n+### Custom webpack setup\n+\n To install `webpack`, run:\n \n ```sh\n"]
| 2 |
["b7e2330fa3a8d7b8a9bff01b707c44e64b845c7b", "ee7cc5d5a940fba774e715b1f029c6361110b108"]
|
["test", "docs"]
|
remove sync ts check,exclude github.io from link checking to avoid rate limiting
|
["diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js\nindex 8b23fba..58a4c17 100644\n--- a/config/webpack.config.prod.js\n+++ b/config/webpack.config.prod.js\n@@ -251,7 +251,7 @@ module.exports = {\n plugins: [\n argv.notypecheck\n ? null\n- : new ForkTsCheckerWebpackPlugin({tslint: true, async: false}),\n+ : new ForkTsCheckerWebpackPlugin({tslint: true}),\n // Makes some environment variables available in index.html.\n // The public URL is available as %PUBLIC_URL% in index.html, e.g.:\n // <link rel=\"shortcut icon\" href=\"%PUBLIC_URL%/favicon.ico\">\n", "diff --git a/.github/workflows/ibis-docs-lint.yml b/.github/workflows/ibis-docs-lint.yml\nindex 90c5a27..db6457b 100644\n--- a/.github/workflows/ibis-docs-lint.yml\n+++ b/.github/workflows/ibis-docs-lint.yml\n@@ -101,6 +101,7 @@ jobs:\n --exclude-mail \\\n --exclude fonts.gstatic.com \\\n --exclude github.com \\\n+ --exclude github.io \\\n --no-progress \\\n --github-token ${{ steps.generate_token.outputs.token }}\n \n"]
| 2 |
["411be831591b2ea15ca9138eaf8db81f51b5101e", "ce0539a32b927a3559feebf8f5307e3863e992a1"]
|
["build", "ci"]
|
Handle different events.,add tests for ProfilePage methods
|
["diff --git a/src/notebook/epics/kernel-launch.js b/src/notebook/epics/kernel-launch.js\nindex 9075d7c..9f16e67 100644\n--- a/src/notebook/epics/kernel-launch.js\n+++ b/src/notebook/epics/kernel-launch.js\n@@ -113,6 +113,12 @@ export function newKernelObservable(kernelSpec: KernelInfo, cwd: string) {\n observer.error({ type: 'ERROR', payload: error, err: true });\n observer.complete();\n });\n+ spawn.on('exit', () => {\n+ observer.complete();\n+ });\n+ spawn.on('disconnect', () => {\n+ observer.complete();\n+ });\n });\n });\n }\n", "diff --git a/client/src/components/Profile/PreScreeningIviewCard.tsx b/client/src/components/Profile/PreScreeningIviewCard.tsx\nindex f84392a..2031203 100644\n--- a/client/src/components/Profile/PreScreeningIviewCard.tsx\n+++ b/client/src/components/Profile/PreScreeningIviewCard.tsx\n@@ -27,7 +27,7 @@ type State = {\n isPreScreeningIviewModalVisible: boolean;\n };\n \n-class CoreJSIviewsCard extends React.PureComponent<Props, State> {\n+class PreScreeningIviewsCard extends React.PureComponent<Props, State> {\n state = {\n courseIndex: 0,\n isPreScreeningIviewModalVisible: false,\n@@ -98,4 +98,4 @@ class CoreJSIviewsCard extends React.PureComponent<Props, State> {\n }\n }\n \n-export default CoreJSIviewsCard;\n+export default PreScreeningIviewsCard;\ndiff --git a/client/src/components/Profile/__test__/__snapshots__/PreScreeningIviewCard.test.tsx.snap b/client/src/components/Profile/__test__/__snapshots__/PreScreeningIviewCard.test.tsx.snap\nindex 7b73c3f..54b378c 100644\n--- a/client/src/components/Profile/__test__/__snapshots__/PreScreeningIviewCard.test.tsx.snap\n+++ b/client/src/components/Profile/__test__/__snapshots__/PreScreeningIviewCard.test.tsx.snap\n@@ -1,7 +1,7 @@\n // Jest Snapshot v1, https://goo.gl/fbAQLP\n \n exports[`PreScreeningIviewCard Should render correctly 1`] = `\n-<CoreJSIviewsCard\n+<PreScreeningIviewsCard\n data={\n Array [\n Object {\n@@ -3015,5 +3015,5 @@ exports[`PreScreeningIviewCard Should render correctly 1`] = `\n </div>\n </Card>\n </CommonCard>\n-</CoreJSIviewsCard>\n+</PreScreeningIviewsCard>\n `;\ndiff --git a/client/src/pages/profile/__tests__/ProfilePage.tests.tsx b/client/src/pages/profile/__tests__/ProfilePage.tests.tsx\nindex 079d966..95f3e49 100644\n--- a/client/src/pages/profile/__tests__/ProfilePage.tests.tsx\n+++ b/client/src/pages/profile/__tests__/ProfilePage.tests.tsx\n@@ -4,7 +4,6 @@ import { shallowToJson } from 'enzyme-to-json';\n import { NextRouter } from 'next/router';\n import { Session } from 'components/withSession';\n import { ProfilePage } from '../index';\n-// import { GeneralInfo } from '../../../../../common/models/profile';\n \n jest.mock('next/config', () => () => ({}));\n jest.mock('services/user', () => ({\n@@ -12,80 +11,378 @@ jest.mock('services/user', () => ({\n getProfileInfo() {\n return jest.fn();\n }\n+ saveProfileInfo() {\n+ return jest.fn();\n+ }\n },\n }),\n );\n \n-describe('ProfilePage', () => {\n- const profile = {\n- generalInfo: {\n- name: 'Dzmitry Petrov',\n- githubId: 'petrov',\n- aboutMyself: 'Test',\n+const profile = {\n+ permissionsSettings: {\n+ isProfileVisible: { all: true },\n+ isAboutVisible: { mentor: true, student: false, all: false },\n+ isEducationVisible: { mentor: true, student: false, all: false },\n+ isEnglishVisible: { student: false, all: false },\n+ isEmailVisible: { student: false, all: false },\n+ isTelegramVisible: { student: false, all: false },\n+ isSkypeVisible: { student: false, all: false },\n+ isPhoneVisible: { student: false, all: false },\n+ isContactsNotesVisible: { student: true, all: false },\n+ isLinkedInVisible: { mentor: true, student: false, all: false },\n+ isPublicFeedbackVisible: { mentor: true, student: true, all: false },\n+ isMentorStatsVisible: { mentor: true, student: true, all: false },\n+ isStudentStatsVisible: { student: false, all: false },\n+ },\n+ generalInfo: {\n+ aboutMyself: 'Test',\n+ educationHistory: [{\n+ graduationYear: '2019',\n+ faculty: 'TT',\n+ university: 'Test',\n+ }],\n+ englishLevel: 'a2+',\n+ locationId: 456,\n+ locationName: 'Brest',\n+ },\n+ contacts: {},\n+ mentorStats: [\n+ {},\n+ ],\n+ studentStats: [\n+ {\n+ courseFullName: 'test',\n+ courseName: 'test',\n locationName: 'Minsk',\n- locationId: '1',\n- educationHistory: null,\n- englishLevel: 'a2+',\n- },\n- permissionsSettings: {\n- isProfileVisible: { all: true },\n- isAboutVisible: { mentor: true, student: false, all: false },\n- isEducationVisible: { mentor: true, student: false, all: false },\n- isEnglishVisible: { student: false, all: false },\n- isEmailVisible: { student: false, all: false },\n- isTelegramVisible: { student: false, all: false },\n- isSkypeVisible: { student: false, all: false },\n- isPhoneVisible: { student: false, all: false },\n- isContactsNotesVisible: { student: true, all: false },\n- isLinkedInVisible: { mentor: true, student: false, all: false },\n- isPublicFeedbackVisible: { mentor: true, student: true, all: false },\n- isMentorStatsVisible: { mentor: true, student: true, all: false },\n- isStudentStatsVisible: { student: false, all: false },\n- },\n- contacts: {\n- phone: '+375292123456',\n- email: '[email protected]',\n- skype: 'petro:live',\n- telegram: 'petro',\n- notes: 'discord: @petro, instagram: @petro12',\n- },\n- isPermissionsSettingsChanged: true,\n- isProfileSettingsChanged: true,\n- };\n- const session = {\n- id: 2020,\n- githubId: 'mikhama',\n- isAdmin: true,\n- isHirer: false,\n- isActivist: false,\n- roles: {\n- 1: 'mentor',\n- 2: 'student',\n- 11: 'mentor',\n- },\n- coursesRoles: {\n- 13: [\n- 'manager',\n+ tasks: [\n+ {\n+ interviewFormAnswers: {},\n+ },\n ],\n },\n- } as Session;\n- const router = {\n- query: {\n- githubId: 'petrov',\n- },\n- asPath: '/#edit/',\n- } as unknown as NextRouter;\n+ ],\n+ publicFeedback: [\n+ {},\n+ ],\n+ stageInterviewFeedback: [\n+ {},\n+ ],\n+};\n+const session = {\n+ id: 2020,\n+ githubId: 'mikhama',\n+ isAdmin: true,\n+ isHirer: false,\n+ isActivist: false,\n+ roles: {\n+ 1: 'mentor',\n+ 2: 'student',\n+ 11: 'mentor',\n+ },\n+ coursesRoles: {\n+ 13: [\n+ 'manager',\n+ ],\n+ },\n+} as Session;\n+const router = {\n+ query: {\n+ githubId: 'petrov',\n+ },\n+ asPath: '/#edit/',\n+} as unknown as NextRouter;\n+const state = {\n+ profile,\n+ isInitialPermissionsSettingsChanged: false,\n+ isInitialProfileSettingsChanged: false,\n+};\n \n+describe('ProfilePage', () => {\n describe('Should render correctly', () => {\n- it('if full info about profile is in the state', () => {\n+ it('if full profile info is in the state', () => {\n const wrapper = shallow(\n <ProfilePage\n session={session}\n router={router}\n />,\n );\n- wrapper.setState({ profile });\n+ wrapper.setState(state);\n expect(shallowToJson(wrapper)).toMatchSnapshot();\n });\n });\n+\n+ const wrapper = shallow(\n+ <ProfilePage\n+ session={session}\n+ router={router}\n+ />,\n+ );\n+ const instance = wrapper.instance();\n+ describe('onPermissionsSettingsChange', () => {\n+ describe('Should set state correctly', () => {\n+ it('if permissions for student role were changed', async () => {\n+ const event = {\n+ target: {\n+ checked: true,\n+ },\n+ }\n+ const changedPermissionsSettings = {\n+ permissionName: 'isEmailVisible',\n+ role: 'student',\n+ };\n+ wrapper.setState(state);\n+ await instance.onPermissionsSettingsChange(event, changedPermissionsSettings);\n+ expect(wrapper.state().profile.permissionsSettings.isEmailVisible).toEqual({\n+ student: true, all: false,\n+ });\n+ expect(wrapper.state().isInitialPermissionsSettingsChanged).toBe(true);\n+ });\n+ it('if permissions for mentor role were changed', async () => {\n+ const event = {\n+ target: {\n+ checked: false,\n+ },\n+ }\n+ const changedPermissionsSettings = {\n+ permissionName: 'isLinkedInVisible',\n+ role: 'mentor',\n+ };\n+ wrapper.setState(state);\n+ await instance.onPermissionsSettingsChange(event, changedPermissionsSettings);\n+ expect(wrapper.state().profile.permissionsSettings.isLinkedInVisible).toEqual({\n+ mentor: false, student: false, all: false,\n+ });\n+ expect(wrapper.state().isInitialPermissionsSettingsChanged).toBe(true);\n+ });\n+ it('if permissions for all roles were changed', async () => {\n+ const event = {\n+ target: {\n+ checked: true,\n+ },\n+ }\n+ const changedPermissionsSettings = {\n+ permissionName: 'isEducationVisible',\n+ role: 'all',\n+ };\n+ wrapper.setState(state);\n+ await instance.onPermissionsSettingsChange(event, changedPermissionsSettings);\n+ expect(wrapper.state().profile.permissionsSettings.isEducationVisible).toEqual({\n+ mentor: true, student: true, all: true,\n+ });\n+ expect(wrapper.state().isInitialPermissionsSettingsChanged).toBe(true);\n+ });\n+ });\n+ });\n+ describe('onProfileSettingsChange', () => {\n+ describe('Should set state correctly', () => {\n+ it('if \"profile.generalInfo.location\" was changed', async () => {\n+ const event = {\n+ id: 123,\n+ name: 'Minsk',\n+ }\n+ const path = 'generalInfo.location';\n+ wrapper.setState(state);\n+ await instance.onProfileSettingsChange(event, path);\n+ expect(wrapper.state().profile.generalInfo.locationId).toBe(123);\n+ expect(wrapper.state().profile.generalInfo.locationName).toBe('Minsk');\n+ expect(wrapper.state().isInitialProfileSettingsChanged).toBe(true);\n+ });\n+ it('if \"profile.generalInfo.englishLevel\" was changed', async () => {\n+ const event = 'b2+';\n+ const path = 'generalInfo.englishLevel';\n+ wrapper.setState(state);\n+ await instance.onProfileSettingsChange(event, path);\n+ expect(wrapper.state().profile.generalInfo.englishLevel).toBe('b2+');\n+ });\n+ it('if field added to \"profile.generalInfo.educationHistory\"', async () => {\n+ const event = {\n+ type: 'add',\n+ };\n+ const path = 'generalInfo.educationHistory';\n+ wrapper.setState(state);\n+ await instance.onProfileSettingsChange(event, path);\n+ expect(wrapper.state().profile.generalInfo.educationHistory).toEqual([\n+ {\n+ graduationYear: '2019',\n+ faculty: 'TT',\n+ university: 'Test',\n+ },\n+ {\n+ graduationYear: null,\n+ faculty: null,\n+ university: null,\n+ },\n+ ]);\n+ expect(wrapper.state().isInitialProfileSettingsChanged).toBe(true);\n+ });\n+ it('if field deleted from \"profile.generalInfo.educationHistory\"', async () => {\n+ const event = {\n+ type: 'delete',\n+ index: 0,\n+ };\n+ const path = 'generalInfo.educationHistory';\n+ wrapper.setState(state);\n+ await instance.onProfileSettingsChange(event, path);\n+ expect(wrapper.state().profile.generalInfo.educationHistory).toEqual([]);\n+ });\n+ it('if some other field was changed', async () => {\n+ const event = {\n+ target: {\n+ value: 'Hello everyone, my name is Mike.',\n+ }\n+ };\n+ const path = 'generalInfo.aboutMyself';\n+ wrapper.setState(state);\n+ await instance.onProfileSettingsChange(event, path);\n+ expect(wrapper.state().profile.generalInfo.aboutMyself).toEqual('Hello everyone, my name is Mike.');\n+ expect(wrapper.state().isInitialProfileSettingsChanged).toBe(true);\n+ });\n+ });\n+ });\n+ describe('changeProfilePageMode', () => {\n+ describe('Should set state correctly', () => {\n+ it('if mode = \"edit\" was passed', async () => {\n+ const mode = 'edit';\n+ wrapper.setState({ ...state, isEditingModeEnabled: false });\n+ expect(wrapper.state().isEditingModeEnabled).toBe(false);\n+ await instance.changeProfilePageMode(mode);\n+ expect(wrapper.state().isEditingModeEnabled).toBe(true);\n+ });\n+ it('if mode = \"view\" was passed', async () => {\n+ const mode = 'view';\n+ wrapper.setState({ ...state, isEditingModeEnabled: true });\n+ expect(wrapper.state().isEditingModeEnabled).toBe(true);\n+ await instance.changeProfilePageMode(mode);\n+ expect(wrapper.state().isEditingModeEnabled).toBe(false);\n+ });\n+ });\n+ });\n+ describe('saveProfile', () => {\n+ it('Should set state correctly', async () => {\n+ const profile = {\n+ generalInfo: {\n+ aboutMyself: 'Hello',\n+ educationHistory: [{\n+ graduationYear: '2019',\n+ faculty: 'TT',\n+ university: 'Test',\n+ }],\n+ englishLevel: 'c1',\n+ locationId: 778,\n+ locationName: 'Hrodna',\n+ },\n+ contacts: {\n+ telegram: 'test',\n+ },\n+ permissionsSettings: {\n+ isProfileVisible: { all: true },\n+ isAboutVisible: { mentor: true, student: false, all: false },\n+ isEducationVisible: { mentor: true, student: false, all: false },\n+ isEnglishVisible: { student: true, all: true },\n+ isEmailVisible: { student: true, all: true },\n+ isTelegramVisible: { student: true, all: true },\n+ isSkypeVisible: { student: true, all: false },\n+ isPhoneVisible: { student: true, all: false },\n+ isContactsNotesVisible: { student: true, all: false },\n+ isLinkedInVisible: { mentor: true, student: false, all: false },\n+ isPublicFeedbackVisible: { mentor: true, student: true, all: false },\n+ isMentorStatsVisible: { mentor: true, student: true, all: false },\n+ isStudentStatsVisible: { student: false, all: false },\n+ },\n+ };\n+ wrapper.setState({\n+ ...state,\n+ profile,\n+ isInitialPermissionsSettingsChanged: true,\n+ isInitialProfileSettingsChanged: true,\n+ });\n+ await instance.saveProfile();\n+ expect(wrapper.state().isSaving).toBe(false);\n+ expect(wrapper.state().isInitialPermissionsSettingsChanged).toBe(false);\n+ expect(wrapper.state().isInitialProfileSettingsChanged).toBe(false);\n+ expect(wrapper.state().initialPermissionsSettings).toEqual(profile.permissionsSettings);\n+ expect(wrapper.state().initialProfileSettings).toEqual(profile);\n+ });\n+ });\n+ describe('hadStudentCoreJSInterview', () => {\n+ describe('Should return', () => {\n+ it('\"true\" if student has an \"interviewFormAnswers\" in one of the task', () => {\n+ const studentStats = [\n+ {\n+ courseFullName: 'test',\n+ courseName: 'test',\n+ locationName: 'Minsk',\n+ tasks: [\n+ {},\n+ {\n+ interviewFormAnswers: {},\n+ },\n+ {},\n+ {},\n+ ],\n+ },\n+ ];\n+ const result = instance.hadStudentCoreJSInterview(studentStats);\n+ expect(result).toBe(true);\n+ });\n+ it('\"false\" if student has not an \"interviewFormAnswers\" in one of the task', () => {\n+ const studentStats = [\n+ {\n+ courseFullName: 'test',\n+ courseName: 'test',\n+ locationName: 'Minsk',\n+ tasks: [\n+ {},\n+ {},\n+ {},\n+ ],\n+ },\n+ ];\n+ const result = instance.hadStudentCoreJSInterview(studentStats);\n+ expect(result).toBe(false);\n+ });\n+ });\n+ });\n+ describe('getStudentCoreJSInterviews', () => {\n+ it('Should return info about CoreJS interviews', () => {\n+ const studentStats = [\n+ {\n+ courseFullName: 'test',\n+ courseName: 'test',\n+ locationName: 'Minsk',\n+ tasks: [\n+ {},\n+ {},\n+ {\n+ interviewer: {\n+ name: 'Dima Petrov',\n+ githubId: 'dip',\n+ },\n+ comment: 'Test',\n+ score: 9,\n+ interviewFormAnswers: {},\n+ },\n+ {},\n+ ],\n+ },\n+ ];\n+ const result = instance.getStudentCoreJSInterviews(studentStats);\n+ expect(result).toEqual([\n+ {\n+ courseFullName: 'test',\n+ courseName: 'test',\n+ interview: {\n+ answers: {},\n+ interviewer: {\n+ name: 'Dima Petrov',\n+ githubId: 'dip',\n+ },\n+ comment: 'Test',\n+ score: 9,\n+ },\n+ locationName: 'Minsk',\n+ },\n+ ]);\n+ });\n+ });\n });\ndiff --git a/client/src/pages/profile/__tests__/__snapshots__/ProfilePage.tests.tsx.snap b/client/src/pages/profile/__tests__/__snapshots__/ProfilePage.tests.tsx.snap\nindex fbd133c..729b2de 100644\n--- a/client/src/pages/profile/__tests__/__snapshots__/ProfilePage.tests.tsx.snap\n+++ b/client/src/pages/profile/__tests__/__snapshots__/ProfilePage.tests.tsx.snap\n@@ -1,6 +1,6 @@\n // Jest Snapshot v1, https://goo.gl/fbAQLP\n \n-exports[`ProfilePage Should render correctly if 1`] = `\n+exports[`ProfilePage Should render correctly if full profile info is in the state 1`] = `\n <Fragment>\n <LoadingScreen\n show={true}\n@@ -50,12 +50,16 @@ exports[`ProfilePage Should render correctly if 1`] = `\n data={\n Object {\n \"aboutMyself\": \"Test\",\n- \"educationHistory\": null,\n+ \"educationHistory\": Array [\n+ Object {\n+ \"faculty\": \"TT\",\n+ \"graduationYear\": \"2019\",\n+ \"university\": \"Test\",\n+ },\n+ ],\n \"englishLevel\": \"a2+\",\n- \"githubId\": \"petrov\",\n- \"locationId\": \"1\",\n- \"locationName\": \"Minsk\",\n- \"name\": \"Dzmitry Petrov\",\n+ \"locationId\": 456,\n+ \"locationName\": \"Brest\",\n }\n }\n isEditingModeEnabled={false}\n@@ -135,12 +139,16 @@ exports[`ProfilePage Should render correctly if 1`] = `\n data={\n Object {\n \"aboutMyself\": \"Test\",\n- \"educationHistory\": null,\n+ \"educationHistory\": Array [\n+ Object {\n+ \"faculty\": \"TT\",\n+ \"graduationYear\": \"2019\",\n+ \"university\": \"Test\",\n+ },\n+ ],\n \"englishLevel\": \"a2+\",\n- \"githubId\": \"petrov\",\n- \"locationId\": \"1\",\n- \"locationName\": \"Minsk\",\n- \"name\": \"Dzmitry Petrov\",\n+ \"locationId\": 456,\n+ \"locationName\": \"Brest\",\n }\n }\n isEditingModeEnabled={false}\n@@ -220,12 +228,16 @@ exports[`ProfilePage Should render correctly if 1`] = `\n data={\n Object {\n \"aboutMyself\": \"Test\",\n- \"educationHistory\": null,\n+ \"educationHistory\": Array [\n+ Object {\n+ \"faculty\": \"TT\",\n+ \"graduationYear\": \"2019\",\n+ \"university\": \"Test\",\n+ },\n+ ],\n \"englishLevel\": \"a2+\",\n- \"githubId\": \"petrov\",\n- \"locationId\": \"1\",\n- \"locationName\": \"Minsk\",\n- \"name\": \"Dzmitry Petrov\",\n+ \"locationId\": 456,\n+ \"locationName\": \"Brest\",\n }\n }\n isEditingModeEnabled={false}\n@@ -305,12 +317,16 @@ exports[`ProfilePage Should render correctly if 1`] = `\n data={\n Object {\n \"aboutMyself\": \"Test\",\n- \"educationHistory\": null,\n+ \"educationHistory\": Array [\n+ Object {\n+ \"faculty\": \"TT\",\n+ \"graduationYear\": \"2019\",\n+ \"university\": \"Test\",\n+ },\n+ ],\n \"englishLevel\": \"a2+\",\n- \"githubId\": \"petrov\",\n- \"locationId\": \"1\",\n- \"locationName\": \"Minsk\",\n- \"name\": \"Dzmitry Petrov\",\n+ \"locationId\": 456,\n+ \"locationName\": \"Brest\",\n }\n }\n isEditingModeEnabled={false}\n@@ -387,15 +403,7 @@ exports[`ProfilePage Should render correctly if 1`] = `\n }\n >\n <ContactsCard\n- data={\n- Object {\n- \"email\": \"[email protected]\",\n- \"notes\": \"discord: @petro, instagram: @petro12\",\n- \"phone\": \"+375292123456\",\n- \"skype\": \"petro:live\",\n- \"telegram\": \"petro\",\n- }\n- }\n+ data={Object {}}\n isEditingModeEnabled={false}\n onPermissionsSettingsChange={[Function]}\n onProfileSettingsChange={[Function]}\n@@ -461,84 +469,22 @@ exports[`ProfilePage Should render correctly if 1`] = `\n }\n />\n </div>\n- </Masonry>\n- <JSXStyle\n- id=\"3803498300\"\n- >\n- div.jsx-3803498300{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-left:-16px;width:auto;}\n- </JSXStyle>\n- <JSXStyle\n- id=\"110195169\"\n- >\n- div.jsx-110195169{padding-left:16px;background-clip:padding-box;}\n- </JSXStyle>\n- </div>\n- </Spin>\n- </LoadingScreen>\n-</Fragment>\n-`;\n-\n-exports[`ProfilePage Should render correctly if full info about profile is in the state 1`] = `\n-<Fragment>\n- <LoadingScreen\n- show={true}\n- >\n- <Header\n- isProfileEditingModeEnabled={false}\n- isProfilePage={false}\n- isSaveButtonVisible={false}\n- onChangeProfilePageMode={[Function]}\n- onSaveClick={[Function]}\n- username=\"mikhama\"\n- />\n- <Spin\n- delay={200}\n- size=\"default\"\n- spinning={false}\n- wrapperClassName=\"\"\n- >\n- <div\n- style={\n- Object {\n- \"padding\": 10,\n- }\n- }\n- >\n- <Masonry\n- breakpointCols={\n- Object {\n- \"1100\": 3,\n- \"500\": 1,\n- \"700\": 2,\n- \"default\": 4,\n- }\n- }\n- className=\"jsx-3803498300\"\n- columnClassName=\"jsx-110195169\"\n- >\n <div\n- key=\"card-0\"\n+ key=\"card-5\"\n style={\n Object {\n \"marginBottom\": 16,\n }\n }\n >\n- <MainCard\n+ <PublicFeedbackCard\n data={\n- Object {\n- \"aboutMyself\": \"Test\",\n- \"educationHistory\": null,\n- \"englishLevel\": \"a2+\",\n- \"githubId\": \"petrov\",\n- \"locationId\": \"1\",\n- \"locationName\": \"Minsk\",\n- \"name\": \"Dzmitry Petrov\",\n- }\n+ Array [\n+ Object {},\n+ ]\n }\n isEditingModeEnabled={false}\n onPermissionsSettingsChange={[Function]}\n- onProfileSettingsChange={[Function]}\n permissionsSettings={\n Object {\n \"isAboutVisible\": Object {\n@@ -602,28 +548,30 @@ exports[`ProfilePage Should render correctly if full info about profile is in th\n />\n </div>\n <div\n- key=\"card-1\"\n+ key=\"card-6\"\n style={\n Object {\n \"marginBottom\": 16,\n }\n }\n >\n- <AboutCard\n+ <StudentStatsCard\n data={\n- Object {\n- \"aboutMyself\": \"Test\",\n- \"educationHistory\": null,\n- \"englishLevel\": \"a2+\",\n- \"githubId\": \"petrov\",\n- \"locationId\": \"1\",\n- \"locationName\": \"Minsk\",\n- \"name\": \"Dzmitry Petrov\",\n- }\n+ Array [\n+ Object {\n+ \"courseFullName\": \"test\",\n+ \"courseName\": \"test\",\n+ \"locationName\": \"Minsk\",\n+ \"tasks\": Array [\n+ Object {\n+ \"interviewFormAnswers\": Object {},\n+ },\n+ ],\n+ },\n+ ]\n }\n isEditingModeEnabled={false}\n onPermissionsSettingsChange={[Function]}\n- onProfileSettingsChange={[Function]}\n permissionsSettings={\n Object {\n \"isAboutVisible\": Object {\n@@ -687,28 +635,21 @@ exports[`ProfilePage Should render correctly if full info about profile is in th\n />\n </div>\n <div\n- key=\"card-2\"\n+ key=\"card-7\"\n style={\n Object {\n \"marginBottom\": 16,\n }\n }\n >\n- <EnglishCard\n+ <MentorStatsCard\n data={\n- Object {\n- \"aboutMyself\": \"Test\",\n- \"educationHistory\": null,\n- \"englishLevel\": \"a2+\",\n- \"githubId\": \"petrov\",\n- \"locationId\": \"1\",\n- \"locationName\": \"Minsk\",\n- \"name\": \"Dzmitry Petrov\",\n- }\n+ Array [\n+ Object {},\n+ ]\n }\n isEditingModeEnabled={false}\n onPermissionsSettingsChange={[Function]}\n- onProfileSettingsChange={[Function]}\n permissionsSettings={\n Object {\n \"isAboutVisible\": Object {\n@@ -772,170 +713,44 @@ exports[`ProfilePage Should render correctly if full info about profile is in th\n />\n </div>\n <div\n- key=\"card-3\"\n+ key=\"card-8\"\n style={\n Object {\n \"marginBottom\": 16,\n }\n }\n >\n- <EducationCard\n+ <CoreJSIviewsCard\n data={\n- Object {\n- \"aboutMyself\": \"Test\",\n- \"educationHistory\": null,\n- \"englishLevel\": \"a2+\",\n- \"githubId\": \"petrov\",\n- \"locationId\": \"1\",\n- \"locationName\": \"Minsk\",\n- \"name\": \"Dzmitry Petrov\",\n- }\n- }\n- isEditingModeEnabled={false}\n- onPermissionsSettingsChange={[Function]}\n- onProfileSettingsChange={[Function]}\n- permissionsSettings={\n- Object {\n- \"isAboutVisible\": Object {\n- \"all\": false,\n- \"mentor\": true,\n- \"student\": false,\n- },\n- \"isContactsNotesVisible\": Object {\n- \"all\": false,\n- \"student\": true,\n- },\n- \"isEducationVisible\": Object {\n- \"all\": false,\n- \"mentor\": true,\n- \"student\": false,\n- },\n- \"isEmailVisible\": Object {\n- \"all\": false,\n- \"student\": false,\n- },\n- \"isEnglishVisible\": Object {\n- \"all\": false,\n- \"student\": false,\n- },\n- \"isLinkedInVisible\": Object {\n- \"all\": false,\n- \"mentor\": true,\n- \"student\": false,\n- },\n- \"isMentorStatsVisible\": Object {\n- \"all\": false,\n- \"mentor\": true,\n- \"student\": true,\n- },\n- \"isPhoneVisible\": Object {\n- \"all\": false,\n- \"student\": false,\n- },\n- \"isProfileVisible\": Object {\n- \"all\": true,\n- },\n- \"isPublicFeedbackVisible\": Object {\n- \"all\": false,\n- \"mentor\": true,\n- \"student\": true,\n- },\n- \"isSkypeVisible\": Object {\n- \"all\": false,\n- \"student\": false,\n- },\n- \"isStudentStatsVisible\": Object {\n- \"all\": false,\n- \"student\": false,\n- },\n- \"isTelegramVisible\": Object {\n- \"all\": false,\n- \"student\": false,\n- },\n- }\n+ Array [\n+ Object {\n+ \"courseFullName\": \"test\",\n+ \"courseName\": \"test\",\n+ \"interview\": Object {\n+ \"answers\": Object {},\n+ \"comment\": undefined,\n+ \"interviewer\": undefined,\n+ \"score\": undefined,\n+ },\n+ \"locationName\": \"Minsk\",\n+ },\n+ ]\n }\n />\n </div>\n <div\n- key=\"card-4\"\n+ key=\"card-9\"\n style={\n Object {\n \"marginBottom\": 16,\n }\n }\n >\n- <ContactsCard\n+ <PreScreeningIviewsCard\n data={\n- Object {\n- \"email\": \"[email protected]\",\n- \"notes\": \"discord: @petro, instagram: @petro12\",\n- \"phone\": \"+375292123456\",\n- \"skype\": \"petro:live\",\n- \"telegram\": \"petro\",\n- }\n- }\n- isEditingModeEnabled={false}\n- onPermissionsSettingsChange={[Function]}\n- onProfileSettingsChange={[Function]}\n- permissionsSettings={\n- Object {\n- \"isAboutVisible\": Object {\n- \"all\": false,\n- \"mentor\": true,\n- \"student\": false,\n- },\n- \"isContactsNotesVisible\": Object {\n- \"all\": false,\n- \"student\": true,\n- },\n- \"isEducationVisible\": Object {\n- \"all\": false,\n- \"mentor\": true,\n- \"student\": false,\n- },\n- \"isEmailVisible\": Object {\n- \"all\": false,\n- \"student\": false,\n- },\n- \"isEnglishVisible\": Object {\n- \"all\": false,\n- \"student\": false,\n- },\n- \"isLinkedInVisible\": Object {\n- \"all\": false,\n- \"mentor\": true,\n- \"student\": false,\n- },\n- \"isMentorStatsVisible\": Object {\n- \"all\": false,\n- \"mentor\": true,\n- \"student\": true,\n- },\n- \"isPhoneVisible\": Object {\n- \"all\": false,\n- \"student\": false,\n- },\n- \"isProfileVisible\": Object {\n- \"all\": true,\n- },\n- \"isPublicFeedbackVisible\": Object {\n- \"all\": false,\n- \"mentor\": true,\n- \"student\": true,\n- },\n- \"isSkypeVisible\": Object {\n- \"all\": false,\n- \"student\": false,\n- },\n- \"isStudentStatsVisible\": Object {\n- \"all\": false,\n- \"student\": false,\n- },\n- \"isTelegramVisible\": Object {\n- \"all\": false,\n- \"student\": false,\n- },\n- }\n+ Array [\n+ Object {},\n+ ]\n }\n />\n </div>\n"]
| 2 |
["a280a52c8309465276c3509848ddcddbe19732b6", "11ffd5174bd61a2939ae58d2b2d43284302ae490"]
|
["fix", "test"]
|
selenium java 4.8.1,create DashboardDetails
|
["diff --git a/pom.xml b/pom.xml\nindex f792f3c..477224a 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -60,8 +60,8 @@\n <codehaus-groovy.version>3.0.11</codehaus-groovy.version>\n <jython.version>2.7.0</jython.version>\n <docker-java.version>3.2.14</docker-java.version>\n- <selenium.version>4.8.0</selenium.version>\n- <jmeter-plugins-webdriver.version>4.8.0</jmeter-plugins-webdriver.version>\n+ <selenium.version>4.8.1</selenium.version>\n+ <jmeter-plugins-webdriver.version>4.8.1</jmeter-plugins-webdriver.version>\n <opentelemetry.version>1.22.0</opentelemetry.version>\n <oracle-database.version>19.7.0.0</oracle-database.version>\n <zookeeper.version>3.8.0</zookeeper.version>\n", "diff --git a/client/src/components/MentorSearch.tsx b/client/src/components/MentorSearch.tsx\nindex 622560a..06f0114 100644\n--- a/client/src/components/MentorSearch.tsx\n+++ b/client/src/components/MentorSearch.tsx\n@@ -7,8 +7,9 @@ type Props = UserProps & {\n };\n \n export function MentorSearch(props: Props) {\n- const courseService = useMemo(() => new CourseService(props.courseId), [props.courseId]);\n+ const { courseId, ...otherProps } = props;\n+ const courseService = useMemo(() => new CourseService(courseId), [courseId]);\n const handleSearch = useCallback(async (value: string) => courseService.searchMentors(value), [courseService]);\n \n- return <UserSearch {...props} searchFn={handleSearch} />;\n+ return <UserSearch {...otherProps} searchFn={handleSearch} />;\n }\ndiff --git a/client/src/components/Student/DashboardDetails.tsx b/client/src/components/Student/DashboardDetails.tsx\nnew file mode 100644\nindex 0000000..30506ef\n--- /dev/null\n+++ b/client/src/components/Student/DashboardDetails.tsx\n@@ -0,0 +1,89 @@\n+import { BranchesOutlined, CloseCircleTwoTone, SolutionOutlined, UndoOutlined } from '@ant-design/icons';\n+import { Button, Descriptions, Drawer } from 'antd';\n+import { CommentModal, MentorSearch } from 'components';\n+import { useState } from 'react';\n+import { StudentDetails } from 'services/course';\n+import { MentorBasic } from '../../../../common/models';\n+import css from 'styled-jsx/css';\n+\n+type Props = {\n+ details: StudentDetails | null;\n+ courseId: number;\n+ onClose: () => void;\n+ onCreateRepository: () => void;\n+ onRestoreStudent: () => void;\n+ onExpelStudent: (comment: string) => void;\n+ onIssueCertificate: () => void;\n+ onUpdateMentor: (githubId: string) => void;\n+};\n+\n+export function DashboardDetails(props: Props) {\n+ const [expelMode, setExpelMode] = useState(false);\n+ const { details } = props;\n+ if (details == null) {\n+ return null;\n+ }\n+ return (\n+ <>\n+ <Drawer\n+ width={600}\n+ title={`${details.name} , ${details.githubId}`}\n+ placement=\"right\"\n+ closable={false}\n+ onClose={props.onClose}\n+ visible={!!details}\n+ >\n+ <div className=\"student-details-actions\">\n+ <Button\n+ disabled={!details.isActive || !!details.repository}\n+ icon={<BranchesOutlined />}\n+ onClick={props.onCreateRepository}\n+ >\n+ Create Repository\n+ </Button>\n+ <Button disabled={!details.isActive} icon={<SolutionOutlined />} onClick={props.onIssueCertificate}>\n+ Issue Certificate\n+ </Button>\n+ <Button\n+ hidden={!details.isActive}\n+ icon={<CloseCircleTwoTone twoToneColor=\"red\" />}\n+ onClick={() => setExpelMode(true)}\n+ >\n+ Expel\n+ </Button>\n+ <Button hidden={details.isActive} icon={<UndoOutlined />} onClick={props.onRestoreStudent}>\n+ Restore\n+ </Button>\n+ <Descriptions bordered layout=\"vertical\" size=\"small\" column={1}>\n+ <Descriptions.Item label=\"Mentor\">\n+ <MentorSearch\n+ style={{ width: '100%' }}\n+ onChange={props.onUpdateMentor}\n+ courseId={props.courseId}\n+ keyField=\"githubId\"\n+ value={(details.mentor as MentorBasic)?.githubId}\n+ defaultValues={details.mentor ? [details.mentor as any] : []}\n+ />\n+ </Descriptions.Item>\n+ </Descriptions>\n+ </div>\n+ </Drawer>\n+ <CommentModal\n+ title=\"Expelling Reason\"\n+ visible={expelMode}\n+ onCancel={() => setExpelMode(false)}\n+ onOk={(text: string) => {\n+ props.onExpelStudent(text);\n+ setExpelMode(false);\n+ }}\n+ />\n+ <style jsx>{styles}</style>\n+ </>\n+ );\n+}\n+\n+const styles = css`\n+ .student-details-actions :global(.ant-btn) {\n+ margin: 0 8px 8px 0;\n+ }\n+`;\ndiff --git a/client/src/components/Student/index.ts b/client/src/components/Student/index.ts\nindex 71e28de..076f0e2 100644\n--- a/client/src/components/Student/index.ts\n+++ b/client/src/components/Student/index.ts\n@@ -1 +1,2 @@\n export { default as AssignStudentModal } from './AssignStudentModal';\n+export { DashboardDetails } from './DashboardDetails';\ndiff --git a/client/src/components/StudentSearch.tsx b/client/src/components/StudentSearch.tsx\nindex 5952aed..7c14263 100644\n--- a/client/src/components/StudentSearch.tsx\n+++ b/client/src/components/StudentSearch.tsx\n@@ -7,8 +7,9 @@ type Props = UserProps & {\n };\n \n export function StudentSearch(props: Props) {\n- const courseService = useMemo(() => new CourseService(props.courseId), [props.courseId]);\n+ const { courseId, ...otherProps } = props;\n+ const courseService = useMemo(() => new CourseService(courseId), [courseId]);\n const handleSearch = useCallback(async (value: string) => courseService.searchStudents(value), [courseService]);\n \n- return <UserSearch {...props} searchFn={handleSearch} />;\n+ return <UserSearch {...otherProps} searchFn={handleSearch} />;\n }\ndiff --git a/client/src/components/UserSearch.tsx b/client/src/components/UserSearch.tsx\nindex ff95941..4075827 100644\n--- a/client/src/components/UserSearch.tsx\n+++ b/client/src/components/UserSearch.tsx\n@@ -14,7 +14,7 @@ export type UserProps = SelectProps<string> & {\n \n export function UserSearch(props: UserProps) {\n const [data, setData] = useState<Person[]>([]);\n- const { searchFn = defaultSearch, defaultValues } = props;\n+ const { searchFn = defaultSearch, defaultValues, keyField, ...otherProps } = props;\n \n useEffect(() => {\n setData(defaultValues ?? []);\n@@ -29,7 +29,6 @@ export function UserSearch(props: UserProps) {\n }\n };\n \n- const { keyField, ...otherProps } = props;\n return (\n <Select\n {...otherProps}\ndiff --git a/client/src/pages/course/admin/students.tsx b/client/src/pages/course/admin/students.tsx\nindex c15dee4..220ef54 100644\n--- a/client/src/pages/course/admin/students.tsx\n+++ b/client/src/pages/course/admin/students.tsx\n@@ -2,15 +2,13 @@ import {\n BranchesOutlined,\n CheckCircleTwoTone,\n ClockCircleTwoTone,\n- CloseCircleTwoTone,\n FileExcelOutlined,\n MinusCircleOutlined,\n- SolutionOutlined,\n- UndoOutlined,\n } from '@ant-design/icons';\n-import { Button, Drawer, message, Row, Statistic, Switch, Table, Typography, Descriptions } from 'antd';\n+import { Button, message, Row, Statistic, Switch, Table, Typography } from 'antd';\n import { ColumnProps } from 'antd/lib/table/Column';\n-import { CommentModal, PageLayout, withSession, MentorSearch } from 'components';\n+import { PageLayout, withSession } from 'components';\n+import { DashboardDetails } from 'components/Student';\n import {\n boolIconRenderer,\n boolSorter,\n@@ -21,14 +19,12 @@ import {\n } from 'components/Table';\n import { useLoading } from 'components/useLoading';\n import withCourseData from 'components/withCourseData';\n+import { isCourseManager } from 'domain/user';\n import _ from 'lodash';\n import { useMemo, useState } from 'react';\n import { useAsync } from 'react-use';\n-import { isCourseManager } from 'domain/user';\n import { CourseService, StudentDetails } from 'services/course';\n import { CoursePageProps } from 'services/models';\n-import css from 'styled-jsx/css';\n-import { MentorBasic } from '../../../../../common/models';\n \n const { Text } = Typography;\n \n@@ -39,7 +35,6 @@ function Page(props: Props) {\n const courseId = props.course.id;\n \n const [loading, withLoading] = useLoading(false);\n- const [expelMode, setExpelMode] = useState(false);\n const [isManager] = useState(isCourseManager(props.session, props.course.id));\n const courseService = useMemo(() => new CourseService(courseId), [courseId]);\n const [students, setStudents] = useState([] as StudentDetails[]);\n@@ -77,7 +72,6 @@ function Page(props: Props) {\n await courseService.expelStudent(githubId, text);\n message.info('Student has been expelled');\n }\n- setExpelMode(false);\n });\n \n const restoreStudent = withLoading(async () => {\n@@ -114,59 +108,20 @@ function Page(props: Props) {\n <div>{renderToolbar()}</div>\n </Row>\n <Table rowKey=\"id\" pagination={{ pageSize: 100 }} size=\"small\" dataSource={students} columns={getColumns()} />\n- <Drawer\n- width={400}\n- title={details ? `${details.name} , ${details.githubId}` : ''}\n- placement=\"right\"\n- closable={false}\n+\n+ <DashboardDetails\n+ onUpdateMentor={updateMentor}\n+ onRestoreStudent={restoreStudent}\n+ onIssueCertificate={issueCertificate}\n+ onExpelStudent={expelStudent}\n+ onCreateRepository={createRepository}\n onClose={() => {\n setDetails(null);\n loadStudents();\n }}\n- visible={!!details}\n- >\n- <div className=\"student-details-actions\">\n- <Button\n- disabled={!details?.isActive || !!details.repository}\n- icon={<BranchesOutlined />}\n- onClick={createRepository}\n- >\n- Create Repository\n- </Button>\n- <Button disabled={!details?.isActive} icon={<SolutionOutlined />} onClick={issueCertificate}>\n- Issue Certificate\n- </Button>\n- <Button\n- hidden={!details?.isActive}\n- icon={<CloseCircleTwoTone twoToneColor=\"red\" />}\n- onClick={() => setExpelMode(true)}\n- >\n- Expel\n- </Button>\n- <Button hidden={details?.isActive} icon={<UndoOutlined />} onClick={restoreStudent}>\n- Restore\n- </Button>\n- <Descriptions bordered layout=\"vertical\" size=\"small\" column={1}>\n- <Descriptions.Item label=\"Mentor\">\n- <MentorSearch\n- style={{ width: '100%' }}\n- onChange={updateMentor}\n- courseId={props.course.id}\n- keyField=\"githubId\"\n- value={(details?.mentor as MentorBasic)?.githubId}\n- defaultValues={details?.mentor ? [details?.mentor as any] : []}\n- />\n- </Descriptions.Item>\n- </Descriptions>\n- </div>\n- </Drawer>\n- <CommentModal\n- title=\"Expelling Reason\"\n- visible={expelMode}\n- onCancel={() => setExpelMode(false)}\n- onOk={expelStudent}\n+ details={details}\n+ courseId={props.course.id}\n />\n- <style jsx>{styles}</style>\n </PageLayout>\n );\n }\n@@ -306,14 +261,4 @@ function calculateStats(students: StudentDetails[]) {\n };\n }\n \n-const styles = css`\n- :global(.rs-table-row-disabled) {\n- opacity: 0.25;\n- }\n-\n- .student-details-actions :global(.ant-btn) {\n- margin: 0 8px 8px 0;\n- }\n-`;\n-\n export default withCourseData(withSession(Page));\ndiff --git a/client/src/styles/main.css b/client/src/styles/main.css\nindex 2ccac3c..df3cc8c 100644\n--- a/client/src/styles/main.css\n+++ b/client/src/styles/main.css\n@@ -21,6 +21,10 @@ body,\n display: none;\n }\n \n+.ant-drawer-content-wrapper {\n+ max-width: 85%;\n+}\n+\n .footer-dark.ant-layout-footer {\n background: #000;\n color: #fff;\n"]
| 2 |
["66f907f2d6ff0956bb5215518678bc79cab83c17", "fd5f211916c989fddc2ee5afeeb7d46e6a2f51cb"]
|
["build", "feat"]
|
skip ruff format in pre-commit ci runner,add more tests for Utils.lookupPathFromDecorator
|
["diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex 6193d96..4ba39d6 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -9,6 +9,7 @@ ci:\n - nixpkgs-fmt\n - prettier\n - ruff\n+ - ruff-format\n - shellcheck\n - shfmt\n - statix\n", "diff --git a/lib/utils/Utils.ts b/lib/utils/Utils.ts\nindex 6de6e05..b03b3e9 100644\n--- a/lib/utils/Utils.ts\n+++ b/lib/utils/Utils.ts\n@@ -338,15 +338,8 @@ export class Utils {\n line++;\n }\n \n- if (stack[line].match(/\\(.+\\)/i)) {\n- meta.path = Utils.normalizePath(\n- stack[line].match(/\\((.*):\\d+:\\d+\\)/)![1],\n- );\n- } else {\n- meta.path = Utils.normalizePath(\n- stack[line].match(/at\\s*(.*):\\d+:\\d+$/)![1],\n- );\n- }\n+ const re = stack[line].match(/\\(.+\\)/i) ? /\\((.*):\\d+:\\d+\\)/ : /at\\s*(.*):\\d+:\\d+$/;\n+ meta.path = Utils.normalizePath(stack[line].match(re)![1]);\n \n return meta.path;\n }\ndiff --git a/tests/Utils.test.ts b/tests/Utils.test.ts\nindex c3e9aa1..4d2a209 100644\n--- a/tests/Utils.test.ts\n+++ b/tests/Utils.test.ts\n@@ -256,7 +256,7 @@ describe('Utils', () => {\n ' at Object.__decorate (/usr/local/var/www/my-project/node_modules/tslib/tslib.js:92:96)',\n ' at Object.<anonymous> (/usr/local/var/www/my-project/dist/entities/Customer.js:20:9)',\n ' at Module._compile (internal/modules/cjs/loader.js:776:30)',\n- ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:787:10)',\n+ ' at Object.Module._extensions.js (internal/modules/cjs/loader.js:787:10)',\n ' at Module.load (internal/modules/cjs/loader.js:643:32)',\n ' at Function.Module._load (internal/modules/cjs/loader.js:556:12)',\n ];\n@@ -272,10 +272,25 @@ describe('Utils', () => {\n ' at Object.<anonymous> (/usr/local/var/www/my-project/src/entities/Customer.ts:9:3)',\n ' at Module._compile (internal/modules/cjs/loader.js:776:30)',\n ' at Module.m._compile (/usr/local/var/www/my-project/node_modules/ts-node/src/index.ts:473:23)',\n- ' at Module._extensions..js (internal/modules/cjs/loader.js:787:10)',\n+ ' at Module._extensions.js (internal/modules/cjs/loader.js:787:10)',\n ' at Object.require.extensions.<computed> [as .ts] (/usr/local/var/www/my-project/node_modules/ts-node/src/index.ts:476:12)',\n ];\n expect(Utils.lookupPathFromDecorator({} as any, stack2)).toBe('/usr/local/var/www/my-project/src/entities/Customer.ts');\n+\n+ // no parens\n+ const stack3 = [\n+ ' at Function.lookupPathFromDecorator (/usr/local/var/www/my-project/node_modules/mikro-orm/dist/utils/Utils.js:170:23)',\n+ ' at /usr/local/var/www/my-project/node_modules/mikro-orm/dist/decorators/PrimaryKey.js:12:23',\n+ ' at DecorateProperty (/usr/local/var/www/my-project/node_modules/reflect-metadata/Reflect.js:553:33)',\n+ ' at Object.decorate (/usr/local/var/www/my-project/node_modules/reflect-metadata/Reflect.js:123:24)',\n+ ' at Object.__decorate (/usr/local/var/www/my-project/node_modules/tslib/tslib.js:92:96)',\n+ ' at /usr/local/var/www/my-project/dist/entities/Customer.js:20:9',\n+ ' at Module._compile (internal/modules/cjs/loader.js:776:30)',\n+ ' at Object.Module._extensions.js (internal/modules/cjs/loader.js:787:10)',\n+ ' at Module.load (internal/modules/cjs/loader.js:643:32)',\n+ ' at Function.Module._load (internal/modules/cjs/loader.js:556:12)',\n+ ];\n+ expect(Utils.lookupPathFromDecorator({} as any, stack3)).toBe('/usr/local/var/www/my-project/dist/entities/Customer.js');\n });\n \n test('lookup path from decorator on windows', () => {\n@@ -287,7 +302,7 @@ describe('Utils', () => {\n ' at Object.<anonymous> (C:\\\\www\\\\my-project\\\\src\\\\entities\\\\Customer.ts:7:5)',\n ' at Module._compile (internal/modules/cjs/loader.js:936:30)',\n ' at Module.m._compile (C:\\\\www\\\\my-project\\\\node_modules\\\\ts-node\\\\src\\\\index.ts:493:23)',\n- ' at Module._extensions..js (internal/modules/cjs/loader.js:947:10)',\n+ ' at Module._extensions.js (internal/modules/cjs/loader.js:947:10)',\n ' at Object.require.extensions.<computed> [as .ts] (C:\\\\www\\\\my-project\\\\node_modules\\\\ts-node\\\\src\\\\index.ts:496:12)',\n ' at Module.load (internal/modules/cjs/loader.js:790:32)',\n ' at Function.Module._load (internal/modules/cjs/loader.js:703:12)',\n"]
| 2 |
["9117fdedb9b5ce0345c31b3e1fa22ae8554944d4", "c5e86dbc00a13a355bffadeb2db197e2fea5640f"]
|
["ci", "test"]
|
README,add test for clickhouse-specific `create_table` parameters
|
["diff --git a/README.md b/README.md\nindex 11a24b3..56e8d2a 100644\n--- a/README.md\n+++ b/README.md\n@@ -16,7 +16,9 @@ oclif: create your own CLI\n \n # Description\n \n-This is a framework for building CLIs in Node.js. This framework was built out of the [Heroku CLI](https://cli.heroku.com) but generalized to build any custom CLI. It's designed both for simple CLIs that can be just a single file with a few flag options, or for very complex CLIs that have many commands (like git or heroku). Most CLI tools in Node are simple flag parsers but oclif is much more than that\u2014though without the overhead of making simple CLIs quick to write with minimal boilerplate.\n+This is a framework for building CLIs in Node.js. This framework was built out of the [Heroku CLI](https://cli.heroku.com) but generalized to build any custom CLI. It's designed both for simple CLIs that can be just a single file with a few flag options, or for very complex CLIs that have many commands (like git or heroku).\n+\n+Most CLI tools for Node are simple flag parsers but oclif is much more than that\u2014though without the overhead of making simple CLIs quick to write with minimal boilerplate.\n \n # Features\n \n", "diff --git a/ibis/backends/clickhouse/tests/test_client.py b/ibis/backends/clickhouse/tests/test_client.py\nindex 678683d..c4e2aec 100644\n--- a/ibis/backends/clickhouse/tests/test_client.py\n+++ b/ibis/backends/clickhouse/tests/test_client.py\n@@ -224,6 +224,21 @@ def test_create_table_data(con, data, engine, temp_table):\n assert len(t.execute()) == 3\n \n \n+def test_create_table_with_properties(con, temp_table):\n+ data = pd.DataFrame({\"a\": list(\"abcde\" * 20), \"b\": [1, 2, 3, 4, 5] * 20})\n+ n = len(data)\n+ t = con.create_table(\n+ temp_table,\n+ data,\n+ schema=ibis.schema(dict(a=\"string\", b=\"!uint32\")),\n+ order_by=[\"a\", \"b\"],\n+ partition_by=[\"a\"],\n+ sample_by=[\"b\"],\n+ settings={\"allow_nullable_key\": \"1\"},\n+ )\n+ assert t.count().execute() == n\n+\n+\n @pytest.mark.parametrize(\n \"engine\",\n [\n"]
| 2 |
["363f84c7da411468b4103da8e0b39ca48cfd8327", "7e1ece7d3fd41d1e3ee38e479c119494bb269966"]
|
["docs", "test"]
|
use lambda to define backend operations,add donation section to footer
|
["diff --git a/ibis/backends/duckdb/registry.py b/ibis/backends/duckdb/registry.py\nindex 20ffd6f..3f56f2a 100644\n--- a/ibis/backends/duckdb/registry.py\n+++ b/ibis/backends/duckdb/registry.py\n@@ -107,28 +107,13 @@ def _literal(_, op):\n return sa.cast(sa.literal(value), sqla_type)\n \n \n-def _array_column(t, op):\n- (arg,) = op.args\n- sqla_type = to_sqla_type(op.output_dtype)\n- return sa.cast(sa.func.list_value(*map(t.translate, arg)), sqla_type)\n-\n-\n def _neg_idx_to_pos(array, idx):\n if_ = getattr(sa.func, \"if\")\n arg_length = sa.func.array_length(array)\n return if_(idx < 0, arg_length + sa.func.greatest(idx, -arg_length), idx)\n \n \n-def _struct_field(t, op):\n- return sa.func.struct_extract(\n- t.translate(op.arg),\n- sa.text(repr(op.field)),\n- type_=to_sqla_type(op.output_dtype),\n- )\n-\n-\n-def _regex_extract(t, op):\n- string, pattern, index = map(t.translate, op.args)\n+def _regex_extract(string, pattern, index):\n result = sa.case(\n [\n (\n@@ -149,8 +134,7 @@ def _regex_extract(t, op):\n return result\n \n \n-def _json_get_item(t, op):\n- left, path = map(t.translate, op.args)\n+def _json_get_item(left, path):\n # Workaround for https://github.com/duckdb/duckdb/issues/5063\n # In some situations duckdb silently does the wrong thing if\n # the path is parametrized.\n@@ -197,7 +181,12 @@ def _struct_column(t, op):\n \n operation_registry.update(\n {\n- ops.ArrayColumn: _array_column,\n+ ops.ArrayColumn: (\n+ lambda t, op: sa.cast(\n+ sa.func.list_value(*map(t.translate, op.cols)),\n+ to_sqla_type(op.output_dtype),\n+ )\n+ ),\n ops.ArrayConcat: fixed_arity(sa.func.array_concat, 2),\n ops.ArrayRepeat: fixed_arity(\n lambda arg, times: sa.func.flatten(\n@@ -222,7 +211,13 @@ operation_registry.update(\n # TODO: map operations, but DuckDB's maps are multimaps\n ops.Modulus: fixed_arity(operator.mod, 2),\n ops.Round: _round,\n- ops.StructField: _struct_field,\n+ ops.StructField: (\n+ lambda t, op: sa.func.struct_extract(\n+ t.translate(op.arg),\n+ sa.text(repr(op.field)),\n+ type_=to_sqla_type(op.output_dtype),\n+ )\n+ ),\n ops.TableColumn: _table_column,\n ops.TimestampDiff: fixed_arity(sa.func.age, 2),\n ops.TimestampFromUNIX: _timestamp_from_unix,\n@@ -232,7 +227,7 @@ operation_registry.update(\n lambda *_: sa.cast(sa.func.now(), sa.TIMESTAMP),\n 0,\n ),\n- ops.RegexExtract: _regex_extract,\n+ ops.RegexExtract: fixed_arity(_regex_extract, 3),\n ops.RegexReplace: fixed_arity(\n lambda *args: sa.func.regexp_replace(*args, \"g\"), 3\n ),\n@@ -255,7 +250,7 @@ operation_registry.update(\n ops.ArgMin: reduction(sa.func.min_by),\n ops.ArgMax: reduction(sa.func.max_by),\n ops.BitwiseXor: fixed_arity(sa.func.xor, 2),\n- ops.JSONGetItem: _json_get_item,\n+ ops.JSONGetItem: fixed_arity(_json_get_item, 2),\n ops.RowID: lambda *_: sa.literal_column('rowid'),\n ops.StringToTimestamp: fixed_arity(sa.func.strptime, 2),\n }\n", "diff --git a/client/src/components/Feedback.tsx b/client/src/components/Feedback.tsx\nindex 117b21d..0d7e7a9 100644\n--- a/client/src/components/Feedback.tsx\n+++ b/client/src/components/Feedback.tsx\n@@ -16,12 +16,7 @@ const publicRoutes = [\n name: `\ud83d\udcdd Feedback on RS School`,\n link: `https://docs.google.com/forms/d/1F4NeS0oBq-CY805aqiPVp6CIrl4_nIYJ7Z_vUcMOFrQ/viewform`,\n newTab: true,\n- },\n- {\n- name: `\ud83d\udcb0 Make a donation`,\n- link: `https://www.patreon.com/therollingscopes`,\n- newTab: true,\n- },\n+ }\n ];\n \n type LinkInfo = { name: string; link: string; newTab: boolean };\ndiff --git a/client/src/components/FooterLayout.tsx b/client/src/components/FooterLayout.tsx\nindex 79c0f39..56661b4 100644\n--- a/client/src/components/FooterLayout.tsx\n+++ b/client/src/components/FooterLayout.tsx\n@@ -1,5 +1,5 @@\n import * as React from 'react';\n-import { Col, Layout, Row, Divider } from 'antd';\n+import { Col, Layout, Row, Divider, Button } from 'antd';\n import { Feedback } from './Feedback';\n import { Help } from './Help';\n import { SocialNetworks } from './SocialNetworks';\n@@ -23,9 +23,17 @@ class FooterLayout extends React.Component<any, any> {\n </Col>\n </Row>\n <Divider />\n- <div className=\"text-center\">\n- <small>© The Rolling Scopes 2019</small>\n- </div>\n+ <h5> Thank you for your support! \ud83c\udf89</h5>\n+ <p>\n+ <object type=\"image/svg+xml\"\n+ data=\"https://opencollective.com/rsschool/backers.svg?avatarHeight=28&button=false\"></object>\n+ </p>\n+ <p>\n+ <Button size=\"small\" href=\"https://opencollective.com/rsschool#section-contribute\" target=\"_blank\" ghost>\n+ \u2764\ufe0f Make a donation\n+ </Button>\n+ </p>\n+ <p className=\"text-center\"><small>© The Rolling Scopes 2019</small></p>\n </Footer>\n </div>\n );\ndiff --git a/client/src/styles/main.scss b/client/src/styles/main.scss\nindex cd61fcd..6e37ea6 100644\n--- a/client/src/styles/main.scss\n+++ b/client/src/styles/main.scss\n@@ -46,4 +46,7 @@ body,\n padding-right: 0;\n font-size: .7rem;\n }\n+ .ant-btn {\n+ font-size: .7rem;\n+ }\n }\n"]
| 2 |
["5d14de6722eb34c6604a124f6f11cb711f16bd44", "7704121d0c0bfce49f01c2b41cbc64a642cbb399"]
|
["refactor", "feat"]
|
set name for topology module,remove writers from interface
|
["diff --git a/topology/pom.xml b/topology/pom.xml\nindex 389508e..ee6239a 100644\n--- a/topology/pom.xml\n+++ b/topology/pom.xml\n@@ -16,6 +16,7 @@\n </parent>\n \n <artifactId>zeebe-cluster-topology</artifactId>\n+ <name>Zeebe Cluster Topology</name>\n \n <properties>\n <proto.dir>${maven.multiModuleProjectDirectory}/topology/src/main/resources/proto</proto.dir>\n", "diff --git a/engine/src/main/java/io/camunda/zeebe/engine/Engine.java b/engine/src/main/java/io/camunda/zeebe/engine/Engine.java\nindex 91f1b41..eb4b9a8 100644\n--- a/engine/src/main/java/io/camunda/zeebe/engine/Engine.java\n+++ b/engine/src/main/java/io/camunda/zeebe/engine/Engine.java\n@@ -81,8 +81,6 @@ public class Engine implements RecordProcessor<EngineContext> {\n \n engineContext.setLifecycleListeners(typedRecordProcessors.getLifecycleListeners());\n recordProcessorMap = typedRecordProcessors.getRecordProcessorMap();\n-\n- engineContext.setWriters(writers);\n }\n \n @Override\ndiff --git a/engine/src/main/java/io/camunda/zeebe/engine/EngineContext.java b/engine/src/main/java/io/camunda/zeebe/engine/EngineContext.java\nindex a8e5538..a27b6e6 100644\n--- a/engine/src/main/java/io/camunda/zeebe/engine/EngineContext.java\n+++ b/engine/src/main/java/io/camunda/zeebe/engine/EngineContext.java\n@@ -15,7 +15,6 @@ import io.camunda.zeebe.engine.processing.streamprocessor.StreamProcessorListene\n import io.camunda.zeebe.engine.processing.streamprocessor.TypedRecordProcessorFactory;\n import io.camunda.zeebe.engine.processing.streamprocessor.writers.LegacyTypedResponseWriter;\n import io.camunda.zeebe.engine.processing.streamprocessor.writers.LegacyTypedStreamWriter;\n-import io.camunda.zeebe.engine.processing.streamprocessor.writers.Writers;\n import io.camunda.zeebe.engine.state.EventApplier;\n import io.camunda.zeebe.engine.state.mutable.MutableZeebeState;\n import java.util.Collections;\n@@ -34,7 +33,6 @@ public final class EngineContext {\n private final TypedRecordProcessorFactory typedRecordProcessorFactory;\n private List<StreamProcessorLifecycleAware> lifecycleListeners = Collections.EMPTY_LIST;\n private StreamProcessorListener streamProcessorListener;\n- private Writers writers;\n \n public EngineContext(\n final int partitionId,\n@@ -102,12 +100,4 @@ public final class EngineContext {\n public void setStreamProcessorListener(final StreamProcessorListener streamProcessorListener) {\n this.streamProcessorListener = streamProcessorListener;\n }\n-\n- public Writers getWriters() {\n- return writers;\n- }\n-\n- public void setWriters(final Writers writers) {\n- this.writers = writers;\n- }\n }\ndiff --git a/engine/src/main/java/io/camunda/zeebe/engine/api/ReadonlyStreamProcessorContext.java b/engine/src/main/java/io/camunda/zeebe/engine/api/ReadonlyStreamProcessorContext.java\nindex f30c7cc..834b421 100644\n--- a/engine/src/main/java/io/camunda/zeebe/engine/api/ReadonlyStreamProcessorContext.java\n+++ b/engine/src/main/java/io/camunda/zeebe/engine/api/ReadonlyStreamProcessorContext.java\n@@ -8,7 +8,6 @@\n package io.camunda.zeebe.engine.api;\n \n import io.camunda.zeebe.engine.processing.streamprocessor.writers.LegacyTypedStreamWriter;\n-import io.camunda.zeebe.engine.processing.streamprocessor.writers.Writers;\n import io.camunda.zeebe.engine.state.mutable.MutableZeebeState;\n import io.camunda.zeebe.logstreams.log.LogStream;\n \n@@ -27,11 +26,6 @@ public interface ReadonlyStreamProcessorContext {\n LegacyTypedStreamWriter getLogStreamWriter();\n \n /**\n- * @return the specific writers, like command, response, etc\n- */\n- Writers getWriters();\n-\n- /**\n * @return the state, where the data is stored during processing\n */\n MutableZeebeState getZeebeState();\ndiff --git a/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessor.java b/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessor.java\nindex 844e487..49fd8e2 100755\n--- a/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessor.java\n+++ b/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessor.java\n@@ -346,7 +346,6 @@ public class StreamProcessor extends Actor implements HealthMonitorable, LogReco\n if (listener != null) {\n streamProcessorContext.listener(engineContext.getStreamProcessorListener());\n }\n- streamProcessorContext.writers(engineContext.getWriters());\n }\n \n private long recoverFromSnapshot() {\ndiff --git a/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessorContext.java b/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessorContext.java\nindex d02b273..b527d3c 100644\n--- a/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessorContext.java\n+++ b/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessorContext.java\n@@ -17,7 +17,6 @@ import io.camunda.zeebe.engine.processing.streamprocessor.writers.CommandRespons\n import io.camunda.zeebe.engine.processing.streamprocessor.writers.LegacyTypedResponseWriterImpl;\n import io.camunda.zeebe.engine.processing.streamprocessor.writers.LegacyTypedStreamWriter;\n import io.camunda.zeebe.engine.processing.streamprocessor.writers.NoopLegacyTypedStreamWriter;\n-import io.camunda.zeebe.engine.processing.streamprocessor.writers.Writers;\n import io.camunda.zeebe.engine.state.EventApplier;\n import io.camunda.zeebe.engine.state.KeyGeneratorControls;\n import io.camunda.zeebe.engine.state.ZeebeDbState;\n@@ -55,7 +54,7 @@ public final class StreamProcessorContext implements ReadonlyStreamProcessorCont\n private StreamProcessorMode streamProcessorMode = StreamProcessorMode.PROCESSING;\n private ProcessingScheduleService processingScheduleService;\n private MutableLastProcessedPositionState lastProcessedPositionState;\n- private Writers writers;\n+\n private LogStreamBatchWriter logStreamBatchWriter;\n private CommandResponseWriter commandResponseWriter;\n \n@@ -85,11 +84,6 @@ public final class StreamProcessorContext implements ReadonlyStreamProcessorCont\n }\n \n @Override\n- public Writers getWriters() {\n- return writers;\n- }\n-\n- @Override\n public MutableZeebeState getZeebeState() {\n return zeebeState;\n }\n@@ -216,10 +210,6 @@ public final class StreamProcessorContext implements ReadonlyStreamProcessorCont\n return streamProcessorMode;\n }\n \n- public void writers(final Writers writers) {\n- this.writers = writers;\n- }\n-\n public void logStreamBatchWriter(final LogStreamBatchWriter batchWriter) {\n logStreamBatchWriter = batchWriter;\n }\n"]
| 2 |
["8911a972222dc80a242f3f1d9b3596321b3fdeaa", "d2709cab63295109dcd1a49f57da9418110e9044"]
|
["build", "refactor"]
|
skip if related view/hook/column of a filter is not found
Signed-off-by: Pranav C <[email protected]>,fix unit tests
|
["diff --git a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts\nindex 1515f88..6c250bd 100644\n--- a/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts\n+++ b/packages/nocodb/src/lib/version-upgrader/ncFilterUpgrader.ts\n@@ -21,7 +21,13 @@ export default async function ({ ncMeta }: NcUpgraderCtx) {\n } else {\n continue;\n }\n- if (filter.project_id != model.project_id) {\n+\n+ // skip if related model is not found\n+ if (!model) {\n+ continue;\n+ }\n+\n+ if (filter.project_id !== model.project_id) {\n await ncMeta.metaUpdate(\n null,\n null,\n", "diff --git a/src/components/__tests__/__snapshots__/BottomNavigation.test.js.snap b/src/components/__tests__/__snapshots__/BottomNavigation.test.js.snap\nindex 4d771d6..9f9683c 100644\n--- a/src/components/__tests__/__snapshots__/BottomNavigation.test.js.snap\n+++ b/src/components/__tests__/__snapshots__/BottomNavigation.test.js.snap\n@@ -9,9 +9,6 @@ exports[`renders custom icon and label in non-shifting bottom navigation 1`] = `\n Object {\n \"flex\": 1,\n },\n- Object {\n- \"backgroundColor\": \"#000000\",\n- },\n undefined,\n ]\n }\n@@ -132,6 +129,33 @@ exports[`renders custom icon and label in non-shifting bottom navigation 1`] = `\n ]\n }\n >\n+ <AnimatedComponent\n+ pointerEvents=\"none\"\n+ style={\n+ Array [\n+ Object {\n+ \"position\": \"absolute\",\n+ },\n+ Object {\n+ \"backgroundColor\": \"rgba(0, 0, 0, 0.12)\",\n+ \"borderRadius\": 48,\n+ \"height\": 96,\n+ \"left\": -54.666666666666664,\n+ \"opacity\": 0.002,\n+ \"top\": -20,\n+ \"transform\": Array [\n+ Object {\n+ \"translateX\": 0,\n+ },\n+ Object {\n+ \"scale\": 0.001,\n+ },\n+ ],\n+ \"width\": 96,\n+ },\n+ ]\n+ }\n+ />\n <TouchableWithoutFeedback\n key=\"key-0\"\n onPress={[Function]}\n@@ -599,9 +623,6 @@ exports[`renders custom icon and label in shifting bottom navigation 1`] = `\n Object {\n \"flex\": 1,\n },\n- Object {\n- \"backgroundColor\": \"#000000\",\n- },\n undefined,\n ]\n }\n@@ -783,12 +804,15 @@ exports[`renders custom icon and label in shifting bottom navigation 1`] = `\n \"backgroundColor\": undefined,\n \"borderRadius\": 0,\n \"height\": 0,\n- \"left\": 6,\n+ \"left\": -4,\n \"opacity\": 0,\n \"top\": 28,\n \"transform\": Array [\n Object {\n- \"scale\": 0.002,\n+ \"translateX\": 10,\n+ },\n+ Object {\n+ \"scale\": 0.008,\n },\n ],\n \"width\": 0,\n@@ -805,17 +829,20 @@ exports[`renders custom icon and label in shifting bottom navigation 1`] = `\n },\n Object {\n \"backgroundColor\": \"rgba(255, 255, 255, 0.12)\",\n- \"borderRadius\": 36,\n- \"height\": 72,\n- \"left\": -30,\n- \"opacity\": 0,\n- \"top\": -8,\n+ \"borderRadius\": 48,\n+ \"height\": 96,\n+ \"left\": -52,\n+ \"opacity\": 0.002,\n+ \"top\": -20,\n \"transform\": Array [\n Object {\n- \"scale\": 0.002,\n+ \"translateX\": 10,\n+ },\n+ Object {\n+ \"scale\": 0.001,\n },\n ],\n- \"width\": 72,\n+ \"width\": 96,\n },\n ]\n }\n@@ -1374,9 +1401,6 @@ exports[`renders non-shifting bottom navigation 1`] = `\n Object {\n \"flex\": 1,\n },\n- Object {\n- \"backgroundColor\": \"#000000\",\n- },\n undefined,\n ]\n }\n@@ -1497,6 +1521,33 @@ exports[`renders non-shifting bottom navigation 1`] = `\n ]\n }\n >\n+ <AnimatedComponent\n+ pointerEvents=\"none\"\n+ style={\n+ Array [\n+ Object {\n+ \"position\": \"absolute\",\n+ },\n+ Object {\n+ \"backgroundColor\": \"rgba(0, 0, 0, 0.12)\",\n+ \"borderRadius\": 48,\n+ \"height\": 96,\n+ \"left\": -54.666666666666664,\n+ \"opacity\": 0.002,\n+ \"top\": -20,\n+ \"transform\": Array [\n+ Object {\n+ \"translateX\": 0,\n+ },\n+ Object {\n+ \"scale\": 0.001,\n+ },\n+ ],\n+ \"width\": 96,\n+ },\n+ ]\n+ }\n+ />\n <TouchableWithoutFeedback\n key=\"key-0\"\n onPress={[Function]}\n@@ -2072,9 +2123,6 @@ exports[`renders shifting bottom navigation 1`] = `\n Object {\n \"flex\": 1,\n },\n- Object {\n- \"backgroundColor\": \"#000000\",\n- },\n undefined,\n ]\n }\n@@ -2256,12 +2304,15 @@ exports[`renders shifting bottom navigation 1`] = `\n \"backgroundColor\": undefined,\n \"borderRadius\": 0,\n \"height\": 0,\n- \"left\": 6,\n+ \"left\": -4,\n \"opacity\": 0,\n \"top\": 28,\n \"transform\": Array [\n Object {\n- \"scale\": 0.002,\n+ \"translateX\": 10,\n+ },\n+ Object {\n+ \"scale\": 0.008,\n },\n ],\n \"width\": 0,\n@@ -2278,17 +2329,20 @@ exports[`renders shifting bottom navigation 1`] = `\n },\n Object {\n \"backgroundColor\": \"rgba(255, 255, 255, 0.12)\",\n- \"borderRadius\": 36,\n- \"height\": 72,\n- \"left\": -30,\n- \"opacity\": 0,\n- \"top\": -8,\n+ \"borderRadius\": 48,\n+ \"height\": 96,\n+ \"left\": -52,\n+ \"opacity\": 0.002,\n+ \"top\": -20,\n \"transform\": Array [\n Object {\n- \"scale\": 0.002,\n+ \"translateX\": 10,\n+ },\n+ Object {\n+ \"scale\": 0.001,\n },\n ],\n- \"width\": 72,\n+ \"width\": 96,\n },\n ]\n }\n"]
| 2 |
["ab1e60a97c6d5c688dacbd23bca40cb8f20c4ac3", "87427fe39d165bee2acedde8dbaa237cca3fb61e"]
|
["fix", "test"]
|
add clean up test
Add another clean up test, which verifies that the state is cleaned up
after the timer (non-recurring) is triggered.,don't consider cases where there are no txids
|
["diff --git a/engine/src/test/java/io/camunda/zeebe/engine/state/ProcessExecutionCleanStateTest.java b/engine/src/test/java/io/camunda/zeebe/engine/state/ProcessExecutionCleanStateTest.java\nindex d36b4c9..ca5047f 100644\n--- a/engine/src/test/java/io/camunda/zeebe/engine/state/ProcessExecutionCleanStateTest.java\n+++ b/engine/src/test/java/io/camunda/zeebe/engine/state/ProcessExecutionCleanStateTest.java\n@@ -630,6 +630,40 @@ public final class ProcessExecutionCleanStateTest {\n }\n \n @Test\n+ public void testProcessWithTriggerTimerStartEvent() {\n+ // given\n+ final var deployment =\n+ engineRule\n+ .deployment()\n+ .withXmlResource(\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .timerWithDate(\"=now() + duration(\\\"PT15S\\\")\")\n+ .endEvent()\n+ .done())\n+ .deploy();\n+\n+ final var processDefinitionKey =\n+ deployment.getValue().getProcessesMetadata().get(0).getProcessDefinitionKey();\n+\n+ // when\n+ engineRule.awaitProcessingOf(\n+ RecordingExporter.timerRecords(TimerIntent.CREATED)\n+ .withProcessDefinitionKey(processDefinitionKey)\n+ .getFirst());\n+\n+ engineRule.increaseTime(Duration.ofSeconds(15));\n+\n+ RecordingExporter.processInstanceRecords(ProcessInstanceIntent.ELEMENT_COMPLETED)\n+ .withProcessDefinitionKey(processDefinitionKey)\n+ .withElementType(BpmnElementType.PROCESS)\n+ .await();\n+\n+ // then\n+ assertThatStateIsEmpty();\n+ }\n+\n+ @Test\n public void testProcessWithTimerStartEventRedeployment() {\n // given\n final var deployment =\n", "diff --git a/src/main.rs b/src/main.rs\nindex 25d9580..9ba4e38 100644\n--- a/src/main.rs\n+++ b/src/main.rs\n@@ -441,6 +441,9 @@ fn main() {\n let mut delta_tx_fees = vec![];\n let empty_txids = vec![];\n let txids = tx_mined_deltas.get(&delta).unwrap_or(&empty_txids);\n+ if txids.len() == 0 {\n+ continue;\n+ }\n for txid in txids.iter() {\n delta_tx_fees.push(*tx_fees.get(txid).unwrap_or(&0));\n }\n"]
| 2 |
["aa746b764e6c54bbbd631210fce35df842d09b12", "37a1b5bbb5270befcee5d9b9621af196c787a61f"]
|
["test", "fix"]
|
only run JMH on develop and master
- reduces test duration of feature branches
- reduces bors merge duration
- show performance impact of PRs and Releases on the respective branches
- number parallel stages to enforce ordering in Blue Ocean view
- **note**: skipping a parallel stage in Blue Ocean triggers a bug where
log will not be show until the stage finished https://issues.jenkins-ci.org/browse/JENKINS-48879,refactor to get ride of cloneDeep
|
["diff --git a/Jenkinsfile b/Jenkinsfile\nindex 9fbd3a1..3e4f052 100644\n--- a/Jenkinsfile\n+++ b/Jenkinsfile\n@@ -29,7 +29,7 @@ pipeline {\n \n stage('Verify') {\n parallel {\n- stage('Tests') {\n+ stage('1 - Java Tests') {\n steps {\n withMaven(jdk: jdkVersion, maven: mavenVersion, mavenSettingsConfig: mavenSettingsConfig) {\n sh 'mvn -B verify -P skip-unstable-ci'\n@@ -42,7 +42,9 @@ pipeline {\n }\n }\n \n- stage('JMH') {\n+ stage('2 - JMH') {\n+ // delete this line to also run JMH on feature branch\n+ when { anyOf { branch 'master'; branch 'develop' } }\n agent { node { label 'ubuntu-large' } }\n \n steps {\n", "diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js\nindex 3d2e5a6..e5219bd 100644\n--- a/config/webpack.config.prod.js\n+++ b/config/webpack.config.prod.js\n@@ -56,7 +56,7 @@ const extractTextPluginOptions = shouldUseRelativeAssetPaths\n const entries = fs.readdirSync(paths.appSrc)\n .filter(name => !name.startsWith('_'))\n .map(name => ({name, dirPath: path.join(paths.appSrc, name)}))\n- .filter(({name, dirPath}) => !/^assets|components|manifest|typings$/.test(name) && fs.lstatSync(dirPath).isDirectory())\n+ .filter(({name, dirPath}) => !/^assets|components|manifest|typings|app-config$/.test(name) && fs.lstatSync(dirPath).isDirectory())\n \n // This is the production configuration.\n // It compiles slowly and is focused on producing a fast and minimal bundle.\ndiff --git a/src/app-config/context-menus.ts b/src/app-config/context-menus.ts\nnew file mode 100644\nindex 0000000..a733b01\n--- /dev/null\n+++ b/src/app-config/context-menus.ts\n@@ -0,0 +1,27 @@\n+export function getAllContextMenus () {\n+ const allContextMenus = {\n+ google_page_translate: 'x',\n+ youdao_page_translate: 'x',\n+ google_search: 'https://www.google.com/#newwindow=1&q=%s',\n+ baidu_search: 'https://www.baidu.com/s?ie=utf-8&wd=%s',\n+ bing_search: 'https://www.bing.com/search?q=%s',\n+ google_translate: 'https://translate.google.cn/#auto/zh-CN/%s',\n+ etymonline: 'http://www.etymonline.com/index.php?search=%s',\n+ merriam_webster: 'http://www.merriam-webster.com/dictionary/%s',\n+ oxford: 'http://www.oxforddictionaries.com/us/definition/english/%s',\n+ cambridge: 'http://dictionary.cambridge.org/spellcheck/english-chinese-simplified/?q=%s',\n+ youdao: 'http://dict.youdao.com/w/%s',\n+ dictcn: 'https://dict.eudic.net/dicts/en/%s',\n+ iciba: 'http://www.iciba.com/%s',\n+ liangan: 'https://www.moedict.tw/~%s',\n+ guoyu: 'https://www.moedict.tw/%s',\n+ longman_business: 'http://www.ldoceonline.com/search/?q=%s',\n+ bing_dict: 'https://cn.bing.com/dict/?q=%s'\n+ }\n+\n+ // Just for type check. Keys in allContextMenus are useful so no actual assertion\n+ // tslint:disable-next-line:no-unused-expression\n+ allContextMenus as { [id: string]: string }\n+\n+ return allContextMenus\n+}\ndiff --git a/src/app-config/dicts.ts b/src/app-config/dicts.ts\nnew file mode 100644\nindex 0000000..905d2de\n--- /dev/null\n+++ b/src/app-config/dicts.ts\n@@ -0,0 +1,398 @@\n+import { DeepReadonly } from '@/typings/helpers'\n+\n+export function getALlDicts () {\n+ const allDicts = {\n+ bing: {\n+ /**\n+ * Full content page to jump to when user clicks the title.\n+ * %s will be replaced with the current word.\n+ * %z will be replaced with the traditional Chinese version of the current word.\n+ */\n+ page: 'https://cn.bing.com/dict/search?q=%s',\n+ /**\n+ * If set to true, the dict start searching automatically.\n+ * Otherwise it'll only start seaching when user clicks the unfold button.\n+ * Default MUST be true and let user decide.\n+ */\n+ defaultUnfold: true,\n+ /**\n+ * This is the default height when the dict first renders the result.\n+ * If the content height is greater than the preferred height,\n+ * the preferred height is used and a mask with a view-more button is shown.\n+ * Otherwise the content height is used.\n+ */\n+ preferredHeight: 240,\n+ /**\n+ * Only start searching if the selection contains the language.\n+ * Better set default to true and let user decide.\n+ */\n+ selectionLang: {\n+ eng: true,\n+ chs: true\n+ },\n+ /** Optional dict custom options. Can only be boolean or number. */\n+ options: {\n+ tense: true,\n+ phsym: true,\n+ cdef: true,\n+ related: true,\n+ sentence: 4\n+ }\n+ },\n+ business: {\n+ /**\n+ * Full content page to jump to when user clicks the title.\n+ * %s will be replaced with the current word.\n+ * %z will be replaced with the traditional Chinese version of the current word\n+ */\n+ page: 'http://www.ldoceonline.com/search/?q=%s',\n+ /**\n+ * If set to true, the dict start searching automatically.\n+ * Otherwise it'll only start seaching when user clicks the unfold button.\n+ * Default MUST be true and let user decide.\n+ */\n+ defaultUnfold: true,\n+ /**\n+ * This is the default height when the dict first renders the result.\n+ * If the content height is greater than the preferred height,\n+ * the preferred height is used and a mask with a view-more button is shown.\n+ * Otherwise the content height is used.\n+ */\n+ preferredHeight: 265,\n+ /**\n+ * Only start searching if the selection contains the language.\n+ * Better set default to true and let user decide.\n+ */\n+ selectionLang: {\n+ eng: true,\n+ chs: true\n+ }\n+ },\n+ cobuild: {\n+ /**\n+ * Full content page to jump to when user clicks the title.\n+ * %s will be replaced with the current word.\n+ * %z will be replaced with the traditional Chinese version of the current word\n+ */\n+ page: 'https://www.collinsdictionary.com/dictionary/%s',\n+ /**\n+ * If set to true, the dict start searching automatically.\n+ * Otherwise it'll only start seaching when user clicks the unfold button.\n+ * Default MUST be true and let user decide.\n+ */\n+ defaultUnfold: true,\n+ /**\n+ * This is the default height when the dict first renders the result.\n+ * If the content height is greater than the preferred height,\n+ * the preferred height is used and a mask with a view-more button is shown.\n+ * Otherwise the content height is used.\n+ */\n+ preferredHeight: 300,\n+ /**\n+ * Only start searching if the selection contains the language.\n+ * Better set default to true and let user decide.\n+ */\n+ selectionLang: {\n+ eng: true,\n+ chs: true\n+ },\n+ /** Optional dict custom options. Can only be boolean or number. */\n+ options: {\n+ sentence: 4\n+ }\n+ },\n+ dictcn: {\n+ /**\n+ * Full content page to jump to when user clicks the title.\n+ * %s will be replaced with the current word.\n+ * %z will be replaced with the traditional Chinese version of the current word\n+ */\n+ page: 'http://dict.cn/%s',\n+ /**\n+ * If set to true, the dict start searching automatically.\n+ * Otherwise it'll only start seaching when user clicks the unfold button.\n+ * Default MUST be true and let user decide.\n+ */\n+ defaultUnfold: true,\n+ /**\n+ * This is the default height when the dict first renders the result.\n+ * If the content height is greater than the preferred height,\n+ * the preferred height is used and a mask with a view-more button is shown.\n+ * Otherwise the content height is used.\n+ */\n+ preferredHeight: 300,\n+ /**\n+ * Only start searching if the selection contains the language.\n+ * Better set default to true and let user decide.\n+ */\n+ selectionLang: {\n+ eng: true,\n+ chs: true\n+ },\n+ /** Optional dict custom options. Can only be boolean or number. */\n+ options: {\n+ chart: true,\n+ etym: true\n+ }\n+ },\n+ etymonline: {\n+ /**\n+ * Full content page to jump to when user clicks the title.\n+ * %s will be replaced with the current word.\n+ * %z will be replaced with the traditional Chinese version of the current word\n+ */\n+ page: 'http://www.etymonline.com/search?q=%s',\n+ /**\n+ * If set to true, the dict start searching automatically.\n+ * Otherwise it'll only start seaching when user clicks the unfold button.\n+ * Default MUST be true and let user decide.\n+ */\n+ defaultUnfold: true,\n+ /**\n+ * This is the default height when the dict first renders the result.\n+ * If the content height is greater than the preferred height,\n+ * the preferred height is used and a mask with a view-more button is shown.\n+ * Otherwise the content height is used.\n+ */\n+ preferredHeight: 265,\n+ /**\n+ * Only start searching if the selection contains the language.\n+ * Better set default to true and let user decide.\n+ */\n+ selectionLang: {\n+ eng: true,\n+ chs: true\n+ },\n+ /** Optional dict custom options. Can only be boolean or number. */\n+ options: {\n+ resultnum: 2\n+ }\n+ },\n+ google: {\n+ /**\n+ * Full content page to jump to when user clicks the title.\n+ * %s will be replaced with the current word.\n+ * %z will be replaced with the traditional Chinese version of the current word\n+ */\n+ page: 'https://translate.google.com/#auto/zh-CN/%s',\n+ /**\n+ * If set to true, the dict start searching automatically.\n+ * Otherwise it'll only start seaching when user clicks the unfold button.\n+ * Default MUST be true and let user decide.\n+ */\n+ defaultUnfold: true,\n+ /**\n+ * This is the default height when the dict first renders the result.\n+ * If the content height is greater than the preferred height,\n+ * the preferred height is used and a mask with a view-more button is shown.\n+ * Otherwise the content height is used.\n+ */\n+ preferredHeight: 110,\n+ /**\n+ * Only start searching if the selection contains the language.\n+ * Better set default to true and let user decide.\n+ */\n+ selectionLang: {\n+ eng: true,\n+ chs: true\n+ }\n+ },\n+ guoyu: {\n+ /**\n+ * Full content page to jump to when user clicks the title.\n+ * %s will be replaced with the current word.\n+ * %z will be replaced with the traditional Chinese version of the current word\n+ */\n+ page: 'https://www.moedict.tw/%z',\n+ /**\n+ * If set to true, the dict start searching automatically.\n+ * Otherwise it'll only start seaching when user clicks the unfold button.\n+ * Default MUST be true and let user decide.\n+ */\n+ defaultUnfold: true,\n+ /**\n+ * This is the default height when the dict first renders the result.\n+ * If the content height is greater than the preferred height,\n+ * the preferred height is used and a mask with a view-more button is shown.\n+ * Otherwise the content height is used.\n+ */\n+ preferredHeight: 265,\n+ /**\n+ * Only start searching if the selection contains the language.\n+ * Better set default to true and let user decide.\n+ */\n+ selectionLang: {\n+ eng: true,\n+ chs: true\n+ }\n+ },\n+ liangan: {\n+ /**\n+ * Full content page to jump to when user clicks the title.\n+ * %s will be replaced with the current word.\n+ * %z will be replaced with the traditional Chinese version of the current word\n+ */\n+ page: 'https://www.moedict.tw/~%z',\n+ /**\n+ * If set to true, the dict start searching automatically.\n+ * Otherwise it'll only start seaching when user clicks the unfold button.\n+ * Default MUST be true and let user decide.\n+ */\n+ defaultUnfold: true,\n+ /**\n+ * This is the default height when the dict first renders the result.\n+ * If the content height is greater than the preferred height,\n+ * the preferred height is used and a mask with a view-more button is shown.\n+ * Otherwise the content height is used.\n+ */\n+ preferredHeight: 265,\n+ /**\n+ * Only start searching if the selection contains the language.\n+ * Better set default to true and let user decide.\n+ */\n+ selectionLang: {\n+ eng: true,\n+ chs: true\n+ }\n+ },\n+ macmillan: {\n+ /**\n+ * Full content page to jump to when user clicks the title.\n+ * %s will be replaced with the current word.\n+ * %z will be replaced with the traditional Chinese version of the current word\n+ */\n+ page: 'http://www.macmillandictionary.com/dictionary/british/%s',\n+ /**\n+ * If set to true, the dict start searching automatically.\n+ * Otherwise it'll only start seaching when user clicks the unfold button.\n+ * Default MUST be true and let user decide.\n+ */\n+ defaultUnfold: true,\n+ /**\n+ * This is the default height when the dict first renders the result.\n+ * If the content height is greater than the preferred height,\n+ * the preferred height is used and a mask with a view-more button is shown.\n+ * Otherwise the content height is used.\n+ */\n+ preferredHeight: 265,\n+ /**\n+ * Only start searching if the selection contains the language.\n+ * Better set default to true and let user decide.\n+ */\n+ selectionLang: {\n+ eng: true,\n+ chs: true\n+ }\n+ },\n+ urban: {\n+ /**\n+ * Full content page to jump to when user clicks the title.\n+ * %s will be replaced with the current word.\n+ * %z will be replaced with the traditional Chinese version of the current word\n+ */\n+ page: 'http://www.urbandictionary.com/define.php?term=%s',\n+ /**\n+ * If set to true, the dict start searching automatically.\n+ * Otherwise it'll only start seaching when user clicks the unfold button.\n+ * Default MUST be true and let user decide.\n+ */\n+ defaultUnfold: true,\n+ /**\n+ * This is the default height when the dict first renders the result.\n+ * If the content height is greater than the preferred height,\n+ * the preferred height is used and a mask with a view-more button is shown.\n+ * Otherwise the content height is used.\n+ */\n+ preferredHeight: 180,\n+ /**\n+ * Only start searching if the selection contains the language.\n+ * Better set default to true and let user decide.\n+ */\n+ selectionLang: {\n+ eng: true,\n+ chs: true\n+ },\n+ /** Optional dict custom options. Can only be boolean or number. */\n+ options: {\n+ resultnum: 4\n+ }\n+ },\n+ vocabulary: {\n+ /**\n+ * Full content page to jump to when user clicks the title.\n+ * %s will be replaced with the current word.\n+ * %z will be replaced with the traditional Chinese version of the current word\n+ */\n+ page: 'https://www.vocabulary.com/dictionary/%s',\n+ /**\n+ * If set to true, the dict start searching automatically.\n+ * Otherwise it'll only start seaching when user clicks the unfold button.\n+ * Default MUST be true and let user decide.\n+ */\n+ defaultUnfold: true,\n+ /**\n+ * This is the default height when the dict first renders the result.\n+ * If the content height is greater than the preferred height,\n+ * the preferred height is used and a mask with a view-more button is shown.\n+ * Otherwise the content height is used.\n+ */\n+ preferredHeight: 180,\n+ /**\n+ * Only start searching if the selection contains the language.\n+ * Better set default to true and let user decide.\n+ */\n+ selectionLang: {\n+ eng: true,\n+ chs: true\n+ }\n+ },\n+ zdic: {\n+ /**\n+ * Full content page to jump to when user clicks the title.\n+ * %s will be replaced with the current word.\n+ * %z will be replaced with the traditional Chinese version of the current word\n+ */\n+ page: 'http://www.zdic.net/search/?c=1&q=%s',\n+ /**\n+ * If set to true, the dict start searching automatically.\n+ * Otherwise it'll only start seaching when user clicks the unfold button.\n+ * Default MUST be true and let user decide.\n+ */\n+ defaultUnfold: true,\n+ /**\n+ * This is the default height when the dict first renders the result.\n+ * If the content height is greater than the preferred height,\n+ * the preferred height is used and a mask with a view-more button is shown.\n+ * Otherwise the content height is used.\n+ */\n+ preferredHeight: 400,\n+ /**\n+ * Only start searching if the selection contains the language.\n+ * Better set default to true and let user decide.\n+ */\n+ selectionLang: {\n+ eng: true,\n+ chs: true\n+ }\n+ },\n+ }\n+\n+ // Just for type check. Keys in allDicts are useful so no actual assertion\n+ // tslint:disable-next-line:no-unused-expression\n+ allDicts as {\n+ [id: string]: {\n+ page: string\n+ defaultUnfold: boolean\n+ preferredHeight: number\n+ selectionLang: {\n+ eng: boolean\n+ chs: boolean\n+ }\n+ options?: {\n+ [option: string]: number | boolean\n+ }\n+ }\n+ }\n+\n+ return allDicts\n+}\ndiff --git a/src/app-config/index.ts b/src/app-config/index.ts\nindex 350cd8f..879a312 100644\n--- a/src/app-config/index.ts\n+++ b/src/app-config/index.ts\n@@ -1,5 +1,6 @@\n-import cloneDeep from 'lodash/cloneDeep'\n-import { DeepReadonly } from './typings/helpers'\n+import { DeepReadonly } from '@/typings/helpers'\n+import { getALlDicts } from './dicts'\n+import { getAllContextMenus } from './context-menus'\n \n const langUI = (browser.i18n.getUILanguage() || 'en').replace('-', '_')\n const langCode = /^zh_CN|zh_TW|en$/.test(langUI)\n@@ -8,220 +9,11 @@ const langCode = /^zh_CN|zh_TW|en$/.test(langUI)\n : langUI\n : 'en'\n \n-const allDicts = {\n- bing: {\n- page: 'https://cn.bing.com/dict/search?q=%s',\n- defaultUnfold: true,\n- preferredHeight: 240,\n- selectionLang: {\n- eng: true,\n- chs: true\n- },\n- options: {\n- tense: true,\n- phsym: true,\n- cdef: true,\n- related: true,\n- sentence: 4\n- }\n- },\n- business: {\n- page: 'http://www.ldoceonline.com/search/?q=%s',\n- defaultUnfold: true,\n- preferredHeight: 265,\n- selectionLang: {\n- eng: true,\n- chs: true\n- }\n- },\n- cobuild: {\n- page: 'https://www.collinsdictionary.com/dictionary/%s',\n- defaultUnfold: true,\n- preferredHeight: 300,\n- selectionLang: {\n- eng: true,\n- chs: true\n- },\n- options: {\n- sentence: 4\n- }\n- },\n- dictcn: {\n- page: 'http://dict.cn/%s',\n- defaultUnfold: true,\n- preferredHeight: 300,\n- selectionLang: {\n- eng: true,\n- chs: true\n- },\n- options: {\n- chart: true,\n- etym: true\n- }\n- },\n- etymonline: {\n- page: 'http://www.etymonline.com/search?q=%s',\n- defaultUnfold: true,\n- preferredHeight: 265,\n- selectionLang: {\n- eng: true,\n- chs: true\n- },\n- options: {\n- resultnum: 2\n- }\n- },\n- eudic: {\n- page: 'https://dict.eudic.net/dicts/en/%s',\n- defaultUnfold: true,\n- preferredHeight: 265,\n- selectionLang: {\n- eng: true,\n- chs: true\n- }\n- },\n- google: {\n- page: 'https://translate.google.com/#auto/zh-CN/%s',\n- defaultUnfold: true,\n- preferredHeight: 110,\n- selectionLang: {\n- eng: true,\n- chs: true\n- }\n- },\n- guoyu: {\n- page: 'https://www.moedict.tw/%z',\n- defaultUnfold: true,\n- preferredHeight: 265,\n- selectionLang: {\n- eng: true,\n- chs: true\n- }\n- },\n- howjsay: {\n- page: 'http://www.howjsay.com/index.php?word=%s',\n- defaultUnfold: true,\n- preferredHeight: 265,\n- selectionLang: {\n- eng: true,\n- chs: true\n- },\n- options: {\n- related: true\n- }\n- },\n- liangan: {\n- page: 'https://www.moedict.tw/~%z',\n- defaultUnfold: true,\n- preferredHeight: 265,\n- selectionLang: {\n- eng: true,\n- chs: true\n- }\n- },\n- macmillan: {\n- page: 'http://www.macmillandictionary.com/dictionary/british/%s',\n- defaultUnfold: true,\n- preferredHeight: 265,\n- selectionLang: {\n- eng: true,\n- chs: true\n- }\n- },\n- urban: {\n- page: 'http://www.urbandictionary.com/define.php?term=%s',\n- defaultUnfold: true,\n- preferredHeight: 180,\n- selectionLang: {\n- eng: true,\n- chs: true\n- },\n- options: {\n- resultnum: 4\n- }\n- },\n- vocabulary: {\n- page: 'https://www.vocabulary.com/dictionary/%s',\n- defaultUnfold: true,\n- preferredHeight: 180,\n- selectionLang: {\n- eng: true,\n- chs: true\n- }\n- },\n- wordreference: {\n- page: 'http://www.wordreference.com/definition/%s',\n- defaultUnfold: true,\n- preferredHeight: 180,\n- selectionLang: {\n- eng: true,\n- chs: true\n- },\n- options: {\n- etym: true,\n- idiom: true\n- }\n- },\n- zdic: {\n- page: 'http://www.zdic.net/search/?c=1&q=%s',\n- defaultUnfold: true,\n- preferredHeight: 400,\n- selectionLang: {\n- eng: true,\n- chs: true\n- }\n- },\n-}\n-\n-// Just for type check. Keys in allDicts are useful so no actual assertion\n-// tslint:disable-next-line:no-unused-expression\n-allDicts as {\n- [id: string]: {\n- /** url for the complete result */\n- page: string\n- /** lazy load */\n- defaultUnfold: boolean\n- /** content below the preferrred height will be hidden by default */\n- preferredHeight: number\n- /** only search when the selection contains the language */\n- selectionLang: {\n- eng: boolean\n- chs: boolean\n- }\n- /** other options */\n- options?: {\n- [option: string]: number | boolean\n- }\n- }\n-}\n-\n-export type DictID = keyof typeof allDicts\n-\n-const allContextMenus = {\n- google_page_translate: 'x',\n- youdao_page_translate: 'x',\n- google_search: 'https://www.google.com/#newwindow=1&q=%s',\n- baidu_search: 'https://www.baidu.com/s?ie=utf-8&wd=%s',\n- bing_search: 'https://www.bing.com/search?q=%s',\n- google_translate: 'https://translate.google.cn/#auto/zh-CN/%s',\n- etymonline: 'http://www.etymonline.com/index.php?search=%s',\n- merriam_webster: 'http://www.merriam-webster.com/dictionary/%s',\n- oxford: 'http://www.oxforddictionaries.com/us/definition/english/%s',\n- cambridge: 'http://dictionary.cambridge.org/spellcheck/english-chinese-simplified/?q=%s',\n- youdao: 'http://dict.youdao.com/w/%s',\n- dictcn: 'https://dict.eudic.net/dicts/en/%s',\n- iciba: 'http://www.iciba.com/%s',\n- liangan: 'https://www.moedict.tw/~%s',\n- guoyu: 'https://www.moedict.tw/%s',\n- longman_business: 'http://www.ldoceonline.com/search/?q=%s',\n- bing_dict: 'https://cn.bing.com/dict/?q=%s'\n-}\n-\n-// Just for type check. Keys in allContextMenus are useful so no actual assertion\n-// tslint:disable-next-line:no-unused-expression\n-allContextMenus as { [id: string]: string }\n+export type DictConfigsMutable = ReturnType<typeof getALlDicts>\n+export type DictConfigs = DeepReadonly<DictConfigsMutable>\n+export type DictID = keyof DictConfigsMutable\n \n-export type ContextMenuDictID = keyof typeof allContextMenus\n+export type ContextMenuDictID = keyof ReturnType<typeof getAllContextMenus>\n \n export const enum TCDirection {\n center,\n@@ -238,10 +30,6 @@ export const enum TCDirection {\n /** '' means no preload */\n export type PreloadSource = '' | 'clipboard' | 'selection'\n \n-export type DictConfigs = DeepReadonly<DictConfigsMutable>\n-\n-export type DictConfigsMutable = typeof allDicts\n-\n export type AppConfig = DeepReadonly<AppConfigMutable>\n \n export interface AppConfigMutable {\n@@ -418,7 +206,7 @@ export function appConfigFactory (): AppConfig {\n },\n en: {\n dict: '',\n- list: ['bing', 'dictcn', 'howjsay', 'macmillan', 'eudic', 'urban'],\n+ list: ['bing', 'dictcn', 'macmillan', 'urban'],\n accent: 'uk' as ('us' | 'uk')\n }\n },\n@@ -426,11 +214,11 @@ export function appConfigFactory (): AppConfig {\n dicts: {\n selected: ['bing', 'urban', 'vocabulary', 'dictcn'],\n // settings of each dict will be auto-generated\n- all: cloneDeep(allDicts)\n+ all: getALlDicts()\n },\n contextMenus: {\n selected: ['oxford', 'google_translate', 'merriam_webster', 'cambridge', 'google_search', 'google_page_translate', 'youdao_page_translate'],\n- all: cloneDeep(allContextMenus)\n+ all: getAllContextMenus()\n }\n }\n }\n"]
| 2 |
["83934807f4061980e7f5bf46d36eca70e238835d", "d986b530775edd8ef1f4e445a5d4b0016f409722"]
|
["ci", "refactor"]
|
Add the select function for logicflow,add react ecosystem
|
["diff --git a/packages/core/src/LogicFlow.tsx b/packages/core/src/LogicFlow.tsx\nindex 0d913b7..dcc59b3 100644\n--- a/packages/core/src/LogicFlow.tsx\n+++ b/packages/core/src/LogicFlow.tsx\n@@ -276,6 +276,12 @@ export default class LogicFlow {\n this.translate(-TRANSLATE_X, -TRANSLATE_Y);\n }\n /**\n+ * \u5c06\u56fe\u5f62\u9009\u4e2d\n+ */\n+ select(id: string) {\n+ this.graphModel.selectElementById(id);\n+ }\n+ /**\n * \u5c06\u56fe\u5f62\u5b9a\u4f4d\u5230\u753b\u5e03\u4e2d\u5fc3\n * @param focusOnArgs \u652f\u6301\u7528\u6237\u4f20\u5165\u56fe\u5f62\u5f53\u524d\u7684\u5750\u6807\u6216id\uff0c\u53ef\u4ee5\u901a\u8fc7type\u6765\u533a\u5206\u662f\u8282\u70b9\u8fd8\u662f\u8fde\u7ebf\u7684id\uff0c\u4e5f\u53ef\u4ee5\u4e0d\u4f20\uff08\u515c\u5e95\uff09\n */\ndiff --git a/packages/core/src/model/GraphModel.ts b/packages/core/src/model/GraphModel.ts\nindex 94d0899..10280a9 100644\n--- a/packages/core/src/model/GraphModel.ts\n+++ b/packages/core/src/model/GraphModel.ts\n@@ -481,6 +481,13 @@ class GraphModel {\n this.selectElement?.setSelected(true);\n }\n \n+ @action\n+ selectElementById(id: string) {\n+ this.selectElement?.setSelected(false);\n+ this.selectElement = this.getElement(id) as BaseNodeModel | BaseEdgeModel;\n+ this.selectElement?.setSelected(true);\n+ }\n+\n /* \u4fee\u6539\u8fde\u7ebf\u7c7b\u578b */\n @action\n changeEdgeType(type: string): void {\n", "diff --git a/package.json b/package.json\nindex 1ba8c4f..d1de9a0 100644\n--- a/package.json\n+++ b/package.json\n@@ -36,14 +36,19 @@\n \"@types/node\": \"^9.3.0\",\n \"@types/react\": \"^16.0.34\",\n \"@types/react-dom\": \"^16.0.3\",\n+ \"@types/react-motion\": \"^0.0.25\",\n \"bootstrap-sass\": \"^3.3.7\",\n \"highcharts\": \"^6.0.4\",\n \"html2canvas\": \"^1.0.0-alpha.9\",\n+ \"immer\": \"^1.2.1\",\n \"lodash\": \"^4.17.4\",\n \"moment\": \"^2.20.1\",\n \"normalize.css\": \"^8.0.0\",\n- \"react\": \"^16.2.0\",\n- \"react-dom\": \"^16.2.0\",\n+ \"react\": \"^16.3.1\",\n+ \"react-dom\": \"^16.3.1\",\n+ \"react-motion\": \"^0.5.2\",\n+ \"react-redux\": \"^5.0.7\",\n+ \"redux\": \"^3.7.2\",\n \"rxjs\": \"^5.5.6\",\n \"vue\": \"^2.5.13\",\n \"vue-plugin-webextension-i18n\": \"^0.1.0\",\ndiff --git a/yarn.lock b/yarn.lock\nindex c8898d8..5d0fc9f 100644\n--- a/yarn.lock\n+++ b/yarn.lock\n@@ -187,6 +187,12 @@\n \"@types/node\" \"*\"\n \"@types/react\" \"*\"\n \n+\"@types/react-motion@^0.0.25\":\n+ version \"0.0.25\"\n+ resolved \"https://registry.npmjs.org/@types/react-motion/-/react-motion-0.0.25.tgz#2445745ee8e8e6149faa47a36ff6b0d4c21dbf94\"\n+ dependencies:\n+ \"@types/react\" \"*\"\n+\n \"@types/react@*\", \"@types/react@^16.0.34\":\n version \"16.0.40\"\n resolved \"https://registry.npmjs.org/@types/react/-/react-16.0.40.tgz#caabc2296886f40b67f6fc80f0f3464476461df9\"\n@@ -3837,6 +3843,10 @@ [email protected]:\n version \"4.2.1\"\n resolved \"https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb\"\n \n+hoist-non-react-statics@^2.5.0:\n+ version \"2.5.0\"\n+ resolved \"https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40\"\n+\n home-or-tmp@^2.0.0:\n version \"2.0.0\"\n resolved \"https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8\"\n@@ -4004,6 +4014,10 @@ ignore@^3.3.5:\n version \"3.3.7\"\n resolved \"https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021\"\n \n+immer@^1.2.1:\n+ version \"1.2.1\"\n+ resolved \"https://registry.npmjs.org/immer/-/immer-1.2.1.tgz#96e2ae29cdfc428f28120b832701931b92fa597c\"\n+\n import-local@^1.0.0:\n version \"1.0.0\"\n resolved \"https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc\"\n@@ -4104,7 +4118,7 @@ interpret@^1.0.0:\n version \"1.1.0\"\n resolved \"https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614\"\n \n-invariant@^2.2.2:\n+invariant@^2.0.0, invariant@^2.2.2:\n version \"2.2.4\"\n resolved \"https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6\"\n dependencies:\n@@ -5040,6 +5054,10 @@ locate-path@^2.0.0:\n p-locate \"^2.0.0\"\n path-exists \"^3.0.0\"\n \n+lodash-es@^4.17.5, lodash-es@^4.2.1:\n+ version \"4.17.8\"\n+ resolved \"https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.8.tgz#6fa8c8c5d337481df0bdf1c0d899d42473121e45\"\n+\n lodash._reinterpolate@~3.0.0:\n version \"3.0.0\"\n resolved \"https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d\"\n@@ -5149,7 +5167,7 @@ [email protected]:\n version \"4.17.2\"\n resolved \"https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42\"\n \[email protected], lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.16.3, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.4:\[email protected], lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.16.3, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.4:\n version \"4.17.5\"\n resolved \"https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511\"\n \n@@ -6467,7 +6485,7 @@ promise@^7.1.1:\n dependencies:\n asap \"~2.0.3\"\n \n-prop-types@^15.6.0:\n+prop-types@^15.5.8, prop-types@^15.6.0:\n version \"15.6.1\"\n resolved \"https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca\"\n dependencies:\n@@ -6574,7 +6592,7 @@ quick-lru@^1.0.0:\n version \"1.1.0\"\n resolved \"https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8\"\n \[email protected]:\[email protected], raf@^3.1.0:\n version \"3.4.0\"\n resolved \"https://registry.npmjs.org/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575\"\n dependencies:\n@@ -6645,9 +6663,9 @@ react-dev-utils@^5.0.0:\n strip-ansi \"3.0.1\"\n text-table \"0.2.0\"\n \n-react-dom@^16.2.0:\n- version \"16.2.0\"\n- resolved \"https://registry.npmjs.org/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044\"\n+react-dom@^16.3.1:\n+ version \"16.3.1\"\n+ resolved \"https://registry.npmjs.org/react-dom/-/react-dom-16.3.1.tgz#6a3c90a4fb62f915bdbcf6204422d93a7d4ca573\"\n dependencies:\n fbjs \"^0.8.16\"\n loose-envify \"^1.1.0\"\n@@ -6658,9 +6676,28 @@ react-error-overlay@^4.0.0:\n version \"4.0.0\"\n resolved \"https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-4.0.0.tgz#d198408a85b4070937a98667f500c832f86bd5d4\"\n \n-react@^16.2.0:\n- version \"16.2.0\"\n- resolved \"https://registry.npmjs.org/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba\"\n+react-motion@^0.5.2:\n+ version \"0.5.2\"\n+ resolved \"https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz#0dd3a69e411316567927917c6626551ba0607316\"\n+ dependencies:\n+ performance-now \"^0.2.0\"\n+ prop-types \"^15.5.8\"\n+ raf \"^3.1.0\"\n+\n+react-redux@^5.0.7:\n+ version \"5.0.7\"\n+ resolved \"https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8\"\n+ dependencies:\n+ hoist-non-react-statics \"^2.5.0\"\n+ invariant \"^2.0.0\"\n+ lodash \"^4.17.5\"\n+ lodash-es \"^4.17.5\"\n+ loose-envify \"^1.1.0\"\n+ prop-types \"^15.6.0\"\n+\n+react@^16.3.1:\n+ version \"16.3.1\"\n+ resolved \"https://registry.npmjs.org/react/-/react-16.3.1.tgz#4a2da433d471251c69b6033ada30e2ed1202cfd8\"\n dependencies:\n fbjs \"^0.8.16\"\n loose-envify \"^1.1.0\"\n@@ -6788,6 +6825,15 @@ reduce-function-call@^1.0.1:\n dependencies:\n balanced-match \"^0.4.2\"\n \n+redux@^3.7.2:\n+ version \"3.7.2\"\n+ resolved \"https://registry.npmjs.org/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b\"\n+ dependencies:\n+ lodash \"^4.2.1\"\n+ lodash-es \"^4.2.1\"\n+ loose-envify \"^1.1.0\"\n+ symbol-observable \"^1.0.3\"\n+\n regenerate@^1.2.1:\n version \"1.3.3\"\n resolved \"https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f\"\n@@ -7811,6 +7857,10 @@ [email protected]:\n version \"1.0.1\"\n resolved \"https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4\"\n \n+symbol-observable@^1.0.3:\n+ version \"1.2.0\"\n+ resolved \"https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804\"\n+\n symbol-tree@^3.2.2:\n version \"3.2.2\"\n resolved \"https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6\"\n"]
| 2 |
["6ae067153cd2608018fd3da76bd6d00a08da4b3a", "7e04a5e829d7416e312ac342a00a11787745753b"]
|
["feat", "build"]
|
export order,explain `ChunkOrder` query test scenario
|
["diff --git a/src/Object/_api.ts b/src/Object/_api.ts\nindex a1e5c8c..70e9fea 100644\n--- a/src/Object/_api.ts\n+++ b/src/Object/_api.ts\n@@ -38,9 +38,9 @@ export {Optional} from './Optional'\n export {OptionalKeys} from './OptionalKeys'\n export {Overwrite} from './Overwrite'\n export {Partial} from './Partial'\n+export {Path} from './Path'\n export {Paths} from './Paths'\n export {PathValid} from './PathValid'\n-export {Path} from './Path'\n export {Pick} from './Pick'\n export {Readonly} from './Readonly'\n export {ReadonlyKeys} from './ReadonlyKeys'\n", "diff --git a/query_tests/src/scenarios.rs b/query_tests/src/scenarios.rs\nindex f0e352b..86df0e9 100644\n--- a/query_tests/src/scenarios.rs\n+++ b/query_tests/src/scenarios.rs\n@@ -1170,6 +1170,21 @@ impl DbSetup for ChunkOrder {\n .clear_lifecycle_action()\n .unwrap();\n \n+ // Now we have the the following chunks (same partition and table):\n+ //\n+ // | ID | order | tag: region | field: user | time |\n+ // | -- | ----- | ----------- | ----------- | ---- |\n+ // | 1 | 1 | \"west\" | 2 | 100 |\n+ // | 2 | 0 | \"west\" | 1 | 100 |\n+ //\n+ // The result after deduplication should be:\n+ //\n+ // | tag: region | field: user | time |\n+ // | ----------- | ----------- | ---- |\n+ // | \"west\" | 2 | 100 |\n+ //\n+ // So the query engine must use `order` as a primary key to sort chunks, NOT `id`.\n+\n let scenario = DbScenario {\n scenario_name: \"chunks where chunk ID alone cannot be used for ordering\".into(),\n db,\n"]
| 2 |
["879edb6ed90f88b9ae6a3c2e8878ae1be48e0c88", "9a60af7fa3b480e2e04bacd646112cad9aaab6d7"]
|
["refactor", "docs"]
|
fix build,extract lambdas
|
["diff --git a/server/Dockerfile b/server/Dockerfile\nindex 2f203bb..a84c31e 100755\n--- a/server/Dockerfile\n+++ b/server/Dockerfile\n@@ -9,9 +9,11 @@ ENV TZ utc\n WORKDIR /src\n \n COPY package.json /src\n+COPY package-lock.json /src\n+COPY tsconfig.json /src\n RUN npm install --production --no-optional\n \n COPY public /src/public\n COPY dist /src\n \n-CMD [ \"node\", \"./server/index.js\" ]\n+CMD [ \"node\", \"-r\", \"tsconfig-paths/register\", \"./server/index.js\" ]\ndiff --git a/server/package-lock.json b/server/package-lock.json\nindex 6cacfa2..236f1bb 100644\n--- a/server/package-lock.json\n+++ b/server/package-lock.json\n@@ -2164,8 +2164,7 @@\n \"@types/json5\": {\n \"version\": \"0.0.29\",\n \"resolved\": \"https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz\",\n- \"integrity\": \"sha1-7ihweulOEdK4J7y+UnC86n8+ce4=\",\n- \"dev\": true\n+ \"integrity\": \"sha1-7ihweulOEdK4J7y+UnC86n8+ce4=\"\n },\n \"@types/jsonwebtoken\": {\n \"version\": \"8.3.5\",\n@@ -9246,8 +9245,7 @@\n \"strip-bom\": {\n \"version\": \"3.0.0\",\n \"resolved\": \"https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz\",\n- \"integrity\": \"sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=\",\n- \"dev\": true\n+ \"integrity\": \"sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=\"\n },\n \"strip-final-newline\": {\n \"version\": \"2.0.0\",\n@@ -9524,7 +9522,6 @@\n \"version\": \"3.9.0\",\n \"resolved\": \"https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz\",\n \"integrity\": \"sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==\",\n- \"dev\": true,\n \"requires\": {\n \"@types/json5\": \"^0.0.29\",\n \"json5\": \"^1.0.1\",\n@@ -9536,7 +9533,6 @@\n \"version\": \"1.0.1\",\n \"resolved\": \"https://registry.npmjs.org/json5/-/json5-1.0.1.tgz\",\n \"integrity\": \"sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==\",\n- \"dev\": true,\n \"requires\": {\n \"minimist\": \"^1.2.0\"\n }\n@@ -9544,8 +9540,7 @@\n \"minimist\": {\n \"version\": \"1.2.5\",\n \"resolved\": \"https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz\",\n- \"integrity\": \"sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==\",\n- \"dev\": true\n+ \"integrity\": \"sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==\"\n }\n }\n },\ndiff --git a/server/package.json b/server/package.json\nindex 35426e9..896e9b3 100644\n--- a/server/package.json\n+++ b/server/package.json\n@@ -41,6 +41,7 @@\n \"pino-cloudwatch\": \"0.7.0\",\n \"pino-multi-stream\": \"4.2.0\",\n \"reflect-metadata\": \"0.1.13\",\n+ \"tsconfig-paths\": \"3.9.0\",\n \"typeorm\": \"0.2.37\"\n },\n \"devDependencies\": {\n@@ -69,7 +70,6 @@\n \"pino-pretty\": \"3.6.1\",\n \"ts-jest\": \"27.0.7\",\n \"ts-node-dev\": \"1.1.8\",\n- \"tsconfig-paths\": \"3.9.0\",\n \"typescript\": \"4.3.5\"\n },\n \"jest-junit\": {\n", "diff --git a/broker/src/main/java/io/camunda/zeebe/broker/system/partitions/impl/AsyncSnapshotDirector.java b/broker/src/main/java/io/camunda/zeebe/broker/system/partitions/impl/AsyncSnapshotDirector.java\nindex 6ee5797..bcfcc72 100644\n--- a/broker/src/main/java/io/camunda/zeebe/broker/system/partitions/impl/AsyncSnapshotDirector.java\n+++ b/broker/src/main/java/io/camunda/zeebe/broker/system/partitions/impl/AsyncSnapshotDirector.java\n@@ -224,7 +224,6 @@ public final class AsyncSnapshotDirector extends Actor\n private void takeSnapshot() {\n final var transientSnapshotFuture =\n stateController.takeTransientSnapshot(lowerBoundSnapshotPosition);\n-\n transientSnapshotFuture.onComplete(\n (optionalTransientSnapshot, snapshotTakenError) -> {\n if (snapshotTakenError != null) {\n@@ -237,27 +236,31 @@ public final class AsyncSnapshotDirector extends Actor\n takingSnapshot = false;\n return;\n }\n- pendingSnapshot = optionalTransientSnapshot.get();\n- onRecovered();\n-\n- final ActorFuture<Long> lastWrittenPosition =\n- streamProcessor.getLastWrittenPositionAsync();\n- actor.runOnCompletion(\n- lastWrittenPosition,\n- (endPosition, error) -> {\n- if (error == null) {\n- LOG.info(LOG_MSG_WAIT_UNTIL_COMMITTED, endPosition, commitPosition);\n- lastWrittenEventPosition = endPosition;\n- persistingSnapshot = false;\n- persistSnapshotIfLastWrittenPositionCommitted();\n- } else {\n- resetStateOnFailure();\n- LOG.error(ERROR_MSG_ON_RESOLVE_WRITTEN_POS, error);\n- }\n- });\n+ onTransientSnapshotTaken(optionalTransientSnapshot.get());\n });\n }\n \n+ private void onTransientSnapshotTaken(final TransientSnapshot transientSnapshot) {\n+\n+ pendingSnapshot = transientSnapshot;\n+ onRecovered();\n+\n+ final ActorFuture<Long> lastWrittenPosition = streamProcessor.getLastWrittenPositionAsync();\n+ actor.runOnCompletion(lastWrittenPosition, this::onLastWrittenPositionReceived);\n+ }\n+\n+ private void onLastWrittenPositionReceived(final Long endPosition, final Throwable error) {\n+ if (error == null) {\n+ LOG.info(LOG_MSG_WAIT_UNTIL_COMMITTED, endPosition, commitPosition);\n+ lastWrittenEventPosition = endPosition;\n+ persistingSnapshot = false;\n+ persistSnapshotIfLastWrittenPositionCommitted();\n+ } else {\n+ resetStateOnFailure();\n+ LOG.error(ERROR_MSG_ON_RESOLVE_WRITTEN_POS, error);\n+ }\n+ }\n+\n private void onRecovered() {\n if (healthStatus != HealthStatus.HEALTHY) {\n healthStatus = HealthStatus.HEALTHY;\n"]
| 2 |
["a827777f41e90b6332c191d05bae8db525de6f38", "14abf5c31523a551134aebe9e8f3505ef26ed421"]
|
["build", "refactor"]
|
add tenant property to ProcessMessageSubscriptionRecord
Adds the tenant id property + getter/setter to the record.,deploy dmn using java client
This test is an acceptance test that verifies that the java client can
deploy a dmn decision model using the newDeployCommand client method.
It verifies that the model was resource was parsed and deployed,
resulting in a response that contains metadata of the deployed decision
requirements graph and the decisions it contains.
|
["diff --git a/protocol-impl/src/main/java/io/camunda/zeebe/protocol/impl/record/value/message/ProcessMessageSubscriptionRecord.java b/protocol-impl/src/main/java/io/camunda/zeebe/protocol/impl/record/value/message/ProcessMessageSubscriptionRecord.java\nindex 0b07e49..790a974 100644\n--- a/protocol-impl/src/main/java/io/camunda/zeebe/protocol/impl/record/value/message/ProcessMessageSubscriptionRecord.java\n+++ b/protocol-impl/src/main/java/io/camunda/zeebe/protocol/impl/record/value/message/ProcessMessageSubscriptionRecord.java\n@@ -37,6 +37,8 @@ public final class ProcessMessageSubscriptionRecord extends UnifiedRecordValue\n private final BooleanProperty interruptingProp = new BooleanProperty(\"interrupting\", true);\n private final StringProperty correlationKeyProp = new StringProperty(\"correlationKey\", \"\");\n private final StringProperty elementIdProp = new StringProperty(\"elementId\", \"\");\n+ private final StringProperty tenantIdProp =\n+ new StringProperty(\"tenantId\", TenantOwned.DEFAULT_TENANT_IDENTIFIER);\n \n public ProcessMessageSubscriptionRecord() {\n declareProperty(subscriptionPartitionIdProp)\n@@ -48,7 +50,8 @@ public final class ProcessMessageSubscriptionRecord extends UnifiedRecordValue\n .declareProperty(interruptingProp)\n .declareProperty(bpmnProcessIdProp)\n .declareProperty(correlationKeyProp)\n- .declareProperty(elementIdProp);\n+ .declareProperty(elementIdProp)\n+ .declareProperty(tenantIdProp);\n }\n \n public void wrap(final ProcessMessageSubscriptionRecord record) {\n@@ -62,6 +65,7 @@ public final class ProcessMessageSubscriptionRecord extends UnifiedRecordValue\n setBpmnProcessId(record.getBpmnProcessIdBuffer());\n setCorrelationKey(record.getCorrelationKeyBuffer());\n setElementId(record.getElementIdBuffer());\n+ setTenantId(record.getTenantId());\n }\n \n @JsonIgnore\n@@ -191,7 +195,11 @@ public final class ProcessMessageSubscriptionRecord extends UnifiedRecordValue\n \n @Override\n public String getTenantId() {\n- // todo(#13289): replace dummy implementation\n- return TenantOwned.DEFAULT_TENANT_IDENTIFIER;\n+ return bufferAsString(tenantIdProp.getValue());\n+ }\n+\n+ public ProcessMessageSubscriptionRecord setTenantId(final String tenantId) {\n+ tenantIdProp.setValue(tenantId);\n+ return this;\n }\n }\n", "diff --git a/qa/integration-tests/src/test/java/io/camunda/zeebe/it/client/command/CreateDeploymentTest.java b/qa/integration-tests/src/test/java/io/camunda/zeebe/it/client/command/CreateDeploymentTest.java\nindex f36465b..6b6ab48 100644\n--- a/qa/integration-tests/src/test/java/io/camunda/zeebe/it/client/command/CreateDeploymentTest.java\n+++ b/qa/integration-tests/src/test/java/io/camunda/zeebe/it/client/command/CreateDeploymentTest.java\n@@ -67,6 +67,49 @@ public final class CreateDeploymentTest {\n }\n \n @Test\n+ public void shouldDeployDecisionModel() {\n+ // given\n+ final String resourceName = \"dmn/drg-force-user.dmn\";\n+\n+ // when\n+ final DeploymentEvent result =\n+ CLIENT_RULE\n+ .getClient()\n+ .newDeployCommand()\n+ .addResourceFromClasspath(resourceName)\n+ .send()\n+ .join();\n+\n+ // then\n+ assertThat(result.getKey()).isPositive();\n+ assertThat(result.getDecisionRequirements()).hasSize(1);\n+ assertThat(result.getDecisions()).hasSize(2);\n+\n+ final var decisionRequirements = result.getDecisionRequirements().get(0);\n+ assertThat(decisionRequirements.getDmnDecisionRequirementsId()).isEqualTo(\"force_users\");\n+ assertThat(decisionRequirements.getDmnDecisionRequirementsName()).isEqualTo(\"Force Users\");\n+ assertThat(decisionRequirements.getVersion()).isEqualTo(1);\n+ assertThat(decisionRequirements.getDecisionRequirementsKey()).isPositive();\n+ assertThat(decisionRequirements.getResourceName()).isEqualTo(resourceName);\n+\n+ final var decision1 = result.getDecisions().get(0);\n+ assertThat(decision1.getDmnDecisionId()).isEqualTo(\"jedi_or_sith\");\n+ assertThat(decision1.getDmnDecisionName()).isEqualTo(\"Jedi or Sith\");\n+ assertThat(decision1.getVersion()).isEqualTo(1);\n+ assertThat(decision1.getDecisionKey()).isPositive();\n+ assertThat(decision1.getDmnDecisionRequirementsId()).isEqualTo(\"force_users\");\n+ assertThat(decision1.getDecisionRequirementsKey()).isPositive();\n+\n+ final var decision2 = result.getDecisions().get(1);\n+ assertThat(decision2.getDmnDecisionId()).isEqualTo(\"force_user\");\n+ assertThat(decision2.getDmnDecisionName()).isEqualTo(\"Which force user?\");\n+ assertThat(decision2.getVersion()).isEqualTo(1);\n+ assertThat(decision2.getDecisionKey()).isPositive();\n+ assertThat(decision2.getDmnDecisionRequirementsId()).isEqualTo(\"force_users\");\n+ assertThat(decision2.getDecisionRequirementsKey()).isPositive();\n+ }\n+\n+ @Test\n public void shouldRejectDeployIfProcessIsInvalid() {\n // given\n final BpmnModelInstance process =\ndiff --git a/qa/integration-tests/src/test/resources/dmn/drg-force-user.dmn b/qa/integration-tests/src/test/resources/dmn/drg-force-user.dmn\nnew file mode 100644\nindex 0000000..8d55c55\n--- /dev/null\n+++ b/qa/integration-tests/src/test/resources/dmn/drg-force-user.dmn\n@@ -0,0 +1,144 @@\n+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<definitions xmlns=\"https://www.omg.org/spec/DMN/20191111/MODEL/\" xmlns:dmndi=\"https://www.omg.org/spec/DMN/20191111/DMNDI/\" xmlns:dc=\"http://www.omg.org/spec/DMN/20180521/DC/\" xmlns:biodi=\"http://bpmn.io/schema/dmn/biodi/2.0\" xmlns:di=\"http://www.omg.org/spec/DMN/20180521/DI/\" id=\"force_users\" name=\"Force Users\" namespace=\"http://camunda.org/schema/1.0/dmn\" exporter=\"Camunda Modeler\" exporterVersion=\"4.12.0\">\n+ <decision id=\"jedi_or_sith\" name=\"Jedi or Sith\">\n+ <decisionTable id=\"DecisionTable_14n3bxx\">\n+ <input id=\"Input_1\" label=\"Lightsaber color\" biodi:width=\"192\">\n+ <inputExpression id=\"InputExpression_1\" typeRef=\"string\">\n+ <text>lightsaberColor</text>\n+ </inputExpression>\n+ </input>\n+ <output id=\"Output_1\" label=\"Jedi or Sith\" name=\"jedi_or_sith\" typeRef=\"string\" biodi:width=\"192\">\n+ <outputValues id=\"UnaryTests_0hj346a\">\n+ <text>\"Jedi\",\"Sith\"</text>\n+ </outputValues>\n+ </output>\n+ <rule id=\"DecisionRule_0zumznl\">\n+ <inputEntry id=\"UnaryTests_0leuxqi\">\n+ <text>\"blue\"</text>\n+ </inputEntry>\n+ <outputEntry id=\"LiteralExpression_0c9vpz8\">\n+ <text>\"Jedi\"</text>\n+ </outputEntry>\n+ </rule>\n+ <rule id=\"DecisionRule_1utwb1e\">\n+ <inputEntry id=\"UnaryTests_1v3sd4m\">\n+ <text>\"green\"</text>\n+ </inputEntry>\n+ <outputEntry id=\"LiteralExpression_0tgh8k1\">\n+ <text>\"Jedi\"</text>\n+ </outputEntry>\n+ </rule>\n+ <rule id=\"DecisionRule_1bwgcym\">\n+ <inputEntry id=\"UnaryTests_0n1ewm3\">\n+ <text>\"red\"</text>\n+ </inputEntry>\n+ <outputEntry id=\"LiteralExpression_19xnlkw\">\n+ <text>\"Sith\"</text>\n+ </outputEntry>\n+ </rule>\n+ </decisionTable>\n+ </decision>\n+ <decision id=\"force_user\" name=\"Which force user?\">\n+ <informationRequirement id=\"InformationRequirement_1o8esai\">\n+ <requiredDecision href=\"#jedi_or_sith\" />\n+ </informationRequirement>\n+ <decisionTable id=\"DecisionTable_07g94t1\" hitPolicy=\"FIRST\">\n+ <input id=\"InputClause_0qnqj25\" label=\"Jedi or Sith\">\n+ <inputExpression id=\"LiteralExpression_00lcyt5\" typeRef=\"string\">\n+ <text>jedi_or_sith</text>\n+ </inputExpression>\n+ <inputValues id=\"UnaryTests_1xjidd8\">\n+ <text>\"Jedi\",\"Sith\"</text>\n+ </inputValues>\n+ </input>\n+ <input id=\"InputClause_0k64hys\" label=\"Body height\">\n+ <inputExpression id=\"LiteralExpression_0ib6fnk\" typeRef=\"number\">\n+ <text>height</text>\n+ </inputExpression>\n+ </input>\n+ <output id=\"OutputClause_0hhe1yo\" label=\"Force user\" name=\"force_user\" typeRef=\"string\" />\n+ <rule id=\"DecisionRule_13zidc5\">\n+ <inputEntry id=\"UnaryTests_056skcq\">\n+ <text>\"Jedi\"</text>\n+ </inputEntry>\n+ <inputEntry id=\"UnaryTests_0l4xksq\">\n+ <text>> 190</text>\n+ </inputEntry>\n+ <outputEntry id=\"LiteralExpression_0hclhw3\">\n+ <text>\"Mace Windu\"</text>\n+ </outputEntry>\n+ </rule>\n+ <rule id=\"DecisionRule_0uin2hk\">\n+ <description></description>\n+ <inputEntry id=\"UnaryTests_16maepk\">\n+ <text>\"Jedi\"</text>\n+ </inputEntry>\n+ <inputEntry id=\"UnaryTests_0rv0nwf\">\n+ <text>> 180</text>\n+ </inputEntry>\n+ <outputEntry id=\"LiteralExpression_0t82c11\">\n+ <text>\"Obi-Wan Kenobi\"</text>\n+ </outputEntry>\n+ </rule>\n+ <rule id=\"DecisionRule_0mpio0p\">\n+ <inputEntry id=\"UnaryTests_09eicyc\">\n+ <text>\"Jedi\"</text>\n+ </inputEntry>\n+ <inputEntry id=\"UnaryTests_1bekl8k\">\n+ <text>< 70</text>\n+ </inputEntry>\n+ <outputEntry id=\"LiteralExpression_0brx3vt\">\n+ <text>\"Yoda\"</text>\n+ </outputEntry>\n+ </rule>\n+ <rule id=\"DecisionRule_06paffx\">\n+ <inputEntry id=\"UnaryTests_1baiid4\">\n+ <text>\"Sith\"</text>\n+ </inputEntry>\n+ <inputEntry id=\"UnaryTests_0fcdq0i\">\n+ <text>> 200</text>\n+ </inputEntry>\n+ <outputEntry id=\"LiteralExpression_02oibi4\">\n+ <text>\"Darth Vader\"</text>\n+ </outputEntry>\n+ </rule>\n+ <rule id=\"DecisionRule_1ua4pcl\">\n+ <inputEntry id=\"UnaryTests_1s1h3nm\">\n+ <text>\"Sith\"</text>\n+ </inputEntry>\n+ <inputEntry id=\"UnaryTests_1pnvw8p\">\n+ <text>> 170</text>\n+ </inputEntry>\n+ <outputEntry id=\"LiteralExpression_1w1n2rc\">\n+ <text>\"Darth Sidius\"</text>\n+ </outputEntry>\n+ </rule>\n+ <rule id=\"DecisionRule_00ew25e\">\n+ <inputEntry id=\"UnaryTests_07uxyug\">\n+ <text></text>\n+ </inputEntry>\n+ <inputEntry id=\"UnaryTests_1he6fym\">\n+ <text></text>\n+ </inputEntry>\n+ <outputEntry id=\"LiteralExpression_07i3sc8\">\n+ <text>\"unknown\"</text>\n+ </outputEntry>\n+ </rule>\n+ </decisionTable>\n+ </decision>\n+ <dmndi:DMNDI>\n+ <dmndi:DMNDiagram>\n+ <dmndi:DMNShape dmnElementRef=\"jedi_or_sith\">\n+ <dc:Bounds height=\"80\" width=\"180\" x=\"160\" y=\"280\" />\n+ </dmndi:DMNShape>\n+ <dmndi:DMNShape id=\"DMNShape_1sb3tre\" dmnElementRef=\"force_user\">\n+ <dc:Bounds height=\"80\" width=\"180\" x=\"280\" y=\"80\" />\n+ </dmndi:DMNShape>\n+ <dmndi:DMNEdge id=\"DMNEdge_0gt1p1u\" dmnElementRef=\"InformationRequirement_1o8esai\">\n+ <di:waypoint x=\"250\" y=\"280\" />\n+ <di:waypoint x=\"370\" y=\"180\" />\n+ <di:waypoint x=\"370\" y=\"160\" />\n+ </dmndi:DMNEdge>\n+ </dmndi:DMNDiagram>\n+ </dmndi:DMNDI>\n+</definitions>\n"]
| 2 |
["497a7d0676564774c18435e082e7de9132a251c7", "73eac947689e3fc6b53bf626a6b4604056166d6e"]
|
["feat", "test"]
|
remove writers from interface,don't consider cases where there are no txids
|
["diff --git a/engine/src/main/java/io/camunda/zeebe/engine/Engine.java b/engine/src/main/java/io/camunda/zeebe/engine/Engine.java\nindex 91f1b41..eb4b9a8 100644\n--- a/engine/src/main/java/io/camunda/zeebe/engine/Engine.java\n+++ b/engine/src/main/java/io/camunda/zeebe/engine/Engine.java\n@@ -81,8 +81,6 @@ public class Engine implements RecordProcessor<EngineContext> {\n \n engineContext.setLifecycleListeners(typedRecordProcessors.getLifecycleListeners());\n recordProcessorMap = typedRecordProcessors.getRecordProcessorMap();\n-\n- engineContext.setWriters(writers);\n }\n \n @Override\ndiff --git a/engine/src/main/java/io/camunda/zeebe/engine/EngineContext.java b/engine/src/main/java/io/camunda/zeebe/engine/EngineContext.java\nindex a8e5538..a27b6e6 100644\n--- a/engine/src/main/java/io/camunda/zeebe/engine/EngineContext.java\n+++ b/engine/src/main/java/io/camunda/zeebe/engine/EngineContext.java\n@@ -15,7 +15,6 @@ import io.camunda.zeebe.engine.processing.streamprocessor.StreamProcessorListene\n import io.camunda.zeebe.engine.processing.streamprocessor.TypedRecordProcessorFactory;\n import io.camunda.zeebe.engine.processing.streamprocessor.writers.LegacyTypedResponseWriter;\n import io.camunda.zeebe.engine.processing.streamprocessor.writers.LegacyTypedStreamWriter;\n-import io.camunda.zeebe.engine.processing.streamprocessor.writers.Writers;\n import io.camunda.zeebe.engine.state.EventApplier;\n import io.camunda.zeebe.engine.state.mutable.MutableZeebeState;\n import java.util.Collections;\n@@ -34,7 +33,6 @@ public final class EngineContext {\n private final TypedRecordProcessorFactory typedRecordProcessorFactory;\n private List<StreamProcessorLifecycleAware> lifecycleListeners = Collections.EMPTY_LIST;\n private StreamProcessorListener streamProcessorListener;\n- private Writers writers;\n \n public EngineContext(\n final int partitionId,\n@@ -102,12 +100,4 @@ public final class EngineContext {\n public void setStreamProcessorListener(final StreamProcessorListener streamProcessorListener) {\n this.streamProcessorListener = streamProcessorListener;\n }\n-\n- public Writers getWriters() {\n- return writers;\n- }\n-\n- public void setWriters(final Writers writers) {\n- this.writers = writers;\n- }\n }\ndiff --git a/engine/src/main/java/io/camunda/zeebe/engine/api/ReadonlyStreamProcessorContext.java b/engine/src/main/java/io/camunda/zeebe/engine/api/ReadonlyStreamProcessorContext.java\nindex f30c7cc..834b421 100644\n--- a/engine/src/main/java/io/camunda/zeebe/engine/api/ReadonlyStreamProcessorContext.java\n+++ b/engine/src/main/java/io/camunda/zeebe/engine/api/ReadonlyStreamProcessorContext.java\n@@ -8,7 +8,6 @@\n package io.camunda.zeebe.engine.api;\n \n import io.camunda.zeebe.engine.processing.streamprocessor.writers.LegacyTypedStreamWriter;\n-import io.camunda.zeebe.engine.processing.streamprocessor.writers.Writers;\n import io.camunda.zeebe.engine.state.mutable.MutableZeebeState;\n import io.camunda.zeebe.logstreams.log.LogStream;\n \n@@ -27,11 +26,6 @@ public interface ReadonlyStreamProcessorContext {\n LegacyTypedStreamWriter getLogStreamWriter();\n \n /**\n- * @return the specific writers, like command, response, etc\n- */\n- Writers getWriters();\n-\n- /**\n * @return the state, where the data is stored during processing\n */\n MutableZeebeState getZeebeState();\ndiff --git a/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessor.java b/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessor.java\nindex 844e487..49fd8e2 100755\n--- a/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessor.java\n+++ b/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessor.java\n@@ -346,7 +346,6 @@ public class StreamProcessor extends Actor implements HealthMonitorable, LogReco\n if (listener != null) {\n streamProcessorContext.listener(engineContext.getStreamProcessorListener());\n }\n- streamProcessorContext.writers(engineContext.getWriters());\n }\n \n private long recoverFromSnapshot() {\ndiff --git a/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessorContext.java b/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessorContext.java\nindex d02b273..b527d3c 100644\n--- a/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessorContext.java\n+++ b/engine/src/main/java/io/camunda/zeebe/streamprocessor/StreamProcessorContext.java\n@@ -17,7 +17,6 @@ import io.camunda.zeebe.engine.processing.streamprocessor.writers.CommandRespons\n import io.camunda.zeebe.engine.processing.streamprocessor.writers.LegacyTypedResponseWriterImpl;\n import io.camunda.zeebe.engine.processing.streamprocessor.writers.LegacyTypedStreamWriter;\n import io.camunda.zeebe.engine.processing.streamprocessor.writers.NoopLegacyTypedStreamWriter;\n-import io.camunda.zeebe.engine.processing.streamprocessor.writers.Writers;\n import io.camunda.zeebe.engine.state.EventApplier;\n import io.camunda.zeebe.engine.state.KeyGeneratorControls;\n import io.camunda.zeebe.engine.state.ZeebeDbState;\n@@ -55,7 +54,7 @@ public final class StreamProcessorContext implements ReadonlyStreamProcessorCont\n private StreamProcessorMode streamProcessorMode = StreamProcessorMode.PROCESSING;\n private ProcessingScheduleService processingScheduleService;\n private MutableLastProcessedPositionState lastProcessedPositionState;\n- private Writers writers;\n+\n private LogStreamBatchWriter logStreamBatchWriter;\n private CommandResponseWriter commandResponseWriter;\n \n@@ -85,11 +84,6 @@ public final class StreamProcessorContext implements ReadonlyStreamProcessorCont\n }\n \n @Override\n- public Writers getWriters() {\n- return writers;\n- }\n-\n- @Override\n public MutableZeebeState getZeebeState() {\n return zeebeState;\n }\n@@ -216,10 +210,6 @@ public final class StreamProcessorContext implements ReadonlyStreamProcessorCont\n return streamProcessorMode;\n }\n \n- public void writers(final Writers writers) {\n- this.writers = writers;\n- }\n-\n public void logStreamBatchWriter(final LogStreamBatchWriter batchWriter) {\n logStreamBatchWriter = batchWriter;\n }\n", "diff --git a/src/main.rs b/src/main.rs\nindex 25d9580..9ba4e38 100644\n--- a/src/main.rs\n+++ b/src/main.rs\n@@ -441,6 +441,9 @@ fn main() {\n let mut delta_tx_fees = vec![];\n let empty_txids = vec![];\n let txids = tx_mined_deltas.get(&delta).unwrap_or(&empty_txids);\n+ if txids.len() == 0 {\n+ continue;\n+ }\n for txid in txids.iter() {\n delta_tx_fees.push(*tx_fees.get(txid).unwrap_or(&0));\n }\n"]
| 2 |
["d2709cab63295109dcd1a49f57da9418110e9044", "37a1b5bbb5270befcee5d9b9621af196c787a61f"]
|
["refactor", "fix"]
|
apply permissions to profile request,fix node test cases run into infinite loop
|
["diff --git a/client/src/components/Profile/AboutCard.tsx b/client/src/components/Profile/AboutCard.tsx\nindex 3bd6e9a..e07ddb6 100644\n--- a/client/src/components/Profile/AboutCard.tsx\n+++ b/client/src/components/Profile/AboutCard.tsx\n@@ -11,6 +11,7 @@ import { InfoCircleOutlined } from '@ant-design/icons';\n \n type Props = {\n data: GeneralInfo;\n+ isEditingModeEnabled: boolean;\n };\n \n class AboutCard extends React.Component<Props> {\ndiff --git a/client/src/components/Profile/ContactsCard.tsx b/client/src/components/Profile/ContactsCard.tsx\nindex 6fe80a3..3a35c9f 100644\n--- a/client/src/components/Profile/ContactsCard.tsx\n+++ b/client/src/components/Profile/ContactsCard.tsx\n@@ -12,8 +12,11 @@ import { ContactsOutlined } from '@ant-design/icons';\n \n type Props = {\n data: Contacts;\n+ isEditingModeEnabled: boolean;\n };\n \n+type Contact = { name: string, value?: string };\n+\n class ContactsCard extends React.Component<Props> {\n render() {\n const { email, telegram, phone, skype, notes } = this.props.data;\n@@ -32,7 +35,7 @@ class ContactsCard extends React.Component<Props> {\n }, {\n name: 'Notes',\n value: notes,\n- }].filter(({ value }: { name: string, value: string | null }) => value);\n+ }].filter(({ value }: Contact) => value);\n \n return (\n <CommonCard\n@@ -42,7 +45,7 @@ class ContactsCard extends React.Component<Props> {\n <List\n itemLayout=\"horizontal\"\n dataSource={contacts}\n- renderItem={({ name, value }: { name: string, value: string }) => (\n+ renderItem={({ name, value }: Contact) => (\n <List.Item>\n <Text strong>{name}:</Text> {value}\n </List.Item>\ndiff --git a/client/src/components/Profile/EducationCard.tsx b/client/src/components/Profile/EducationCard.tsx\nindex 4279c9f..b409c29 100644\n--- a/client/src/components/Profile/EducationCard.tsx\n+++ b/client/src/components/Profile/EducationCard.tsx\n@@ -12,6 +12,7 @@ import { ReadOutlined } from '@ant-design/icons';\n \n type Props = {\n data: GeneralInfo;\n+ isEditingModeEnabled: boolean;\n };\n \n class EducationCard extends React.Component<Props> {\ndiff --git a/client/src/components/Profile/EnglishCard.tsx b/client/src/components/Profile/EnglishCard.tsx\nindex d8f8ab4..2d5efa0 100644\n--- a/client/src/components/Profile/EnglishCard.tsx\n+++ b/client/src/components/Profile/EnglishCard.tsx\n@@ -11,6 +11,7 @@ import { TagOutlined } from '@ant-design/icons';\n \n type Props = {\n data: GeneralInfo;\n+ isEditingModeEnabled: boolean;\n };\n \n class EnglishCard extends React.Component<Props> {\ndiff --git a/client/src/components/Profile/MainCard.tsx b/client/src/components/Profile/MainCard.tsx\nindex cbfb71b..c0d49cc 100644\n--- a/client/src/components/Profile/MainCard.tsx\n+++ b/client/src/components/Profile/MainCard.tsx\n@@ -4,6 +4,8 @@ import { GithubAvatar } from 'components';\n import {\n Card,\n Typography,\n+ Drawer,\n+ Checkbox,\n } from 'antd';\n \n const { Title, Paragraph } = Typography;\n@@ -11,30 +13,70 @@ const { Title, Paragraph } = Typography;\n import {\n GithubFilled,\n EnvironmentFilled,\n+ EditOutlined,\n+ SettingOutlined,\n } from '@ant-design/icons';\n \n type Props = {\n data: GeneralInfo;\n+ isEditingModeEnabled: boolean;\n };\n \n-class MainCard extends React.Component<Props> {\n+type State = {\n+ isSettingsVisible: boolean;\n+}\n+\n+class MainCard extends React.Component<Props, State> {\n+ state = {\n+ isSettingsVisible: false,\n+ }\n+\n+ private showSettings = () => {\n+ this.setState({ isSettingsVisible: true });\n+ }\n+\n+ private hideSettings = () => {\n+ this.setState({ isSettingsVisible: false });\n+ }\n+\n render() {\n const { githubId, name, locationName } = this.props.data;\n+ const { isSettingsVisible } = this.state;\n+\n return (\n- <Card>\n- <GithubAvatar size={96} githubId={githubId} style={{ margin: '0 auto 10px', display: 'block' }} />\n- <Title level={1} style={{ fontSize: 24, textAlign: 'center', margin: 0 }}>{name}</Title>\n- <Paragraph style={{ textAlign: 'center', marginBottom: 20 }}>\n- <a target=\"_blank\" href={`https://github.com/${githubId}`} style={{ marginLeft: '-14px', fontSize: 16 }}>\n- <GithubFilled /> {githubId}\n- </a>\n- </Paragraph>\n- <Paragraph style={{ textAlign: 'center', margin: 0 }}>\n- <span style={{ marginLeft: '-14px' }}>\n- <EnvironmentFilled /> {locationName}\n- </span>\n- </Paragraph>\n- </Card>\n+ <>\n+\n+ <Card\n+ actions={[\n+ <EditOutlined key=\"main-card-actions-edit\"/>,\n+ <SettingOutlined key=\"main-card-actions-settings\" onClick={this.showSettings} />,\n+ ]}\n+ >\n+ <GithubAvatar size={96} githubId={githubId} style={{ margin: '0 auto 10px', display: 'block' }} />\n+ <Title level={1} style={{ fontSize: 24, textAlign: 'center', margin: 0 }}>{name}</Title>\n+ <Paragraph style={{ textAlign: 'center', marginBottom: 20 }}>\n+ <a target=\"_blank\" href={`https://github.com/${githubId}`} style={{ marginLeft: '-14px', fontSize: 16 }}>\n+ <GithubFilled /> {githubId}\n+ </a>\n+ </Paragraph>\n+ <Paragraph style={{ textAlign: 'center', margin: 0 }}>\n+ <span style={{ marginLeft: '-14px' }}>\n+ <EnvironmentFilled /> {locationName}\n+ </span>\n+ </Paragraph>\n+ <Drawer\n+ title=\"Who can see my profile?\"\n+ placement=\"top\"\n+ closable={true}\n+ onClose={this.hideSettings}\n+ visible={isSettingsVisible}\n+ getContainer={false}\n+ style={{ position: 'absolute', display: isSettingsVisible ? 'block' : 'none' }}\n+ >\n+ <Checkbox>Nobody</Checkbox>\n+ </Drawer>\n+ </Card>\n+ </>\n );\n }\n }\ndiff --git a/client/src/components/Profile/MentorStatsCard.tsx b/client/src/components/Profile/MentorStatsCard.tsx\nindex ca54480..1ec3b9c 100644\n--- a/client/src/components/Profile/MentorStatsCard.tsx\n+++ b/client/src/components/Profile/MentorStatsCard.tsx\n@@ -18,6 +18,7 @@ import {\n \n type Props = {\n data: MentorStats[];\n+ isEditingModeEnabled: boolean;\n };\n \n type State = {\n@@ -80,7 +81,7 @@ class MentorStatsCard extends React.Component<Props, State> {\n <Text strong>{courseName}{locationName && ` / ${locationName}`}</Text>\n </p>\n {\n- idx === 0 && (\n+ students ? idx === 0 && (\n <List\n itemLayout=\"horizontal\"\n dataSource={students}\n@@ -116,12 +117,14 @@ class MentorStatsCard extends React.Component<Props, State> {\n </List.Item>\n )}\n />\n- )\n+ ) : <p>Doesn't have students at this course yet</p>\n }\n </div>\n- <Button type=\"dashed\" onClick={this.showMentorStatsModal.bind(null, idx)}>\n- <FullscreenOutlined/>\n- </Button>\n+ {\n+ students && <Button type=\"dashed\" onClick={this.showMentorStatsModal.bind(null, idx)}>\n+ <FullscreenOutlined/>\n+ </Button>\n+ }\n </List.Item>\n )}\n />\ndiff --git a/client/src/components/Profile/MentorStatsModal.tsx b/client/src/components/Profile/MentorStatsModal.tsx\nindex 47b5f2a..0e94cc1 100644\n--- a/client/src/components/Profile/MentorStatsModal.tsx\n+++ b/client/src/components/Profile/MentorStatsModal.tsx\n@@ -38,7 +38,7 @@ class MentorStatsModal extends React.Component<Props> {\n >\n <Row gutter={[16, 16]}>\n {\n- students.map(({ name, githubId, isExpelled, totalScore }) => {\n+ students?.map(({ name, githubId, isExpelled, totalScore }) => {\n const profile = `/profile?githubId=${githubId}`;\n const guithubLink = `https://github.com/${githubId}`;\n const privateRepoLink = `https://github.com/rolling-scopes-school/${githubId}-${courseYearPostfix}`;\ndiff --git a/client/src/components/Profile/PublicFeedbackCard.tsx b/client/src/components/Profile/PublicFeedbackCard.tsx\nindex 2f8a999..6ce1862 100644\n--- a/client/src/components/Profile/PublicFeedbackCard.tsx\n+++ b/client/src/components/Profile/PublicFeedbackCard.tsx\n@@ -22,6 +22,7 @@ import {\n \n type Props = {\n data: PublicFeedback[];\n+ isEditingModeEnabled: boolean;\n };\n \n interface State {\ndiff --git a/client/src/components/Profile/StudentStatsCard.tsx b/client/src/components/Profile/StudentStatsCard.tsx\nindex c811640..b472e49 100644\n--- a/client/src/components/Profile/StudentStatsCard.tsx\n+++ b/client/src/components/Profile/StudentStatsCard.tsx\n@@ -18,6 +18,7 @@ import {\n \n type Props = {\n data: StudentStats[];\n+ isEditingModeEnabled: boolean;\n };\n \n type State = {\ndiff --git a/client/src/pages/profile/index.tsx b/client/src/pages/profile/index.tsx\nindex 68b2a70..b6ffb1a 100644\n--- a/client/src/pages/profile/index.tsx\n+++ b/client/src/pages/profile/index.tsx\n@@ -1,6 +1,7 @@\n import * as React from 'react';\n import {\n Result,\n+ Button,\n } from 'antd';\n import css from 'styled-jsx/css';\n import Masonry from 'react-masonry-css';\n@@ -23,18 +24,25 @@ import CoreJsIviewsCard from 'components/Profile/CoreJsIviewsCard';\n import { CoreJsInterviewData } from 'components/Profile/CoreJsIviewsCard';\n import PreScreeningIviewCard from 'components/Profile/PreScreeningIviewCard';\n \n+import {\n+ EditOutlined,\n+ EyeOutlined,\n+} from '@ant-design/icons';\n+\n type Props = {\n router: NextRouter;\n session: Session;\n };\n \n type State = {\n+ isEditingModeEnabled: boolean;\n profile: ProfileInfo | null;\n isLoading: boolean;\n };\n \n class ProfilePage extends React.Component<Props, State> {\n state: State = {\n+ isEditingModeEnabled: false,\n isLoading: true,\n profile: null,\n };\n@@ -79,6 +87,12 @@ class ProfilePage extends React.Component<Props, State> {\n }\n };\n \n+ private toggleEditViewProfileButton = () => {\n+ const { isEditingModeEnabled } = this.state;\n+\n+ this.setState({ isEditingModeEnabled: !isEditingModeEnabled });\n+ }\n+\n async componentDidMount() {\n await this.fetchData();\n }\n@@ -90,21 +104,29 @@ class ProfilePage extends React.Component<Props, State> {\n }\n \n render() {\n- const { profile } = this.state;\n+ const { profile, isEditingModeEnabled } = this.state;\n \n const cards = [\n- profile?.generalInfo && <MainCard data={profile.generalInfo}/>,\n- profile?.generalInfo?.aboutMyself && <AboutCard data={profile.generalInfo}/>,\n- profile?.generalInfo?.englishLevel && <EnglishCard data={profile.generalInfo}/>,\n- profile?.generalInfo?.educationHistory.length && <EducationCard data={profile.generalInfo}/>,\n- profile?.contacts && <ContactsCard data={profile.contacts}/>,\n- profile?.publicFeedback.length && <PublicFeedbackCard data={profile.publicFeedback}/>,\n- profile?.studentStats.length && <StudentStatsCard data={profile.studentStats}/>,\n- profile?.mentorStats.length && <MentorStatsCard data={profile.mentorStats}/>,\n- profile?.studentStats.length &&\n- this.hadStudentCoreJSInterview(profile.studentStats) &&\n+ profile?.generalInfo &&\n+ <MainCard data={profile.generalInfo} isEditingModeEnabled={isEditingModeEnabled}/>,\n+ profile?.generalInfo?.aboutMyself &&\n+ <AboutCard data={profile.generalInfo} isEditingModeEnabled={isEditingModeEnabled}/>,\n+ profile?.generalInfo?.englishLevel &&\n+ <EnglishCard data={profile.generalInfo} isEditingModeEnabled={isEditingModeEnabled}/>,\n+ profile?.generalInfo?.educationHistory?.length &&\n+ <EducationCard data={profile.generalInfo} isEditingModeEnabled={isEditingModeEnabled}/>,\n+ profile?.contacts &&\n+ <ContactsCard data={profile.contacts} isEditingModeEnabled={isEditingModeEnabled}/>,\n+ profile?.publicFeedback?.length &&\n+ <PublicFeedbackCard data={profile.publicFeedback} isEditingModeEnabled={isEditingModeEnabled}/>,\n+ profile?.studentStats?.length &&\n+ <StudentStatsCard data={profile.studentStats} isEditingModeEnabled={isEditingModeEnabled}/>,\n+ profile?.mentorStats?.length &&\n+ <MentorStatsCard data={profile.mentorStats} isEditingModeEnabled={isEditingModeEnabled}/>,\n+ profile?.studentStats?.length && this.hadStudentCoreJSInterview(profile.studentStats) &&\n <CoreJsIviewsCard data={this.getStudentCoreJSInterviews(profile.studentStats)}/>,\n- profile?.stageInterviewFeedback.length && <PreScreeningIviewCard data={profile.stageInterviewFeedback}/>,\n+ profile?.stageInterviewFeedback.length &&\n+ <PreScreeningIviewCard data={profile.stageInterviewFeedback}/>,\n ].filter(Boolean) as JSX.Element[];\n \n return (\n@@ -114,6 +136,17 @@ class ProfilePage extends React.Component<Props, State> {\n {\n this.state.profile\n ? <div style={{ padding: 10 }}>\n+ <Button\n+ type=\"ghost\"\n+ style={{ position: 'fixed', width: 80, right: 10, zIndex: 1 }}\n+ onClick={this.toggleEditViewProfileButton}\n+ >\n+ {\n+ isEditingModeEnabled ?\n+ <span><EditOutlined/> Edit</span> :\n+ <span><EyeOutlined /> View</span>\n+ }\n+ </Button>\n <Masonry\n breakpointCols={{\n default: 4,\ndiff --git a/common/models/profile.ts b/common/models/profile.ts\nindex 6a06fd1..ce7abc2 100644\n--- a/common/models/profile.ts\n+++ b/common/models/profile.ts\n@@ -3,26 +3,25 @@ import { EnglishLevel } from './';\n export interface GeneralInfo {\n name: string;\n githubId: string;\n- aboutMyself: string;\n+ aboutMyself?: string;\n locationName: string;\n- educationHistory: any;\n- employmentHistory: any;\n- englishLevel: EnglishLevel;\n+ educationHistory?: any;\n+ englishLevel?: EnglishLevel;\n }\n \n export interface Contacts {\n- phone: string;\n- email: string;\n- skype: string;\n- telegram: string;\n- notes: string;\n+ phone?: string;\n+ email?: string;\n+ skype?: string;\n+ telegram?: string;\n+ notes?: string;\n }\n \n export interface MentorStats {\n courseName: string;\n locationName: string;\n courseFullName: string;\n- students: {\n+ students?: {\n githubId: string;\n name: string;\n isExpelled: boolean;\n@@ -102,14 +101,14 @@ export interface StageInterviewDetailedFeedback {\n \n export interface UserInfo {\n generalInfo: GeneralInfo;\n- contacts: Contacts;\n+ contacts?: Contacts;\n };\n \n export interface ProfileInfo {\n generalInfo?: GeneralInfo;\n contacts?: Contacts;\n- mentorStats: MentorStats[];\n- studentStats: StudentStats[];\n- publicFeedback: PublicFeedback[];\n+ mentorStats?: MentorStats[];\n+ studentStats?: StudentStats[];\n+ publicFeedback?: PublicFeedback[];\n stageInterviewFeedback: StageInterviewDetailedFeedback[];\n };\ndiff --git a/server/package.json b/server/package.json\nindex 1bd6de1..bf2d5f0 100755\n--- a/server/package.json\n+++ b/server/package.json\n@@ -4,7 +4,7 @@\n \"private\": true,\n \"scripts\": {\n \"build\": \"tsc\",\n- \"start\": \"nodemon --inspect --watch 'src/**/*' -e ts --exec node -r ts-node/register -r dotenv/config ./index.ts | pino-pretty -i time,hostname,pid,host,method,remoteAddress\",\n+ \"start\": \"nodemon --inspect --watch \\\"src/**/*\\\" -e ts --exec node -r ts-node/register -r dotenv/config ./index.ts | pino-pretty -i time,hostname,pid,host,method,remoteAddress\",\n \"lint\": \"tslint -c tslint.json -p tsconfig.json\",\n \"swagger\": \"swagger-jsdoc -d swaggerDef.js -o ./public/swagger.yml ./src/routes/**/*.ts ./src/routes/**.ts\"\n },\ndiff --git a/server/src/models/profilePermissions.ts b/server/src/models/profilePermissions.ts\nindex 1b2a79a..fd06900 100644\n--- a/server/src/models/profilePermissions.ts\n+++ b/server/src/models/profilePermissions.ts\n@@ -1,20 +1,20 @@\n import { Entity, Column, CreateDateColumn, UpdateDateColumn, PrimaryGeneratedColumn, OneToOne } from 'typeorm';\n import { User } from './user';\n \n-interface PublicVisibilitySettings {\n+export interface PublicVisibilitySettings {\n all: boolean;\n }\n \n-interface VisibilitySettings extends PublicVisibilitySettings {\n+export interface VisibilitySettings extends PublicVisibilitySettings {\n mentor: boolean;\n student: boolean;\n }\n \n-const defaultPublicVisibilitySettings = {\n+export const defaultPublicVisibilitySettings = {\n all: false,\n };\n \n-const defaultVisibilitySettings = {\n+export const defaultVisibilitySettings = {\n mentor: false,\n student: false,\n all: false,\ndiff --git a/server/src/routes/profile/info.ts b/server/src/routes/profile/info.ts\nindex f5d249d..22a8132 100644\n--- a/server/src/routes/profile/info.ts\n+++ b/server/src/routes/profile/info.ts\n@@ -1,4 +1,4 @@\n-import { NOT_FOUND, OK } from 'http-status-codes';\n+import { NOT_FOUND, OK, FORBIDDEN } from 'http-status-codes';\n import Router from 'koa-router';\n import { ILogger } from '../../logger';\n import { setResponse } from '../utils';\n@@ -9,7 +9,7 @@ import { getPublicFeedback } from './public-feedback';\n import { getStageInterviewFeedback } from './stage-interview-feedback';\n import { getStudentStats } from './student-stats';\n import { getUserInfo } from './user-info';\n-import { getPermissions } from './permissions';\n+import { getPermissions, getOwnerPermissions } from './permissions';\n \n /*\n WHO CAN SEE\n@@ -60,13 +60,9 @@ import { getPermissions } from './permissions';\n */\n \n export const getProfileInfo = (_: ILogger) => async (ctx: Router.RouterContext) => {\n- const {\n- // id: userId,\n- githubId: userGithubId,\n- } = ctx.state!.user as IUserSession;\n+ const { githubId: userGithubId } = ctx.state!.user as IUserSession;\n // const { isAdmin, roles } = ctx.state!.user as IUserSession;\n- const { githubId } = ctx.query as { githubId: string | undefined };\n-\n+ const { githubId = userGithubId } = ctx.query as { githubId: string | undefined };\n // console.log('GITHUB =>', githubId);\n // console.log('ADMIN =>', isAdmin);\n // console.log('ROLES =>', roles);\n@@ -75,16 +71,28 @@ export const getProfileInfo = (_: ILogger) => async (ctx: Router.RouterContext) \n return setResponse(ctx, NOT_FOUND);\n }\n \n+ const isProfileOwner = githubId === userGithubId;\n+ console.log('isProfileOwner', isProfileOwner);\n // await getRepository(ProfilePermissions).save({ userId });\n \n- const permissions = await getPermissions(userGithubId, githubId);\n+ const permissions = await getPermissions(userGithubId, githubId, { isProfileOwner });\n \n- console.log(JSON.stringify(permissions, null, 2));\n+ const { isProfileVisible, isPublicFeedbackVisible, isMentorStatsVisible, isStudentStatsVisible } = permissions;\n+\n+ if (!isProfileVisible && !isProfileOwner) {\n+ return setResponse(ctx, FORBIDDEN);\n+ }\n+\n+ if (isProfileOwner) {\n+ const ownerPermissions = await getOwnerPermissions(userGithubId);\n+\n+ console.log('OWN =>', ownerPermissions);\n+ }\n \n const { generalInfo, contacts } = await getUserInfo(githubId, permissions);\n- const publicFeedback = await getPublicFeedback(githubId);\n- const mentorStats = await getMentorStats(githubId);\n- const studentStats = await getStudentStats(githubId);\n+ const publicFeedback = isPublicFeedbackVisible ? await getPublicFeedback(githubId) : undefined;\n+ const mentorStats = isMentorStatsVisible ? await getMentorStats(githubId) : undefined;\n+ const studentStats = isStudentStatsVisible ? await getStudentStats(githubId) : undefined;\n const stageInterviewFeedback = await getStageInterviewFeedback(githubId);\n \n const profileInfo: ProfileInfo = {\n@@ -96,7 +104,8 @@ export const getProfileInfo = (_: ILogger) => async (ctx: Router.RouterContext) \n studentStats,\n };\n \n- // console.log(JSON.stringify(profileInfo, null, 2));\n+ console.log(JSON.stringify(permissions, null, 2));\n+ console.log(JSON.stringify(profileInfo, null, 2));\n \n setResponse(ctx, OK, profileInfo);\n };\ndiff --git a/server/src/routes/profile/mentor-stats.ts b/server/src/routes/profile/mentor-stats.ts\nindex 843a2f7..72e6b30 100644\n--- a/server/src/routes/profile/mentor-stats.ts\n+++ b/server/src/routes/profile/mentor-stats.ts\n@@ -36,11 +36,11 @@ export const getMentorStats = async (githubId: string): Promise<MentorStats[]> =\n studentIsExpelledStatuses,\n studentTotalScores,\n }: any) => {\n- const students = studentGithubIds.map((githubId: string, idx: number) => ({\n+ const students = studentGithubIds[0] ? studentGithubIds.map((githubId: string, idx: number) => ({\n githubId,\n name: getFullName(studentFirstNames[idx], studentLastNames[idx], githubId),\n isExpelled: studentIsExpelledStatuses[idx],\n totalScore: studentTotalScores[idx],\n- }));\n+ })) : undefined;\n return { courseName, locationName, courseFullName, students };\n });\ndiff --git a/server/src/routes/profile/permissions.ts b/server/src/routes/profile/permissions.ts\nindex 61924a8..b40121c 100644\n--- a/server/src/routes/profile/permissions.ts\n+++ b/server/src/routes/profile/permissions.ts\n@@ -1,3 +1,4 @@\n+import { get, mapValues } from 'lodash';\n import { getRepository } from 'typeorm';\n import {\n User,\n@@ -8,6 +9,12 @@ import {\n TaskInterviewResult,\n StageInterview,\n } from '../../models';\n+import {\n+ PublicVisibilitySettings,\n+ VisibilitySettings,\n+ defaultPublicVisibilitySettings,\n+ defaultVisibilitySettings,\n+} from '../../models/profilePermissions';\n \n interface Relations {\n student: string;\n@@ -19,7 +26,43 @@ interface Relations {\n \n type RelationRole = 'student' | 'mentor' | 'all';\n \n-const getAllProfilePermissions = async (githubId: string): Promise<any> => (\n+interface SuperAccessRights {\n+ isProfileOwner: boolean;\n+}\n+\n+interface ConfigurableProfilePermissions {\n+ isProfileVisible: PublicVisibilitySettings;\n+ isAboutVisible: VisibilitySettings;\n+ isEducationVisible: VisibilitySettings;\n+ isEnglishVisible: VisibilitySettings;\n+ isEmailVisible: VisibilitySettings;\n+ isTelegramVisible: VisibilitySettings;\n+ isSkypeVisible: VisibilitySettings;\n+ isPhoneVisible: VisibilitySettings;\n+ isContactsNotesVisible: VisibilitySettings;\n+ isLinkedInVisible: VisibilitySettings;\n+ isPublicFeedbackVisible: VisibilitySettings;\n+ isMentorStatsVisible: VisibilitySettings;\n+ isStudentStatsVisible: VisibilitySettings;\n+}\n+\n+export interface Permissions {\n+ isProfileVisible: boolean;\n+ isAboutVisible: boolean;\n+ isEducationVisible: boolean;\n+ isEnglishVisible: boolean;\n+ isEmailVisible: boolean;\n+ isTelegramVisible: boolean;\n+ isSkypeVisible: boolean;\n+ isPhoneVisible: boolean;\n+ isContactsNotesVisible: boolean;\n+ isLinkedInVisible: boolean;\n+ isPublicFeedbackVisible: boolean;\n+ isMentorStatsVisible: boolean;\n+ isStudentStatsVisible: boolean;\n+}\n+\n+const getConfigurableProfilePermissions = async (githubId: string): Promise<ConfigurableProfilePermissions> => (\n (await getRepository(ProfilePermissions)\n .createQueryBuilder('pp')\n .select('\"pp\".\"isProfileVisible\" AS \"isProfileVisible\"')\n@@ -85,16 +128,67 @@ const getRelationRole = async (userGithubId: string, requestedGithubId: string):\n return 'all';\n };\n \n-const matchPermissions = (permissions: any, role: RelationRole) => {\n- const obj: any = {};\n- Object.keys(permissions).forEach((key) => {\n- obj[key] = permissions[key].all || permissions[key][role];\n- });\n- return obj;\n+const matchPermissions = (\n+ permissions: ConfigurableProfilePermissions,\n+ role: RelationRole,\n+ { isProfileOwner }: SuperAccessRights,\n+): Permissions => {\n+ const p: Permissions = {\n+ isProfileVisible: false,\n+ isAboutVisible: false,\n+ isEducationVisible: false,\n+ isEnglishVisible: false,\n+ isEmailVisible: false,\n+ isTelegramVisible: false,\n+ isSkypeVisible: false,\n+ isPhoneVisible: false,\n+ isContactsNotesVisible: false,\n+ isLinkedInVisible: false,\n+ isPublicFeedbackVisible: false,\n+ isMentorStatsVisible: false,\n+ isStudentStatsVisible: false,\n+ };\n+\n+ // (Object.keys(p) as (keyof Permissions)[]).forEach((key) => {\n+ // p[key] = isProfileOwner || permissions[key].all || permissions[key][role];\n+ // });\n+\n+ // return p;\n+\n+ return mapValues(p, (_, key) => isProfileOwner ||\n+ get(permissions, `${key}.all`) ||\n+ get(permissions, `${key}.${role}`) ||\n+ false,\n+ );\n };\n \n-export const getPermissions = async (userGithubId: string, requestedGithubId: string) => {\n- const permissions = await getAllProfilePermissions(requestedGithubId);\n+export const getPermissions = async (\n+ userGithubId: string,\n+ requestedGithubId: string,\n+ superAccessRights: SuperAccessRights,\n+) => {\n+ const permissions = await getConfigurableProfilePermissions(requestedGithubId);\n const role = await getRelationRole(userGithubId, requestedGithubId);\n- return matchPermissions(permissions, role);\n+ return matchPermissions(permissions, role, superAccessRights);\n+};\n+\n+export const getOwnerPermissions = async (githubId: string) => {\n+ const permissions = await getConfigurableProfilePermissions(githubId);\n+ const p: ConfigurableProfilePermissions = {\n+ isProfileVisible: defaultPublicVisibilitySettings,\n+ isAboutVisible: defaultVisibilitySettings,\n+ isEducationVisible: defaultVisibilitySettings,\n+ isEnglishVisible: defaultVisibilitySettings,\n+ isEmailVisible: defaultVisibilitySettings,\n+ isTelegramVisible: defaultVisibilitySettings,\n+ isSkypeVisible: defaultVisibilitySettings,\n+ isPhoneVisible: defaultVisibilitySettings,\n+ isContactsNotesVisible: defaultVisibilitySettings,\n+ isLinkedInVisible: defaultVisibilitySettings,\n+ isPublicFeedbackVisible: defaultVisibilitySettings,\n+ isMentorStatsVisible: defaultVisibilitySettings,\n+ isStudentStatsVisible: defaultVisibilitySettings,\n+ };\n+\n+ return mapValues(p, (value, key) => get(permissions, key, value));\n };\ndiff --git a/server/src/routes/profile/user-info.ts b/server/src/routes/profile/user-info.ts\nindex 5b871e0..1998ed0 100644\n--- a/server/src/routes/profile/user-info.ts\n+++ b/server/src/routes/profile/user-info.ts\n@@ -2,23 +2,53 @@ import { getRepository } from 'typeorm';\n import { UserInfo } from '../../../../common/models/profile';\n import { getFullName } from '../../lib/utils';\n import { User } from '../../models';\n+import { Permissions } from './permissions';\n \n-export const getUserInfo = async (githubId: string, permissions: any): Promise<UserInfo> => {\n- const { isAboutVisible } = permissions;\n+export const getUserInfo = async (githubId: string, permissions: Permissions): Promise<UserInfo> => {\n+ const {\n+ isAboutVisible,\n+ isEducationVisible,\n+ isEnglishVisible,\n+ isPhoneVisible,\n+ isEmailVisible,\n+ isTelegramVisible,\n+ isSkypeVisible,\n+ isContactsNotesVisible,\n+ } = permissions;\n \n const query = await getRepository(User)\n .createQueryBuilder('user')\n .select('\"user\".\"firstName\" AS \"firstName\", \"user\".\"lastName\" AS \"lastName\"')\n .addSelect('\"user\".\"githubId\" AS \"githubId\"')\n- .addSelect('\"user\".\"locationName\" AS \"locationName\"')\n- .addSelect('\"user\".\"educationHistory\" AS \"educationHistory\"')\n- .addSelect('\"user\".\"employmentHistory\" AS \"employmentHistory\"')\n- .addSelect('\"user\".\"englishLevel\" AS \"englishLevel\"')\n- .addSelect('\"user\".\"contactsPhone\" AS \"contactsPhone\"')\n- .addSelect('\"user\".\"contactsEmail\" AS \"contactsEmail\"')\n- .addSelect('\"user\".\"contactsTelegram\" AS \"contactsTelegram\"')\n- .addSelect('\"user\".\"contactsSkype\" AS \"contactsSkype\"')\n- .addSelect('\"user\".\"contactsNotes\" AS \"contactsNotes\"');\n+ .addSelect('\"user\".\"locationName\" AS \"locationName\"');\n+\n+ if (isEducationVisible) {\n+ query.addSelect('\"user\".\"educationHistory\" AS \"educationHistory\"');\n+ }\n+\n+ if (isEnglishVisible) {\n+ query.addSelect('\"user\".\"englishLevel\" AS \"englishLevel\"');\n+ }\n+\n+ if (isPhoneVisible) {\n+ query.addSelect('\"user\".\"contactsPhone\" AS \"contactsPhone\"');\n+ }\n+\n+ if (isEmailVisible) {\n+ query.addSelect('\"user\".\"contactsEmail\" AS \"contactsEmail\"');\n+ }\n+\n+ if (isTelegramVisible) {\n+ query.addSelect('\"user\".\"contactsTelegram\" AS \"contactsTelegram\"');\n+ }\n+\n+ if (isSkypeVisible) {\n+ query.addSelect('\"user\".\"contactsSkype\" AS \"contactsSkype\"');\n+ }\n+\n+ if (isContactsNotesVisible) {\n+ query.addSelect('\"user\".\"contactsNotes\" AS \"contactsNotes\"');\n+ }\n \n if (isAboutVisible) {\n query.addSelect('\"user\".\"aboutMyself\" AS \"aboutMyself\"');\n@@ -33,7 +63,6 @@ export const getUserInfo = async (githubId: string, permissions: any): Promise<U\n lastName,\n locationName,\n educationHistory,\n- employmentHistory,\n englishLevel,\n contactsPhone,\n contactsEmail,\n@@ -49,16 +78,15 @@ export const getUserInfo = async (githubId: string, permissions: any): Promise<U\n aboutMyself,\n locationName,\n educationHistory,\n- employmentHistory,\n englishLevel,\n name: getFullName(firstName, lastName, githubId),\n },\n- contacts: {\n+ contacts: contactsPhone || contactsEmail || contactsSkype || contactsTelegram || contactsNotes ? {\n phone: contactsPhone,\n email: contactsEmail,\n skype: contactsSkype,\n telegram: contactsTelegram,\n notes: contactsNotes,\n- },\n+ } : undefined,\n };\n };\n", "diff --git a/packages/designer/tests/document/node/node.test.ts b/packages/designer/tests/document/node/node.test.ts\nindex dd20bd3..113360d 100644\n--- a/packages/designer/tests/document/node/node.test.ts\n+++ b/packages/designer/tests/document/node/node.test.ts\n@@ -26,7 +26,7 @@ import rootHeaderMetadata from '../../fixtures/component-metadata/root-header';\n import rootContentMetadata from '../../fixtures/component-metadata/root-content';\n import rootFooterMetadata from '../../fixtures/component-metadata/root-footer';\n \n-describe.skip('Node \u65b9\u6cd5\u6d4b\u8bd5', () => {\n+describe('Node \u65b9\u6cd5\u6d4b\u8bd5', () => {\n let editor: Editor;\n let designer: Designer;\n let project: Project;\n@@ -474,15 +474,16 @@ describe.skip('Node \u65b9\u6cd5\u6d4b\u8bd5', () => {\n it('didDropIn / didDropOut', () => {\n const form = doc.getNode('node_k1ow3cbo');\n designer.createComponentMeta(divMetadata);\n+ designer.createComponentMeta(formMetadata);\n const callbacks = form.componentMeta.getMetadata().configure.advanced?.callbacks;\n const fn1 = callbacks.onNodeAdd = jest.fn();\n const fn2 = callbacks.onNodeRemove = jest.fn();\n const textField = doc.getNode('node_k1ow3cc9');\n form.didDropIn(textField);\n- expect(fn1).toHaveBeenCalledWith(textField, form);\n+ expect(fn1).toHaveBeenCalledWith(textField.internalToShellNode(), form.internalToShellNode());\n \n form.didDropOut(textField);\n- expect(fn2).toHaveBeenCalledWith(textField, form);\n+ expect(fn2).toHaveBeenCalledWith(textField.internalToShellNode(), form.internalToShellNode());\n });\n \n it('hover', () => {\n"]
| 2 |
["1f15f71e415ba49b21684c7a3a51c8e3faaa7cf3", "d2c3f0ba6f85b659b76636a91ea9ab2b5a95a720"]
|
["feat", "test"]
|
new ShowDebug parameter
calculate each segment timing
new parameter to show/hide segment debug information
set-poshprompt updated with the new showDebug parameter
Force disabled segment to be visible for debug purpose,ensure "dist" dirs exist
|
["diff --git a/engine.go b/engine.go\nindex 6cc1ff3..4617ceb 100644\n--- a/engine.go\n+++ b/engine.go\n@@ -67,6 +67,9 @@ func (e *engine) renderText(text string) {\n \tprefix := e.activeSegment.getValue(Prefix, \" \")\n \tpostfix := e.activeSegment.getValue(Postfix, \" \")\n \te.renderer.write(e.activeSegment.Background, e.activeSegment.Foreground, fmt.Sprintf(\"%s%s%s\", prefix, text, postfix))\n+\tif *e.env.getArgs().Debug {\n+\t\te.renderer.write(e.activeSegment.Background, e.activeSegment.Foreground, fmt.Sprintf(\"(%s:%s)\", e.activeSegment.Type, e.activeSegment.timing))\n+\t}\n }\n \n func (e *engine) renderSegmentText(text string) {\n@@ -107,13 +110,11 @@ func (e *engine) setStringValues(segments []*Segment) {\n \twg.Add(len(segments))\n \tdefer wg.Wait()\n \tcwd := e.env.getcwd()\n+\tdebug := *e.env.getArgs().Debug\n \tfor _, segment := range segments {\n \t\tgo func(s *Segment) {\n \t\t\tdefer wg.Done()\n-\t\t\terr := s.mapSegmentWithWriter(e.env)\n-\t\t\tif err == nil && !s.hasValue(IgnoreFolders, cwd) && s.enabled() {\n-\t\t\t\ts.stringValue = s.string()\n-\t\t\t}\n+\t\t\ts.setStringValue(e.env, cwd, debug)\n \t\t}(segment)\n \t}\n }\ndiff --git a/main.go b/main.go\nindex 56ae8a5..d67a640 100644\n--- a/main.go\n+++ b/main.go\n@@ -14,6 +14,7 @@ type args struct {\n \tConfig *string\n \tShell *string\n \tPWD *string\n+\tDebug *bool\n }\n \n func main() {\n@@ -42,6 +43,10 @@ func main() {\n \t\t\t\"pwd\",\n \t\t\t\"\",\n \t\t\t\"the path you are working in\"),\n+\t\tDebug: flag.Bool(\n+\t\t\t\"debug\",\n+\t\t\tfalse,\n+\t\t\t\"Print debug information\"),\n \t}\n \tflag.Parse()\n \tenv := &environment{\ndiff --git a/packages/powershell/oh-my-posh/oh-my-posh.psm1 b/packages/powershell/oh-my-posh/oh-my-posh.psm1\nindex 9234fc6..1450eb3 100644\n--- a/packages/powershell/oh-my-posh/oh-my-posh.psm1\n+++ b/packages/powershell/oh-my-posh/oh-my-posh.psm1\n@@ -5,6 +5,7 @@\n \n $global:PoshSettings = New-Object -TypeName PSObject -Property @{\n Theme = \"$PSScriptRoot\\themes\\jandedobbeleer.json\";\n+ ShowDebug = $false\n }\n \n function Get-PoshCommand {\n@@ -36,9 +37,14 @@ function Set-PoshPrompt {\n param(\n [Parameter(Mandatory = $false)]\n [string]\n- $Theme\n+ $Theme,\n+ [Parameter(Mandatory = $false)]\n+ [bool]\n+ $ShowDebug = $false\n )\n \n+ $global:PoshSettings.ShowDebug = $ShowDebug\n+\n if (Test-Path \"$PSScriptRoot/themes/$Theme.json\") {\n $global:PoshSettings.Theme = \"$PSScriptRoot/themes/$Theme.json\"\n }\n@@ -68,8 +74,9 @@ function Set-PoshPrompt {\n $startInfo = New-Object System.Diagnostics.ProcessStartInfo\n $startInfo.FileName = Get-PoshCommand\n $config = $global:PoshSettings.Theme\n+ $showDebug = $global:PoshSettings.ShowDebug\n $cleanPWD = $PWD.ProviderPath.TrimEnd(\"\\\")\n- $startInfo.Arguments = \"-config=\"\"$config\"\" -error=$errorCode -pwd=\"\"$cleanPWD\"\"\"\n+ $startInfo.Arguments = \"-debug=\"\"$showDebug\"\" -config=\"\"$config\"\" -error=$errorCode -pwd=\"\"$cleanPWD\"\"\"\n $startInfo.Environment[\"TERM\"] = \"xterm-256color\"\n $startInfo.CreateNoWindow = $true\n $startInfo.StandardOutputEncoding = [System.Text.Encoding]::UTF8\ndiff --git a/segment.go b/segment.go\nindex 27dd416..4015dac 100644\n--- a/segment.go\n+++ b/segment.go\n@@ -1,6 +1,9 @@\n package main\n \n-import \"errors\"\n+import (\n+\t\"errors\"\n+\t\"time\"\n+)\n \n // Segment represent a single segment and it's configuration\n type Segment struct {\n@@ -17,6 +20,7 @@ type Segment struct {\n \twriter SegmentWriter\n \tstringValue string\n \tactive bool\n+\ttiming time.Duration\n }\n \n // SegmentWriter is the interface used to define what and if to write to the prompt\n@@ -149,3 +153,26 @@ func (segment *Segment) mapSegmentWithWriter(env environmentInfo) error {\n \t}\n \treturn errors.New(\"unable to map writer\")\n }\n+\n+func (segment *Segment) setStringValue(env environmentInfo, cwd string, debug bool) {\n+\terr := segment.mapSegmentWithWriter(env)\n+\tif err != nil || segment.hasValue(IgnoreFolders, cwd) {\n+\t\treturn\n+\t}\n+\t// add timing only in debug\n+\tif debug {\n+\t\tstart := time.Now()\n+\t\tdefer (func() {\n+\t\t\t// force segment rendering to display the time it took\n+\t\t\t// to check if the segment is enabled or not\n+\t\t\t// depending on the segement, calling enabled()\n+\t\t\t// can be time consuming\n+\t\t\tsegment.active = true\n+\t\t\telapsed := time.Since(start)\n+\t\t\tsegment.timing = elapsed\n+\t\t})()\n+\t}\n+\tif segment.enabled() {\n+\t\tsegment.stringValue = segment.string()\n+\t}\n+}\n", "diff --git a/scripts/prepare.js b/scripts/prepare.js\nindex 9eb8cb8..f285825 100644\n--- a/scripts/prepare.js\n+++ b/scripts/prepare.js\n@@ -68,6 +68,9 @@ async function prepare() {\n names.push(json.name)\n }\n \n+ // Ensure all \"dist\" directories exist.\n+ dirs.forEach(dir => fs.ensureDirSync(join(dir, distId)))\n+\n log(``)\n for (let i = 0; i < names.length; i++) {\n const dir = dirs[i]\n"]
| 2 |
["bea32587586ca08f390c901a95e9b9c25263f4df", "ca060bf255a55b99000ddf0c67f7422f28b735a6"]
|
["feat", "build"]
|
fix sonar integration,Improved Config Loading #423
|
["diff --git a/.ci/scripts/distribution/analyse-java.sh b/.ci/scripts/distribution/analyse-java.sh\nindex a0122f7..0e965df 100755\n--- a/.ci/scripts/distribution/analyse-java.sh\n+++ b/.ci/scripts/distribution/analyse-java.sh\n@@ -23,12 +23,12 @@ else\n fi\n \n if [ \"${GIT_BRANCH}\" == \"master\" ] || [ \"${GIT_BRANCH}\" == \"develop\" ]; then\n- TARGET_BRANCH=\"master\"\n+ TARGET_BRANCH=\"${GIT_BRANCH}\"\n else\n TARGET_BRANCH=\"develop\"\n+ PROPERTIES+=(\"-Dsonar.branch.target=${TARGET_BRANCH}\")\n fi\n \n- PROPERTIES+=(\"-Dsonar.branch.target=${TARGET_BRANCH}\")\n git fetch --no-tags \"${GIT_URL}\" \"+refs/heads/${TARGET_BRANCH}:refs/remotes/origin/${TARGET_BRANCH}\"\n fi\n \ndiff --git a/parent/pom.xml b/parent/pom.xml\nindex f4c3160..d34b41f 100644\n--- a/parent/pom.xml\n+++ b/parent/pom.xml\n@@ -1570,7 +1570,7 @@\n <!-- sonarscanner integration -->\n <!-- sonar.login token must be passed at runtime to avoid sharing token -->\n <sonar.host.url>https://sonarcloud.io</sonar.host.url>\n- <sonar.organization>zeebe-io</sonar.organization>\n+ <sonar.organization>camunda-cloud</sonar.organization>\n <sonar.login>${env.SONARCLOUD_TOKEN}</sonar.login>\n <sonar.links.issue>${project.scm.url}/issues</sonar.links.issue>\n <sonar.cpd.exclusions>\n", "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 76dd749..2087803 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)\n ## [Unreleased]\n * Fix the tab '(Sync)' suffix in named tabs (https://github.com/zellij-org/zellij/pull/410)\n * Improve performance when multiple panes are open (https://github.com/zellij-org/zellij/pull/318)\n+* Improve error reporting and tests of configuration (https://github.com/zellij-org/zellij/pull/423)\n \n ## [0.6.0] - 2021-04-29\n * Doesn't quit anymore on single `q` press while in tab mode (https://github.com/zellij-org/zellij/pull/342)\n"]
| 2 |
["6cbbd98dfe6c768dbe49f8d6d2448856a9a86089", "099861ff5b0f83773ca0af4c70e6e39be3b0336c"]
|
["build", "docs"]
|
add donation section to footer,retry uploading pdb files on appveyor (#21561)
|
["diff --git a/client/src/components/Feedback.tsx b/client/src/components/Feedback.tsx\nindex 117b21d..0d7e7a9 100644\n--- a/client/src/components/Feedback.tsx\n+++ b/client/src/components/Feedback.tsx\n@@ -16,12 +16,7 @@ const publicRoutes = [\n name: `\ud83d\udcdd Feedback on RS School`,\n link: `https://docs.google.com/forms/d/1F4NeS0oBq-CY805aqiPVp6CIrl4_nIYJ7Z_vUcMOFrQ/viewform`,\n newTab: true,\n- },\n- {\n- name: `\ud83d\udcb0 Make a donation`,\n- link: `https://www.patreon.com/therollingscopes`,\n- newTab: true,\n- },\n+ }\n ];\n \n type LinkInfo = { name: string; link: string; newTab: boolean };\ndiff --git a/client/src/components/FooterLayout.tsx b/client/src/components/FooterLayout.tsx\nindex 79c0f39..56661b4 100644\n--- a/client/src/components/FooterLayout.tsx\n+++ b/client/src/components/FooterLayout.tsx\n@@ -1,5 +1,5 @@\n import * as React from 'react';\n-import { Col, Layout, Row, Divider } from 'antd';\n+import { Col, Layout, Row, Divider, Button } from 'antd';\n import { Feedback } from './Feedback';\n import { Help } from './Help';\n import { SocialNetworks } from './SocialNetworks';\n@@ -23,9 +23,17 @@ class FooterLayout extends React.Component<any, any> {\n </Col>\n </Row>\n <Divider />\n- <div className=\"text-center\">\n- <small>© The Rolling Scopes 2019</small>\n- </div>\n+ <h5> Thank you for your support! \ud83c\udf89</h5>\n+ <p>\n+ <object type=\"image/svg+xml\"\n+ data=\"https://opencollective.com/rsschool/backers.svg?avatarHeight=28&button=false\"></object>\n+ </p>\n+ <p>\n+ <Button size=\"small\" href=\"https://opencollective.com/rsschool#section-contribute\" target=\"_blank\" ghost>\n+ \u2764\ufe0f Make a donation\n+ </Button>\n+ </p>\n+ <p className=\"text-center\"><small>© The Rolling Scopes 2019</small></p>\n </Footer>\n </div>\n );\ndiff --git a/client/src/styles/main.scss b/client/src/styles/main.scss\nindex cd61fcd..6e37ea6 100644\n--- a/client/src/styles/main.scss\n+++ b/client/src/styles/main.scss\n@@ -46,4 +46,7 @@ body,\n padding-right: 0;\n font-size: .7rem;\n }\n+ .ant-btn {\n+ font-size: .7rem;\n+ }\n }\n", "diff --git a/appveyor.yml b/appveyor.yml\nindex 9aca21e..8b54543 100644\n--- a/appveyor.yml\n+++ b/appveyor.yml\n@@ -146,12 +146,12 @@ build_script:\n - ps: >-\n if ($env:GN_CONFIG -eq 'release') {\n python electron\\script\\zip-symbols.py\n- appveyor PushArtifact out/Default/symbols.zip\n+ appveyor-retry appveyor PushArtifact out/Default/symbols.zip\n } else {\n # It's useful to have pdb files when debugging testing builds that are\n # built on CI.\n 7z a pdb.zip out\\Default\\*.pdb\n- appveyor PushArtifact pdb.zip\n+ appveyor-retry appveyor PushArtifact pdb.zip\n }\n - python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest\n test_script:\n"]
| 2 |
["7704121d0c0bfce49f01c2b41cbc64a642cbb399", "7152173d26293f4638920b17ce2dfa8ae995193b"]
|
["feat", "ci"]
|
lint source on ci,simplify loadFiles code
|
["diff --git a/.travis.yml b/.travis.yml\nindex d56185e..96510cb 100644\n--- a/.travis.yml\n+++ b/.travis.yml\n@@ -2,5 +2,6 @@ language: node_js\n node_js:\n - 'stable'\n script:\n+ - yarn lint\n - yarn build\n - yarn test\n", "diff --git a/frontend/app/player/web/network/loadFiles.ts b/frontend/app/player/web/network/loadFiles.ts\nindex ec174fc..d164333 100644\n--- a/frontend/app/player/web/network/loadFiles.ts\n+++ b/frontend/app/player/web/network/loadFiles.ts\n@@ -1,43 +1,33 @@\n import APIClient from 'App/api_client';\n \n-const NO_NTH_FILE = \"nnf\"\n-const NO_UNPROCESSED_FILES = \"nuf\"\n+const NO_FILE_OK = \"No-file-but-this-is-ok\"\n+const NO_BACKUP_FILE = \"No-efs-file\"\n \n export const loadFiles = (\n urls: string[],\n onData: (data: Uint8Array) => void,\n ): Promise<void> => {\n- const firstFileURL = urls[0]\n- urls = urls.slice(1)\n- if (!firstFileURL) {\n+ if (!urls.length) {\n return Promise.reject(\"No urls provided\")\n }\n- return window.fetch(firstFileURL)\n- .then(r => {\n- return processAPIStreamResponse(r, true)\n- })\n- .then(onData)\n- .then(() =>\n- urls.reduce((p, url) =>\n- p.then(() =>\n- window.fetch(url)\n- .then(r => {\n- return processAPIStreamResponse(r, false)\n- })\n- .then(onData)\n- ),\n- Promise.resolve(),\n- )\n+ return urls.reduce((p, url, index) =>\n+ p.then(() =>\n+ window.fetch(url)\n+ .then(r => {\n+ return processAPIStreamResponse(r, index===0)\n+ })\n+ .then(onData)\n+ ),\n+ Promise.resolve(),\n )\n .catch(e => {\n- if (e === NO_NTH_FILE) {\n+ if (e === NO_FILE_OK) {\n return\n }\n throw e\n })\n }\n \n-\n export async function requestEFSDom(sessionId: string) {\n return await requestEFSMobFile(sessionId + \"/dom.mob\")\n }\n@@ -50,21 +40,18 @@ async function requestEFSMobFile(filename: string) {\n const api = new APIClient()\n const res = await api.fetch('/unprocessed/' + filename)\n if (res.status >= 400) {\n- throw NO_UNPROCESSED_FILES\n+ throw NO_BACKUP_FILE\n }\n return await processAPIStreamResponse(res, false)\n }\n \n-const processAPIStreamResponse = (response: Response, isFirstFile: boolean) => {\n+const processAPIStreamResponse = (response: Response, canBeMissed: boolean) => {\n return new Promise<ArrayBuffer>((res, rej) => {\n- if (response.status === 404 && !isFirstFile) {\n- return rej(NO_NTH_FILE)\n+ if (response.status === 404 && canBeMissed) {\n+ return rej(NO_FILE_OK)\n }\n if (response.status >= 400) {\n- return rej(\n- isFirstFile ? `no start file. status code ${ response.status }`\n- : `Bad endfile status code ${response.status}`\n- )\n+ return rej(`Bad file status code ${response.status}. Url: ${response.url}`)\n }\n res(response.arrayBuffer())\n }).then(buffer => new Uint8Array(buffer))\n"]
| 2 |
["2ac99c0a66a1adc18ee4ef660608f814823dd198", "983fef55ef08ca2ca25349bb2d5bdff10ecf89f4"]
|
["ci", "refactor"]
|
#972 External links open in the same tab,add automation for rebasing `*.x.x` branches
|
["diff --git a/kofta/src/app/components/Footer.tsx b/kofta/src/app/components/Footer.tsx\nindex c55fae9..940f7ac 100644\n--- a/kofta/src/app/components/Footer.tsx\n+++ b/kofta/src/app/components/Footer.tsx\n@@ -13,14 +13,14 @@ export const Footer: React.FC<FooterProps> = ({ isLogin }) => {\n return (\n <div className={`justify-between flex text-center`}>\n {isLogin ? (\n- <RegularAnchor href=\"https://www.youtube.com/watch?v=hy-EhJ_tTQo\">\n+ <RegularAnchor href=\"https://www.youtube.com/watch?v=hy-EhJ_tTQo\" target=\"_blank\">\n {t(\"footer.link_1\")}\n </RegularAnchor>\n ) : null}\n- <RegularAnchor href=\"https://discord.gg/wCbKBZF9cV\">\n+ <RegularAnchor href=\"https://discord.gg/wCbKBZF9cV\" target=\"_blank\">\n {t(\"footer.link_2\")}\n </RegularAnchor>\n- <RegularAnchor href=\"https://github.com/benawad/dogehouse/issues\">\n+ <RegularAnchor href=\"https://github.com/benawad/dogehouse/issues\" target=\"_blank\">\n {t(\"footer.link_3\")}\n </RegularAnchor>\n {/* cramps footer on mobile @todo think about how to incorporate this without cramping footer and making the footer really tall */}\ndiff --git a/kofta/src/app/pages/Login.tsx b/kofta/src/app/pages/Login.tsx\nindex 3854b5d..1f06220 100644\n--- a/kofta/src/app/pages/Login.tsx\n+++ b/kofta/src/app/pages/Login.tsx\n@@ -46,6 +46,7 @@ export const Login: React.FC<LoginProps> = () => {\n <a\n href=\"https://github.com/benawad/dogehouse\"\n className={`p-0 text-blue-400`}\n+ target=\"_blank\"\n >\n {t(\"pages.login.featureText_4\")}\n </a>\n", "diff --git a/.github/workflows/ibis-rebase-nightly.yml b/.github/workflows/ibis-rebase-nightly.yml\nnew file mode 100644\nindex 0000000..3d2f064\n--- /dev/null\n+++ b/.github/workflows/ibis-rebase-nightly.yml\n@@ -0,0 +1,82 @@\n+name: Update Dependencies\n+on:\n+ schedule:\n+ # run every 24 hours at 1 AM\n+ - cron: \"1 */24 * * *\"\n+ workflow_dispatch:\n+\n+jobs:\n+ generate_branches:\n+ runs-on: ubuntu-latest\n+ outputs:\n+ matrix: ${{ steps.set-matrix.outputs.matrix }}\n+ steps:\n+ - name: output branches list\n+ id: set-matrix\n+ run: |\n+ set -euo pipefail\n+\n+ branches=$(git ls-remote --heads https://github.com/ibis-project/ibis.git \\\n+ | sed -e 's#\\t# #g' -e 's#refs/heads/##g' \\\n+ | cut -d ' ' -f2 \\\n+ | grep -P '\\d+\\.x\\.x' \\\n+ | xargs -I {} printf '\"%s\"' \\\n+ | jq -s '{branch: .}')\n+\n+ echo \"::set-output name=matrix::$branches\"\n+\n+ niv_update:\n+ runs-on: ubuntu-latest\n+ needs:\n+ - generate_branches\n+ strategy:\n+ matrix: ${{ fromJSON(needs.generate_branches.outputs.matrix) }}\n+ steps:\n+ - uses: actions/checkout@v3\n+\n+ - uses: tibdex/github-app-token@v1\n+ id: generate_pr_token\n+ with:\n+ app_id: ${{ secrets.SQUAWK_BOT_APP_ID }}\n+ private_key: ${{ secrets.SQUAWK_BOT_APP_PRIVATE_KEY }}\n+\n+ - uses: tibdex/github-app-token@v1\n+ id: generate_pr_approval_token\n+ with:\n+ app_id: ${{ secrets.PR_APPROVAL_BOT_APP_ID }}\n+ private_key: ${{ secrets.PR_APPROVAL_BOT_APP_PRIVATE_KEY }}\n+\n+ - uses: cpcloud/[email protected]\n+ id: compare_commits\n+ with:\n+ token: ${{ steps.generate_pr_token.outputs.token }}\n+ owner: ibis-project\n+ repo: ibis\n+ basehead: ${{ github.sha }}...${{ steps.get_current_commit.outputs.rev }}\n+ include-merge-commits: false\n+\n+ - uses: peter-evans/create-pull-request@v4\n+ id: create_pr\n+ with:\n+ token: ${{ steps.generate_pr_token.outputs.token }}\n+ commit-message: \"chore(${{ matrix.branch }}): rebase onto upstream\"\n+ branch: \"create-pull-request/rebase-${{ matrix.branch }}\"\n+ base: ${{ matrix.branch }}\n+ delete-branch: true\n+ author: \"ibis-squawk-bot[bot] <ibis-squawk-bot[bot]@users.noreply.github.com>\"\n+ title: \"chore(${{ matrix.branch }}): rebase onto upstream\"\n+ body: ${{ steps.compare_commits.outputs.differences }}\n+ labels: dependencies\n+\n+ - uses: juliangruber/[email protected]\n+ if: ${{ fromJSON(steps.create_pr.outputs.pull-request-number) != null }}\n+ with:\n+ github-token: ${{ steps.generate_pr_approval_token.outputs.token }}\n+ number: ${{ steps.create_pr.outputs.pull-request-number }}\n+\n+ - uses: peter-evans/enable-pull-request-automerge@v2\n+ if: ${{ fromJSON(steps.create_pr.outputs.pull-request-number) != null }}\n+ with:\n+ token: ${{ steps.generate_pr_token.outputs.token }}\n+ pull-request-number: ${{ steps.create_pr.outputs.pull-request-number }}\n+ merge-method: rebase\n"]
| 2 |
["07452180fee89e98f05e1aeca68f9923d4c7ab63", "e82254c4ca73fe55834f005f08bc2a060496f815"]
|
["fix", "ci"]
|
e2e,fix `memtable` docstrings
|
["diff --git a/.github/workflows/kibbeh-e2e_tests.yaml b/.github/workflows/kibbeh-e2e_tests.yaml\nindex 52bf3ed..74fe785 100644\n--- a/.github/workflows/kibbeh-e2e_tests.yaml\n+++ b/.github/workflows/kibbeh-e2e_tests.yaml\n@@ -4,7 +4,7 @@ on:\n branches:\n - staging\n paths:\n- - '.github/workflows/end-to-end-tests.yaml'\n+ - '.github/workflows/kibbeh-e2e_tests.yaml'\n - 'kousa/lib/**'\n - 'kibbeh/src/**'\n pull_request:\n", "diff --git a/ibis/expr/api.py b/ibis/expr/api.py\nindex 93fabaa..66a2ea9 100644\n--- a/ibis/expr/api.py\n+++ b/ibis/expr/api.py\n@@ -403,15 +403,21 @@ def memtable(\n >>> import ibis\n >>> t = ibis.memtable([{\"a\": 1}, {\"a\": 2}])\n >>> t\n+ PandasInMemoryTable\n+ data:\n+ DataFrameProxy:\n+ a\n+ 0 1\n+ 1 2\n \n >>> t = ibis.memtable([{\"a\": 1, \"b\": \"foo\"}, {\"a\": 2, \"b\": \"baz\"}])\n >>> t\n PandasInMemoryTable\n data:\n- ((1, 'foo'), (2, 'baz'))\n- schema:\n- a int8\n- b string\n+ DataFrameProxy:\n+ a b\n+ 0 1 foo\n+ 1 2 baz\n \n Create a table literal without column names embedded in the data and pass\n `columns`\n@@ -420,10 +426,22 @@ def memtable(\n >>> t\n PandasInMemoryTable\n data:\n- ((1, 'foo'), (2, 'baz'))\n- schema:\n- a int8\n- b string\n+ DataFrameProxy:\n+ a b\n+ 0 1 foo\n+ 1 2 baz\n+\n+ Create a table literal without column names embedded in the data. Ibis\n+ generates column names if none are provided.\n+\n+ >>> t = ibis.memtable([(1, \"foo\"), (2, \"baz\")])\n+ >>> t\n+ PandasInMemoryTable\n+ data:\n+ DataFrameProxy:\n+ col0 col1\n+ 0 1 foo\n+ 1 2 baz\n \"\"\"\n if columns is not None and schema is not None:\n raise NotImplementedError(\n"]
| 2 |
["02f9e79a755a1dd95e661c674d6966837f378442", "72bc0f5172c0a3d17bde29cfc00db4c60d2fee3a"]
|
["ci", "docs"]
|
alerts do not trigger modal lifecycle events
fixes #8616,add style prop to FAB group action items. closes #475
|
["diff --git a/src/components/app/app-root.ts b/src/components/app/app-root.ts\nindex ec7daee..29dc797 100644\n--- a/src/components/app/app-root.ts\n+++ b/src/components/app/app-root.ts\n@@ -15,6 +15,7 @@ export const AppRootToken = new OpaqueToken('USERROOT');\n selector: 'ion-app',\n template:\n '<div #viewport app-viewport></div>' +\n+ '<div #modalPortal overlay-portal></div>' +\n '<div #overlayPortal overlay-portal></div>' +\n '<div #loadingPortal class=\"loading-portal\" overlay-portal></div>' +\n '<div #toastPortal class=\"toast-portal\" overlay-portal></div>' +\n@@ -24,6 +25,8 @@ export class IonicApp extends Ion implements OnInit {\n \n @ViewChild('viewport', {read: ViewContainerRef}) _viewport: ViewContainerRef;\n \n+ @ViewChild('modalPortal', { read: OverlayPortal }) _modalPortal: OverlayPortal;\n+\n @ViewChild('overlayPortal', { read: OverlayPortal }) _overlayPortal: OverlayPortal;\n \n @ViewChild('loadingPortal', { read: OverlayPortal }) _loadingPortal: OverlayPortal;\n@@ -96,6 +99,9 @@ export class IonicApp extends Ion implements OnInit {\n if (portal === AppPortal.TOAST) {\n return this._toastPortal;\n }\n+ if (portal === AppPortal.MODAL) {\n+ return this._modalPortal;\n+ }\n return this._overlayPortal;\n }\n \n@@ -110,6 +116,7 @@ export class IonicApp extends Ion implements OnInit {\n \n export enum AppPortal {\n DEFAULT,\n+ MODAL,\n LOADING,\n TOAST\n };\ndiff --git a/src/components/modal/modal.ts b/src/components/modal/modal.ts\nindex bd4d406..c3e7a62 100644\n--- a/src/components/modal/modal.ts\n+++ b/src/components/modal/modal.ts\n@@ -1,6 +1,7 @@\n import { Injectable } from '@angular/core';\n \n import { App } from '../app/app';\n+import { AppPortal } from '../app/app-root';\n import { isPresent } from '../../util/util';\n import { ModalCmp } from './modal-component';\n import { ModalOptions } from './modal-options';\n@@ -40,7 +41,7 @@ export class Modal extends ViewController {\n * @returns {Promise} Returns a promise which is resolved when the transition has completed.\n */\n present(navOptions: NavOptions = {}) {\n- return this._app.present(this, navOptions);\n+ return this._app.present(this, navOptions, AppPortal.MODAL);\n }\n \n /**\n", "diff --git a/src/components/FAB/FABGroup.js b/src/components/FAB/FABGroup.js\nindex 424a178..11bd10f 100644\n--- a/src/components/FAB/FABGroup.js\n+++ b/src/components/FAB/FABGroup.js\n@@ -25,6 +25,7 @@ type Props = {\n * - `label`: optional label text\n * - `accessibilityLabel`: accessibility label for the action, uses label by default if specified\n * - `color`: custom icon color of the action item\n+ * - `style`: pass additional styles for the fab item, for example, `backgroundColor`\n * - `onPress`: callback that is called when `FAB` is pressed (required)\n */\n actions: Array<{\n@@ -32,6 +33,7 @@ type Props = {\n label?: string,\n color?: string,\n accessibilityLabel?: string,\n+ style?: any,\n onPress: () => mixed,\n }>,\n /**\n@@ -44,7 +46,7 @@ type Props = {\n */\n accessibilityLabel?: string,\n /**\n- * Custom icon color for the `FAB`.\n+ * Custom color for the `FAB`.\n */\n color?: string,\n /**\n@@ -252,9 +254,7 @@ class FABGroup extends React.Component<Props, State> {\n <Card\n style={[\n styles.label,\n- {\n- transform: [{ scale: scales[i] }],\n- },\n+ { transform: [{ scale: scales[i] }] },\n ]}\n onPress={() => {\n it.onPress();\n@@ -280,6 +280,7 @@ class FABGroup extends React.Component<Props, State> {\n transform: [{ scale: scales[i] }],\n backgroundColor: theme.colors.surface,\n },\n+ it.style,\n ]}\n onPress={() => {\n it.onPress();\n"]
| 2 |
["e2704a4a25b9e348764e1cc922ca7d6a927550eb", "8b9176b44bb01a1eef497a403b0304bc389c9aee"]
|
["fix", "feat"]
|
update pr condition,fix monorepo.dir prop
Signed-off-by: Carlos Alexandro Becker <[email protected]>
|
["diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml\nindex 697ca8e..23f4475 100644\n--- a/.github/workflows/release-pr.yml\n+++ b/.github/workflows/release-pr.yml\n@@ -3,7 +3,6 @@ name: release\n on:\n issue_comment:\n types: [created]\n- contains: \"/trigger release\"\n \n env:\n # 7 GiB by default on GitHub, setting to 6 GiB\n@@ -11,6 +10,7 @@ env:\n \n jobs:\n release-pr:\n+ if: ${{ github.event.issue.pull_request && github.event.comment.body == '/trigger release' }}\n permissions:\n id-token: write\n runs-on: ubuntu-latest\n", "diff --git a/www/docs/customization/monorepo.md b/www/docs/customization/monorepo.md\nindex 6d0e857..e45490f 100644\n--- a/www/docs/customization/monorepo.md\n+++ b/www/docs/customization/monorepo.md\n@@ -18,7 +18,7 @@ project_name: subproj1\n \n monorepo:\n tag_prefix: subproject1/\n- folder: subproj1\n+ dir: subproj1\n ```\n \n Then, you can release with (from the project's root directory):\n@@ -30,11 +30,11 @@ goreleaser release --rm-dist -f ./subproj1/.goreleaser.yml\n Then, the following is different from a \"regular\" run:\n \n - GoReleaser will then look if current commit has a tag prefixed with `subproject1`, and also the previous tag with the same prefix;\n-- Changelog will include only commits that contain changes to files within the `subproj1` folder;\n+- Changelog will include only commits that contain changes to files within the `subproj1` directory;\n - Release name gets prefixed with `{{ .ProjectName }} ` if empty;\n-- All build's `dir` setting get set to `monorepo.folder` if empty;\n+- All build's `dir` setting get set to `monorepo.dir` if empty;\n - if yours is not, you might want to change that manually;\n-- Extra files on the release, archives, Docker builds, etc are prefixed with `monorepo.folder`;\n+- Extra files on the release, archives, Docker builds, etc are prefixed with `monorepo.dir`;\n - On templates, `{{.PrefixedTag}}` will be `monorepo.prefix/tag` (aka the actual tag name), and `{{.Tag}}` has the prefix stripped;\n \n The rest of the release process should work as usual.\n"]
| 2 |
["f8c7b34bdeedcf1a4628cd50b23920afeaf57cb6", "9ed3c0c4a72af977fc9150512fb6538f20a94b22"]
|
["ci", "docs"]
|
include `token_version` value in jwt payload
use a generic function to populate jwt token to avoid repetition
re #2361
Signed-off-by: Pranav C <[email protected]>,add link to roadmap
|
["diff --git a/packages/nocodb/src/lib/meta/api/sync/importApis.ts b/packages/nocodb/src/lib/meta/api/sync/importApis.ts\nindex 2facc67..1f8d137 100644\n--- a/packages/nocodb/src/lib/meta/api/sync/importApis.ts\n+++ b/packages/nocodb/src/lib/meta/api/sync/importApis.ts\n@@ -7,7 +7,7 @@ import NocoJobs from '../../../jobs/NocoJobs';\n import job, { AirtableSyncConfig } from './helpers/job';\n import SyncSource from '../../../models/SyncSource';\n import Noco from '../../../Noco';\n-import * as jwt from 'jsonwebtoken';\n+import { genJwt } from '../userApi/helpers';\n const AIRTABLE_IMPORT_JOB = 'AIRTABLE_IMPORT_JOB';\n const AIRTABLE_PROGRESS_JOB = 'AIRTABLE_PROGRESS_JOB';\n \n@@ -76,18 +76,7 @@ export default (router: Router, clients: { [id: string]: Socket }) => {\n const syncSource = await SyncSource.get(req.params.syncId);\n \n const user = await syncSource.getUser();\n- const token = jwt.sign(\n- {\n- email: user.email,\n- firstname: user.firstname,\n- lastname: user.lastname,\n- id: user.id,\n- roles: user.roles\n- },\n-\n- Noco.getConfig().auth.jwt.secret,\n- Noco.getConfig().auth.jwt.options\n- );\n+ const token = genJwt(user, Noco.getConfig());\n \n // Treat default baseUrl as siteUrl from req object\n let baseURL = (req as any).ncSiteUrl;\ndiff --git a/packages/nocodb/src/lib/meta/api/userApi/helpers.ts b/packages/nocodb/src/lib/meta/api/userApi/helpers.ts\nnew file mode 100644\nindex 0000000..48f7c11\n--- /dev/null\n+++ b/packages/nocodb/src/lib/meta/api/userApi/helpers.ts\n@@ -0,0 +1,18 @@\n+import * as jwt from 'jsonwebtoken';\n+import User from '../../../models/User';\n+import { NcConfig } from '../../../../interface/config';\n+\n+export function genJwt(user: User, config: NcConfig) {\n+ return jwt.sign(\n+ {\n+ email: user.email,\n+ firstname: user.firstname,\n+ lastname: user.lastname,\n+ id: user.id,\n+ roles: user.roles,\n+ token_version: user.token_version\n+ },\n+ config.auth.jwt.secret,\n+ config.auth.jwt.options\n+ );\n+}\ndiff --git a/packages/nocodb/src/lib/meta/api/userApi/userApis.ts b/packages/nocodb/src/lib/meta/api/userApi/userApis.ts\nindex 2b8384a..7a6fa31 100644\n--- a/packages/nocodb/src/lib/meta/api/userApi/userApis.ts\n+++ b/packages/nocodb/src/lib/meta/api/userApi/userApis.ts\n@@ -10,7 +10,6 @@ import User from '../../../models/User';\n import { Tele } from 'nc-help';\n \n const { v4: uuidv4 } = require('uuid');\n-import * as jwt from 'jsonwebtoken';\n import Audit from '../../../models/Audit';\n import crypto from 'crypto';\n import NcPluginMgrv2 from '../../helpers/NcPluginMgrv2';\n@@ -20,6 +19,7 @@ import extractProjectIdAndAuthenticate from '../../helpers/extractProjectIdAndAu\n import ncMetaAclMw from '../../helpers/ncMetaAclMw';\n import { MetaTable } from '../../../utils/globals';\n import Noco from '../../../Noco';\n+import { genJwt } from './helpers';\n \n export async function signup(req: Request, res: Response<TableType>) {\n const {\n@@ -147,18 +147,7 @@ export async function signup(req: Request, res: Response<TableType>) {\n });\n \n res.json({\n- token: jwt.sign(\n- {\n- email: user.email,\n- firstname: user.firstname,\n- lastname: user.lastname,\n- id: user.id,\n- roles: user.roles,\n- token_version: user.token_version\n- },\n- Noco.getConfig().auth.jwt.secret,\n- Noco.getConfig().auth.jwt.options\n- )\n+ token: genJwt(user, Noco.getConfig())\n } as any);\n }\n \n@@ -205,19 +194,7 @@ async function successfulSignIn({\n });\n \n res.json({\n- token: jwt.sign(\n- {\n- email: user.email,\n- firstname: user.firstname,\n- lastname: user.lastname,\n- id: user.id,\n- roles: user.roles,\n- token_version\n- },\n-\n- Noco.getConfig().auth.jwt.secret,\n- Noco.getConfig().auth.jwt.options\n- )\n+ token: genJwt(user, Noco.getConfig())\n } as any);\n } catch (e) {\n console.log(e);\n@@ -477,17 +454,7 @@ async function refreshToken(req, res): Promise<any> {\n setTokenCookie(res, refreshToken);\n \n res.json({\n- token: jwt.sign(\n- {\n- email: user.email,\n- firstname: user.firstname,\n- lastname: user.lastname,\n- id: user.id,\n- roles: user.roles\n- },\n- Noco.getConfig().auth.jwt.secret,\n- Noco.getConfig().auth.jwt.options\n- )\n+ token: genJwt(user, Noco.getConfig())\n } as any);\n } catch (e) {\n return res.status(400).json({ msg: e.message });\n", "diff --git a/packages/plugin-core/README.md b/packages/plugin-core/README.md\nindex 3c25c9b..c7506d4 100644\n--- a/packages/plugin-core/README.md\n+++ b/packages/plugin-core/README.md\n@@ -187,6 +187,10 @@ When the workspace opens, it will show dialogue to install the recommended exten\n \n See [[FAQ]] to answers for common questions.\n \n+# Roadmap\n+\n+Check out our [public roadmap](https://github.com/orgs/dendronhq/projects/1) to see the features we're working on and to vote for what you want to see next. \n+\n \n # Contributing\n \n"]
| 2 |
["5ac169d840351733849207e082d2a65abf629c92", "94202f01e44c58bee4419044f8a18ac5f1a50dff"]
|
["fix", "docs"]
|
missing transformation for T,add travis file
|
["diff --git a/src/Tuple/Merge.ts b/src/Tuple/Merge.ts\nindex dfa7ce5..5ba44b7 100644\n--- a/src/Tuple/Merge.ts\n+++ b/src/Tuple/Merge.ts\n@@ -30,7 +30,7 @@ type _MergeFlat<O extends object, O1P extends object> = {\n }\n \n type MergeDeep<T extends any[], T1 extends any[]> =\n- TupleOf<Compute<_MergeDeep<T, Omit<ObjectOf<T1>, keyof T>, ObjectOf<T1>>>>\n+ TupleOf<Compute<_MergeDeep<ObjectOf<T>, Omit<ObjectOf<T1>, keyof T>, ObjectOf<T1>>>>\n // same principle as above, but with a little tweak\n // we keep the original `O1` to know if we can merge\n // => if `O` and `O1` have `object` fields of same name\n", "diff --git a/.travis.yml b/.travis.yml\nnew file mode 100644\nindex 0000000..c08cc34\n--- /dev/null\n+++ b/.travis.yml\n@@ -0,0 +1,11 @@\n+sudo: false\n+\n+language: java\n+jdk: oraclejdk8\n+\n+branches:\n+ only:\n+ - master\n+\n+notifications:\n+ email: false\n"]
| 2 |
["c4d9e5023fa0f88ba283b37da27677ceda1cbfbb", "d0814a928601706635287fd3d9d3451d156b821a"]
|
["fix", "ci"]
|
extract lambdas,include `token_version` value in jwt payload
use a generic function to populate jwt token to avoid repetition
re #2361
Signed-off-by: Pranav C <[email protected]>
|
["diff --git a/broker/src/main/java/io/camunda/zeebe/broker/system/partitions/impl/AsyncSnapshotDirector.java b/broker/src/main/java/io/camunda/zeebe/broker/system/partitions/impl/AsyncSnapshotDirector.java\nindex 6ee5797..bcfcc72 100644\n--- a/broker/src/main/java/io/camunda/zeebe/broker/system/partitions/impl/AsyncSnapshotDirector.java\n+++ b/broker/src/main/java/io/camunda/zeebe/broker/system/partitions/impl/AsyncSnapshotDirector.java\n@@ -224,7 +224,6 @@ public final class AsyncSnapshotDirector extends Actor\n private void takeSnapshot() {\n final var transientSnapshotFuture =\n stateController.takeTransientSnapshot(lowerBoundSnapshotPosition);\n-\n transientSnapshotFuture.onComplete(\n (optionalTransientSnapshot, snapshotTakenError) -> {\n if (snapshotTakenError != null) {\n@@ -237,27 +236,31 @@ public final class AsyncSnapshotDirector extends Actor\n takingSnapshot = false;\n return;\n }\n- pendingSnapshot = optionalTransientSnapshot.get();\n- onRecovered();\n-\n- final ActorFuture<Long> lastWrittenPosition =\n- streamProcessor.getLastWrittenPositionAsync();\n- actor.runOnCompletion(\n- lastWrittenPosition,\n- (endPosition, error) -> {\n- if (error == null) {\n- LOG.info(LOG_MSG_WAIT_UNTIL_COMMITTED, endPosition, commitPosition);\n- lastWrittenEventPosition = endPosition;\n- persistingSnapshot = false;\n- persistSnapshotIfLastWrittenPositionCommitted();\n- } else {\n- resetStateOnFailure();\n- LOG.error(ERROR_MSG_ON_RESOLVE_WRITTEN_POS, error);\n- }\n- });\n+ onTransientSnapshotTaken(optionalTransientSnapshot.get());\n });\n }\n \n+ private void onTransientSnapshotTaken(final TransientSnapshot transientSnapshot) {\n+\n+ pendingSnapshot = transientSnapshot;\n+ onRecovered();\n+\n+ final ActorFuture<Long> lastWrittenPosition = streamProcessor.getLastWrittenPositionAsync();\n+ actor.runOnCompletion(lastWrittenPosition, this::onLastWrittenPositionReceived);\n+ }\n+\n+ private void onLastWrittenPositionReceived(final Long endPosition, final Throwable error) {\n+ if (error == null) {\n+ LOG.info(LOG_MSG_WAIT_UNTIL_COMMITTED, endPosition, commitPosition);\n+ lastWrittenEventPosition = endPosition;\n+ persistingSnapshot = false;\n+ persistSnapshotIfLastWrittenPositionCommitted();\n+ } else {\n+ resetStateOnFailure();\n+ LOG.error(ERROR_MSG_ON_RESOLVE_WRITTEN_POS, error);\n+ }\n+ }\n+\n private void onRecovered() {\n if (healthStatus != HealthStatus.HEALTHY) {\n healthStatus = HealthStatus.HEALTHY;\n", "diff --git a/packages/nocodb/src/lib/meta/api/sync/importApis.ts b/packages/nocodb/src/lib/meta/api/sync/importApis.ts\nindex 2facc67..1f8d137 100644\n--- a/packages/nocodb/src/lib/meta/api/sync/importApis.ts\n+++ b/packages/nocodb/src/lib/meta/api/sync/importApis.ts\n@@ -7,7 +7,7 @@ import NocoJobs from '../../../jobs/NocoJobs';\n import job, { AirtableSyncConfig } from './helpers/job';\n import SyncSource from '../../../models/SyncSource';\n import Noco from '../../../Noco';\n-import * as jwt from 'jsonwebtoken';\n+import { genJwt } from '../userApi/helpers';\n const AIRTABLE_IMPORT_JOB = 'AIRTABLE_IMPORT_JOB';\n const AIRTABLE_PROGRESS_JOB = 'AIRTABLE_PROGRESS_JOB';\n \n@@ -76,18 +76,7 @@ export default (router: Router, clients: { [id: string]: Socket }) => {\n const syncSource = await SyncSource.get(req.params.syncId);\n \n const user = await syncSource.getUser();\n- const token = jwt.sign(\n- {\n- email: user.email,\n- firstname: user.firstname,\n- lastname: user.lastname,\n- id: user.id,\n- roles: user.roles\n- },\n-\n- Noco.getConfig().auth.jwt.secret,\n- Noco.getConfig().auth.jwt.options\n- );\n+ const token = genJwt(user, Noco.getConfig());\n \n // Treat default baseUrl as siteUrl from req object\n let baseURL = (req as any).ncSiteUrl;\ndiff --git a/packages/nocodb/src/lib/meta/api/userApi/helpers.ts b/packages/nocodb/src/lib/meta/api/userApi/helpers.ts\nnew file mode 100644\nindex 0000000..48f7c11\n--- /dev/null\n+++ b/packages/nocodb/src/lib/meta/api/userApi/helpers.ts\n@@ -0,0 +1,18 @@\n+import * as jwt from 'jsonwebtoken';\n+import User from '../../../models/User';\n+import { NcConfig } from '../../../../interface/config';\n+\n+export function genJwt(user: User, config: NcConfig) {\n+ return jwt.sign(\n+ {\n+ email: user.email,\n+ firstname: user.firstname,\n+ lastname: user.lastname,\n+ id: user.id,\n+ roles: user.roles,\n+ token_version: user.token_version\n+ },\n+ config.auth.jwt.secret,\n+ config.auth.jwt.options\n+ );\n+}\ndiff --git a/packages/nocodb/src/lib/meta/api/userApi/userApis.ts b/packages/nocodb/src/lib/meta/api/userApi/userApis.ts\nindex 2b8384a..7a6fa31 100644\n--- a/packages/nocodb/src/lib/meta/api/userApi/userApis.ts\n+++ b/packages/nocodb/src/lib/meta/api/userApi/userApis.ts\n@@ -10,7 +10,6 @@ import User from '../../../models/User';\n import { Tele } from 'nc-help';\n \n const { v4: uuidv4 } = require('uuid');\n-import * as jwt from 'jsonwebtoken';\n import Audit from '../../../models/Audit';\n import crypto from 'crypto';\n import NcPluginMgrv2 from '../../helpers/NcPluginMgrv2';\n@@ -20,6 +19,7 @@ import extractProjectIdAndAuthenticate from '../../helpers/extractProjectIdAndAu\n import ncMetaAclMw from '../../helpers/ncMetaAclMw';\n import { MetaTable } from '../../../utils/globals';\n import Noco from '../../../Noco';\n+import { genJwt } from './helpers';\n \n export async function signup(req: Request, res: Response<TableType>) {\n const {\n@@ -147,18 +147,7 @@ export async function signup(req: Request, res: Response<TableType>) {\n });\n \n res.json({\n- token: jwt.sign(\n- {\n- email: user.email,\n- firstname: user.firstname,\n- lastname: user.lastname,\n- id: user.id,\n- roles: user.roles,\n- token_version: user.token_version\n- },\n- Noco.getConfig().auth.jwt.secret,\n- Noco.getConfig().auth.jwt.options\n- )\n+ token: genJwt(user, Noco.getConfig())\n } as any);\n }\n \n@@ -205,19 +194,7 @@ async function successfulSignIn({\n });\n \n res.json({\n- token: jwt.sign(\n- {\n- email: user.email,\n- firstname: user.firstname,\n- lastname: user.lastname,\n- id: user.id,\n- roles: user.roles,\n- token_version\n- },\n-\n- Noco.getConfig().auth.jwt.secret,\n- Noco.getConfig().auth.jwt.options\n- )\n+ token: genJwt(user, Noco.getConfig())\n } as any);\n } catch (e) {\n console.log(e);\n@@ -477,17 +454,7 @@ async function refreshToken(req, res): Promise<any> {\n setTokenCookie(res, refreshToken);\n \n res.json({\n- token: jwt.sign(\n- {\n- email: user.email,\n- firstname: user.firstname,\n- lastname: user.lastname,\n- id: user.id,\n- roles: user.roles\n- },\n- Noco.getConfig().auth.jwt.secret,\n- Noco.getConfig().auth.jwt.options\n- )\n+ token: genJwt(user, Noco.getConfig())\n } as any);\n } catch (e) {\n return res.status(400).json({ msg: e.message });\n"]
| 2 |
["14abf5c31523a551134aebe9e8f3505ef26ed421", "5ac169d840351733849207e082d2a65abf629c92"]
|
["refactor", "fix"]
|
rename step,add LICENSE
|
["diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml\nindex e81d897..5c3ee6b 100644\n--- a/.github/workflows/ci.yml\n+++ b/.github/workflows/ci.yml\n@@ -45,7 +45,7 @@ jobs:\n - name: Install dependencies\n run: pnpm install\n \n- - name: Typecheck\n+ - name: Build (stub)\n run: pnpm build:stub\n \n - name: Typecheck\n", "diff --git a/LICENSE b/LICENSE\nnew file mode 100644\nindex 0000000..005581d\n--- /dev/null\n+++ b/LICENSE\n@@ -0,0 +1,21 @@\n+MIT License\n+\n+Copyright (c) Hassan El Mghari\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in all\n+copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n+SOFTWARE.\n"]
| 2 |
["34875bc0e59b43d9041903101c823d25ec194a21", "096145f0d32a6b351b1db413b04a685952f04fb3"]
|
["ci", "docs"]
|
render-svg,wire up fixed null encoding
|
["diff --git a/package.json b/package.json\nindex 3f8e5fa..cc4e398 100644\n--- a/package.json\n+++ b/package.json\n@@ -42,6 +42,7 @@\n \"rollup\": \"^2.34.2\",\n \"rollup-plugin-copy\": \"^3.3.0\",\n \"rollup-plugin-dts\": \"^2.0.0\",\n+ \"rollup-plugin-terser\": \"^7.0.2\",\n \"rollup-plugin-typescript2\": \"^0.29.0\",\n \"ts-jest\": \"^26.4.4\",\n \"tsup\": \"^3.10.1\",\ndiff --git a/packages/renderer-svg/package.json b/packages/renderer-svg/package.json\nindex fa9c049..6a0654c 100644\n--- a/packages/renderer-svg/package.json\n+++ b/packages/renderer-svg/package.json\n@@ -1,16 +1,27 @@\n {\n- \"name\": \"shiki-renderer-svg\",\n+ \"name\": \"@antfu/shiki-renderer-svg\",\n \"version\": \"0.2.0\",\n \"description\": \"SVG renderer for shiki\",\n \"author\": \"Pine Wu <[email protected]>\",\n \"homepage\": \"https://github.com/octref/shiki/tree/master/packages/renderer-svg\",\n \"license\": \"MIT\",\n- \"main\": \"dist/index.js\",\n- \"types\": \"dist/index.d.ts\",\n \"repository\": {\n \"type\": \"git\",\n \"url\": \"git+https://github.com/shikijs/shiki.git\"\n },\n+ \"main\": \"dist/index.js\",\n+ \"module\": \"dist/index.mjs\",\n+ \"types\": \"dist/index.d.ts\",\n+ \"unpkg\": \"dist/index.iife.min.js\",\n+ \"jsdelivr\": \"dist/index.iife.min.js\",\n+ \"files\": [\n+ \"dist\"\n+ ],\n+ \"scripts\": {\n+ \"prepublishOnly\": \"npm run build\",\n+ \"build\": \"rollup -c\",\n+ \"watch\": \"rollup -c -w\"\n+ },\n \"dependencies\": {\n \"puppeteer\": \"^5.2.1\"\n },\ndiff --git a/packages/renderer-svg/rollup.config.js b/packages/renderer-svg/rollup.config.js\nnew file mode 100644\nindex 0000000..d4e45ce\n--- /dev/null\n+++ b/packages/renderer-svg/rollup.config.js\n@@ -0,0 +1,67 @@\n+import { nodeResolve } from '@rollup/plugin-node-resolve'\n+import commonjs from '@rollup/plugin-commonjs'\n+import dts from 'rollup-plugin-dts'\n+import typescript from 'rollup-plugin-typescript2'\n+import replace from '@rollup/plugin-replace'\n+import { terser } from 'rollup-plugin-terser'\n+\n+const external = ['shiki', 'puppeteer']\n+\n+export default [\n+ {\n+ input: 'src/index.ts',\n+ external,\n+ output: [\n+ {\n+ file: 'dist/index.js',\n+ format: 'cjs'\n+ },\n+ {\n+ file: 'dist/index.mjs',\n+ format: 'esm'\n+ }\n+ ],\n+ plugins: [\n+ replace({\n+ __BROWSER__: JSON.stringify(false)\n+ }),\n+ typescript(),\n+ nodeResolve(),\n+ commonjs()\n+ ]\n+ },\n+ {\n+ input: 'src/index.ts',\n+ output: [\n+ {\n+ file: 'dist/index.iife.js',\n+ format: 'iife',\n+ name: 'ShikiRenderSVG'\n+ },\n+ {\n+ file: 'dist/index.iife.min.js',\n+ format: 'iife',\n+ name: 'ShikiRenderSVG',\n+ plugins: [terser()]\n+ }\n+ ],\n+ plugins: [\n+ replace({\n+ __BROWSER__: JSON.stringify(true)\n+ }),\n+ typescript(),\n+ nodeResolve(),\n+ commonjs()\n+ ]\n+ },\n+ {\n+ input: 'src/index.ts',\n+ output: [\n+ {\n+ file: 'dist/index.d.ts',\n+ format: 'es'\n+ }\n+ ],\n+ plugins: [dts()]\n+ }\n+]\ndiff --git a/packages/renderer-svg/src/global.d.ts b/packages/renderer-svg/src/global.d.ts\nnew file mode 100644\nindex 0000000..08c128f\n--- /dev/null\n+++ b/packages/renderer-svg/src/global.d.ts\n@@ -0,0 +1 @@\n+declare var __BROWSER__: boolean\ndiff --git a/packages/renderer-svg/src/index.ts b/packages/renderer-svg/src/index.ts\nindex ae77136..8f92312 100644\n--- a/packages/renderer-svg/src/index.ts\n+++ b/packages/renderer-svg/src/index.ts\n@@ -1,4 +1,4 @@\n-import { IThemedToken } from 'shiki'\n+import type { IThemedToken } from 'shiki'\n import { measureMonospaceTypeface } from './measureMonospaceTypeface'\n \n interface SVGRendererOptions {\ndiff --git a/packages/renderer-svg/src/measureMonospaceTypeface.ts b/packages/renderer-svg/src/measureMonospaceTypeface.ts\nindex e28a1ff..6ab834d 100644\n--- a/packages/renderer-svg/src/measureMonospaceTypeface.ts\n+++ b/packages/renderer-svg/src/measureMonospaceTypeface.ts\n@@ -1,58 +1,61 @@\n-import puppeteer from 'puppeteer'\n+function measureFont(fontName: string, fontSize: number) {\n+ /**\n+ * Measure `M` for width\n+ */\n+ var c = document.createElement('canvas')\n+ var ctx = c.getContext('2d')!\n+ ctx.font = `${fontSize}px \"${fontName}\"`\n \n-export async function measureMonospaceTypeface(\n- fontName: string,\n- fontSize: number\n-): Promise<{ width: number; height: number }> {\n- const browser = await puppeteer.launch({ headless: true })\n- const page = await browser.newPage()\n- const measurement = await page.evaluate(measureFont, fontName, fontSize)\n- await browser.close()\n- return measurement\n+ const capMMeasurement = ctx.measureText('M')\n \n- function measureFont(fontName: string, fontSize: number) {\n- /**\n- * Measure `M` for width\n- */\n- var c = document.createElement('canvas')\n- var ctx = c.getContext('2d')!\n- ctx.font = `${fontSize}px \"${fontName}\"`\n-\n- const capMMeasurement = ctx.measureText('M')\n+ /**\n+ * Measure A-Z, a-z for height\n+ * A - 65\n+ * Z - 90\n+ * a - 97\n+ * z - 122\n+ */\n+ const characters = []\n+ for (let i = 65; i <= 90; i++) {\n+ characters.push(String.fromCharCode(i))\n+ }\n+ for (let i = 97; i <= 122; i++) {\n+ characters.push(String.fromCharCode(i))\n+ }\n \n- /**\n- * Measure A-Z, a-z for height\n- * A - 65\n- * Z - 90\n- * a - 97\n- * z - 122\n- */\n- const characters = []\n- for (let i = 65; i <= 90; i++) {\n- characters.push(String.fromCharCode(i))\n+ let highC, lowC\n+ let highestAscent = 0\n+ let lowestDescent = 0\n+ characters.forEach(c => {\n+ const m = ctx.measureText(c)\n+ if (m.actualBoundingBoxAscent > highestAscent) {\n+ highestAscent = m.actualBoundingBoxAscent\n+ highC = c\n }\n- for (let i = 97; i <= 122; i++) {\n- characters.push(String.fromCharCode(i))\n+ if (m.actualBoundingBoxDescent > lowestDescent) {\n+ lowestDescent = m.actualBoundingBoxDescent\n+ lowC = c\n }\n+ })\n \n- let highC, lowC\n- let highestAscent = 0\n- let lowestDescent = 0\n- characters.forEach(c => {\n- const m = ctx.measureText(c)\n- if (m.actualBoundingBoxAscent > highestAscent) {\n- highestAscent = m.actualBoundingBoxAscent\n- highC = c\n- }\n- if (m.actualBoundingBoxDescent > lowestDescent) {\n- lowestDescent = m.actualBoundingBoxDescent\n- lowC = c\n- }\n- })\n+ return {\n+ width: capMMeasurement.width,\n+ height: highestAscent + lowestDescent\n+ }\n+}\n \n- return {\n- width: capMMeasurement.width,\n- height: highestAscent + lowestDescent\n- }\n+export async function measureMonospaceTypeface(\n+ fontName: string,\n+ fontSize: number\n+): Promise<{ width: number; height: number }> {\n+ if (__BROWSER__) {\n+ return measureFont(fontName, fontSize)\n+ } else {\n+ const puppeteer = await import('puppeteer')\n+ const browser = await puppeteer.launch({ headless: true })\n+ const page = await browser.newPage()\n+ const measurement = await page.evaluate(measureFont, fontName, fontSize)\n+ await browser.close()\n+ return measurement\n }\n }\ndiff --git a/packages/renderer-svg/tsconfig.json b/packages/renderer-svg/tsconfig.json\nindex 3613212..bc50ce3 100644\n--- a/packages/renderer-svg/tsconfig.json\n+++ b/packages/renderer-svg/tsconfig.json\n@@ -1,9 +1,10 @@\n {\n- \"extends\": \"../../tsconfig.json\",\n \"compilerOptions\": {\n- \"composite\": true,\n- \"rootDir\": \"src\",\n- \"outDir\": \"dist\",\n- \"lib\": [\"dom\"]\n+ \"module\": \"esnext\",\n+ \"target\": \"es2017\",\n+ \"esModuleInterop\": true,\n+ \"moduleResolution\": \"node\",\n+ \"lib\": [\"esnext\", \"DOM\"],\n+ \"sourceMap\": true\n }\n }\ndiff --git a/packages/shiki/rollup.config.js b/packages/shiki/rollup.config.js\nindex b8ba9e3..9078ea2 100644\n--- a/packages/shiki/rollup.config.js\n+++ b/packages/shiki/rollup.config.js\n@@ -4,6 +4,7 @@ import dts from 'rollup-plugin-dts'\n import typescript from 'rollup-plugin-typescript2'\n import copy from 'rollup-plugin-copy'\n import replace from '@rollup/plugin-replace'\n+import { terser } from 'rollup-plugin-terser'\n import { version } from './package.json'\n \n const external = ['onigasm', 'vscode-textmate']\n@@ -22,7 +23,14 @@ export default [\n format: 'esm'\n }\n ],\n- plugins: [typescript(), nodeResolve(), commonjs()]\n+ plugins: [\n+ replace({\n+ __BROWSER__: JSON.stringify(false)\n+ }),\n+ typescript(),\n+ nodeResolve(),\n+ commonjs()\n+ ]\n },\n {\n input: 'src/index.ts',\n@@ -58,7 +66,15 @@ export default [\n ]\n }\n ],\n- plugins: [typescript(), nodeResolve(), commonjs()]\n+ plugins: [\n+ replace({\n+ __BROWSER__: JSON.stringify(true)\n+ }),\n+ typescript(),\n+ nodeResolve(),\n+ commonjs(),\n+ terser()\n+ ]\n },\n {\n input: 'src/index.ts',\ndiff --git a/packages/shiki/src/global.d.ts b/packages/shiki/src/global.d.ts\nnew file mode 100644\nindex 0000000..08c128f\n--- /dev/null\n+++ b/packages/shiki/src/global.d.ts\n@@ -0,0 +1 @@\n+declare var __BROWSER__: boolean\ndiff --git a/packages/shiki/src/loader.ts b/packages/shiki/src/loader.ts\nindex 934cfbd..d9c3128 100644\n--- a/packages/shiki/src/loader.ts\n+++ b/packages/shiki/src/loader.ts\n@@ -5,11 +5,16 @@ import type { ILanguageRegistration, IShikiTheme } from './types'\n export const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined'\n \n let CDN_ROOT = '__CDN_ROOT__'\n+let ONIGASM_WASM = ''\n \n export function setCDN(root: string) {\n CDN_ROOT = root\n }\n \n+export function setOnigasmWASM(path: string) {\n+ ONIGASM_WASM = path\n+}\n+\n let _onigasmPromise: Promise<IOnigLib> = null\n \n export async function getOnigasm(): Promise<IOnigLib> {\n@@ -17,7 +22,7 @@ export async function getOnigasm(): Promise<IOnigLib> {\n let loader: Promise<any>\n \n if (isBrowser) {\n- loader = Onigasm.loadWASM(_resolvePath('onigasm.wasm', 'dist/'))\n+ loader = Onigasm.loadWASM(ONIGASM_WASM || _resolvePath('onigasm.wasm', 'dist/'))\n } else {\n const path = require('path')\n const onigasmPath = path.join(require.resolve('onigasm'), '../onigasm.wasm')\ndiff --git a/yarn.lock b/yarn.lock\nindex c143969..dfd7540 100644\n--- a/yarn.lock\n+++ b/yarn.lock\n@@ -2487,6 +2487,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:\n dependencies:\n delayed-stream \"~1.0.0\"\n \n+commander@^2.20.0, commander@~2.20.3:\n+ version \"2.20.3\"\n+ resolved \"https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33\"\n+ integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==\n+\n commander@^4.0.0:\n version \"4.1.1\"\n resolved \"https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068\"\n@@ -2497,11 +2502,6 @@ commander@^6.2.0:\n resolved \"https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75\"\n integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==\n \n-commander@~2.20.3:\n- version \"2.20.3\"\n- resolved \"https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33\"\n- integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==\n-\n commondir@^1.0.1:\n version \"1.0.1\"\n resolved \"https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b\"\n@@ -4799,7 +4799,7 @@ jest-watcher@^26.6.2:\n jest-util \"^26.6.2\"\n string-length \"^4.0.1\"\n \n-jest-worker@^26.6.2:\n+jest-worker@^26.2.1, jest-worker@^26.6.2:\n version \"26.6.2\"\n resolved \"https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed\"\n integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==\n@@ -6444,6 +6444,13 @@ quick-lru@^4.0.1:\n resolved \"https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f\"\n integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==\n \n+randombytes@^2.1.0:\n+ version \"2.1.0\"\n+ resolved \"https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a\"\n+ integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==\n+ dependencies:\n+ safe-buffer \"^5.1.0\"\n+\n react-is@^17.0.1:\n version \"17.0.1\"\n resolved \"https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339\"\n@@ -6812,6 +6819,16 @@ rollup-plugin-dts@^2.0.0:\n optionalDependencies:\n \"@babel/code-frame\" \"^7.10.4\"\n \n+rollup-plugin-terser@^7.0.2:\n+ version \"7.0.2\"\n+ resolved \"https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d\"\n+ integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==\n+ dependencies:\n+ \"@babel/code-frame\" \"^7.10.4\"\n+ jest-worker \"^26.2.1\"\n+ serialize-javascript \"^4.0.0\"\n+ terser \"^5.0.0\"\n+\n rollup-plugin-typescript2@^0.29.0:\n version \"0.29.0\"\n resolved \"https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.29.0.tgz#b7ad83f5241dbc5bdf1e98d9c3fca005ffe39e1a\"\n@@ -6873,7 +6890,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, \n resolved \"https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d\"\n integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==\n \n-safe-buffer@^5.2.0, safe-buffer@~5.2.0:\n+safe-buffer@^5.1.0, safe-buffer@^5.2.0, safe-buffer@~5.2.0:\n version \"5.2.1\"\n resolved \"https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6\"\n integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==\n@@ -6937,6 +6954,13 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:\n resolved \"https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d\"\n integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==\n \n+serialize-javascript@^4.0.0:\n+ version \"4.0.0\"\n+ resolved \"https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa\"\n+ integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==\n+ dependencies:\n+ randombytes \"^2.1.0\"\n+\n set-blocking@^2.0.0, set-blocking@~2.0.0:\n version \"2.0.0\"\n resolved \"https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7\"\n@@ -7140,7 +7164,7 @@ source-map-resolve@^0.5.0:\n source-map-url \"^0.4.0\"\n urix \"^0.1.0\"\n \n-source-map-support@^0.5.6:\n+source-map-support@^0.5.6, source-map-support@~0.5.19:\n version \"0.5.19\"\n resolved \"https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61\"\n integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==\n@@ -7163,7 +7187,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:\n resolved \"https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263\"\n integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==\n \n-source-map@^0.7.3:\n+source-map@^0.7.3, source-map@~0.7.2:\n version \"0.7.3\"\n resolved \"https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383\"\n integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==\n@@ -7552,6 +7576,15 @@ terminal-link@^2.0.0:\n ansi-escapes \"^4.2.1\"\n supports-hyperlinks \"^2.0.0\"\n \n+terser@^5.0.0:\n+ version \"5.5.1\"\n+ resolved \"https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289\"\n+ integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==\n+ dependencies:\n+ commander \"^2.20.0\"\n+ source-map \"~0.7.2\"\n+ source-map-support \"~0.5.19\"\n+\n test-exclude@^6.0.0:\n version \"6.0.0\"\n resolved \"https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e\"\n", "diff --git a/read_buffer/src/row_group.rs b/read_buffer/src/row_group.rs\nindex 91c9fb5..ca77f3c 100644\n--- a/read_buffer/src/row_group.rs\n+++ b/read_buffer/src/row_group.rs\n@@ -958,24 +958,15 @@ impl From<RecordBatch> for RowGroup {\n }\n Some(InfluxColumnType::Field(_)) => {\n let column_data = match arrow_column.data_type() {\n- arrow::datatypes::DataType::Int64 => Column::from(\n- arrow_column\n- .as_any()\n- .downcast_ref::<arrow::array::Int64Array>()\n- .unwrap(),\n- ),\n- arrow::datatypes::DataType::Float64 => Column::from(\n- arrow_column\n- .as_any()\n- .downcast_ref::<arrow::array::Float64Array>()\n- .unwrap(),\n- ),\n- arrow::datatypes::DataType::UInt64 => Column::from(\n- arrow_column\n- .as_any()\n- .downcast_ref::<arrow::array::UInt64Array>()\n- .unwrap(),\n- ),\n+ arrow::datatypes::DataType::Int64 => {\n+ Column::from(arrow::array::Int64Array::from(arrow_column.data()))\n+ }\n+ arrow::datatypes::DataType::Float64 => {\n+ Column::from(arrow::array::Float64Array::from(arrow_column.data()))\n+ }\n+ arrow::datatypes::DataType::UInt64 => {\n+ Column::from(arrow::array::UInt64Array::from(arrow_column.data()))\n+ }\n dt => unimplemented!(\n \"data type {:?} currently not supported for field columns\",\n dt\n"]
| 2 |
["ace6b981c8098a68092d4a10e75daae7b8bfee9b", "28b596b8834d1b51be3ac6a2ac30df28f37702d8"]
|
["feat", "refactor"]
|
only run JMH on develop and master
- reduces test duration of feature branches
- reduces bors merge duration
- show performance impact of PRs and Releases on the respective branches
- number parallel stages to enforce ordering in Blue Ocean view
- **note**: skipping a parallel stage in Blue Ocean triggers a bug where
log will not be show until the stage finished https://issues.jenkins-ci.org/browse/JENKINS-48879,don't delay rendering if initialLayout is not specified
|
["diff --git a/Jenkinsfile b/Jenkinsfile\nindex 9fbd3a1..3e4f052 100644\n--- a/Jenkinsfile\n+++ b/Jenkinsfile\n@@ -29,7 +29,7 @@ pipeline {\n \n stage('Verify') {\n parallel {\n- stage('Tests') {\n+ stage('1 - Java Tests') {\n steps {\n withMaven(jdk: jdkVersion, maven: mavenVersion, mavenSettingsConfig: mavenSettingsConfig) {\n sh 'mvn -B verify -P skip-unstable-ci'\n@@ -42,7 +42,9 @@ pipeline {\n }\n }\n \n- stage('JMH') {\n+ stage('2 - JMH') {\n+ // delete this line to also run JMH on feature branch\n+ when { anyOf { branch 'master'; branch 'develop' } }\n agent { node { label 'ubuntu-large' } }\n \n steps {\n", "diff --git a/packages/react-native-tab-view/example/src/BottomBarIconTextExample.js b/packages/react-native-tab-view/example/src/BottomBarIconTextExample.js\nindex fcc4708..397e6e6 100644\n--- a/packages/react-native-tab-view/example/src/BottomBarIconTextExample.js\n+++ b/packages/react-native-tab-view/example/src/BottomBarIconTextExample.js\n@@ -1,7 +1,7 @@\n /* @flow */\n \n import React, { Component } from 'react';\n-import { Animated, View, Text, Dimensions, StyleSheet } from 'react-native';\n+import { Animated, View, Text, StyleSheet } from 'react-native';\n import { TabViewAnimated, TabBar } from 'react-native-tab-view';\n import { Ionicons } from '@exponent/vector-icons';\n \n@@ -13,7 +13,6 @@ const styles = StyleSheet.create({\n backgroundColor: '#222',\n },\n tab: {\n- opacity: 1,\n padding: 0,\n },\n icon: {\n@@ -50,11 +49,6 @@ const styles = StyleSheet.create({\n },\n });\n \n-const initialLayout = {\n- height: 0,\n- width: Dimensions.get('window').width,\n-};\n-\n export default class TopBarIconExample extends Component {\n \n static title = 'Bottom bar with indicator';\n@@ -80,14 +74,16 @@ export default class TopBarIconExample extends Component {\n };\n \n _renderIndicator = (props) => {\n- const { width, position } = props;\n+ const { width, opacity, position } = props;\n \n- const translateX = Animated.multiply(position, new Animated.Value(width));\n+ const translateX = Animated.multiply(position, width);\n \n return (\n <Animated.View\n- style={[ styles.indicator, { width: width - 8, transform: [ { translateX } ] } ]}\n- />\n+ style={[ styles.container, { width, opacity, transform: [ { translateX } ] } ]}\n+ >\n+ <View style={styles.indicator} />\n+ </Animated.View>\n );\n };\n \n@@ -146,7 +142,6 @@ export default class TopBarIconExample extends Component {\n renderScene={this._renderScene}\n renderFooter={this._renderFooter}\n onRequestChangeTab={this._handleChangeTab}\n- initialLayout={initialLayout}\n />\n );\n }\ndiff --git a/packages/react-native-tab-view/example/src/CoverflowExample.js b/packages/react-native-tab-view/example/src/CoverflowExample.js\nindex 8950c0e..2336591 100644\n--- a/packages/react-native-tab-view/example/src/CoverflowExample.js\n+++ b/packages/react-native-tab-view/example/src/CoverflowExample.js\n@@ -2,7 +2,7 @@\n /* eslint-disable import/no-commonjs */\n \n import React, { Component } from 'react';\n-import { Animated, View, Image, Text, Dimensions, StyleSheet } from 'react-native';\n+import { Animated, View, Image, Text, StyleSheet } from 'react-native';\n import { TabViewAnimated, TabViewPagerPan } from 'react-native-tab-view';\n \n const styles = StyleSheet.create({\n@@ -48,11 +48,6 @@ const ALBUMS = {\n 'Lost Horizons': require('../assets/album-art-8.jpg'),\n };\n \n-const initialLayout = {\n- height: 0,\n- width: Dimensions.get('window').width,\n-};\n-\n export default class CoverflowExample extends Component {\n \n static title = 'Coverflow';\n@@ -142,7 +137,6 @@ export default class CoverflowExample extends Component {\n renderPager={this._renderPager}\n renderScene={this._renderScene}\n onRequestChangeTab={this._handleChangeTab}\n- initialLayout={initialLayout}\n />\n );\n }\ndiff --git a/packages/react-native-tab-view/example/src/ScrollViewsExample.js b/packages/react-native-tab-view/example/src/ScrollViewsExample.js\nindex 94fefbb..5be3b69 100644\n--- a/packages/react-native-tab-view/example/src/ScrollViewsExample.js\n+++ b/packages/react-native-tab-view/example/src/ScrollViewsExample.js\n@@ -28,11 +28,6 @@ const styles = StyleSheet.create({\n },\n });\n \n-const initialLayout = {\n- height: 0,\n- width: Dimensions.get('window').width,\n-};\n-\n export default class TopBarTextExample extends Component {\n \n static title = 'Scroll views';\n@@ -104,6 +99,7 @@ export default class TopBarTextExample extends Component {\n renderLabel={this._renderLabel(props)}\n indicatorStyle={styles.indicator}\n tabStyle={styles.tab}\n+ tabWidth={80}\n style={styles.tabbar}\n />\n );\n@@ -130,7 +126,6 @@ export default class TopBarTextExample extends Component {\n renderScene={this._renderScene}\n renderHeader={this._renderHeader}\n onRequestChangeTab={this._handleChangeTab}\n- initialLayout={initialLayout}\n />\n );\n }\ndiff --git a/packages/react-native-tab-view/example/src/TopBarIconExample.js b/packages/react-native-tab-view/example/src/TopBarIconExample.js\nindex d13755f..5464981 100644\n--- a/packages/react-native-tab-view/example/src/TopBarIconExample.js\n+++ b/packages/react-native-tab-view/example/src/TopBarIconExample.js\n@@ -1,7 +1,7 @@\n /* @flow */\n \n import React, { Component } from 'react';\n-import { View, Dimensions, StyleSheet } from 'react-native';\n+import { View, StyleSheet } from 'react-native';\n import { TabViewAnimated, TabBarTop } from 'react-native-tab-view';\n import { Ionicons } from '@exponent/vector-icons';\n \n@@ -22,11 +22,6 @@ const styles = StyleSheet.create({\n },\n });\n \n-const initialLayout = {\n- height: 0,\n- width: Dimensions.get('window').width,\n-};\n-\n export default class TopBarIconExample extends Component {\n \n static title = 'Icon only top bar';\n@@ -93,7 +88,6 @@ export default class TopBarIconExample extends Component {\n renderScene={this._renderScene}\n renderHeader={this._renderHeader}\n onRequestChangeTab={this._handleChangeTab}\n- initialLayout={initialLayout}\n />\n );\n }\ndiff --git a/packages/react-native-tab-view/example/src/TopBarTextExample.js b/packages/react-native-tab-view/example/src/TopBarTextExample.js\nindex 30307ad..454533d 100644\n--- a/packages/react-native-tab-view/example/src/TopBarTextExample.js\n+++ b/packages/react-native-tab-view/example/src/TopBarTextExample.js\n@@ -1,7 +1,7 @@\n /* @flow */\n \n import React, { Component } from 'react';\n-import { View, Dimensions, StyleSheet } from 'react-native';\n+import { View, StyleSheet } from 'react-native';\n import { TabViewAnimated, TabBarTop } from 'react-native-tab-view';\n \n const styles = StyleSheet.create({\n@@ -25,11 +25,6 @@ const styles = StyleSheet.create({\n },\n });\n \n-const initialLayout = {\n- height: 0,\n- width: Dimensions.get('window').width,\n-};\n-\n export default class TopBarTextExample extends Component {\n \n static title = 'Scrollable top bar';\n@@ -90,7 +85,6 @@ export default class TopBarTextExample extends Component {\n renderScene={this._renderScene}\n renderHeader={this._renderHeader}\n onRequestChangeTab={this._handleChangeTab}\n- initialLayout={initialLayout}\n />\n );\n }\ndiff --git a/packages/react-native-tab-view/src/TabBar.js b/packages/react-native-tab-view/src/TabBar.js\nindex 615e85a..a03d8e5 100644\n--- a/packages/react-native-tab-view/src/TabBar.js\n+++ b/packages/react-native-tab-view/src/TabBar.js\n@@ -92,6 +92,7 @@ type Props = SceneRendererProps & {\n \n type State = {\n offset: Animated.Value;\n+ visibility: Animated.Value;\n }\n \n export default class TabBar extends Component<DefaultProps, Props, State> {\n@@ -115,8 +116,15 @@ export default class TabBar extends Component<DefaultProps, Props, State> {\n \n state: State = {\n offset: new Animated.Value(0),\n+ visibility: new Animated.Value(0),\n };\n \n+ componentWillMount() {\n+ if (this.props.layout.width || this.props.tabWidth) {\n+ this.state.visibility.setValue(1);\n+ }\n+ }\n+\n componentDidMount() {\n this._adjustScroll(this.props.navigationState.index);\n this._positionListener = this.props.subscribe('position', this._adjustScroll);\n@@ -126,6 +134,16 @@ export default class TabBar extends Component<DefaultProps, Props, State> {\n if (this.props.navigationState !== nextProps.navigationState) {\n this._resetScrollOffset(nextProps);\n }\n+\n+ if (\n+ (this.props.tabWidth !== nextProps.tabWidth && nextProps.tabWidth) ||\n+ (this.props.layout.width !== nextProps.layout.width && nextProps.layout.width)\n+ ) {\n+ Animated.timing(this.state.visibility, {\n+ toValue: 1,\n+ duration: 150,\n+ }).start();\n+ }\n }\n \n componentWillUnmount() {\n@@ -282,7 +300,8 @@ export default class TabBar extends Component<DefaultProps, Props, State> {\n {this.props.renderIndicator ?\n this.props.renderIndicator({\n ...this.props,\n- width: tabWidth,\n+ width: new Animated.Value(tabWidth),\n+ opacity: this.state.visibility,\n }) :\n null\n }\n@@ -307,10 +326,10 @@ export default class TabBar extends Component<DefaultProps, Props, State> {\n {routes.map((route, i) => {\n const focused = index === i;\n const outputRange = inputRange.map(inputIndex => inputIndex === i ? 1 : 0.7);\n- const opacity = position.interpolate({\n+ const opacity = Animated.multiply(this.state.visibility, position.interpolate({\n inputRange,\n outputRange,\n- });\n+ }));\n const scene = {\n route,\n focused,\n@@ -348,14 +367,14 @@ export default class TabBar extends Component<DefaultProps, Props, State> {\n }}\n >\n <View style={styles.container}>\n- <Animated.View style={[ styles.tabitem, { opacity, width: tabWidth }, tabStyle, this.props.tabStyle ]}>\n+ <Animated.View style={[ styles.tabitem, { opacity }, tabWidth ? { width: tabWidth } : null, tabStyle, this.props.tabStyle ]}>\n {icon}\n {label}\n </Animated.View>\n {badge ?\n- <View style={styles.badge}>\n+ <Animated.View style={[ styles.badge, { opacity: this.state.visibility } ]}>\n {badge}\n- </View> : null\n+ </Animated.View> : null\n }\n </View>\n </TouchableItem>\ndiff --git a/packages/react-native-tab-view/src/TabBarTop.js b/packages/react-native-tab-view/src/TabBarTop.js\nindex 0960d4e..84dd6e2 100644\n--- a/packages/react-native-tab-view/src/TabBarTop.js\n+++ b/packages/react-native-tab-view/src/TabBarTop.js\n@@ -28,7 +28,8 @@ const styles = StyleSheet.create({\n });\n \n type IndicatorProps = SceneRendererProps & {\n- width: number;\n+ width: Animated.Valye;\n+ opacity: Animated.Value;\n }\n \n type Props = SceneRendererProps & {\n@@ -50,13 +51,13 @@ export default class TabBarTop extends Component<void, Props, void> {\n );\n \n _renderIndicator = (props: IndicatorProps) => {\n- const { width, position } = props;\n+ const { width, opacity, position } = props;\n \n- const translateX = Animated.multiply(position, new Animated.Value(width));\n+ const translateX = Animated.multiply(position, width);\n \n return (\n <Animated.View\n- style={[ styles.indicator, { width, transform: [ { translateX } ] }, this.props.indicatorStyle ]}\n+ style={[ styles.indicator, { width, opacity, transform: [ { translateX } ] }, this.props.indicatorStyle ]}\n />\n );\n };\ndiff --git a/packages/react-native-tab-view/src/TabViewAnimated.js b/packages/react-native-tab-view/src/TabViewAnimated.js\nindex d484816..4499748 100644\n--- a/packages/react-native-tab-view/src/TabViewAnimated.js\n+++ b/packages/react-native-tab-view/src/TabViewAnimated.js\n@@ -94,19 +94,17 @@ export default class TabViewAnimated extends Component<DefaultProps, Props, Stat\n };\n \n _renderItems = (props: SceneRendererProps) => {\n- if (props.layout.width === 0) {\n- return null;\n- }\n-\n const { renderPager, renderHeader, renderFooter } = this.props;\n+ const { navigationState, layout } = props;\n+ const currentRoute = navigationState.routes[navigationState.index];\n \n return (\n <View style={styles.container}>\n {renderHeader && renderHeader(props)}\n {renderPager({\n ...props,\n- children: props.navigationState.routes.map((route, index) => (\n- <View key={route.key} style={{ width: props.layout.width }}>\n+ children: layout.width ? navigationState.routes.map((route, index) => (\n+ <View key={route.key} style={{ width: layout.width }}>\n {this._renderScene({\n ...props,\n route,\n@@ -114,7 +112,16 @@ export default class TabViewAnimated extends Component<DefaultProps, Props, Stat\n focused: index === props.navigationState.index,\n })}\n </View>\n- )),\n+ )) : (\n+ <View key={currentRoute.key} style={styles.container}>\n+ {this._renderScene({\n+ ...props,\n+ route: currentRoute,\n+ index: navigationState.index,\n+ focused: true,\n+ })}\n+ </View>\n+ ),\n })}\n {renderFooter && renderFooter(props)}\n </View>\n"]
| 2 |
["83934807f4061980e7f5bf46d36eca70e238835d", "e9233ae3f7811707945fc2de60971595d83c578d"]
|
["ci", "fix"]
|
fixed start types for size and opacity,fix typos (#90)
|
["diff --git a/core/main/src/Core/Particle.ts b/core/main/src/Core/Particle.ts\nindex 1aa6fba..6ea6ffc 100644\n--- a/core/main/src/Core/Particle.ts\n+++ b/core/main/src/Core/Particle.ts\n@@ -271,7 +271,7 @@ export class Particle implements IParticle {\n }\n }\n \n- const sizeAnimation = this.options.size.animation;\n+ const sizeAnimation = sizeOptions.animation;\n \n if (sizeAnimation.enable) {\n this.size.status = AnimationStatus.increasing;\n@@ -279,7 +279,8 @@ export class Particle implements IParticle {\n if (!randomSize) {\n switch (sizeAnimation.startValue) {\n case StartValueType.min:\n- this.size.value = sizeAnimation.minimumValue * pxRatio;\n+ this.size.value = NumberUtils.getRangeMin(sizeOptions.value) * pxRatio;\n+ this.size.status = AnimationStatus.increasing;\n \n break;\n \n@@ -287,11 +288,14 @@ export class Particle implements IParticle {\n this.size.value = NumberUtils.randomInRange(\n NumberUtils.setRangeValue(sizeAnimation.minimumValue * pxRatio, this.size.value)\n );\n+ this.size.status =\n+ Math.random() >= 0.5 ? AnimationStatus.increasing : AnimationStatus.decreasing;\n \n break;\n \n case StartValueType.max:\n default:\n+ this.size.value = NumberUtils.getRangeMax(sizeOptions.value) * pxRatio;\n this.size.status = AnimationStatus.decreasing;\n \n break;\n@@ -393,7 +397,8 @@ export class Particle implements IParticle {\n if (!randomOpacity) {\n switch (opacityAnimation.startValue) {\n case StartValueType.min:\n- this.opacity.value = opacityAnimation.minimumValue;\n+ this.opacity.value = NumberUtils.getRangeMin(this.opacity.value);\n+ this.opacity.status = AnimationStatus.increasing;\n \n break;\n \n@@ -401,11 +406,14 @@ export class Particle implements IParticle {\n this.opacity.value = NumberUtils.randomInRange(\n NumberUtils.setRangeValue(opacityAnimation.minimumValue, this.opacity.value)\n );\n+ this.opacity.status =\n+ Math.random() >= 0.5 ? AnimationStatus.increasing : AnimationStatus.decreasing;\n \n break;\n \n case StartValueType.max:\n default:\n+ this.opacity.value = NumberUtils.getRangeMax(this.opacity.value);\n this.opacity.status = AnimationStatus.decreasing;\n \n break;\ndiff --git a/presets/confetti/src/options.ts b/presets/confetti/src/options.ts\nindex 7fc6225..a713425 100644\n--- a/presets/confetti/src/options.ts\n+++ b/presets/confetti/src/options.ts\n@@ -28,7 +28,7 @@ export const loadOptions = (confettiOptions: RecursivePartial<IConfettiOptions>)\n animation: {\n enable: true,\n minimumValue: 0,\n- speed: 2,\n+ speed: 0.5,\n startValue: \"max\",\n destroy: \"min\",\n },\n", "diff --git a/README.md b/README.md\nindex de15ac5..5ad8b47 100755\n--- a/README.md\n+++ b/README.md\n@@ -16,13 +16,13 @@ content that will be loaded, similar to Facebook cards loaders.\n \n ## Features\n \n-* :gear: **Complety customizable:** you can change the colors, speed and sizes;\n+* :gear: **Completely customizable:** you can change the colors, speed and sizes;\n * :pencil2: **Create your own loading:** use the\n [create-react-content-loader](https://danilowoz.github.io/create-react-content-loader/) to create\n- your customs loadings easily;\n+ your custom loadings easily;\n * :ok_hand: **You can use right now:** there are a lot of presets to use the loader, see the\n [options](#options);\n-* :rocket: **Perfomance:** react-content-loader uses pure SVG to work, so it's works without any extra scritpt,\n+* :rocket: **Performance:** react-content-loader uses pure SVG to work, so it works without any extra scripts,\n canvas, etc;\n \n ## Usage\n"]
| 2 |
["06960183db42cba1b1f1a8077660ba8c801c9e18", "88257ee720ed8ba136d49087c0d31373e8397dd5"]
|
["fix", "docs"]
|
use module path alias,use connect instead of begin to avoid nesting transactions
|
["diff --git a/src/background/audio-manager.ts b/src/background/audio-manager.ts\nindex 54e8b24..11c5fba 100644\n--- a/src/background/audio-manager.ts\n+++ b/src/background/audio-manager.ts\n@@ -2,7 +2,7 @@\n * To make sure only one audio plays at a time\n */\n \n-import { timeout } from '../_helpers/promise-more'\n+import { timeout } from '@/_helpers/promise-more'\n \n declare global {\n interface Window {\ndiff --git a/src/background/context-menus.ts b/src/background/context-menus.ts\nindex 994b59e..7036362 100644\n--- a/src/background/context-menus.ts\n+++ b/src/background/context-menus.ts\n@@ -1,5 +1,5 @@\n-import { storage, openURL } from '../_helpers/browser-api'\n-import { AppConfig } from '../app-config'\n+import { storage, openURL } from '@/_helpers/browser-api'\n+import { AppConfig } from '@/app-config'\n \n import { Observable } from 'rxjs/Observable'\n import { fromPromise } from 'rxjs/observable/fromPromise'\ndiff --git a/src/background/initialization.ts b/src/background/initialization.ts\nindex 0e5b3ad..001ee73 100644\n--- a/src/background/initialization.ts\n+++ b/src/background/initialization.ts\n@@ -1,6 +1,6 @@\n-import { storage, openURL } from '../_helpers/browser-api'\n-import checkUpdate from '../_helpers/check-update'\n-import { AppConfig } from '../app-config'\n+import { storage, openURL } from '@/_helpers/browser-api'\n+import checkUpdate from '@/_helpers/check-update'\n+import { AppConfig } from '@/app-config'\n import { mergeConfig } from './merge-config'\n import { init as initMenus } from './context-menus'\n import { init as initPdf } from './pdf-sniffer'\ndiff --git a/src/background/merge-config.ts b/src/background/merge-config.ts\nindex afa1800..afdbd63 100644\n--- a/src/background/merge-config.ts\n+++ b/src/background/merge-config.ts\n@@ -1,4 +1,4 @@\n-import { appConfigFactory, AppConfig } from '../app-config'\n+import { appConfigFactory, AppConfig } from '@/app-config'\n import _ from 'lodash'\n \n /**\n@@ -24,7 +24,7 @@ function initConfig (): Promise<AppConfig> {\n const storageObj = { config: appConfigFactory() }\n \n Object.keys(storageObj.config.dicts.all).forEach(id => {\n- storageObj[id] = require('../components/dictionaries/' + id + '/config')\n+ storageObj[id] = require('@/components/dictionaries/' + id + '/config')\n })\n \n return browser.storage.sync.set(storageObj)\n@@ -70,7 +70,7 @@ function mergeHistorical (config): Promise<AppConfig> {\n \n const storageObj = { config: base }\n Object.keys(base.dicts.all).forEach(id => {\n- storageObj[id] = config.dicts.all[id] || require('../components/dictionaries/' + id + '/config')\n+ storageObj[id] = config.dicts.all[id] || require('@/components/dictionaries/' + id + '/config')\n })\n \n return browser.storage.sync.set(storageObj)\ndiff --git a/src/background/pdf-sniffer.ts b/src/background/pdf-sniffer.ts\nindex 6ba27cf..70aa38f 100644\n--- a/src/background/pdf-sniffer.ts\n+++ b/src/background/pdf-sniffer.ts\n@@ -2,8 +2,8 @@\n * Open pdf link directly\n */\n \n-import { storage } from '../_helpers/browser-api'\n-import { AppConfig } from '../app-config'\n+import { storage } from '@/_helpers/browser-api'\n+import { AppConfig } from '@/app-config'\n \n export function init (pdfSniff: boolean) {\n if (browser.webRequest.onBeforeRequest.hasListener(otherPdfListener)) {\ndiff --git a/src/background/server.ts b/src/background/server.ts\nindex 73b34b6..66ed5c0 100644\n--- a/src/background/server.ts\n+++ b/src/background/server.ts\n@@ -1,7 +1,7 @@\n-import { DictID } from '../app-config'\n-import { message, openURL } from '../_helpers/browser-api'\n+import { DictID } from '@/app-config'\n+import { message, openURL } from '@/_helpers/browser-api'\n import { play } from './audio-manager'\n-import { chsToChz } from '../_helpers/chs-to-chz'\n+import { chsToChz } from '@/_helpers/chs-to-chz'\n \n interface MessageOpenUrlWithEscape {\n type: 'OPEN_URL'\n@@ -63,7 +63,7 @@ function fetchDictResult (data: MessageFetchDictResult): Promise<void> {\n let search\n \n try {\n- search = require('../components/dictionaries/' + data.dict + '/engine.js')\n+ search = require('@/components/dictionaries/' + data.dict + '/engine.js')\n } catch (err) {\n return Promise.reject(err)\n }\ndiff --git a/test/unit/_helpers/browser-api.spec.ts b/test/unit/_helpers/browser-api.spec.ts\nindex 1f39145..e327169 100644\n--- a/test/unit/_helpers/browser-api.spec.ts\n+++ b/test/unit/_helpers/browser-api.spec.ts\n@@ -1,4 +1,4 @@\n-import { message, storage, openURL } from '../../../src/_helpers/browser-api'\n+import { message, storage, openURL } from '@/_helpers/browser-api'\n \n beforeEach(() => {\n browser.flush()\ndiff --git a/test/unit/_helpers/check-update.spec.ts b/test/unit/_helpers/check-update.spec.ts\nindex 2abfc57..fd0b678 100644\n--- a/test/unit/_helpers/check-update.spec.ts\n+++ b/test/unit/_helpers/check-update.spec.ts\n@@ -1,4 +1,4 @@\n-import checkUpdate from '../../../src/_helpers/check-update'\n+import checkUpdate from '@/_helpers/check-update'\n import fetchMock from 'jest-fetch-mock'\n \n describe('Check Update', () => {\ndiff --git a/test/unit/_helpers/chs-to-chz.spec.ts b/test/unit/_helpers/chs-to-chz.spec.ts\nindex 295c6ad..21d5229 100644\n--- a/test/unit/_helpers/chs-to-chz.spec.ts\n+++ b/test/unit/_helpers/chs-to-chz.spec.ts\n@@ -1,4 +1,4 @@\n-import chsToChz from '../../../src/_helpers/chs-to-chz'\n+import chsToChz from '@/_helpers/chs-to-chz'\n \n describe('Chs to Chz', () => {\n it('should convert chs to chz', () => {\ndiff --git a/test/unit/_helpers/fetch-dom.spec.ts b/test/unit/_helpers/fetch-dom.spec.ts\nindex a79dda0..bbfbf10 100644\n--- a/test/unit/_helpers/fetch-dom.spec.ts\n+++ b/test/unit/_helpers/fetch-dom.spec.ts\n@@ -1,4 +1,4 @@\n-import fetchDom from '../../../src/_helpers/fetch-dom'\n+import fetchDom from '@/_helpers/fetch-dom'\n \n class XMLHttpRequestMock {\n static queue: XMLHttpRequestMock[] = []\ndiff --git a/test/unit/_helpers/lang-check.spec.ts b/test/unit/_helpers/lang-check.spec.ts\nindex f3e668a..09f30bb 100644\n--- a/test/unit/_helpers/lang-check.spec.ts\n+++ b/test/unit/_helpers/lang-check.spec.ts\n@@ -1,4 +1,4 @@\n-import { isContainChinese, isContainEnglish } from '../../../src/_helpers/lang-check'\n+import { isContainChinese, isContainEnglish } from '@/_helpers/lang-check'\n \n describe('Language Check', () => {\n it('isContainChinese should return ture if text contains Chinese', () => {\ndiff --git a/test/unit/_helpers/promise-more.spec.ts b/test/unit/_helpers/promise-more.spec.ts\nindex 9601c7d..66dc8d9 100644\n--- a/test/unit/_helpers/promise-more.spec.ts\n+++ b/test/unit/_helpers/promise-more.spec.ts\n@@ -1,4 +1,4 @@\n-import * as pm from '../../../src/_helpers/promise-more'\n+import * as pm from '@/_helpers/promise-more'\n \n describe('Promise More', () => {\n beforeAll(() => {\ndiff --git a/test/unit/_helpers/selection.spec.ts b/test/unit/_helpers/selection.spec.ts\nindex 370239a..06812cf 100644\n--- a/test/unit/_helpers/selection.spec.ts\n+++ b/test/unit/_helpers/selection.spec.ts\n@@ -1,4 +1,4 @@\n-import selection from '../../../src/_helpers/selection'\n+import selection from '@/_helpers/selection'\n \n describe('Selection', () => {\n const bakSelection = window.getSelection\ndiff --git a/test/unit/_helpers/strip-script.spec.ts b/test/unit/_helpers/strip-script.spec.ts\nindex cce558f..355b382 100644\n--- a/test/unit/_helpers/strip-script.spec.ts\n+++ b/test/unit/_helpers/strip-script.spec.ts\n@@ -1,4 +1,4 @@\n-import stripScript from '../../../src/_helpers/strip-script'\n+import stripScript from '@/_helpers/strip-script'\n \n describe('Strip Script', () => {\n const expectedEl = document.createElement('div') as HTMLDivElement\ndiff --git a/test/unit/background/audio-manager.spec.ts b/test/unit/background/audio-manager.spec.ts\nindex b0096a6..b1266d7 100644\n--- a/test/unit/background/audio-manager.spec.ts\n+++ b/test/unit/background/audio-manager.spec.ts\n@@ -1,4 +1,4 @@\n-import audio from '../../../src/background/audio-manager'\n+import audio from '@/background/audio-manager'\n \n describe('Audio Manager', () => {\n const bakAudio = (window as any).Audio\ndiff --git a/test/unit/background/context-menus.spec.ts b/test/unit/background/context-menus.spec.ts\nindex 39e249c..d9049dc 100644\n--- a/test/unit/background/context-menus.spec.ts\n+++ b/test/unit/background/context-menus.spec.ts\n@@ -1,4 +1,4 @@\n-import { appConfigFactory, AppConfig } from '../../../src/app-config'\n+import { appConfigFactory, AppConfig } from '@/app-config'\n import sinon from 'sinon'\n \n function specialConfig () {\n@@ -11,7 +11,7 @@ describe('Context Menus', () => {\n beforeAll(() => {\n browser.flush()\n jest.resetModules()\n- require('../../../src/background/context-menus')\n+ require('@/background/context-menus')\n })\n afterAll(() => browser.flush())\n \n@@ -93,7 +93,7 @@ describe('Context Menus', () => {\n browser.contextMenus.create.callsFake((_, cb) => cb())\n config = specialConfig()\n jest.resetModules()\n- const { init } = require('../../../src/background/context-menus')\n+ const { init } = require('@/background/context-menus')\n init(config.contextMenus)\n })\n \n@@ -110,7 +110,7 @@ describe('Context Menus', () => {\n it('should not init setup when called multiple times', () => {\n expect(browser.contextMenus.removeAll.calledOnce).toBeTruthy()\n \n- const { init } = require('../../../src/background/context-menus')\n+ const { init } = require('@/background/context-menus')\n init(config.contextMenus)\n init(config.contextMenus)\n \ndiff --git a/test/unit/background/initialization.spec.ts b/test/unit/background/initialization.spec.ts\nindex 7bc0972..56a6389 100644\n--- a/test/unit/background/initialization.spec.ts\n+++ b/test/unit/background/initialization.spec.ts\n@@ -1,4 +1,4 @@\n-import { appConfigFactory, AppConfig } from '../../../src/app-config'\n+import { appConfigFactory, AppConfig } from '@/app-config'\n import fetchMock from 'jest-fetch-mock'\n import sinon from 'sinon'\n \n@@ -11,12 +11,12 @@ describe('Initialization', () => {\n const checkUpdate = jest.fn().mockReturnValue(Promise.resolve())\n \n beforeAll(() => {\n- const { message, storage } = require('../../../src/_helpers/browser-api')\n+ const { message, storage } = require('@/_helpers/browser-api')\n window.fetch = fetchMock\n \n browser.flush()\n jest.resetModules()\n- jest.doMock('../../../src/background/merge-config', () => {\n+ jest.doMock('@/background/merge-config', () => {\n return {\n mergeConfig (config) {\n mergeConfig(config)\n@@ -24,16 +24,16 @@ describe('Initialization', () => {\n }\n }\n })\n- jest.doMock('../../../src/background/context-menus', () => {\n+ jest.doMock('@/background/context-menus', () => {\n return { init: initMenus }\n })\n- jest.doMock('../../../src/background/pdf-sniffer', () => {\n+ jest.doMock('@/background/pdf-sniffer', () => {\n return { init: initPdf }\n })\n- jest.doMock('../../../src/_helpers/check-update', () => {\n+ jest.doMock('@/_helpers/check-update', () => {\n return checkUpdate\n })\n- jest.doMock('../../../src/_helpers/browser-api', () => {\n+ jest.doMock('@/_helpers/browser-api', () => {\n return {\n message,\n storage,\n@@ -41,13 +41,13 @@ describe('Initialization', () => {\n }\n })\n \n- require('../../../src/background/initialization')\n+ require('@/background/initialization')\n })\n afterAll(() => {\n browser.flush()\n- jest.dontMock('../../../src/background/merge-config')\n- jest.dontMock('../../../src/background/context-menus')\n- jest.dontMock('../../../src/_helpers/browser-api')\n+ jest.dontMock('@/background/merge-config')\n+ jest.dontMock('@/background/context-menus')\n+ jest.dontMock('@/_helpers/browser-api')\n window.fetch = bakFetch\n })\n \ndiff --git a/test/unit/background/merge-config.spec.ts b/test/unit/background/merge-config.spec.ts\nindex 73c047d..c0dce26 100644\n--- a/test/unit/background/merge-config.spec.ts\n+++ b/test/unit/background/merge-config.spec.ts\n@@ -1,5 +1,5 @@\n-import { appConfigFactory, AppConfig, AppConfigMutable } from '../../../src/app-config'\n-import mergeConfig from '../../../src/background/merge-config'\n+import { appConfigFactory, AppConfig, AppConfigMutable } from '@/app-config'\n+import mergeConfig from '@/background/merge-config'\n import sinon from 'sinon'\n \n describe('Merge Config', () => {\ndiff --git a/test/unit/background/pdf-sniffer.spec.ts b/test/unit/background/pdf-sniffer.spec.ts\nindex a0219d2..bb7726f 100644\n--- a/test/unit/background/pdf-sniffer.spec.ts\n+++ b/test/unit/background/pdf-sniffer.spec.ts\n@@ -1,5 +1,5 @@\n-import { appConfigFactory, AppConfig } from '../../../src/app-config'\n-import { init as initPdf } from '../../../src/background/pdf-sniffer'\n+import { appConfigFactory, AppConfig } from '@/app-config'\n+import { init as initPdf } from '@/background/pdf-sniffer'\n import sinon from 'sinon'\n \n function hasListenerPatch (fn) {\ndiff --git a/test/unit/background/server.spec.ts b/test/unit/background/server.spec.ts\nindex b8ef065..aa04525 100644\n--- a/test/unit/background/server.spec.ts\n+++ b/test/unit/background/server.spec.ts\n@@ -1,5 +1,5 @@\n-import { appConfigFactory, AppConfig } from '../../../src/app-config'\n-import * as browserWrap from '../../../src/_helpers/browser-api'\n+import { appConfigFactory, AppConfig } from '@/app-config'\n+import * as browserWrap from '@/_helpers/browser-api'\n import sinon from 'sinon'\n \n describe('Server', () => {\n@@ -13,26 +13,26 @@ describe('Server', () => {\n browserWrap.openURL = openURL\n \n beforeAll(() => {\n- jest.doMock('../../../src/_helpers/chs-to-chz', () => {\n+ jest.doMock('@/_helpers/chs-to-chz', () => {\n return { chsToChz }\n })\n- jest.doMock('../../../src/background/audio-manager', () => {\n+ jest.doMock('@/background/audio-manager', () => {\n return { play }\n })\n- jest.doMock('../../../src/_helpers/browser-api', () => {\n+ jest.doMock('@/_helpers/browser-api', () => {\n return browserWrap\n })\n- jest.doMock('../../../src/components/dictionaries/bing/engine.js', () => {\n+ jest.doMock('@/components/dictionaries/bing/engine.js', () => {\n return bingSearch\n })\n })\n \n afterAll(() => {\n browser.flush()\n- jest.dontMock('../../../src/_helpers/chs-to-chz')\n- jest.dontMock('../../../src/background/audio-manager')\n- jest.dontMock('../../../src/_helpers/browser-api')\n- jest.dontMock('../../../src/components/dictionaries/bing/engine.js')\n+ jest.dontMock('@/_helpers/chs-to-chz')\n+ jest.dontMock('@/background/audio-manager')\n+ jest.dontMock('@/_helpers/browser-api')\n+ jest.dontMock('@/components/dictionaries/bing/engine.js')\n })\n \n beforeEach(() => {\n@@ -46,7 +46,7 @@ describe('Server', () => {\n bingSearch.mockReset()\n bingSearch.mockImplementation(() => Promise.resolve())\n jest.resetModules()\n- require('../../../src/background/server')\n+ require('@/background/server')\n })\n \n it('should properly init', () => {\n", "diff --git a/ibis/backends/duckdb/__init__.py b/ibis/backends/duckdb/__init__.py\nindex 2006f59..bb2028e 100644\n--- a/ibis/backends/duckdb/__init__.py\n+++ b/ibis/backends/duckdb/__init__.py\n@@ -1180,7 +1180,7 @@ WHERE catalog_name = :database\"\"\"\n def _register_udfs(self, expr: ir.Expr) -> None:\n import ibis.expr.operations as ops\n \n- with self.begin() as con:\n+ with self.con.connect() as con:\n for udf_node in expr.op().find(ops.ScalarUDF):\n compile_func = getattr(\n self, f\"_compile_{udf_node.__input_type__.name.lower()}_udf\"\n"]
| 2 |
["8246d024f21d93cc092e19bede5f7b3a5325c8dc", "6889543bec720e7e7da66535e1012cb66edfe081"]
|
["refactor", "fix"]
|
add workingDirectory option to shell.openExternal() (#15065)
Allows passing `workingDirectory` to the underlying `ShellExecuteW` API on Windows._x000D_
_x000D_
the motivation is that by default `ShellExecute` would use the current working directory, which would get locked on Windows and can prevent autoUpdater from working correctly. We need to be able specify a different `workingDirectory` to prevent this situation.,add jackson dependencies for zb-bpmn-model
|
["diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc\nindex 97e5f26..df0774b 100644\n--- a/atom/browser/atom_browser_client.cc\n+++ b/atom/browser/atom_browser_client.cc\n@@ -611,7 +611,7 @@ void OnOpenExternal(const GURL& escaped_url, bool allowed) {\n #else\n escaped_url,\n #endif\n- true);\n+ platform_util::OpenExternalOptions());\n }\n \n void HandleExternalProtocolInUI(\ndiff --git a/atom/common/api/atom_api_shell.cc b/atom/common/api/atom_api_shell.cc\nindex 1323cd6..7c67c7a 100644\n--- a/atom/common/api/atom_api_shell.cc\n+++ b/atom/common/api/atom_api_shell.cc\n@@ -60,11 +60,12 @@ bool OpenExternal(\n const GURL& url,\n #endif\n mate::Arguments* args) {\n- bool activate = true;\n+ platform_util::OpenExternalOptions options;\n if (args->Length() >= 2) {\n- mate::Dictionary options;\n- if (args->GetNext(&options)) {\n- options.Get(\"activate\", &activate);\n+ mate::Dictionary obj;\n+ if (args->GetNext(&obj)) {\n+ obj.Get(\"activate\", &options.activate);\n+ obj.Get(\"workingDirectory\", &options.working_dir);\n }\n }\n \n@@ -72,13 +73,13 @@ bool OpenExternal(\n base::Callback<void(v8::Local<v8::Value>)> callback;\n if (args->GetNext(&callback)) {\n platform_util::OpenExternal(\n- url, activate,\n+ url, options,\n base::Bind(&OnOpenExternalFinished, args->isolate(), callback));\n return true;\n }\n }\n \n- return platform_util::OpenExternal(url, activate);\n+ return platform_util::OpenExternal(url, options);\n }\n \n #if defined(OS_WIN)\ndiff --git a/atom/common/platform_util.h b/atom/common/platform_util.h\nindex 6fd8405..6686a4f 100644\n--- a/atom/common/platform_util.h\n+++ b/atom/common/platform_util.h\n@@ -8,6 +8,7 @@\n #include <string>\n \n #include \"base/callback_forward.h\"\n+#include \"base/files/file_path.h\"\n #include \"build/build_config.h\"\n \n #if defined(OS_WIN)\n@@ -16,10 +17,6 @@\n \n class GURL;\n \n-namespace base {\n-class FilePath;\n-}\n-\n namespace platform_util {\n \n typedef base::Callback<void(const std::string&)> OpenExternalCallback;\n@@ -32,6 +29,11 @@ bool ShowItemInFolder(const base::FilePath& full_path);\n // Must be called from the UI thread.\n bool OpenItem(const base::FilePath& full_path);\n \n+struct OpenExternalOptions {\n+ bool activate = true;\n+ base::FilePath working_dir;\n+};\n+\n // Open the given external protocol URL in the desktop's default manner.\n // (For example, mailto: URLs in the default mail user agent.)\n bool OpenExternal(\n@@ -40,7 +42,7 @@ bool OpenExternal(\n #else\n const GURL& url,\n #endif\n- bool activate);\n+ const OpenExternalOptions& options);\n \n // The asynchronous version of OpenExternal.\n void OpenExternal(\n@@ -49,7 +51,7 @@ void OpenExternal(\n #else\n const GURL& url,\n #endif\n- bool activate,\n+ const OpenExternalOptions& options,\n const OpenExternalCallback& callback);\n \n // Move a file to trash.\ndiff --git a/atom/common/platform_util_linux.cc b/atom/common/platform_util_linux.cc\nindex 63ee0bd..f17cbda 100644\n--- a/atom/common/platform_util_linux.cc\n+++ b/atom/common/platform_util_linux.cc\n@@ -80,7 +80,7 @@ bool OpenItem(const base::FilePath& full_path) {\n return XDGOpen(full_path.value(), false);\n }\n \n-bool OpenExternal(const GURL& url, bool activate) {\n+bool OpenExternal(const GURL& url, const OpenExternalOptions& options) {\n // Don't wait for exit, since we don't want to wait for the browser/email\n // client window to close before returning\n if (url.SchemeIs(\"mailto\"))\n@@ -90,10 +90,10 @@ bool OpenExternal(const GURL& url, bool activate) {\n }\n \n void OpenExternal(const GURL& url,\n- bool activate,\n+ const OpenExternalOptions& options,\n const OpenExternalCallback& callback) {\n // TODO(gabriel): Implement async open if callback is specified\n- callback.Run(OpenExternal(url, activate) ? \"\" : \"Failed to open\");\n+ callback.Run(OpenExternal(url, options) ? \"\" : \"Failed to open\");\n }\n \n bool MoveItemToTrash(const base::FilePath& full_path) {\ndiff --git a/atom/common/platform_util_mac.mm b/atom/common/platform_util_mac.mm\nindex b83b1e1..4cda8bf 100644\n--- a/atom/common/platform_util_mac.mm\n+++ b/atom/common/platform_util_mac.mm\n@@ -139,16 +139,16 @@ bool OpenItem(const base::FilePath& full_path) {\n launchIdentifiers:NULL];\n }\n \n-bool OpenExternal(const GURL& url, bool activate) {\n+bool OpenExternal(const GURL& url, const OpenExternalOptions& options) {\n DCHECK([NSThread isMainThread]);\n NSURL* ns_url = net::NSURLWithGURL(url);\n if (ns_url)\n- return OpenURL(ns_url, activate).empty();\n+ return OpenURL(ns_url, options.activate).empty();\n return false;\n }\n \n void OpenExternal(const GURL& url,\n- bool activate,\n+ const OpenExternalOptions& options,\n const OpenExternalCallback& callback) {\n NSURL* ns_url = net::NSURLWithGURL(url);\n if (!ns_url) {\n@@ -157,13 +157,13 @@ void OpenExternal(const GURL& url,\n }\n \n __block OpenExternalCallback c = callback;\n- dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),\n- ^{\n- __block std::string error = OpenURL(ns_url, activate);\n- dispatch_async(dispatch_get_main_queue(), ^{\n- c.Run(error);\n- });\n- });\n+ dispatch_async(\n+ dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{\n+ __block std::string error = OpenURL(ns_url, options.activate);\n+ dispatch_async(dispatch_get_main_queue(), ^{\n+ c.Run(error);\n+ });\n+ });\n }\n \n bool MoveItemToTrash(const base::FilePath& full_path) {\ndiff --git a/atom/common/platform_util_win.cc b/atom/common/platform_util_win.cc\nindex 34576be..5712200 100644\n--- a/atom/common/platform_util_win.cc\n+++ b/atom/common/platform_util_win.cc\n@@ -294,15 +294,18 @@ bool OpenItem(const base::FilePath& full_path) {\n return ui::win::OpenFileViaShell(full_path);\n }\n \n-bool OpenExternal(const base::string16& url, bool activate) {\n+bool OpenExternal(const base::string16& url,\n+ const OpenExternalOptions& options) {\n // Quote the input scheme to be sure that the command does not have\n // parameters unexpected by the external program. This url should already\n // have been escaped.\n base::string16 escaped_url = L\"\\\"\" + url + L\"\\\"\";\n+ auto working_dir = options.working_dir.value();\n \n- if (reinterpret_cast<ULONG_PTR>(ShellExecuteW(\n- NULL, L\"open\", escaped_url.c_str(), NULL, NULL, SW_SHOWNORMAL)) <=\n- 32) {\n+ if (reinterpret_cast<ULONG_PTR>(\n+ ShellExecuteW(nullptr, L\"open\", escaped_url.c_str(), nullptr,\n+ working_dir.empty() ? nullptr : working_dir.c_str(),\n+ SW_SHOWNORMAL)) <= 32) {\n // We fail to execute the call. We could display a message to the user.\n // TODO(nsylvain): we should also add a dialog to warn on errors. See\n // bug 1136923.\n@@ -312,10 +315,10 @@ bool OpenExternal(const base::string16& url, bool activate) {\n }\n \n void OpenExternal(const base::string16& url,\n- bool activate,\n+ const OpenExternalOptions& options,\n const OpenExternalCallback& callback) {\n // TODO(gabriel): Implement async open if callback is specified\n- callback.Run(OpenExternal(url, activate) ? \"\" : \"Failed to open\");\n+ callback.Run(OpenExternal(url, options) ? \"\" : \"Failed to open\");\n }\n \n bool MoveItemToTrash(const base::FilePath& path) {\ndiff --git a/docs/api/shell.md b/docs/api/shell.md\nindex a469f94..b38348a 100644\n--- a/docs/api/shell.md\n+++ b/docs/api/shell.md\n@@ -37,9 +37,10 @@ Open the given file in the desktop's default manner.\n ### `shell.openExternal(url[, options, callback])`\n \n * `url` String - Max 2081 characters on windows, or the function returns false.\n-* `options` Object (optional) _macOS_\n- * `activate` Boolean - `true` to bring the opened application to the\n- foreground. The default is `true`.\n+* `options` Object (optional)\n+ * `activate` Boolean (optional) - `true` to bring the opened application to the\n+ foreground. The default is `true`. _macOS_\n+ * `workingDirectory` String (optional) - The working directory. _Windows_\n * `callback` Function (optional) _macOS_ - If specified will perform the open asynchronously.\n * `error` Error\n \n", "diff --git a/parent/pom.xml b/parent/pom.xml\nindex d475131..6290e66 100644\n--- a/parent/pom.xml\n+++ b/parent/pom.xml\n@@ -35,6 +35,7 @@\n <version.mockito>1.8.5</version.mockito>\n <version.assertj>3.8.0</version.assertj>\n <version.msgpack>0.8.13</version.msgpack>\n+ <version.jackson>2.9.0</version.jackson>\n <version.jmh>1.11.2</version.jmh>\n <version.sbe>1.5.6</version.sbe>\n <version.slf4j>1.7.23</version.slf4j>\n@@ -64,6 +65,18 @@\n </dependency>\n \n <dependency>\n+ <groupId>com.fasterxml.jackson.core</groupId>\n+ <artifactId>jackson-databind</artifactId>\n+ <version>${version.jackson}</version>\n+ </dependency>\n+\n+ <dependency>\n+ <groupId>com.fasterxml.jackson.dataformat</groupId>\n+ <artifactId>jackson-dataformat-yaml</artifactId>\n+ <version>${version.jackson}</version>\n+ </dependency>\n+\n+ <dependency>\n <groupId>org.msgpack</groupId>\n <artifactId>msgpack-core</artifactId>\n <version>${version.msgpack}</version>\n"]
| 2 |
["a9475f359061fcd6cd53557599fedf0df5e9ee00", "fab09655d5cc30727289cc3f26e5396fce235cd3"]
|
["feat", "build"]
|
retry uploading pdb files on appveyor (#21561),brew tests/multiple darwin builds/gh enterprise
|
["diff --git a/appveyor.yml b/appveyor.yml\nindex 9aca21e..8b54543 100644\n--- a/appveyor.yml\n+++ b/appveyor.yml\n@@ -146,12 +146,12 @@ build_script:\n - ps: >-\n if ($env:GN_CONFIG -eq 'release') {\n python electron\\script\\zip-symbols.py\n- appveyor PushArtifact out/Default/symbols.zip\n+ appveyor-retry appveyor PushArtifact out/Default/symbols.zip\n } else {\n # It's useful to have pdb files when debugging testing builds that are\n # built on CI.\n 7z a pdb.zip out\\Default\\*.pdb\n- appveyor PushArtifact pdb.zip\n+ appveyor-retry appveyor PushArtifact pdb.zip\n }\n - python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest\n test_script:\n", "diff --git a/pipeline/brew/brew.go b/pipeline/brew/brew.go\nindex ec27182..15ed189 100644\n--- a/pipeline/brew/brew.go\n+++ b/pipeline/brew/brew.go\n@@ -1,5 +1,3 @@\n-// Package brew implements the Pipe, providing formula generation and\n-// uploading it to a configured repo.\n package brew\n \n import (\n@@ -10,13 +8,12 @@ import (\n \t\"strings\"\n \t\"text/template\"\n \n-\t\"github.com/goreleaser/goreleaser/internal/artifact\"\n-\n \t\"github.com/apex/log\"\n \n \t\"github.com/goreleaser/goreleaser/checksum\"\n \t\"github.com/goreleaser/goreleaser/config\"\n \t\"github.com/goreleaser/goreleaser/context\"\n+\t\"github.com/goreleaser/goreleaser/internal/artifact\"\n \t\"github.com/goreleaser/goreleaser/internal/client\"\n \t\"github.com/goreleaser/goreleaser/pipeline\"\n )\n@@ -106,14 +103,14 @@ func doRun(ctx *context.Context, client client.Client) error {\n \t\tartifact.And(\n \t\t\tartifact.ByGoos(\"darwin\"),\n \t\t\tartifact.ByGoarch(\"amd64\"),\n-\t\t\tartifact.ByGoarch(\"\"),\n+\t\t\tartifact.ByGoarm(\"\"),\n \t\t\tartifact.ByType(artifact.UploadableArchive),\n \t\t),\n \t).List()\n \tif len(archives) == 0 {\n \t\treturn ErrNoDarwin64Build\n \t}\n-\tif len(archives) > 0 {\n+\tif len(archives) > 1 {\n \t\treturn ErrTooManyDarwin64Builds\n \t}\n \tvar path = filepath.Join(ctx.Config.Brew.Folder, ctx.Config.ProjectName+\".rb\")\n@@ -145,8 +142,7 @@ func doBuildFormula(data templateData) (out bytes.Buffer, err error) {\n }\n \n func dataFor(ctx *context.Context, client client.Client, artifact artifact.Artifact) (result templateData, err error) {\n-\tvar file = artifact.Path\n-\tsum, err := checksum.SHA256(file)\n+\tsum, err := checksum.SHA256(artifact.Path)\n \tif err != nil {\n \t\treturn\n \t}\n@@ -163,7 +159,7 @@ func dataFor(ctx *context.Context, client client.Client, artifact artifact.Artif\n \t\tTag: ctx.Git.CurrentTag,\n \t\tVersion: ctx.Version,\n \t\tCaveats: ctx.Config.Brew.Caveats,\n-\t\tFile: file,\n+\t\tFile: artifact.Name,\n \t\tSHA256: sum,\n \t\tDependencies: ctx.Config.Brew.Dependencies,\n \t\tConflicts: ctx.Config.Brew.Conflicts,\ndiff --git a/pipeline/brew/brew_test.go b/pipeline/brew/brew_test.go\nindex 7e513bf..9066935 100644\n--- a/pipeline/brew/brew_test.go\n+++ b/pipeline/brew/brew_test.go\n@@ -9,6 +9,7 @@ import (\n \n \t\"github.com/goreleaser/goreleaser/config\"\n \t\"github.com/goreleaser/goreleaser/context\"\n+\t\"github.com/goreleaser/goreleaser/internal/artifact\"\n \t\"github.com/goreleaser/goreleaser/internal/testlib\"\n \t\"github.com/stretchr/testify/assert\"\n )\n@@ -93,7 +94,8 @@ func TestRunPipe(t *testing.T) {\n \t\tGit: context.GitInfo{\n \t\t\tCurrentTag: \"v1.0.1\",\n \t\t},\n-\t\tVersion: \"1.0.1\",\n+\t\tVersion: \"1.0.1\",\n+\t\tArtifacts: artifact.New(),\n \t\tConfig: config.Project{\n \t\t\tDist: folder,\n \t\t\tProjectName: \"run-pipe\",\n@@ -124,31 +126,53 @@ func TestRunPipe(t *testing.T) {\n \t\tPublish: true,\n \t}\n \tvar path = filepath.Join(folder, \"bin.tar.gz\")\n-\tctx.AddBinary(\"darwinamd64\", \"bin\", \"bin\", path)\n+\tctx.Artifacts.Add(artifact.Artifact{\n+\t\tName: \"bin.tar.gz\",\n+\t\tPath: path,\n+\t\tGoos: \"darwin\",\n+\t\tGoarch: \"amd64\",\n+\t\tType: artifact.UploadableArchive,\n+\t})\n \tclient := &DummyClient{}\n \tassert.Error(t, doRun(ctx, client))\n \tassert.False(t, client.CreatedFile)\n \n \t_, err = os.Create(path)\n \tassert.NoError(t, err)\n-\tassert.NoError(t, doRun(ctx, client))\n-\tassert.True(t, client.CreatedFile)\n \n-\tbts, err := ioutil.ReadFile(\"testdata/run_pipe.rb\")\n-\tassert.NoError(t, err)\n-\t// ioutil.WriteFile(\"testdata/run_pipe.rb\", []byte(client.Content), 0644)\n+\tt.Run(\"default git url\", func(tt *testing.T) {\n+\t\tassert.NoError(tt, doRun(ctx, client))\n+\t\tassert.True(tt, client.CreatedFile)\n+\n+\t\tbts, err := ioutil.ReadFile(\"testdata/run_pipe.rb\")\n+\t\tassert.NoError(tt, err)\n+\t\t// TODO: make writing this file toggleable somehow?\n+\t\t// ioutil.WriteFile(\"testdata/run_pipe.rb\", []byte(client.Content), 0644)\n+\t\tassert.Equal(tt, string(bts), client.Content)\n+\t})\n \n-\tassert.Equal(t, string(bts), client.Content)\n+\tt.Run(\"github enterprise url\", func(tt *testing.T) {\n+\t\tctx.Config.GitHubURLs.Download = \"http://github.example.org\"\n+\t\tassert.NoError(tt, doRun(ctx, client))\n+\t\tassert.True(tt, client.CreatedFile)\n+\n+\t\tbts, err := ioutil.ReadFile(\"testdata/run_pipe_enterprise.rb\")\n+\t\tassert.NoError(tt, err)\n+\t\t// TODO: make writing this file toggleable somehow?\n+\t\t// ioutil.WriteFile(\"testdata/run_pipe_enterprise.rb\", []byte(client.Content), 0644)\n+\t\tassert.Equal(tt, string(bts), client.Content)\n+\t})\n }\n \n+// TODO: this test is irrelevant and can probavly be removed\n func TestRunPipeFormatOverride(t *testing.T) {\n \tfolder, err := ioutil.TempDir(\"\", \"goreleasertest\")\n \tassert.NoError(t, err)\n \tvar path = filepath.Join(folder, \"bin.zip\")\n \t_, err = os.Create(path)\n \tassert.NoError(t, err)\n-\tvar ctx = &context.Context{\n-\t\tConfig: config.Project{\n+\tvar ctx = context.New(\n+\t\tconfig.Project{\n \t\t\tDist: folder,\n \t\t\tArchive: config.Archive{\n \t\t\t\tFormat: \"tar.gz\",\n@@ -166,9 +190,15 @@ func TestRunPipeFormatOverride(t *testing.T) {\n \t\t\t\t},\n \t\t\t},\n \t\t},\n-\t\tPublish: true,\n-\t}\n-\tctx.AddBinary(\"darwinamd64\", \"bin\", \"bin\", path)\n+\t)\n+\tctx.Publish = true\n+\tctx.Artifacts.Add(artifact.Artifact{\n+\t\tName: \"bin.zip\",\n+\t\tPath: path,\n+\t\tGoos: \"darwin\",\n+\t\tGoarch: \"amd64\",\n+\t\tType: artifact.UploadableArchive,\n+\t})\n \tclient := &DummyClient{}\n \tassert.NoError(t, doRun(ctx, client))\n \tassert.True(t, client.CreatedFile)\n@@ -195,6 +225,40 @@ func TestRunPipeNoDarwin64Build(t *testing.T) {\n \tassert.False(t, client.CreatedFile)\n }\n \n+func TestRunPipeMultipleDarwin64Build(t *testing.T) {\n+\tvar ctx = context.New(\n+\t\tconfig.Project{\n+\t\t\tArchive: config.Archive{\n+\t\t\t\tFormat: \"tar.gz\",\n+\t\t\t},\n+\t\t\tBrew: config.Homebrew{\n+\t\t\t\tGitHub: config.Repo{\n+\t\t\t\t\tOwner: \"test\",\n+\t\t\t\t\tName: \"test\",\n+\t\t\t\t},\n+\t\t\t},\n+\t\t},\n+\t)\n+\tctx.Publish = true\n+\tctx.Artifacts.Add(artifact.Artifact{\n+\t\tName: \"bin1\",\n+\t\tPath: \"doesnt mather\",\n+\t\tGoos: \"darwin\",\n+\t\tGoarch: \"amd64\",\n+\t\tType: artifact.UploadableArchive,\n+\t})\n+\tctx.Artifacts.Add(artifact.Artifact{\n+\t\tName: \"bin2\",\n+\t\tPath: \"doesnt mather\",\n+\t\tGoos: \"darwin\",\n+\t\tGoarch: \"amd64\",\n+\t\tType: artifact.UploadableArchive,\n+\t})\n+\tclient := &DummyClient{}\n+\tassert.Equal(t, ErrTooManyDarwin64Builds, doRun(ctx, client))\n+\tassert.False(t, client.CreatedFile)\n+}\n+\n func TestRunPipeBrewNotSetup(t *testing.T) {\n \tvar ctx = &context.Context{\n \t\tConfig: config.Project{},\n@@ -206,9 +270,8 @@ func TestRunPipeBrewNotSetup(t *testing.T) {\n }\n \n func TestRunPipeBinaryRelease(t *testing.T) {\n-\tvar ctx = &context.Context{\n-\t\tPublish: true,\n-\t\tConfig: config.Project{\n+\tvar ctx = context.New(\n+\t\tconfig.Project{\n \t\t\tArchive: config.Archive{\n \t\t\t\tFormat: \"binary\",\n \t\t\t},\n@@ -219,8 +282,15 @@ func TestRunPipeBinaryRelease(t *testing.T) {\n \t\t\t\t},\n \t\t\t},\n \t\t},\n-\t}\n-\tctx.AddBinary(\"darwinamd64\", \"foo\", \"bar\", \"baz\")\n+\t)\n+\tctx.Publish = true\n+\tctx.Artifacts.Add(artifact.Artifact{\n+\t\tName: \"bin\",\n+\t\tPath: \"doesnt mather\",\n+\t\tGoos: \"darwin\",\n+\t\tGoarch: \"amd64\",\n+\t\tType: artifact.Binary,\n+\t})\n \tclient := &DummyClient{}\n \ttestlib.AssertSkipped(t, doRun(ctx, client))\n \tassert.False(t, client.CreatedFile)\ndiff --git a/pipeline/brew/doc.go b/pipeline/brew/doc.go\nnew file mode 100644\nindex 0000000..2cddc12\n--- /dev/null\n+++ b/pipeline/brew/doc.go\n@@ -0,0 +1,3 @@\n+// Package brew implements the Pipe, providing formula generation and\n+// uploading it to a configured repo.\n+package brew\ndiff --git a/pipeline/brew/testdata/run_pipe_enterprise.rb b/pipeline/brew/testdata/run_pipe_enterprise.rb\nnew file mode 100644\nindex 0000000..4b24ce0\n--- /dev/null\n+++ b/pipeline/brew/testdata/run_pipe_enterprise.rb\n@@ -0,0 +1,33 @@\n+class RunPipe < Formula\n+ desc \"A run pipe test formula\"\n+ homepage \"https://github.com/goreleaser\"\n+ url \"http://github.example.org/test/test/releases/download/v1.0.1/bin.tar.gz\"\n+ version \"1.0.1\"\n+ sha256 \"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855\"\n+ \n+ depends_on \"zsh\"\n+ depends_on \"bash\"\n+ \n+ conflicts_with \"gtk+\"\n+ conflicts_with \"qt\"\n+\n+ def install\n+ bin.install \"foo\"\n+ end\n+\n+ def caveats\n+ \"don't do this\"\n+ end\n+\n+ plist_options :startup => false\n+\n+ def plist; <<-EOS.undent\n+ <xml>whatever</xml>\n+ EOS\n+ end\n+\n+ test do\n+ system \"true\"\n+ system \"#{bin}/foo -h\"\n+ end\n+end\n"]
| 2 |
["7152173d26293f4638920b17ce2dfa8ae995193b", "f433bcb59c36571e22d4e86c612e0a6a52f73c09"]
|
["ci", "feat"]
|
missing transformation for T,create dashboards from imported templates
|
["diff --git a/src/Tuple/Merge.ts b/src/Tuple/Merge.ts\nindex dfa7ce5..5ba44b7 100644\n--- a/src/Tuple/Merge.ts\n+++ b/src/Tuple/Merge.ts\n@@ -30,7 +30,7 @@ type _MergeFlat<O extends object, O1P extends object> = {\n }\n \n type MergeDeep<T extends any[], T1 extends any[]> =\n- TupleOf<Compute<_MergeDeep<T, Omit<ObjectOf<T1>, keyof T>, ObjectOf<T1>>>>\n+ TupleOf<Compute<_MergeDeep<ObjectOf<T>, Omit<ObjectOf<T1>, keyof T>, ObjectOf<T1>>>>\n // same principle as above, but with a little tweak\n // we keep the original `O1` to know if we can merge\n // => if `O` and `O1` have `object` fields of same name\n", "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 590f5ea..bd74e95 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -1,6 +1,7 @@\n ## v2.0.0-alpha.6 [unreleased]\n \n ### Features\n+1. [12496](https://github.com/influxdata/influxdb/pull/12496): Add ability to import a dashboard\n \n ### Bug Fixes\n \ndiff --git a/ui/src/dashboards/actions/v2/index.ts b/ui/src/dashboards/actions/v2/index.ts\nindex ad0d13d..35babc7 100644\n--- a/ui/src/dashboards/actions/v2/index.ts\n+++ b/ui/src/dashboards/actions/v2/index.ts\n@@ -16,6 +16,7 @@ import {\n removeDashboardLabels as removeDashboardLabelsAJAX,\n updateView as updateViewAJAX,\n } from 'src/dashboards/apis/v2'\n+import {client} from 'src/utils/api'\n \n // Actions\n import {notify} from 'src/shared/actions/notifications'\n@@ -25,6 +26,10 @@ import {\n DeleteTimeRangeAction,\n } from 'src/dashboards/actions/v2/ranges'\n import {setView, SetViewAction} from 'src/dashboards/actions/v2/views'\n+import {\n+ importDashboardSucceeded,\n+ importDashboardFailed,\n+} from 'src/shared/copy/notifications'\n \n // Utils\n import {\n@@ -38,7 +43,7 @@ import * as copy from 'src/shared/copy/notifications'\n // Types\n import {RemoteDataState} from 'src/types'\n import {PublishNotificationAction} from 'src/types/actions/notifications'\n-import {CreateCell} from '@influxdata/influx'\n+import {CreateCell, IDashboardTemplate} from '@influxdata/influx'\n import {Dashboard, NewView, Cell} from 'src/types/v2'\n import {ILabel} from '@influxdata/influx'\n \n@@ -201,6 +206,19 @@ export const getDashboardsAsync = () => async (\n }\n }\n \n+export const createDashboardFromTemplate = (\n+ template: IDashboardTemplate,\n+ orgID: string\n+) => async dispatch => {\n+ try {\n+ await client.dashboards.createFromTemplate(template, orgID)\n+\n+ dispatch(notify(importDashboardSucceeded()))\n+ } catch (error) {\n+ dispatch(notify(importDashboardFailed(error)))\n+ }\n+}\n+\n export const importDashboardAsync = (dashboard: Dashboard) => async (\n dispatch: Dispatch<Action>\n ): Promise<void> => {\ndiff --git a/ui/src/dashboards/components/ImportDashboardOverlay.tsx b/ui/src/dashboards/components/ImportDashboardOverlay.tsx\nindex 37ef80b..84216c3 100644\n--- a/ui/src/dashboards/components/ImportDashboardOverlay.tsx\n+++ b/ui/src/dashboards/components/ImportDashboardOverlay.tsx\n@@ -1,70 +1,80 @@\n+// Libraries\n import React, {PureComponent} from 'react'\n import _ from 'lodash'\n+import {connect} from 'react-redux'\n \n-import Container from 'src/clockface/components/overlays/OverlayContainer'\n-import Heading from 'src/clockface/components/overlays/OverlayHeading'\n-import Body from 'src/clockface/components/overlays/OverlayBody'\n-import DragAndDrop from 'src/shared/components/DragAndDrop'\n+// Constants\n import {dashboardImportFailed} from 'src/shared/copy/notifications'\n \n-import {Dashboard} from 'src/types/v2'\n-import {Notification} from 'src/types/notifications'\n+// Actions\n+import {notify as notifyAction} from 'src/shared/actions/notifications'\n+import {getDashboardsAsync} from 'src/dashboards/actions/v2'\n \n-interface Props {\n+// Types\n+import ImportOverlay from 'src/shared/components/ImportOverlay'\n+import {createDashboardFromTemplate as createDashboardFromTemplateAction} from 'src/dashboards/actions/v2'\n+\n+interface OwnProps {\n onDismissOverlay: () => void\n- onImportDashboard: (dashboard: Dashboard) => void\n- notify: (message: Notification) => void\n+ orgID: string\n+ isVisible: boolean\n+}\n+interface DispatchProps {\n+ notify: typeof notifyAction\n+ createDashboardFromTemplate: typeof createDashboardFromTemplateAction\n+ populateDashboards: typeof getDashboardsAsync\n }\n+\n+type Props = OwnProps & DispatchProps\n+\n class ImportDashboardOverlay extends PureComponent<Props> {\n constructor(props: Props) {\n super(props)\n }\n \n public render() {\n- const {onDismissOverlay} = this.props\n+ const {isVisible, onDismissOverlay} = this.props\n \n return (\n- <Container maxWidth={800}>\n- <Heading title=\"Import Dashboard\" onDismiss={onDismissOverlay} />\n- <Body>\n- <DragAndDrop\n- submitText=\"Upload Dashboard\"\n- fileTypesToAccept={this.validFileExtension}\n- handleSubmit={this.handleUploadDashboard}\n- />\n- </Body>\n- </Container>\n+ <ImportOverlay\n+ isVisible={isVisible}\n+ onDismissOverlay={onDismissOverlay}\n+ resourceName=\"Dashboard\"\n+ onSubmit={this.handleUploadDashboard}\n+ />\n )\n }\n \n- private get validFileExtension(): string {\n- return '.json'\n- }\n-\n- private handleUploadDashboard = (\n- uploadContent: string,\n- fileName: string\n- ): void => {\n- const {notify, onImportDashboard, onDismissOverlay} = this.props\n- const fileExtensionRegex = new RegExp(`${this.validFileExtension}$`)\n- if (!fileName.match(fileExtensionRegex)) {\n- notify(dashboardImportFailed('Please import a JSON file'))\n- return\n- }\n+ private handleUploadDashboard = async (\n+ uploadContent: string\n+ ): Promise<void> => {\n+ const {\n+ notify,\n+ createDashboardFromTemplate,\n+ onDismissOverlay,\n+ populateDashboards,\n+ orgID,\n+ } = this.props\n \n try {\n- const {dashboard} = JSON.parse(uploadContent)\n+ const template = JSON.parse(uploadContent)\n \n- if (!_.isEmpty(dashboard)) {\n- onImportDashboard(dashboard)\n- onDismissOverlay()\n- } else {\n- notify(dashboardImportFailed('No dashboard found in file'))\n- }\n+ await createDashboardFromTemplate(template, orgID)\n+ await populateDashboards()\n+\n+ onDismissOverlay()\n } catch (error) {\n notify(dashboardImportFailed(error))\n }\n }\n }\n+const mdtp: DispatchProps = {\n+ notify: notifyAction,\n+ createDashboardFromTemplate: createDashboardFromTemplateAction,\n+ populateDashboards: getDashboardsAsync,\n+}\n \n-export default ImportDashboardOverlay\n+export default connect<{}, DispatchProps, OwnProps>(\n+ null,\n+ mdtp\n+)(ImportDashboardOverlay)\ndiff --git a/ui/src/dashboards/components/dashboard_index/DashboardsIndex.tsx b/ui/src/dashboards/components/dashboard_index/DashboardsIndex.tsx\nindex d6b299f..1ff7f47 100644\n--- a/ui/src/dashboards/components/dashboard_index/DashboardsIndex.tsx\n+++ b/ui/src/dashboards/components/dashboard_index/DashboardsIndex.tsx\n@@ -2,15 +2,15 @@\n import React, {PureComponent} from 'react'\n import {InjectedRouter} from 'react-router'\n import {connect} from 'react-redux'\n-import {isEmpty} from 'lodash'\n+import {get} from 'lodash'\n \n // Components\n import DashboardsIndexContents from 'src/dashboards/components/dashboard_index/DashboardsIndexContents'\n import {Page} from 'src/pageLayout'\n import SearchWidget from 'src/shared/components/search_widget/SearchWidget'\n import AddResourceDropdown from 'src/shared/components/AddResourceDropdown'\n-import ImportOverlay from 'src/shared/components/ImportOverlay'\n import ExportOverlay from 'src/shared/components/ExportOverlay'\n+import ImportDashboardOverlay from 'src/dashboards/components/ImportDashboardOverlay'\n \n // APIs\n import {createDashboard, cloneDashboard} from 'src/dashboards/apis/v2/'\n@@ -32,10 +32,7 @@ import {DEFAULT_DASHBOARD_NAME} from 'src/dashboards/constants/index'\n import {\n dashboardSetDefaultFailed,\n dashboardCreateFailed,\n- dashboardImported,\n- dashboardImportFailed,\n } from 'src/shared/copy/notifications'\n-import {cantImportInvalidResource} from 'src/shared/copy/v2/notifications'\n \n // Types\n import {Notification} from 'src/types/notifications'\n@@ -197,24 +194,6 @@ class DashboardIndex extends PureComponent<Props, State> {\n this.props.handleDeleteDashboard(dashboard)\n }\n \n- private handleImportDashboard = async (\n- importString: string\n- ): Promise<void> => {\n- const {notify} = this.props\n- try {\n- const resource = JSON.parse(importString)\n-\n- if (isEmpty(resource)) {\n- notify(cantImportInvalidResource('Dashboard'))\n- return\n- }\n- this.handleToggleImportOverlay()\n- notify(dashboardImported())\n- } catch (error) {\n- notify(dashboardImportFailed(error))\n- }\n- }\n-\n private handleFilterDashboards = (searchTerm: string): void => {\n this.setState({searchTerm})\n }\n@@ -229,13 +208,13 @@ class DashboardIndex extends PureComponent<Props, State> {\n \n private get importOverlay(): JSX.Element {\n const {isImportingDashboard} = this.state\n+ const {orgs} = this.props\n \n return (\n- <ImportOverlay\n- isVisible={isImportingDashboard}\n- resourceName=\"Dashboard\"\n+ <ImportDashboardOverlay\n onDismissOverlay={this.handleToggleImportOverlay}\n- onSubmit={this.handleImportDashboard}\n+ orgID={get(orgs, '0.id', '')}\n+ isVisible={isImportingDashboard}\n />\n )\n }\ndiff --git a/ui/src/organizations/components/Dashboards.tsx b/ui/src/organizations/components/Dashboards.tsx\nindex 08c8402..90c2514 100644\n--- a/ui/src/organizations/components/Dashboards.tsx\n+++ b/ui/src/organizations/components/Dashboards.tsx\n@@ -6,13 +6,10 @@ import _ from 'lodash'\n \n // Components\n import DashboardsIndexContents from 'src/dashboards/components/dashboard_index/DashboardsIndexContents'\n-import {OverlayTechnology, Input, Tabs} from 'src/clockface'\n+import {Input, Tabs} from 'src/clockface'\n import {Button, ComponentColor, IconFont} from '@influxdata/clockface'\n import ImportDashboardOverlay from 'src/dashboards/components/ImportDashboardOverlay'\n \n-// Utils\n-import {getDeep} from 'src/utils/wrappers'\n-\n // APIs\n import {createDashboard, cloneDashboard} from 'src/dashboards/apis/v2/'\n \n@@ -39,7 +36,7 @@ import {DEFAULT_DASHBOARD_NAME} from 'src/dashboards/constants/index'\n \n // Types\n import {Notification} from 'src/types/notifications'\n-import {Links, Cell, Dashboard, AppState, Organization} from 'src/types/v2'\n+import {Links, Dashboard, AppState, Organization} from 'src/types/v2'\n \n // Decorators\n import {ErrorHandling} from 'src/shared/decorators/errors'\n@@ -205,46 +202,20 @@ class Dashboards extends PureComponent<Props, State> {\n this.props.handleDeleteDashboard(dashboard)\n }\n \n- private handleImportDashboard = async (\n- dashboard: Dashboard\n- ): Promise<void> => {\n- const defaultCell = {\n- x: 0,\n- y: 0,\n- w: 4,\n- h: 4,\n- }\n-\n- const name = _.get(dashboard, 'name', DEFAULT_DASHBOARD_NAME)\n- const cellsWithDefaultsApplied = getDeep<Cell[]>(\n- dashboard,\n- 'cells',\n- []\n- ).map(c => ({...defaultCell, ...c}))\n-\n- await this.props.handleImportDashboard({\n- ...dashboard,\n- name,\n- cells: cellsWithDefaultsApplied,\n- })\n- }\n-\n private handleToggleOverlay = (): void => {\n this.setState({isImportingDashboard: !this.state.isImportingDashboard})\n }\n \n private get renderImportOverlay(): JSX.Element {\n- const {notify} = this.props\n const {isImportingDashboard} = this.state\n+ const {orgs} = this.props\n \n return (\n- <OverlayTechnology visible={isImportingDashboard}>\n- <ImportDashboardOverlay\n- onDismissOverlay={this.handleToggleOverlay}\n- onImportDashboard={this.handleImportDashboard}\n- notify={notify}\n- />\n- </OverlayTechnology>\n+ <ImportDashboardOverlay\n+ onDismissOverlay={this.handleToggleOverlay}\n+ orgID={_.get(orgs, '0.id', '')}\n+ isVisible={isImportingDashboard}\n+ />\n )\n }\n }\ndiff --git a/ui/src/shared/components/ImportOverlay.tsx b/ui/src/shared/components/ImportOverlay.tsx\nindex 10f1d50..476fa70 100644\n--- a/ui/src/shared/components/ImportOverlay.tsx\n+++ b/ui/src/shared/components/ImportOverlay.tsx\n@@ -10,6 +10,7 @@ import {\n OverlayHeading,\n OverlayFooter,\n Radio,\n+ ComponentStatus,\n } from 'src/clockface'\n import {Button, ComponentColor} from '@influxdata/clockface'\n \n@@ -93,6 +94,7 @@ export default class ImportOverlay extends PureComponent<Props, State> {\n submitText=\"Upload\"\n handleSubmit={this.handleSetImportContent}\n submitOnDrop={true}\n+ submitOnUpload={true}\n onCancel={this.clearImportContent}\n />\n )\n@@ -110,18 +112,21 @@ export default class ImportOverlay extends PureComponent<Props, State> {\n private get submitButton(): JSX.Element {\n const {resourceName} = this.props\n const {selectedImportOption, importContent} = this.state\n- if (\n+ const isEnabled =\n selectedImportOption === ImportOption.Paste ||\n (selectedImportOption === ImportOption.Upload && importContent)\n- ) {\n- return (\n- <Button\n- text={`Import JSON as ${resourceName}`}\n- onClick={this.submit}\n- color={ComponentColor.Primary}\n- />\n- )\n- }\n+ const status = isEnabled\n+ ? ComponentStatus.Default\n+ : ComponentStatus.Disabled\n+\n+ return (\n+ <Button\n+ text={`Import JSON as ${resourceName}`}\n+ onClick={this.submit}\n+ color={ComponentColor.Primary}\n+ status={status}\n+ />\n+ )\n }\n \n private submit = () => {\ndiff --git a/ui/src/shared/copy/notifications.ts b/ui/src/shared/copy/notifications.ts\nindex 4492078..86700e2 100644\n--- a/ui/src/shared/copy/notifications.ts\n+++ b/ui/src/shared/copy/notifications.ts\n@@ -799,9 +799,18 @@ export const importTaskSucceeded = (): Notification => ({\n })\n \n export const importTaskFailed = (error: string): Notification => ({\n- ...defaultSuccessNotification,\n+ ...defaultErrorNotification,\n message: `Failed to import task: ${error}`,\n })\n+export const importDashboardSucceeded = (): Notification => ({\n+ ...defaultSuccessNotification,\n+ message: `Successfully imported dashboard.`,\n+})\n+\n+export const importDashboardFailed = (error: string): Notification => ({\n+ ...defaultErrorNotification,\n+ message: `Failed to import dashboard: ${error}`,\n+})\n \n // Labels\n export const getLabelsFailed = (): Notification => ({\n"]
| 2 |
["c4d9e5023fa0f88ba283b37da27677ceda1cbfbb", "9114362b39f5194209cd0b330af7076333f3db77"]
|
["fix", "feat"]
|
remove unnecessary lines from verify-wal test,correctly read new last flushed index
|
["diff --git a/storage/wal/verifier_test.go b/storage/wal/verifier_test.go\nindex 61e1536..a44755f 100644\n--- a/storage/wal/verifier_test.go\n+++ b/storage/wal/verifier_test.go\n@@ -138,22 +138,13 @@ func writeCorruptEntries(file *os.File, t *testing.T, n int) {\n \t\t}\n \t}\n \n-\n \t// Write some random bytes to the file to simulate corruption.\n \tif _, err := file.Write(corruption); err != nil {\n \t\tfatal(t, \"corrupt WAL segment\", err)\n \t}\n-\tcorrupt := []byte{1, 255, 0, 3, 45, 26, 110}\n-\n-\twrote, err := file.Write(corrupt)\n-\tif err != nil {\n-\t\tt.Fatal(err)\n-\t} else if wrote != len(corrupt) {\n-\t\tt.Fatal(\"Error writing corrupt data to file\")\n-\t}\n \n \tif err := file.Close(); err != nil {\n-\t\tt.Fatalf(\"Error: filed to close file: %v\\n\", err)\n+\t\tt.Fatalf(\"Error: failed to close file: %v\\n\", err)\n \t}\n }\n \n", "diff --git a/restore/src/main/java/io/camunda/zeebe/restore/PartitionRestoreService.java b/restore/src/main/java/io/camunda/zeebe/restore/PartitionRestoreService.java\nindex 69b06b6..a4fcb77 100644\n--- a/restore/src/main/java/io/camunda/zeebe/restore/PartitionRestoreService.java\n+++ b/restore/src/main/java/io/camunda/zeebe/restore/PartitionRestoreService.java\n@@ -112,7 +112,7 @@ public class PartitionRestoreService {\n SegmentedJournal.builder()\n .withDirectory(dataDirectory.toFile())\n .withName(partition.name())\n- .withLastWrittenIndex(-1)\n+ .withLastFlushedIndex(-1)\n .build()) {\n \n resetJournal(checkpointPosition, journal);\n"]
| 2 |
["fba4326c72fc22d81aba6976a9fef1e4b6154fd9", "5ffc5794808647de14f945141692be26ad143006"]
|
["refactor", "fix"]
|
fix `memtable` docstrings,expose the means by which we process each reward cycle's affirmation maps at reward cycle boundaries
|
["diff --git a/ibis/expr/api.py b/ibis/expr/api.py\nindex 93fabaa..66a2ea9 100644\n--- a/ibis/expr/api.py\n+++ b/ibis/expr/api.py\n@@ -403,15 +403,21 @@ def memtable(\n >>> import ibis\n >>> t = ibis.memtable([{\"a\": 1}, {\"a\": 2}])\n >>> t\n+ PandasInMemoryTable\n+ data:\n+ DataFrameProxy:\n+ a\n+ 0 1\n+ 1 2\n \n >>> t = ibis.memtable([{\"a\": 1, \"b\": \"foo\"}, {\"a\": 2, \"b\": \"baz\"}])\n >>> t\n PandasInMemoryTable\n data:\n- ((1, 'foo'), (2, 'baz'))\n- schema:\n- a int8\n- b string\n+ DataFrameProxy:\n+ a b\n+ 0 1 foo\n+ 1 2 baz\n \n Create a table literal without column names embedded in the data and pass\n `columns`\n@@ -420,10 +426,22 @@ def memtable(\n >>> t\n PandasInMemoryTable\n data:\n- ((1, 'foo'), (2, 'baz'))\n- schema:\n- a int8\n- b string\n+ DataFrameProxy:\n+ a b\n+ 0 1 foo\n+ 1 2 baz\n+\n+ Create a table literal without column names embedded in the data. Ibis\n+ generates column names if none are provided.\n+\n+ >>> t = ibis.memtable([(1, \"foo\"), (2, \"baz\")])\n+ >>> t\n+ PandasInMemoryTable\n+ data:\n+ DataFrameProxy:\n+ col0 col1\n+ 0 1 foo\n+ 1 2 baz\n \"\"\"\n if columns is not None and schema is not None:\n raise NotImplementedError(\n", "diff --git a/src/burnchains/burnchain.rs b/src/burnchains/burnchain.rs\nindex 92105d6..60c608a 100644\n--- a/src/burnchains/burnchain.rs\n+++ b/src/burnchains/burnchain.rs\n@@ -851,8 +851,26 @@ impl Burnchain {\n );\n \n burnchain_db.store_new_burnchain_block(burnchain, indexer, &block)?;\n- let block_height = block.block_height();\n+ Burnchain::process_affirmation_maps(\n+ burnchain,\n+ burnchain_db,\n+ indexer,\n+ block.block_height(),\n+ )?;\n+\n+ let header = block.header();\n+ Ok(header)\n+ }\n \n+ /// Update the affirmation maps for the previous reward cycle's commits.\n+ /// This is a no-op unless the given burnchain block height falls on a reward cycle boundary. In that\n+ /// case, the previous reward cycle's block commits' affirmation maps are all re-calculated.\n+ pub fn process_affirmation_maps<B: BurnchainHeaderReader>(\n+ burnchain: &Burnchain,\n+ burnchain_db: &mut BurnchainDB,\n+ indexer: &B,\n+ block_height: u64,\n+ ) -> Result<(), burnchain_error> {\n let this_reward_cycle = burnchain\n .block_height_to_reward_cycle(block_height)\n .unwrap_or(0);\n@@ -872,10 +890,7 @@ impl Burnchain {\n );\n update_pox_affirmation_maps(burnchain_db, indexer, prev_reward_cycle, burnchain)?;\n }\n-\n- let header = block.header();\n-\n- Ok(header)\n+ Ok(())\n }\n \n /// Hand off the block to the ChainsCoordinator _and_ process the sortition\n"]
| 2 |
["72bc0f5172c0a3d17bde29cfc00db4c60d2fee3a", "d7972da833257c073403dec3c2ac3a7f297e328a"]
|
["docs", "refactor"]
|
new ShowDebug parameter
calculate each segment timing
new parameter to show/hide segment debug information
set-poshprompt updated with the new showDebug parameter
Force disabled segment to be visible for debug purpose,set cursor position in setHorizontalRule correctly, fix #2429
|
["diff --git a/engine.go b/engine.go\nindex 6cc1ff3..4617ceb 100644\n--- a/engine.go\n+++ b/engine.go\n@@ -67,6 +67,9 @@ func (e *engine) renderText(text string) {\n \tprefix := e.activeSegment.getValue(Prefix, \" \")\n \tpostfix := e.activeSegment.getValue(Postfix, \" \")\n \te.renderer.write(e.activeSegment.Background, e.activeSegment.Foreground, fmt.Sprintf(\"%s%s%s\", prefix, text, postfix))\n+\tif *e.env.getArgs().Debug {\n+\t\te.renderer.write(e.activeSegment.Background, e.activeSegment.Foreground, fmt.Sprintf(\"(%s:%s)\", e.activeSegment.Type, e.activeSegment.timing))\n+\t}\n }\n \n func (e *engine) renderSegmentText(text string) {\n@@ -107,13 +110,11 @@ func (e *engine) setStringValues(segments []*Segment) {\n \twg.Add(len(segments))\n \tdefer wg.Wait()\n \tcwd := e.env.getcwd()\n+\tdebug := *e.env.getArgs().Debug\n \tfor _, segment := range segments {\n \t\tgo func(s *Segment) {\n \t\t\tdefer wg.Done()\n-\t\t\terr := s.mapSegmentWithWriter(e.env)\n-\t\t\tif err == nil && !s.hasValue(IgnoreFolders, cwd) && s.enabled() {\n-\t\t\t\ts.stringValue = s.string()\n-\t\t\t}\n+\t\t\ts.setStringValue(e.env, cwd, debug)\n \t\t}(segment)\n \t}\n }\ndiff --git a/main.go b/main.go\nindex 56ae8a5..d67a640 100644\n--- a/main.go\n+++ b/main.go\n@@ -14,6 +14,7 @@ type args struct {\n \tConfig *string\n \tShell *string\n \tPWD *string\n+\tDebug *bool\n }\n \n func main() {\n@@ -42,6 +43,10 @@ func main() {\n \t\t\t\"pwd\",\n \t\t\t\"\",\n \t\t\t\"the path you are working in\"),\n+\t\tDebug: flag.Bool(\n+\t\t\t\"debug\",\n+\t\t\tfalse,\n+\t\t\t\"Print debug information\"),\n \t}\n \tflag.Parse()\n \tenv := &environment{\ndiff --git a/packages/powershell/oh-my-posh/oh-my-posh.psm1 b/packages/powershell/oh-my-posh/oh-my-posh.psm1\nindex 9234fc6..1450eb3 100644\n--- a/packages/powershell/oh-my-posh/oh-my-posh.psm1\n+++ b/packages/powershell/oh-my-posh/oh-my-posh.psm1\n@@ -5,6 +5,7 @@\n \n $global:PoshSettings = New-Object -TypeName PSObject -Property @{\n Theme = \"$PSScriptRoot\\themes\\jandedobbeleer.json\";\n+ ShowDebug = $false\n }\n \n function Get-PoshCommand {\n@@ -36,9 +37,14 @@ function Set-PoshPrompt {\n param(\n [Parameter(Mandatory = $false)]\n [string]\n- $Theme\n+ $Theme,\n+ [Parameter(Mandatory = $false)]\n+ [bool]\n+ $ShowDebug = $false\n )\n \n+ $global:PoshSettings.ShowDebug = $ShowDebug\n+\n if (Test-Path \"$PSScriptRoot/themes/$Theme.json\") {\n $global:PoshSettings.Theme = \"$PSScriptRoot/themes/$Theme.json\"\n }\n@@ -68,8 +74,9 @@ function Set-PoshPrompt {\n $startInfo = New-Object System.Diagnostics.ProcessStartInfo\n $startInfo.FileName = Get-PoshCommand\n $config = $global:PoshSettings.Theme\n+ $showDebug = $global:PoshSettings.ShowDebug\n $cleanPWD = $PWD.ProviderPath.TrimEnd(\"\\\")\n- $startInfo.Arguments = \"-config=\"\"$config\"\" -error=$errorCode -pwd=\"\"$cleanPWD\"\"\"\n+ $startInfo.Arguments = \"-debug=\"\"$showDebug\"\" -config=\"\"$config\"\" -error=$errorCode -pwd=\"\"$cleanPWD\"\"\"\n $startInfo.Environment[\"TERM\"] = \"xterm-256color\"\n $startInfo.CreateNoWindow = $true\n $startInfo.StandardOutputEncoding = [System.Text.Encoding]::UTF8\ndiff --git a/segment.go b/segment.go\nindex 27dd416..4015dac 100644\n--- a/segment.go\n+++ b/segment.go\n@@ -1,6 +1,9 @@\n package main\n \n-import \"errors\"\n+import (\n+\t\"errors\"\n+\t\"time\"\n+)\n \n // Segment represent a single segment and it's configuration\n type Segment struct {\n@@ -17,6 +20,7 @@ type Segment struct {\n \twriter SegmentWriter\n \tstringValue string\n \tactive bool\n+\ttiming time.Duration\n }\n \n // SegmentWriter is the interface used to define what and if to write to the prompt\n@@ -149,3 +153,26 @@ func (segment *Segment) mapSegmentWithWriter(env environmentInfo) error {\n \t}\n \treturn errors.New(\"unable to map writer\")\n }\n+\n+func (segment *Segment) setStringValue(env environmentInfo, cwd string, debug bool) {\n+\terr := segment.mapSegmentWithWriter(env)\n+\tif err != nil || segment.hasValue(IgnoreFolders, cwd) {\n+\t\treturn\n+\t}\n+\t// add timing only in debug\n+\tif debug {\n+\t\tstart := time.Now()\n+\t\tdefer (func() {\n+\t\t\t// force segment rendering to display the time it took\n+\t\t\t// to check if the segment is enabled or not\n+\t\t\t// depending on the segement, calling enabled()\n+\t\t\t// can be time consuming\n+\t\t\tsegment.active = true\n+\t\t\telapsed := time.Since(start)\n+\t\t\tsegment.timing = elapsed\n+\t\t})()\n+\t}\n+\tif segment.enabled() {\n+\t\tsegment.stringValue = segment.string()\n+\t}\n+}\n", "diff --git a/packages/extension-horizontal-rule/src/horizontal-rule.ts b/packages/extension-horizontal-rule/src/horizontal-rule.ts\nindex 6f583e1..c905b63 100644\n--- a/packages/extension-horizontal-rule/src/horizontal-rule.ts\n+++ b/packages/extension-horizontal-rule/src/horizontal-rule.ts\n@@ -49,15 +49,14 @@ export const HorizontalRule = Node.create<HorizontalRuleOptions>({\n // set cursor after horizontal rule\n .command(({ tr, dispatch }) => {\n if (dispatch) {\n- const { parent, pos } = tr.selection.$from\n- const posAfter = pos + 1\n- const nodeAfter = tr.doc.nodeAt(posAfter)\n+ const { $to } = tr.selection\n+ const posAfter = $to.end()\n \n- if (nodeAfter) {\n- tr.setSelection(TextSelection.create(tr.doc, posAfter))\n+ if ($to.nodeAfter) {\n+ tr.setSelection(TextSelection.create(tr.doc, $to.pos))\n } else {\n // add node after horizontal rule if it\u2019s the end of the document\n- const node = parent.type.contentMatch.defaultType?.create()\n+ const node = $to.parent.type.contentMatch.defaultType?.create()\n \n if (node) {\n tr.insert(posAfter, node)\n"]
| 2 |
["bea32587586ca08f390c901a95e9b9c25263f4df", "34d80114704679118e9bb6058e0d6c7aa03fd4b5"]
|
["feat", "fix"]
|
remove unused,disable edit/delete if primary key missing
Signed-off-by: Pranav C <[email protected]>
|
["diff --git a/src/content/redux/modules/dictionaries.ts b/src/content/redux/modules/dictionaries.ts\nindex 88f7215..570d397 100644\n--- a/src/content/redux/modules/dictionaries.ts\n+++ b/src/content/redux/modules/dictionaries.ts\n@@ -3,7 +3,6 @@ import { DictID, appConfigFactory, AppConfig } from '@/app-config'\n import isEqual from 'lodash/isEqual'\n import { saveWord } from '@/_helpers/record-manager'\n import { getDefaultSelectionInfo, SelectionInfo, isSameSelection } from '@/_helpers/selection'\n-import { createActiveConfigStream } from '@/_helpers/config-manager'\n import { isContainChinese, isContainEnglish, testerPunct, isContainMinor, testerChinese, testJapanese, testKorean } from '@/_helpers/lang-check'\n import { MsgType, MsgFetchDictResult } from '@/typings/message'\n import { StoreState, DispatcherThunk, Dispatcher } from './index'\ndiff --git a/src/content/redux/modules/widget.ts b/src/content/redux/modules/widget.ts\nindex 53ad550..68e0a3d 100644\n--- a/src/content/redux/modules/widget.ts\n+++ b/src/content/redux/modules/widget.ts\n@@ -1,9 +1,9 @@\n import * as recordManager from '@/_helpers/record-manager'\n import { StoreState, DispatcherThunk, Dispatcher } from './index'\n-import appConfigFactory, { TCDirection, AppConfig, DictID } from '@/app-config'\n+import appConfigFactory, { TCDirection, DictID } from '@/app-config'\n import { message, storage } from '@/_helpers/browser-api'\n-import { createActiveConfigStream, createConfigIDListStream } from '@/_helpers/config-manager'\n-import { MsgSelection, MsgType, MsgTempDisabledState, MsgEditWord, MsgOpenUrl, MsgFetchDictResult } from '@/typings/message'\n+import { createConfigIDListStream } from '@/_helpers/config-manager'\n+import { MsgType, MsgTempDisabledState, MsgEditWord, MsgOpenUrl, MsgFetchDictResult } from '@/typings/message'\n import { searchText, restoreDicts } from '@/content/redux/modules/dictionaries'\n import { SelectionInfo, getDefaultSelectionInfo } from '@/_helpers/selection'\n import { Mutable } from '@/typings/helpers'\n", "diff --git a/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue b/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue\nindex 5f9841f..c414c8c 100644\n--- a/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue\n+++ b/packages/nc-gui/components/project/spreadsheet/components/expandedForm.vue\n@@ -413,6 +413,9 @@ export default {\n \n await this.reload()\n } else if (Object.keys(updatedObj).length) {\n+ if (!id) {\n+ return this.$toast.info('Update not allowed for table which doesn\\'t have primary Key').goAway(3000)\n+ }\n await this.api.update(id, updatedObj, this.oldRow)\n } else {\n return this.$toast.info('No columns to update').goAway(3000)\ndiff --git a/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue b/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue\nindex c2b4b81..1b9d6a0 100644\n--- a/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue\n+++ b/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue\n@@ -62,7 +62,15 @@\n <v-spacer class=\"h-100\" @dblclick=\"debug=true\" />\n \n <debug-metas v-if=\"debug\" class=\"mr-3\" />\n-\n+ <v-tooltip bottom>\n+ <template #activator=\"{on}\">\n+ <v-icon v-if=\"!isPkAvail\" color=\"warning\" small class=\"mr-3\" v-on=\"on\">\n+ mdi-information-outline\n+ </v-icon>\n+ </template>\n+ <span class=\"caption\"> Update & Delete not allowed since the table doesn't have any primary key\n+ </span>\n+ </v-tooltip>\n <lock-menu v-if=\"_isUIAllowed('view-type')\" v-model=\"viewStatus.type\" />\n <x-btn tooltip=\"Reload view data\" outlined small text @click=\"reload\">\n <v-icon small class=\"mr-1\" color=\"grey darken-3\">\n@@ -208,6 +216,7 @@\n :meta=\"meta\"\n :is-virtual=\"selectedView.type === 'vtable'\"\n :api=\"api\"\n+ :is-pk-avail=\"isPkAvail\"\n @onNewColCreation=\"onNewColCreation\"\n @onCellValueChange=\"onCellValueChange\"\n @insertNewRow=\"insertNewRow\"\n@@ -631,8 +640,8 @@ export default {\n if (\n !this.meta || (\n (this.meta.hasMany && this.meta.hasMany.length) ||\n- (this.meta.manyToMany && this.meta.manyToMany.length) ||\n- (this.meta.belongsTo && this.meta.belongsTo.length))\n+ (this.meta.manyToMany && this.meta.manyToMany.length) ||\n+ (this.meta.belongsTo && this.meta.belongsTo.length))\n ) {\n return this.$toast.info('Please delete relations before deleting table.').goAway(3000)\n }\n@@ -817,6 +826,10 @@ export default {\n \n const id = this.meta.columns.filter(c => c.pk).map(c => rowObj[c._cn]).join('___')\n \n+ if (!id) {\n+ return this.$toast.info('Update not allowed for table which doesn\\'t have primary Key').goAway(3000)\n+ }\n+\n const newData = await this.api.update(id, {\n [column._cn]: rowObj[column._cn]\n }, { [column._cn]: oldRow[column._cn] })\n@@ -841,6 +854,11 @@ export default {\n const rowObj = this.rowContextMenu.row\n if (!this.rowContextMenu.rowMeta.new) {\n const id = this.meta && this.meta.columns && this.meta.columns.filter(c => c.pk).map(c => rowObj[c._cn]).join('___')\n+\n+ if (!id) {\n+ return this.$toast.info('Delete not allowed for table which doesn\\'t have primary Key').goAway(3000)\n+ }\n+\n await this.api.delete(id)\n }\n this.data.splice(this.rowContextMenu.index, 1)\n@@ -859,6 +877,11 @@ export default {\n }\n if (!rowMeta.new) {\n const id = this.meta.columns.filter(c => c.pk).map(c => rowObj[c._cn]).join('___')\n+\n+ if (!id) {\n+ return this.$toast.info('Delete not allowed for table which doesn\\'t have primary Key').goAway(3000)\n+ }\n+\n await this.api.delete(id)\n }\n this.data.splice(row, 1)\n@@ -991,6 +1014,9 @@ export default {\n }\n },\n computed: {\n+ isPkAvail() {\n+ return this.meta && this.meta.columns.some(c => c.pk)\n+ },\n isGallery() {\n return this.selectedView && this.selectedView.show_as === 'gallery'\n },\ndiff --git a/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue b/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue\nindex 5497d05..c198784 100644\n--- a/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue\n+++ b/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue\n@@ -27,7 +27,7 @@\n @xcresized=\"resizingCol = null\"\n >\n <!-- :style=\"columnsWidth[col._cn] ? `min-width:${columnsWidth[col._cn]}; max-width:${columnsWidth[col._cn]}` : ''\"\n- -->\n+-->\n \n <virtual-header-cell\n v-if=\"col.virtual\"\n@@ -136,13 +136,13 @@\n :key=\"row + columnObj.alias\"\n class=\"cell pointer\"\n :class=\"{\n- 'active' : !isPublicView && selected.col === col && selected.row === row && isEditable ,\n+ 'active' :!isPublicView && selected.col === col && selected.row === row && isEditable ,\n 'primary-column' : primaryValueColumn === columnObj._cn,\n 'text-center': isCentrallyAligned(columnObj),\n 'required': isRequired(columnObj,rowObj)\n }\"\n :data-col=\"columnObj.alias\"\n- @dblclick=\"makeEditable(col,row,columnObj.ai)\"\n+ @dblclick=\"makeEditable(col,row,columnObj.ai,rowMeta)\"\n @click=\"makeSelected(col,row);\"\n @contextmenu=\"showRowContextMenu($event,rowObj,rowMeta,row,col, columnObj)\"\n >\n@@ -162,7 +162,8 @@\n \n <editable-cell\n v-else-if=\"\n- !isLocked\n+ (isPkAvail ||rowMeta.new) &&\n+ !isLocked\n && !isPublicView\n && (editEnabled.col === col && editEnabled.row === row)\n || enableEditable(columnObj)\n@@ -190,11 +191,11 @@\n :db-alias=\"nodes.dbAlias\"\n :value=\"rowObj[columnObj._cn]\"\n :sql-ui=\"sqlUi\"\n- @enableedit=\"makeSelected(col,row);makeEditable(col,row,columnObj.ai)\"\n+ @enableedit=\"makeSelected(col,row);makeEditable(col,row,columnObj.ai, rowMeta)\"\n />\n </td>\n </tr>\n- <tr v-if=\"!isLocked && !isPublicView && isEditable && relationType !== 'bt'\">\n+ <tr v-if=\"isPkAvail && !isLocked && !isPublicView && isEditable && relationType !== 'bt'\">\n <td :colspan=\"visibleColLength + 1\" class=\"text-left pointer\" @click=\"insertNewRow(true)\">\n <v-tooltip top>\n <template #activator=\"{on}\">\n@@ -214,7 +215,9 @@\n <!-- <div is=\"style\" v-html=\"resizeColStyle\" />-->\n <dynamic-style>\n <template v-if=\"resizingCol\">\n- [data-col=\"{{ resizingCol }}\"]{min-width:{{ resizingColWidth }};max-width:{{ resizingColWidth }};width:{{ resizingColWidth }};}\n+ [data-col=\"{{ resizingCol }}\"]{min-width:{{ resizingColWidth }};max-width:{{\n+ resizingColWidth\n+ }};width:{{ resizingColWidth }};}\n </template>\n </dynamic-style>\n </div>\n@@ -261,7 +264,8 @@ export default {\n table: String,\n isVirtual: Boolean,\n isLocked: Boolean,\n- columnsWidth: { type: Object }\n+ columnsWidth: { type: Object },\n+ isPkAvail: Boolean\n },\n data: () => ({\n resizingCol: null,\n@@ -426,6 +430,10 @@ export default {\n return\n }\n if (e.key && e.key.length === 1) {\n+ if (!this.isPkAvail && !this.data[this.selected.row].rowMeta.new) {\n+ return this.$toast.info('Update not allowed for table which doesn\\'t have primary Key').goAway(3000)\n+ }\n+\n this.$set(this.data[this.selected.row].row, this.availableColumns[this.selected.col]._cn, '')\n this.editEnabled = { ...this.selected }\n }\n@@ -466,10 +474,14 @@ export default {\n this.editEnabled = {}\n }\n },\n- makeEditable(col, row) {\n+ makeEditable(col, row, _, rowMeta) {\n if (this.isPublicView || !this.isEditable) {\n return\n }\n+\n+ if (!this.isPkAvail && !rowMeta.new) {\n+ return this.$toast.info('Update not allowed for table which doesn\\'t have primary Key').goAway(3000)\n+ }\n if (this.availableColumns[col].ai) {\n return this.$toast.info('Auto Increment field is not editable').goAway(3000)\n }\n"]
| 2 |
["a50b51999015e210918d9c8e95fd4cac347353be", "4d92f352741b04c8709319dfe5c8419654f3682c"]
|
["refactor", "feat"]
|
correctly read new last flushed index,fix sonar integration
|
["diff --git a/restore/src/main/java/io/camunda/zeebe/restore/PartitionRestoreService.java b/restore/src/main/java/io/camunda/zeebe/restore/PartitionRestoreService.java\nindex 69b06b6..a4fcb77 100644\n--- a/restore/src/main/java/io/camunda/zeebe/restore/PartitionRestoreService.java\n+++ b/restore/src/main/java/io/camunda/zeebe/restore/PartitionRestoreService.java\n@@ -112,7 +112,7 @@ public class PartitionRestoreService {\n SegmentedJournal.builder()\n .withDirectory(dataDirectory.toFile())\n .withName(partition.name())\n- .withLastWrittenIndex(-1)\n+ .withLastFlushedIndex(-1)\n .build()) {\n \n resetJournal(checkpointPosition, journal);\n", "diff --git a/.ci/scripts/distribution/analyse-java.sh b/.ci/scripts/distribution/analyse-java.sh\nindex a0122f7..0e965df 100755\n--- a/.ci/scripts/distribution/analyse-java.sh\n+++ b/.ci/scripts/distribution/analyse-java.sh\n@@ -23,12 +23,12 @@ else\n fi\n \n if [ \"${GIT_BRANCH}\" == \"master\" ] || [ \"${GIT_BRANCH}\" == \"develop\" ]; then\n- TARGET_BRANCH=\"master\"\n+ TARGET_BRANCH=\"${GIT_BRANCH}\"\n else\n TARGET_BRANCH=\"develop\"\n+ PROPERTIES+=(\"-Dsonar.branch.target=${TARGET_BRANCH}\")\n fi\n \n- PROPERTIES+=(\"-Dsonar.branch.target=${TARGET_BRANCH}\")\n git fetch --no-tags \"${GIT_URL}\" \"+refs/heads/${TARGET_BRANCH}:refs/remotes/origin/${TARGET_BRANCH}\"\n fi\n \ndiff --git a/parent/pom.xml b/parent/pom.xml\nindex f4c3160..d34b41f 100644\n--- a/parent/pom.xml\n+++ b/parent/pom.xml\n@@ -1570,7 +1570,7 @@\n <!-- sonarscanner integration -->\n <!-- sonar.login token must be passed at runtime to avoid sharing token -->\n <sonar.host.url>https://sonarcloud.io</sonar.host.url>\n- <sonar.organization>zeebe-io</sonar.organization>\n+ <sonar.organization>camunda-cloud</sonar.organization>\n <sonar.login>${env.SONARCLOUD_TOKEN}</sonar.login>\n <sonar.links.issue>${project.scm.url}/issues</sonar.links.issue>\n <sonar.cpd.exclusions>\n"]
| 2 |
["5ffc5794808647de14f945141692be26ad143006", "6cbbd98dfe6c768dbe49f8d6d2448856a9a86089"]
|
["fix", "build"]
|
fix node test cases run into infinite loop,101: fix import key cmd
Signed-off-by: Sam Alba <[email protected]>
|
["diff --git a/packages/designer/tests/document/node/node.test.ts b/packages/designer/tests/document/node/node.test.ts\nindex dd20bd3..113360d 100644\n--- a/packages/designer/tests/document/node/node.test.ts\n+++ b/packages/designer/tests/document/node/node.test.ts\n@@ -26,7 +26,7 @@ import rootHeaderMetadata from '../../fixtures/component-metadata/root-header';\n import rootContentMetadata from '../../fixtures/component-metadata/root-content';\n import rootFooterMetadata from '../../fixtures/component-metadata/root-footer';\n \n-describe.skip('Node \u65b9\u6cd5\u6d4b\u8bd5', () => {\n+describe('Node \u65b9\u6cd5\u6d4b\u8bd5', () => {\n let editor: Editor;\n let designer: Designer;\n let project: Project;\n@@ -474,15 +474,16 @@ describe.skip('Node \u65b9\u6cd5\u6d4b\u8bd5', () => {\n it('didDropIn / didDropOut', () => {\n const form = doc.getNode('node_k1ow3cbo');\n designer.createComponentMeta(divMetadata);\n+ designer.createComponentMeta(formMetadata);\n const callbacks = form.componentMeta.getMetadata().configure.advanced?.callbacks;\n const fn1 = callbacks.onNodeAdd = jest.fn();\n const fn2 = callbacks.onNodeRemove = jest.fn();\n const textField = doc.getNode('node_k1ow3cc9');\n form.didDropIn(textField);\n- expect(fn1).toHaveBeenCalledWith(textField, form);\n+ expect(fn1).toHaveBeenCalledWith(textField.internalToShellNode(), form.internalToShellNode());\n \n form.didDropOut(textField);\n- expect(fn2).toHaveBeenCalledWith(textField, form);\n+ expect(fn2).toHaveBeenCalledWith(textField.internalToShellNode(), form.internalToShellNode());\n });\n \n it('hover', () => {\n", "diff --git a/docs/learn/101-use.md b/docs/learn/101-use.md\nindex 283c1c1..2ec10f9 100644\n--- a/docs/learn/101-use.md\n+++ b/docs/learn/101-use.md\n@@ -41,8 +41,7 @@ cd ./examples/todoapp\n The example app contains encrypted secrets and other pre-configured inputs, here is how to decrypt them:\n \n ```sh\n-curl -sfL https://releases.dagger.io/examples/key.txt >> ~/.config/dagger/keys.txt\n-dagger input list\n+dagger input list || curl -sfL https://releases.dagger.io/examples/key.txt >> ~/.config/dagger/keys.txt\n ```\n \n **Step 4**: Deploy!\n"]
| 2 |
["d2c3f0ba6f85b659b76636a91ea9ab2b5a95a720", "2b01808ec86fe9d8b4a93141a1b7f95e11fd6010"]
|
["test", "docs"]
|
auto focus inputs in survey form,updated webpack in react
|
["diff --git a/packages/nc-gui/pages/[projectType]/form/[viewId]/index/survey.vue b/packages/nc-gui/pages/[projectType]/form/[viewId]/index/survey.vue\nindex b2a90d8..dbad824 100644\n--- a/packages/nc-gui/pages/[projectType]/form/[viewId]/index/survey.vue\n+++ b/packages/nc-gui/pages/[projectType]/form/[viewId]/index/survey.vue\n@@ -6,6 +6,7 @@ import {\n DropZoneRef,\n computed,\n onKeyStroke,\n+ onMounted,\n provide,\n ref,\n useEventListener,\n@@ -85,6 +86,8 @@ function transition(direction: TransitionDirection) {\n \n setTimeout(() => {\n isTransitioning.value = false\n+\n+ setTimeout(focusInput, 100)\n }, 1000)\n }\n \n@@ -113,6 +116,19 @@ async function goPrevious() {\n goToPrevious()\n }\n \n+function focusInput() {\n+ if (document && typeof document !== 'undefined') {\n+ const inputEl =\n+ (document.querySelector('.nc-cell input') as HTMLInputElement) ||\n+ (document.querySelector('.nc-cell textarea') as HTMLTextAreaElement)\n+\n+ if (inputEl) {\n+ inputEl.select()\n+ inputEl.focus()\n+ }\n+ }\n+}\n+\n useEventListener('wheel', (event) => {\n if (Math.abs(event.deltaX) < Math.abs(event.deltaY)) {\n // Scrolling more vertically than horizontally\n@@ -130,6 +146,8 @@ useEventListener('wheel', (event) => {\n \n onKeyStroke(['ArrowLeft', 'ArrowDown'], goPrevious)\n onKeyStroke(['ArrowRight', 'ArrowUp', 'Enter', 'Space'], goNext)\n+\n+onMounted(focusInput)\n </script>\n \n <template>\n", "diff --git a/components/react/package.json b/components/react/package.json\nindex bbeb9ee..43ddebc 100644\n--- a/components/react/package.json\n+++ b/components/react/package.json\n@@ -114,7 +114,7 @@\n \"ts-loader\": \"^9.2.9\",\n \"ts-node\": \"^10.7.0\",\n \"typescript\": \"^4.7.3\",\n- \"webpack\": \"^5.72.0\",\n+ \"webpack\": \"^5.73.0\",\n \"webpack-bundle-analyzer\": \"^4.5.0\",\n \"webpack-cli\": \"^4.9.2\",\n \"webpack-node-externals\": \"^3.0.0\"\ndiff --git a/yarn.lock b/yarn.lock\nindex a3fdb26..19a0716 100644\n--- a/yarn.lock\n+++ b/yarn.lock\n@@ -25212,7 +25212,7 @@ webpack@^4.38.0, webpack@^4.42.1:\n watchpack \"^1.7.4\"\n webpack-sources \"^1.4.1\"\n \n-webpack@^5.54.0, webpack@^5.71.0, webpack@^5.72.0:\n+webpack@^5.54.0, webpack@^5.71.0, webpack@^5.72.0, webpack@^5.73.0:\n version \"5.73.0\"\n resolved \"https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38\"\n integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==\n"]
| 2 |
["5373c3036866db58b322b424d3be9dedff57a376", "78c446cbea61af2268b4c4da03a9ad4283f10049"]
|
["feat", "build"]
|
conditionals and iterators in rsx,await job creation to ensure asserted event sequence
|
["diff --git a/packages/interpreter/src/interpreter.js b/packages/interpreter/src/interpreter.js\nindex 2f5c06f..58613ea 100644\n--- a/packages/interpreter/src/interpreter.js\n+++ b/packages/interpreter/src/interpreter.js\n@@ -172,7 +172,7 @@ export class Interpreter {\n node.style = {};\n }\n node.style[name] = value;\n- } else if (ns != null || ns != undefined) {\n+ } else if (ns != null && ns != undefined) {\n node.setAttributeNS(ns, name, value);\n } else {\n switch (name) {\n@@ -266,7 +266,7 @@ export class Interpreter {\n this.AssignId(edit.path, edit.id);\n break;\n case \"CreateElement\":\n- if (edit.namespace !== null || edit.namespace !== undefined) {\n+ if (edit.namespace !== null && edit.namespace !== undefined) {\n this.CreateElementNs(edit.name, edit.id, edit.namespace);\n } else {\n this.CreateElement(edit.name, edit.id);\ndiff --git a/packages/rsx/src/lib.rs b/packages/rsx/src/lib.rs\nindex 09c6bd6..d974a6c 100644\n--- a/packages/rsx/src/lib.rs\n+++ b/packages/rsx/src/lib.rs\n@@ -245,7 +245,11 @@ impl<'a> DynamicContext<'a> {\n quote! { ::dioxus::core::TemplateNode::Text(#text) }\n }\n \n- BodyNode::Text(_) | BodyNode::RawExpr(_) | BodyNode::Component(_) => {\n+ BodyNode::RawExpr(_)\n+ | BodyNode::Text(_)\n+ | BodyNode::ForLoop(_)\n+ | BodyNode::IfChain(_)\n+ | BodyNode::Component(_) => {\n let ct = self.dynamic_nodes.len();\n self.dynamic_nodes.push(root);\n self.node_paths.push(self.current_path.clone());\ndiff --git a/packages/rsx/src/node.rs b/packages/rsx/src/node.rs\nindex 4013c9c..7b4bd23 100644\n--- a/packages/rsx/src/node.rs\n+++ b/packages/rsx/src/node.rs\n@@ -5,7 +5,7 @@ use quote::{quote, ToTokens, TokenStreamExt};\n use syn::{\n parse::{Parse, ParseStream},\n spanned::Spanned,\n- token, Expr, LitStr, Result,\n+ token, Block, Expr, ExprIf, LitStr, Pat, Result,\n };\n \n /*\n@@ -20,6 +20,8 @@ Parse\n pub enum BodyNode {\n Element(Element),\n Component(Component),\n+ ForLoop(ForLoop),\n+ IfChain(ExprIf),\n Text(IfmtInput),\n RawExpr(Expr),\n }\n@@ -35,6 +37,8 @@ impl BodyNode {\n BodyNode::Component(component) => component.name.span(),\n BodyNode::Text(text) => text.source.span(),\n BodyNode::RawExpr(exp) => exp.span(),\n+ BodyNode::ForLoop(fl) => fl.for_token.span(),\n+ BodyNode::IfChain(f) => f.if_token.span(),\n }\n }\n }\n@@ -89,6 +93,28 @@ impl Parse for BodyNode {\n }\n }\n \n+ // Transform for loops into into_iter calls\n+ if stream.peek(Token![for]) {\n+ let _f = stream.parse::<Token![for]>()?;\n+ let pat = stream.parse::<Pat>()?;\n+ let _i = stream.parse::<Token![in]>()?;\n+ let expr = stream.parse::<Box<Expr>>()?;\n+ let body = stream.parse::<Block>()?;\n+\n+ return Ok(BodyNode::ForLoop(ForLoop {\n+ for_token: _f,\n+ pat,\n+ in_token: _i,\n+ expr,\n+ body,\n+ }));\n+ }\n+\n+ // Transform unterminated if statements into terminated optional if statements\n+ if stream.peek(Token![if]) {\n+ return Ok(BodyNode::IfChain(stream.parse()?));\n+ }\n+\n Ok(BodyNode::RawExpr(stream.parse::<Expr>()?))\n }\n }\n@@ -104,6 +130,104 @@ impl ToTokens for BodyNode {\n BodyNode::RawExpr(exp) => tokens.append_all(quote! {\n __cx.fragment_from_iter(#exp)\n }),\n+ BodyNode::ForLoop(exp) => {\n+ let ForLoop {\n+ pat, expr, body, ..\n+ } = exp;\n+\n+ tokens.append_all(quote! {\n+ __cx.fragment_from_iter(\n+ (#expr).into_iter().map(|#pat| {\n+ #body\n+ })\n+ )\n+ })\n+ }\n+ BodyNode::IfChain(chain) => {\n+ if is_if_chain_terminated(chain) {\n+ tokens.append_all(quote! {\n+ __cx.fragment_from_iter(#chain)\n+ });\n+ } else {\n+ let ExprIf {\n+ cond,\n+ then_branch,\n+ else_branch,\n+ ..\n+ } = chain;\n+\n+ let mut body = TokenStream2::new();\n+\n+ body.append_all(quote! {\n+ if #cond {\n+ Some(#then_branch)\n+ }\n+ });\n+\n+ let mut elif = else_branch;\n+\n+ while let Some((_, ref branch)) = elif {\n+ match branch.as_ref() {\n+ Expr::If(ref eelif) => {\n+ let ExprIf {\n+ cond,\n+ then_branch,\n+ else_branch,\n+ ..\n+ } = eelif;\n+\n+ body.append_all(quote! {\n+ else if #cond {\n+ Some(#then_branch)\n+ }\n+ });\n+\n+ elif = else_branch;\n+ }\n+ _ => {\n+ body.append_all(quote! {\n+ else {\n+ #branch\n+ }\n+ });\n+ break;\n+ }\n+ }\n+ }\n+\n+ body.append_all(quote! {\n+ else { None }\n+ });\n+\n+ tokens.append_all(quote! {\n+ __cx.fragment_from_iter(#body)\n+ });\n+ }\n+ }\n+ }\n+ }\n+}\n+\n+#[derive(PartialEq, Eq, Clone, Debug, Hash)]\n+pub struct ForLoop {\n+ pub for_token: Token![for],\n+ pub pat: Pat,\n+ pub in_token: Token![in],\n+ pub expr: Box<Expr>,\n+ pub body: Block,\n+}\n+\n+fn is_if_chain_terminated(chain: &ExprIf) -> bool {\n+ let mut current = chain;\n+ loop {\n+ if let Some((_, else_block)) = ¤t.else_branch {\n+ if let Expr::If(else_if) = else_block.as_ref() {\n+ current = else_if;\n+ } else {\n+ return true;\n+ }\n+ } else {\n+ return false;\n }\n }\n }\n", "diff --git a/engine/src/test/java/io/zeebe/engine/processor/workflow/boundary/BoundaryEventTest.java b/engine/src/test/java/io/zeebe/engine/processor/workflow/boundary/BoundaryEventTest.java\nindex 9ffa1fa..4333db0 100644\n--- a/engine/src/test/java/io/zeebe/engine/processor/workflow/boundary/BoundaryEventTest.java\n+++ b/engine/src/test/java/io/zeebe/engine/processor/workflow/boundary/BoundaryEventTest.java\n@@ -114,12 +114,18 @@ public class BoundaryEventTest {\n ENGINE.deployment().withXmlResource(MULTIPLE_SEQUENCE_FLOWS).deploy();\n final long workflowInstanceKey = ENGINE.workflowInstance().ofBpmnProcessId(PROCESS_ID).create();\n \n- // when\n RecordingExporter.timerRecords()\n .withHandlerNodeId(\"timer\")\n .withIntent(TimerIntent.CREATED)\n .withWorkflowInstanceKey(workflowInstanceKey)\n .getFirst();\n+\n+ RecordingExporter.jobRecords(JobIntent.CREATED)\n+ .withType(\"type\")\n+ .withWorkflowInstanceKey(workflowInstanceKey)\n+ .getFirst();\n+\n+ // when\n ENGINE.increaseTime(Duration.ofMinutes(1));\n \n // then\n"]
| 2 |
["6b473cbdc5997af47c56a2a74f5b64da6d4c2ad7", "a8d1a60fd48d3fbd76d4271987a1b0f538d498f1"]
|
["feat", "test"]
|
fix golden tests for aws_vpn_connection,extract lambdas
|
["diff --git a/internal/providers/terraform/aws/testdata/vpn_connection_test/vpn_connection_test.tf b/internal/providers/terraform/aws/testdata/vpn_connection_test/vpn_connection_test.tf\nindex d895677..cf10e3f 100644\n--- a/internal/providers/terraform/aws/testdata/vpn_connection_test/vpn_connection_test.tf\n+++ b/internal/providers/terraform/aws/testdata/vpn_connection_test/vpn_connection_test.tf\n@@ -12,6 +12,7 @@ provider \"aws\" {\n resource \"aws_vpn_connection\" \"vpn_connection\" {\n customer_gateway_id = \"dummy-customer-gateway-id\"\n type = \"ipsec.1\"\n+ vpn_gateway_id = \"vpn-gateway-id\"\n }\n \n resource \"aws_vpn_connection\" \"transit\" {\n@@ -23,10 +24,11 @@ resource \"aws_vpn_connection\" \"transit\" {\n resource \"aws_vpn_connection\" \"vpn_connection_withUsage\" {\n customer_gateway_id = \"dummy-customer-gateway-id2\"\n type = \"ipsec.1\"\n+ vpn_gateway_id = \"vpn-gateway-id\"\n }\n \n resource \"aws_vpn_connection\" \"transit_withUsage\" {\n customer_gateway_id = \"dummy-customer-gateway-id2\"\n type = \"ipsec.1\"\n transit_gateway_id = \"dummy-transit-gateway-id2\"\n-}\n\\ No newline at end of file\n+}\n", "diff --git a/broker/src/main/java/io/camunda/zeebe/broker/system/partitions/impl/AsyncSnapshotDirector.java b/broker/src/main/java/io/camunda/zeebe/broker/system/partitions/impl/AsyncSnapshotDirector.java\nindex 6ee5797..bcfcc72 100644\n--- a/broker/src/main/java/io/camunda/zeebe/broker/system/partitions/impl/AsyncSnapshotDirector.java\n+++ b/broker/src/main/java/io/camunda/zeebe/broker/system/partitions/impl/AsyncSnapshotDirector.java\n@@ -224,7 +224,6 @@ public final class AsyncSnapshotDirector extends Actor\n private void takeSnapshot() {\n final var transientSnapshotFuture =\n stateController.takeTransientSnapshot(lowerBoundSnapshotPosition);\n-\n transientSnapshotFuture.onComplete(\n (optionalTransientSnapshot, snapshotTakenError) -> {\n if (snapshotTakenError != null) {\n@@ -237,27 +236,31 @@ public final class AsyncSnapshotDirector extends Actor\n takingSnapshot = false;\n return;\n }\n- pendingSnapshot = optionalTransientSnapshot.get();\n- onRecovered();\n-\n- final ActorFuture<Long> lastWrittenPosition =\n- streamProcessor.getLastWrittenPositionAsync();\n- actor.runOnCompletion(\n- lastWrittenPosition,\n- (endPosition, error) -> {\n- if (error == null) {\n- LOG.info(LOG_MSG_WAIT_UNTIL_COMMITTED, endPosition, commitPosition);\n- lastWrittenEventPosition = endPosition;\n- persistingSnapshot = false;\n- persistSnapshotIfLastWrittenPositionCommitted();\n- } else {\n- resetStateOnFailure();\n- LOG.error(ERROR_MSG_ON_RESOLVE_WRITTEN_POS, error);\n- }\n- });\n+ onTransientSnapshotTaken(optionalTransientSnapshot.get());\n });\n }\n \n+ private void onTransientSnapshotTaken(final TransientSnapshot transientSnapshot) {\n+\n+ pendingSnapshot = transientSnapshot;\n+ onRecovered();\n+\n+ final ActorFuture<Long> lastWrittenPosition = streamProcessor.getLastWrittenPositionAsync();\n+ actor.runOnCompletion(lastWrittenPosition, this::onLastWrittenPositionReceived);\n+ }\n+\n+ private void onLastWrittenPositionReceived(final Long endPosition, final Throwable error) {\n+ if (error == null) {\n+ LOG.info(LOG_MSG_WAIT_UNTIL_COMMITTED, endPosition, commitPosition);\n+ lastWrittenEventPosition = endPosition;\n+ persistingSnapshot = false;\n+ persistSnapshotIfLastWrittenPositionCommitted();\n+ } else {\n+ resetStateOnFailure();\n+ LOG.error(ERROR_MSG_ON_RESOLVE_WRITTEN_POS, error);\n+ }\n+ }\n+\n private void onRecovered() {\n if (healthStatus != HealthStatus.HEALTHY) {\n healthStatus = HealthStatus.HEALTHY;\n"]
| 2 |
["9b059dd8245e72f0bf8c40fc633f9ef6fccae405", "14abf5c31523a551134aebe9e8f3505ef26ed421"]
|
["test", "refactor"]
|
add LICENSE,add workflow to release branches
|
["diff --git a/LICENSE b/LICENSE\nnew file mode 100644\nindex 0000000..005581d\n--- /dev/null\n+++ b/LICENSE\n@@ -0,0 +1,21 @@\n+MIT License\n+\n+Copyright (c) Hassan El Mghari\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in all\n+copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n+SOFTWARE.\n", "diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml\nnew file mode 100644\nindex 0000000..697ca8e\n--- /dev/null\n+++ b/.github/workflows/release-pr.yml\n@@ -0,0 +1,48 @@\n+name: release\n+\n+on:\n+ issue_comment:\n+ types: [created]\n+ contains: \"/trigger release\"\n+\n+env:\n+ # 7 GiB by default on GitHub, setting to 6 GiB\n+ NODE_OPTIONS: --max-old-space-size=6144\n+\n+jobs:\n+ release-pr:\n+ permissions:\n+ id-token: write\n+ runs-on: ubuntu-latest\n+ timeout-minutes: 20\n+\n+ steps:\n+ - name: Ensure action is by maintainer\n+ uses: octokit/[email protected]\n+ id: check_role\n+ with:\n+ route: GET /repos/danielroe/roe.dev/collaborators/${{ github.event.comment.user.login }}\n+ env:\n+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}\n+\n+ - uses: actions/checkout@v3\n+ with:\n+ fetch-depth: 0\n+\n+ - run: corepack enable\n+ - uses: actions/setup-node@v3\n+ with:\n+ node-version: 20\n+ cache: \"pnpm\"\n+\n+ - name: Install dependencies\n+ run: pnpm install\n+\n+ - name: Build\n+ run: pnpm build\n+\n+ - name: Release Edge\n+ run: ./scripts/release-edge.sh\n+ env:\n+ NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}\n+ NPM_CONFIG_PROVENANCE: true\ndiff --git a/package.json b/package.json\nindex 1074dcd..48bb566 100644\n--- a/package.json\n+++ b/package.json\n@@ -5,7 +5,7 @@\n \"license\": \"MIT\",\n \"type\": \"module\",\n \"scripts\": {\n- \"build\": \"FORCE_COLOR=1 pnpm --filter './packages/**' prepack\",\n+ \"build\": \"pnpm --filter './packages/**' prepack\",\n \"build:stub\": \"pnpm --filter './packages/**' prepack --stub\",\n \"cleanup\": \"rimraf 'packages/**/node_modules' 'examples/**/node_modules' 'docs/node_modules' 'playground/node_modules' 'node_modules'\",\n \"dev\": \"pnpm play\",\n"]
| 2 |
["096145f0d32a6b351b1db413b04a685952f04fb3", "bc28d536c0dd1061ac96cea0241857c1d4e4e0f2"]
|
["docs", "ci"]
|
update the formatting for python integration example,init environ cache
|
["diff --git a/website/docs/integration/python.md b/website/docs/integration/python.md\nindex 064cae3..b6b720d 100644\n--- a/website/docs/integration/python.md\n+++ b/website/docs/integration/python.md\n@@ -13,6 +13,7 @@ header = \"All notable changes to this project will be documented in this file.\"\n body = \"...\"\n footer = \"<!-- generated by git-cliff -->\"\n # see [changelog] section for more keys\n+\n [tool.git-cliff.git]\n conventional_commits = true\n commit_parsers = []\n", "diff --git a/src/environment.go b/src/environment.go\nindex ae5e26a..0c961c5 100644\n--- a/src/environment.go\n+++ b/src/environment.go\n@@ -229,6 +229,7 @@ func (env *environment) environ() map[string]string {\n \tif env.environCache != nil {\n \t\treturn env.environCache\n \t}\n+\tenv.environCache = make(map[string]string)\n \tconst separator = \"=\"\n \tvalues := os.Environ()\n \tfor value := range values {\n"]
| 2 |
["3ee672483790ec71c700907a6e93af4698492026", "dc50bd35462a49058c91a939fc8830ae7a9eb692"]
|
["docs", "fix"]
|
lint README,added resize observer, this will replace window.resize if available
|
["diff --git a/README.md b/README.md\nindex a163c83..9cd12bc 100644\n--- a/README.md\n+++ b/README.md\n@@ -26,7 +26,7 @@ Ibis has three primary components:\n Ibis aims to be a future-proof solution to interacting with data using Python and can accomplish this goal through its main features:\n \n - **Familiar API**: Ibis\u2019s API design borrows from popular APIs like pandas and dplyr that most users already know and like to use.\n-- **Consistent syntax**: Ibis aims to be universal Python API for tabular data, big or small.\n+- **Consistent syntax**: Ibis aims to be universal Python API for tabular data, big or small.\n - **Deferred execution**: Ibis pushes code execution to the query engine and only moves required data into memory when it has to.\n This leads to more faster, more efficient analytics workflows\n - **Interactive mode**: Ibis also provides an interactive mode, in which users can quickly diagnose problems, do exploratory data analysis, and mock up workflows locally.\n", "diff --git a/engine/src/Utils/EventListeners.ts b/engine/src/Utils/EventListeners.ts\nindex 9e7b189..a29cab4 100644\n--- a/engine/src/Utils/EventListeners.ts\n+++ b/engine/src/Utils/EventListeners.ts\n@@ -47,6 +47,7 @@ export class EventListeners {\n \n private canPush: boolean;\n private resizeTimeout?: NodeJS.Timeout;\n+ private resizeObserver?: ResizeObserver;\n \n /**\n * Events listener constructor\n@@ -144,7 +145,31 @@ export class EventListeners {\n }\n \n if (options.interactivity.events.resize) {\n- manageListener(window, Constants.resizeEvent, this.resizeHandler, add);\n+ if (typeof ResizeObserver !== \"undefined\") {\n+ if (this.resizeObserver && !add) {\n+ if (container.canvas.element) {\n+ this.resizeObserver.unobserve(container.canvas.element);\n+ }\n+\n+ this.resizeObserver.disconnect();\n+\n+ delete this.resizeObserver;\n+ } else if (!this.resizeObserver && add && container.canvas.element) {\n+ this.resizeObserver = new ResizeObserver((entries) => {\n+ const entry = entries.find((e) => e.target === container.canvas.element);\n+\n+ if (!entry) {\n+ return;\n+ }\n+\n+ this.handleWindowResize();\n+ });\n+\n+ this.resizeObserver.observe(container.canvas.element);\n+ }\n+ } else {\n+ manageListener(window, Constants.resizeEvent, this.resizeHandler, add);\n+ }\n }\n \n if (document) {\n"]
| 2 |
["cab2cf4d3fffb0ec2b56d455e67ac5fa992b4104", "4197f2654e8767039dbfd66eca34f261ee3d88c8"]
|
["docs", "feat"]
|
remove unnecessary spotless definition
It receives this already from the parent pom.,skip ruff format in pre-commit ci runner
|
["diff --git a/benchmarks/project/pom.xml b/benchmarks/project/pom.xml\nindex 62030b6..ab87dea 100644\n--- a/benchmarks/project/pom.xml\n+++ b/benchmarks/project/pom.xml\n@@ -123,11 +123,6 @@\n </plugin>\n \n <plugin>\n- <groupId>com.diffplug.spotless</groupId>\n- <artifactId>spotless-maven-plugin</artifactId>\n- </plugin>\n-\n- <plugin>\n <groupId>org.apache.maven.plugins</groupId>\n <artifactId>maven-shade-plugin</artifactId>\n <executions>\n", "diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex 6193d96..4ba39d6 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -9,6 +9,7 @@ ci:\n - nixpkgs-fmt\n - prettier\n - ruff\n+ - ruff-format\n - shellcheck\n - shfmt\n - statix\n"]
| 2 |
["7f9721dc9bbf66a3712d59352f64ca089da139f0", "9117fdedb9b5ce0345c31b3e1fa22ae8554944d4"]
|
["build", "ci"]
|
add link to roadmap,refactor generate_completion
|
["diff --git a/packages/plugin-core/README.md b/packages/plugin-core/README.md\nindex 3c25c9b..c7506d4 100644\n--- a/packages/plugin-core/README.md\n+++ b/packages/plugin-core/README.md\n@@ -187,6 +187,10 @@ When the workspace opens, it will show dialogue to install the recommended exten\n \n See [[FAQ]] to answers for common questions.\n \n+# Roadmap\n+\n+Check out our [public roadmap](https://github.com/orgs/dendronhq/projects/1) to see the features we're working on and to vote for what you want to see next. \n+\n \n # Contributing\n \n", "diff --git a/src/lib.rs b/src/lib.rs\nindex dfd8014..15850f7 100644\n--- a/src/lib.rs\n+++ b/src/lib.rs\n@@ -1,11 +1,106 @@\n //! Generates [Nushell](https://github.com/nushell/nushell) completions for [`clap`](https://github.com/clap-rs/clap) based CLIs\n \n-use clap::Command;\n+use clap::{Arg, Command};\n use clap_complete::Generator;\n \n /// Generate Nushell complete file\n pub struct Nushell;\n \n+enum Argument {\n+ Short(char),\n+ Long(String),\n+ ShortAndLong(char, String),\n+ Positional(String, bool),\n+}\n+\n+struct ArgumentLine {\n+ arg: Argument,\n+ takes_values: bool,\n+ help: Option<String>,\n+}\n+\n+impl From<&Arg> for ArgumentLine {\n+ fn from(arg: &Arg) -> Self {\n+ let takes_values = arg\n+ .get_num_args()\n+ .map(|v| v.takes_values())\n+ .unwrap_or(false);\n+\n+ let help = arg.get_help().map(|s| s.to_string());\n+\n+ if arg.is_positional() {\n+ let id = arg.get_id().to_string();\n+ let required = arg.is_required_set();\n+ let arg = Argument::Positional(id, required);\n+\n+ return Self {\n+ arg,\n+ takes_values,\n+ help,\n+ };\n+ }\n+\n+ let short = arg.get_short();\n+ let long = arg.get_long();\n+\n+ match short {\n+ Some(short) => match long {\n+ Some(long) => Self {\n+ arg: Argument::ShortAndLong(short, long.into()),\n+ takes_values,\n+ help,\n+ },\n+ None => Self {\n+ arg: Argument::Short(short),\n+ takes_values,\n+ help,\n+ },\n+ },\n+ None => match long {\n+ Some(long) => Self {\n+ arg: Argument::Long(long.into()),\n+ takes_values,\n+ help,\n+ },\n+ None => unreachable!(\"No short or long option found\"),\n+ },\n+ }\n+ }\n+}\n+\n+impl ToString for ArgumentLine {\n+ fn to_string(&self) -> String {\n+ let mut s = String::new();\n+\n+ match &self.arg {\n+ Argument::Short(short) => s.push_str(format!(\" -{}\", short).as_str()),\n+ Argument::Long(long) => s.push_str(format!(\" --{}\", long).as_str()),\n+ Argument::ShortAndLong(short, long) => {\n+ s.push_str(format!(\" --{}(-{})\", long, short).as_str())\n+ }\n+ Argument::Positional(positional, required) => {\n+ s.push_str(format!(\" {}\", positional).as_str());\n+\n+ if !*required {\n+ s.push('?');\n+ }\n+ }\n+ }\n+\n+ if self.takes_values {\n+ s.push_str(\": string\");\n+ }\n+\n+ if let Some(help) = &self.help {\n+ s.push_str(format!(\"\\t# {}\", help).as_str());\n+ }\n+\n+ s.push('\\n');\n+\n+ s\n+ }\n+}\n+\n impl Generator for Nushell {\n fn file_name(&self, name: &str) -> String {\n format!(\"{}.nu\", name)\n@@ -37,51 +132,18 @@ fn generate_completion(completions: &mut String, cmd: &Command, is_subcommand: b\n \n let bin_name = cmd.get_bin_name().expect(\"Failed to get bin name\");\n \n- if is_subcommand {\n- completions.push_str(format!(\" export extern \\\"{}\\\" [\\n\", bin_name).as_str());\n+ let name = if is_subcommand {\n+ format!(r#\"\"{}\"\"#, bin_name)\n } else {\n- completions.push_str(format!(\" export extern {} [\\n\", bin_name).as_str());\n- }\n+ bin_name.into()\n+ };\n \n- let mut s = String::new();\n- for arg in cmd.get_arguments() {\n- if arg.is_positional() {\n- s.push_str(format!(\" {}\", arg.get_id()).as_str());\n- if !arg.is_required_set() {\n- s.push('?');\n- }\n- }\n-\n- let long = arg.get_long();\n- if let Some(opt) = long {\n- s.push_str(format!(\" --{}\", opt).as_str());\n- }\n+ completions.push_str(format!(\" export extern {} [\\n\", name).as_str());\n \n- let short = arg.get_short();\n- if let Some(opt) = short {\n- if long.is_some() {\n- s.push_str(format!(\"(-{})\", opt).as_str());\n- } else {\n- s.push_str(format!(\" -{}\", opt).as_str());\n- }\n- }\n-\n- if let Some(v) = arg.get_num_args() {\n- if v.takes_values() {\n- // TODO: add more types?\n- // TODO: add possible values?\n- s.push_str(\": string\");\n- }\n- }\n-\n- if let Some(msg) = arg.get_help() {\n- if arg.is_positional() || long.is_some() || short.is_some() {\n- s.push_str(format!(\"\\t# {}\", msg).as_str());\n- }\n- }\n-\n- s.push('\\n');\n- }\n+ let s: String = cmd\n+ .get_arguments()\n+ .map(|arg| ArgumentLine::from(arg).to_string())\n+ .collect();\n \n completions.push_str(&s);\n completions.push_str(\" ]\\n\\n\");\n"]
| 2 |
["94202f01e44c58bee4419044f8a18ac5f1a50dff", "f1bc5a554af4e617c7d7508f7f16f8fd25c78c91"]
|
["docs", "refactor"]
|
add test case with multiple partitions for message,support react@17 in peer deps
resolves #1478
|
["diff --git a/broker-core/src/main/java/io/zeebe/broker/subscription/command/SubscriptionCommandSender.java b/broker-core/src/main/java/io/zeebe/broker/subscription/command/SubscriptionCommandSender.java\nindex 693d1da..e3552d4 100644\n--- a/broker-core/src/main/java/io/zeebe/broker/subscription/command/SubscriptionCommandSender.java\n+++ b/broker-core/src/main/java/io/zeebe/broker/subscription/command/SubscriptionCommandSender.java\n@@ -74,7 +74,7 @@ public class SubscriptionCommandSender {\n new CloseWorkflowInstanceSubscriptionCommand();\n \n private final ClientTransport subscriptionClient;\n- private final IntArrayList partitionIds;\n+ private final IntArrayList partitionIds = new IntArrayList();\n \n private int partitionId;\n private TopologyPartitionListenerImpl partitionListener;\n@@ -82,7 +82,6 @@ public class SubscriptionCommandSender {\n public SubscriptionCommandSender(\n final ClusterCfg clusterCfg, final ClientTransport subscriptionClient) {\n this.subscriptionClient = subscriptionClient;\n- partitionIds = new IntArrayList();\n partitionIds.addAll(clusterCfg.getPartitionIds());\n }\n \n@@ -100,7 +99,8 @@ public class SubscriptionCommandSender {\n final DirectBuffer messageName,\n final DirectBuffer correlationKey) {\n \n- final int subscriptionPartitionId = getSubscriptionPartitionId(correlationKey);\n+ final int subscriptionPartitionId =\n+ SubscriptionUtil.getSubscriptionPartitionId(correlationKey, partitionIds.size());\n \n openMessageSubscriptionCommand.setSubscriptionPartitionId(subscriptionPartitionId);\n openMessageSubscriptionCommand.setWorkflowInstanceKey(workflowInstanceKey);\n@@ -111,14 +111,6 @@ public class SubscriptionCommandSender {\n return sendSubscriptionCommand(subscriptionPartitionId, openMessageSubscriptionCommand);\n }\n \n- private int getSubscriptionPartitionId(final DirectBuffer correlationKey) {\n- if (partitionIds == null) {\n- throw new IllegalStateException(\"no partition ids available\");\n- }\n-\n- return SubscriptionUtil.getSubscriptionPartitionId(correlationKey, partitionIds.size());\n- }\n-\n public boolean openWorkflowInstanceSubscription(\n final long workflowInstanceKey,\n final long elementInstanceKey,\ndiff --git a/broker-core/src/test/java/io/zeebe/broker/workflow/message/MessageCatchElementTest.java b/broker-core/src/test/java/io/zeebe/broker/workflow/message/MessageCatchElementTest.java\nindex 4baed4f..838c9ca 100644\n--- a/broker-core/src/test/java/io/zeebe/broker/workflow/message/MessageCatchElementTest.java\n+++ b/broker-core/src/test/java/io/zeebe/broker/workflow/message/MessageCatchElementTest.java\n@@ -36,7 +36,6 @@ import io.zeebe.model.bpmn.Bpmn;\n import io.zeebe.model.bpmn.BpmnModelInstance;\n import io.zeebe.protocol.clientapi.RecordType;\n import io.zeebe.protocol.clientapi.ValueType;\n-import io.zeebe.protocol.impl.SubscriptionUtil;\n import io.zeebe.protocol.intent.DeploymentIntent;\n import io.zeebe.protocol.intent.MessageSubscriptionIntent;\n import io.zeebe.protocol.intent.WorkflowInstanceIntent;\n@@ -44,7 +43,6 @@ import io.zeebe.protocol.intent.WorkflowInstanceSubscriptionIntent;\n import io.zeebe.test.broker.protocol.clientapi.ClientApiRule;\n import io.zeebe.test.broker.protocol.clientapi.PartitionTestClient;\n import io.zeebe.test.util.record.RecordingExporter;\n-import io.zeebe.util.buffer.BufferUtil;\n import java.util.List;\n import java.util.stream.Collectors;\n import org.agrona.DirectBuffer;\n@@ -171,39 +169,6 @@ public class MessageCatchElementTest {\n }\n \n @Test\n- public void shouldOpenMessageSubscriptionsOnSamePartition() {\n- // given\n- final List<Integer> partitionIds = apiRule.getPartitionIds();\n-\n- final String correlationKey = \"order-123\";\n-\n- final PartitionTestClient workflowPartition = apiRule.partitionClient(partitionIds.get(0));\n- final PartitionTestClient subscriptionPartition =\n- apiRule.partitionClient(getPartitionId(correlationKey));\n-\n- testClient.deploy(CATCH_EVENT_WORKFLOW);\n-\n- // when\n- final long workflowInstanceKey1 =\n- workflowPartition.createWorkflowInstance(PROCESS_ID, asMsgPack(\"orderId\", correlationKey));\n-\n- final long workflowInstanceKey2 =\n- workflowPartition.createWorkflowInstance(PROCESS_ID, asMsgPack(\"orderId\", correlationKey));\n-\n- // then\n- final List<Record<MessageSubscriptionRecordValue>> subscriptions =\n- subscriptionPartition\n- .receiveMessageSubscriptions()\n- .withIntent(MessageSubscriptionIntent.OPENED)\n- .limit(2)\n- .collect(Collectors.toList());\n-\n- assertThat(subscriptions)\n- .extracting(s -> s.getValue().getWorkflowInstanceKey())\n- .contains(workflowInstanceKey1, workflowInstanceKey2);\n- }\n-\n- @Test\n public void shouldOpenWorkflowInstanceSubscription() {\n final long workflowInstanceKey =\n testClient.createWorkflowInstance(PROCESS_ID, asMsgPack(\"orderId\", \"order-123\"));\n@@ -352,10 +317,4 @@ public class MessageCatchElementTest {\n .exists())\n .isTrue();\n }\n-\n- private int getPartitionId(final String correlationKey) {\n- final List<Integer> partitionIds = apiRule.getPartitionIds();\n- return SubscriptionUtil.getSubscriptionPartitionId(\n- BufferUtil.wrapString(correlationKey), partitionIds.size());\n- }\n }\ndiff --git a/broker-core/src/test/java/io/zeebe/broker/workflow/message/MessageCorrelationMultiplePartitionsTest.java b/broker-core/src/test/java/io/zeebe/broker/workflow/message/MessageCorrelationMultiplePartitionsTest.java\nnew file mode 100644\nindex 0000000..cf8261a\n--- /dev/null\n+++ b/broker-core/src/test/java/io/zeebe/broker/workflow/message/MessageCorrelationMultiplePartitionsTest.java\n@@ -0,0 +1,134 @@\n+/*\n+ * Zeebe Broker Core\n+ * Copyright \u00a9 2017 camunda services GmbH ([email protected])\n+ *\n+ * This program is free software: you can redistribute it and/or modify\n+ * it under the terms of the GNU Affero General Public License as published by\n+ * the Free Software Foundation, either version 3 of the License, or\n+ * (at your option) any later version.\n+ *\n+ * This program is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ * GNU Affero General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Affero General Public License\n+ * along with this program. If not, see <http://www.gnu.org/licenses/>.\n+ */\n+package io.zeebe.broker.workflow.message;\n+\n+import static io.zeebe.broker.test.EmbeddedBrokerConfigurator.setPartitionCount;\n+import static io.zeebe.test.util.MsgPackUtil.asMsgPack;\n+import static org.assertj.core.api.Assertions.assertThat;\n+import static org.assertj.core.api.Assertions.tuple;\n+\n+import io.zeebe.broker.test.EmbeddedBrokerRule;\n+import io.zeebe.model.bpmn.Bpmn;\n+import io.zeebe.model.bpmn.BpmnModelInstance;\n+import io.zeebe.protocol.impl.SubscriptionUtil;\n+import io.zeebe.protocol.intent.MessageSubscriptionIntent;\n+import io.zeebe.protocol.intent.WorkflowInstanceIntent;\n+import io.zeebe.test.broker.protocol.clientapi.ClientApiRule;\n+import io.zeebe.test.broker.protocol.clientapi.PartitionTestClient;\n+import io.zeebe.test.util.record.RecordingExporter;\n+import io.zeebe.util.buffer.BufferUtil;\n+import java.util.List;\n+import java.util.stream.IntStream;\n+import org.junit.Before;\n+import org.junit.Rule;\n+import org.junit.Test;\n+import org.junit.rules.RuleChain;\n+\n+public class MessageCorrelationMultiplePartitionsTest {\n+\n+ private static final String CORRELATION_KEY_PARTITION_0 = \"item-2\";\n+ private static final String CORRELATION_KEY_PARTITION_1 = \"item-1\";\n+ private static final String CORRELATION_KEY_PARTITION_2 = \"item-0\";\n+\n+ private static final String PROCESS_ID = \"process\";\n+\n+ private static final BpmnModelInstance WORKFLOW =\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .intermediateCatchEvent(\"receive-message\")\n+ .message(m -> m.name(\"message\").zeebeCorrelationKey(\"$.key\"))\n+ .endEvent(\"end\")\n+ .done();\n+\n+ public EmbeddedBrokerRule brokerRule = new EmbeddedBrokerRule(setPartitionCount(3));\n+\n+ public ClientApiRule apiRule = new ClientApiRule(brokerRule::getClientAddress);\n+\n+ @Rule public RuleChain ruleChain = RuleChain.outerRule(brokerRule).around(apiRule);\n+\n+ private PartitionTestClient testClient;\n+\n+ @Before\n+ public void init() {\n+ assertThat(getPartitionId(CORRELATION_KEY_PARTITION_0)).isEqualTo(0);\n+ assertThat(getPartitionId(CORRELATION_KEY_PARTITION_1)).isEqualTo(1);\n+ assertThat(getPartitionId(CORRELATION_KEY_PARTITION_2)).isEqualTo(2);\n+\n+ testClient = apiRule.partitionClient();\n+\n+ testClient.deploy(WORKFLOW);\n+ }\n+\n+ @Test\n+ public void shouldOpenMessageSubscriptionsOnDifferentPartitions() {\n+ // when\n+ IntStream.range(0, 10)\n+ .forEach(\n+ i -> {\n+ testClient.createWorkflowInstance(\n+ PROCESS_ID, asMsgPack(\"key\", CORRELATION_KEY_PARTITION_0));\n+ testClient.createWorkflowInstance(\n+ PROCESS_ID, asMsgPack(\"key\", CORRELATION_KEY_PARTITION_1));\n+ testClient.createWorkflowInstance(\n+ PROCESS_ID, asMsgPack(\"key\", CORRELATION_KEY_PARTITION_2));\n+ });\n+\n+ // then\n+ assertThat(\n+ RecordingExporter.messageSubscriptionRecords(MessageSubscriptionIntent.OPENED)\n+ .limit(30))\n+ .extracting(r -> tuple(r.getMetadata().getPartitionId(), r.getValue().getCorrelationKey()))\n+ .containsOnly(\n+ tuple(0, CORRELATION_KEY_PARTITION_0),\n+ tuple(1, CORRELATION_KEY_PARTITION_1),\n+ tuple(2, CORRELATION_KEY_PARTITION_2));\n+ }\n+\n+ @Test\n+ public void shouldCorrelateMessageOnDifferentPartitions() {\n+ // given\n+ apiRule\n+ .partitionClient(0)\n+ .publishMessage(\"message\", CORRELATION_KEY_PARTITION_0, asMsgPack(\"p\", \"p0\"));\n+ apiRule\n+ .partitionClient(1)\n+ .publishMessage(\"message\", CORRELATION_KEY_PARTITION_1, asMsgPack(\"p\", \"p1\"));\n+ apiRule\n+ .partitionClient(2)\n+ .publishMessage(\"message\", CORRELATION_KEY_PARTITION_2, asMsgPack(\"p\", \"p2\"));\n+\n+ // when\n+ testClient.createWorkflowInstance(PROCESS_ID, asMsgPack(\"key\", CORRELATION_KEY_PARTITION_0));\n+ testClient.createWorkflowInstance(PROCESS_ID, asMsgPack(\"key\", CORRELATION_KEY_PARTITION_1));\n+ testClient.createWorkflowInstance(PROCESS_ID, asMsgPack(\"key\", CORRELATION_KEY_PARTITION_2));\n+\n+ // then\n+ assertThat(\n+ RecordingExporter.workflowInstanceRecords(WorkflowInstanceIntent.END_EVENT_OCCURRED)\n+ .withElementId(\"end\")\n+ .limit(3))\n+ .extracting(r -> r.getValue().getPayloadAsMap().get(\"p\"))\n+ .contains(\"p0\", \"p1\", \"p2\");\n+ }\n+\n+ private int getPartitionId(final String correlationKey) {\n+ final List<Integer> partitionIds = apiRule.getPartitionIds();\n+ return SubscriptionUtil.getSubscriptionPartitionId(\n+ BufferUtil.wrapString(correlationKey), partitionIds.size());\n+ }\n+}\ndiff --git a/protocol-test-util/src/main/java/io/zeebe/test/broker/protocol/clientapi/PartitionTestClient.java b/protocol-test-util/src/main/java/io/zeebe/test/broker/protocol/clientapi/PartitionTestClient.java\nindex dac11a2..e2b8397 100644\n--- a/protocol-test-util/src/main/java/io/zeebe/test/broker/protocol/clientapi/PartitionTestClient.java\n+++ b/protocol-test-util/src/main/java/io/zeebe/test/broker/protocol/clientapi/PartitionTestClient.java\n@@ -329,6 +329,7 @@ public class PartitionTestClient {\n final String messageName, final String correlationKey, final byte[] payload, final long ttl) {\n return apiRule\n .createCmdRequest()\n+ .partitionId(partitionId)\n .type(ValueType.MESSAGE, MessageIntent.PUBLISH)\n .command()\n .put(\"name\", messageName)\ndiff --git a/qa/integration-tests/src/test/java/io/zeebe/broker/it/startup/BrokerReprocessingTest.java b/qa/integration-tests/src/test/java/io/zeebe/broker/it/startup/BrokerReprocessingTest.java\nindex 9a122d9..b7db67e 100644\n--- a/qa/integration-tests/src/test/java/io/zeebe/broker/it/startup/BrokerReprocessingTest.java\n+++ b/qa/integration-tests/src/test/java/io/zeebe/broker/it/startup/BrokerReprocessingTest.java\n@@ -619,14 +619,9 @@ public class BrokerReprocessingTest {\n }\n \n @Test\n- public void shouldCorrelateMessageAfterRestartIfEnteredBeforeA() throws Exception {\n+ public void shouldCorrelateMessageAfterRestartIfEnteredBefore() throws Exception {\n // given\n- clientRule\n- .getWorkflowClient()\n- .newDeployCommand()\n- .addWorkflowModel(WORKFLOW_MESSAGE, \"message.bpmn\")\n- .send()\n- .join();\n+ deploy(WORKFLOW_MESSAGE, \"message.bpmn\");\n \n final long workflowInstanceKey =\n startWorkflowInstance(PROCESS_ID, singletonMap(\"orderId\", \"order-123\"))\n@@ -658,12 +653,7 @@ public class BrokerReprocessingTest {\n @Test\n public void shouldCorrelateMessageAfterRestartIfPublishedBefore() throws Exception {\n // given\n- clientRule\n- .getWorkflowClient()\n- .newDeployCommand()\n- .addWorkflowModel(WORKFLOW_MESSAGE, \"message.bpmn\")\n- .send()\n- .join();\n+ deploy(WORKFLOW_MESSAGE, \"message.bpmn\");\n \n publishMessage(\"order canceled\", \"order-123\", singletonMap(\"foo\", \"bar\"));\n reprocessingTrigger.accept(this);\ndiff --git a/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/MessageCorrelationTest.java b/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/MessageCorrelationTest.java\ndeleted file mode 100644\nindex c6a05fb..0000000\n--- a/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/MessageCorrelationTest.java\n+++ /dev/null\n@@ -1,176 +0,0 @@\n-/*\n- * Copyright \u00a9 2017 camunda services GmbH ([email protected])\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-package io.zeebe.broker.it.workflow;\n-\n-import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertElementActivated;\n-import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertElementCompleted;\n-import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertWorkflowInstanceCompleted;\n-import static org.assertj.core.api.Assertions.assertThat;\n-import static org.assertj.core.api.Assertions.entry;\n-\n-import io.zeebe.broker.it.GrpcClientRule;\n-import io.zeebe.broker.test.EmbeddedBrokerRule;\n-import io.zeebe.client.api.events.DeploymentEvent;\n-import io.zeebe.model.bpmn.Bpmn;\n-import io.zeebe.model.bpmn.BpmnModelInstance;\n-import java.util.Collections;\n-import org.junit.Before;\n-import org.junit.Rule;\n-import org.junit.Test;\n-import org.junit.rules.RuleChain;\n-import org.junit.runner.RunWith;\n-import org.junit.runners.Parameterized;\n-import org.junit.runners.Parameterized.Parameter;\n-import org.junit.runners.Parameterized.Parameters;\n-\n-@RunWith(Parameterized.class)\n-public class MessageCorrelationTest {\n-\n- public EmbeddedBrokerRule brokerRule = new EmbeddedBrokerRule();\n- public GrpcClientRule clientRule = new GrpcClientRule(brokerRule);\n-\n- @Rule public RuleChain ruleChain = RuleChain.outerRule(brokerRule).around(clientRule);\n-\n- private static final BpmnModelInstance CATCH_EVENT_WORKFLOW =\n- Bpmn.createExecutableProcess(\"wf\")\n- .startEvent()\n- .intermediateCatchEvent(\"receive-message\")\n- .message(m -> m.name(\"order canceled\").zeebeCorrelationKey(\"$.orderId\"))\n- .sequenceFlowId(\"to-end\")\n- .endEvent()\n- .done();\n-\n- private static final BpmnModelInstance RECEIVE_TASK_WORKFLOW =\n- Bpmn.createExecutableProcess(\"wf\")\n- .startEvent()\n- .receiveTask(\"receive-message\")\n- .message(m -> m.name(\"order canceled\").zeebeCorrelationKey(\"$.orderId\"))\n- .sequenceFlowId(\"to-end\")\n- .endEvent()\n- .done();\n-\n- @Parameter(0)\n- public String elementType;\n-\n- @Parameter(1)\n- public BpmnModelInstance workflow;\n-\n- @Parameters(name = \"{0}\")\n- public static final Object[][] parameters() {\n- return new Object[][] {\n- {\"intermediate message catch event\", CATCH_EVENT_WORKFLOW},\n- {\"receive task\", RECEIVE_TASK_WORKFLOW}\n- };\n- }\n-\n- @Before\n- public void init() {\n- final DeploymentEvent deploymentEvent =\n- clientRule\n- .getWorkflowClient()\n- .newDeployCommand()\n- .addWorkflowModel(workflow, \"wf.bpmn\")\n- .send()\n- .join();\n-\n- clientRule.waitUntilDeploymentIsDone(deploymentEvent.getKey());\n- }\n-\n- @Test\n- public void shouldCorrelateMessageIfEnteredBefore() {\n- // given\n- clientRule\n- .getWorkflowClient()\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- assertElementActivated(\"receive-message\");\n-\n- // when\n- clientRule\n- .getWorkflowClient()\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .send()\n- .join();\n-\n- // then\n- assertWorkflowInstanceCompleted(\"wf\");\n- }\n-\n- @Test\n- public void shouldCorrelateMessageIfPublishedBefore() {\n- // given\n- clientRule\n- .getWorkflowClient()\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .send()\n- .join();\n-\n- // when\n- clientRule\n- .getWorkflowClient()\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- // then\n- assertWorkflowInstanceCompleted(\"wf\");\n- }\n-\n- @Test\n- public void shouldCorrelateMessageAndMergePayload() {\n- // given\n- clientRule\n- .getWorkflowClient()\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- // when\n- clientRule\n- .getWorkflowClient()\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .payload(Collections.singletonMap(\"foo\", \"bar\"))\n- .send()\n- .join();\n-\n- // then\n- assertWorkflowInstanceCompleted(\"wf\");\n-\n- assertElementCompleted(\n- \"wf\",\n- \"receive-message\",\n- (catchEventOccurredEvent) ->\n- assertThat(catchEventOccurredEvent.getPayloadAsMap())\n- .containsExactly(entry(\"orderId\", \"order-123\"), entry(\"foo\", \"bar\")));\n- }\n-}\ndiff --git a/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/PublishMessageTest.java b/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/PublishMessageTest.java\ndeleted file mode 100644\nindex 7845eec..0000000\n--- a/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/PublishMessageTest.java\n+++ /dev/null\n@@ -1,234 +0,0 @@\n-/*\n- * Copyright \u00a9 2017 camunda services GmbH ([email protected])\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-package io.zeebe.broker.it.workflow;\n-\n-import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertElementActivated;\n-import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertElementCompleted;\n-import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertWorkflowInstanceCompleted;\n-import static io.zeebe.broker.test.EmbeddedBrokerConfigurator.setPartitionCount;\n-import static org.assertj.core.api.Assertions.assertThat;\n-import static org.assertj.core.api.Assertions.assertThatThrownBy;\n-import static org.assertj.core.api.Assertions.entry;\n-\n-import io.zeebe.broker.it.GrpcClientRule;\n-import io.zeebe.broker.test.EmbeddedBrokerRule;\n-import io.zeebe.client.api.ZeebeFuture;\n-import io.zeebe.client.api.clients.WorkflowClient;\n-import io.zeebe.client.api.events.DeploymentEvent;\n-import io.zeebe.client.api.events.WorkflowInstanceEvent;\n-import io.zeebe.client.cmd.ClientException;\n-import io.zeebe.model.bpmn.Bpmn;\n-import io.zeebe.model.bpmn.BpmnModelInstance;\n-import java.time.Duration;\n-import java.util.Collections;\n-import org.junit.Before;\n-import org.junit.Rule;\n-import org.junit.Test;\n-import org.junit.rules.RuleChain;\n-\n-public class PublishMessageTest {\n-\n- private static final BpmnModelInstance WORKFLOW =\n- Bpmn.createExecutableProcess(\"wf\")\n- .startEvent()\n- .intermediateCatchEvent(\"catch-event\")\n- .message(c -> c.name(\"order canceled\").zeebeCorrelationKey(\"$.orderId\"))\n- .endEvent()\n- .done();\n- public EmbeddedBrokerRule brokerRule = new EmbeddedBrokerRule(setPartitionCount(3));\n- public GrpcClientRule clientRule = new GrpcClientRule(brokerRule);\n-\n- @Rule public RuleChain ruleChain = RuleChain.outerRule(brokerRule).around(clientRule);\n-\n- private WorkflowClient workflowClient;\n-\n- @Before\n- public void init() {\n-\n- workflowClient = clientRule.getClient().workflowClient();\n-\n- final DeploymentEvent deploymentEvent =\n- workflowClient.newDeployCommand().addWorkflowModel(WORKFLOW, \"wf.bpmn\").send().join();\n-\n- clientRule.waitUntilDeploymentIsDone(deploymentEvent.getKey());\n- }\n-\n- @Test\n- public void shouldCorrelateMessageToAllSubscriptions() {\n- // given\n- final WorkflowInstanceEvent wf =\n- workflowClient\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- final WorkflowInstanceEvent wf2 =\n- workflowClient\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- // when\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .send()\n- .join();\n-\n- // then\n- assertWorkflowInstanceCompleted(\"wf\", wf.getWorkflowInstanceKey());\n- assertWorkflowInstanceCompleted(\"wf\", wf2.getWorkflowInstanceKey());\n- }\n-\n- @Test\n- public void shouldCorrelateMessageWithZeroTTL() {\n- // given\n- workflowClient\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- assertElementActivated(\"catch-event\");\n-\n- // when\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .timeToLive(Duration.ZERO)\n- .send()\n- .join();\n-\n- // then\n- assertElementCompleted(\"wf\", \"catch-event\");\n- }\n-\n- @Test\n- public void shouldNotCorrelateMessageAfterTTL() {\n- // given\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .timeToLive(Duration.ZERO)\n- .payload(Collections.singletonMap(\"msg\", \"failure\"))\n- .send()\n- .join();\n-\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .timeToLive(Duration.ofMinutes(1))\n- .payload(Collections.singletonMap(\"msg\", \"expected\"))\n- .send()\n- .join();\n-\n- // when\n- workflowClient\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- // then\n-\n- assertElementCompleted(\n- \"wf\",\n- \"catch-event\",\n- (catchEventOccurred) ->\n- assertThat(catchEventOccurred.getPayloadAsMap()).contains(entry(\"msg\", \"expected\")));\n- }\n-\n- @Test\n- public void shouldCorrelateMessageOnDifferentPartitions() {\n- // given\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .send()\n- .join();\n-\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-124\")\n- .send()\n- .join();\n-\n- // when\n- final WorkflowInstanceEvent wf =\n- workflowClient\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- final WorkflowInstanceEvent wf2 =\n- workflowClient\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-124\\\"}\")\n- .send()\n- .join();\n-\n- // then\n- assertWorkflowInstanceCompleted(\"wf\", wf.getWorkflowInstanceKey());\n- assertWorkflowInstanceCompleted(\"wf\", wf2.getWorkflowInstanceKey());\n- }\n-\n- @Test\n- public void shouldRejectMessageWithSameId() {\n- // given\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .messageId(\"foo\")\n- .send()\n- .join();\n-\n- // when\n- final ZeebeFuture<Void> future =\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .messageId(\"foo\")\n- .send();\n-\n- // then\n- assertThatThrownBy(future::join)\n- .isInstanceOf(ClientException.class)\n- .hasMessageContaining(\"message with id 'foo' is already published\");\n- }\n-}\ndiff --git a/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/message/MessageCorrelationMultiplePartitionsTest.java b/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/message/MessageCorrelationMultiplePartitionsTest.java\nnew file mode 100644\nindex 0000000..0e37c95\n--- /dev/null\n+++ b/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/message/MessageCorrelationMultiplePartitionsTest.java\n@@ -0,0 +1,196 @@\n+/*\n+ * Copyright \u00a9 2017 camunda services GmbH ([email protected])\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package io.zeebe.broker.it.workflow.message;\n+\n+import static io.zeebe.broker.test.EmbeddedBrokerConfigurator.setPartitionCount;\n+import static org.assertj.core.api.Assertions.assertThat;\n+import static org.assertj.core.api.Assertions.tuple;\n+\n+import io.zeebe.broker.it.GrpcClientRule;\n+import io.zeebe.broker.test.EmbeddedBrokerRule;\n+import io.zeebe.client.api.events.DeploymentEvent;\n+import io.zeebe.model.bpmn.Bpmn;\n+import io.zeebe.model.bpmn.BpmnModelInstance;\n+import io.zeebe.protocol.intent.MessageIntent;\n+import io.zeebe.protocol.intent.MessageSubscriptionIntent;\n+import io.zeebe.protocol.intent.WorkflowInstanceIntent;\n+import io.zeebe.test.util.record.RecordingExporter;\n+import java.util.Collections;\n+import java.util.stream.IntStream;\n+import org.junit.Before;\n+import org.junit.Rule;\n+import org.junit.Test;\n+import org.junit.rules.RuleChain;\n+\n+public class MessageCorrelationMultiplePartitionsTest {\n+\n+ private static final String CORRELATION_KEY_PARTITION_0 = \"item-2\";\n+ private static final String CORRELATION_KEY_PARTITION_1 = \"item-1\";\n+ private static final String CORRELATION_KEY_PARTITION_2 = \"item-0\";\n+\n+ private static final String PROCESS_ID = \"process\";\n+\n+ public EmbeddedBrokerRule brokerRule = new EmbeddedBrokerRule(setPartitionCount(3));\n+ public GrpcClientRule clientRule = new GrpcClientRule(brokerRule);\n+\n+ @Rule public RuleChain ruleChain = RuleChain.outerRule(brokerRule).around(clientRule);\n+\n+ private static final BpmnModelInstance WORKFLOW =\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .intermediateCatchEvent()\n+ .message(m -> m.name(\"message\").zeebeCorrelationKey(\"$.key\"))\n+ .endEvent(\"end\")\n+ .done();\n+\n+ @Before\n+ public void init() {\n+ final DeploymentEvent deploymentEvent =\n+ clientRule\n+ .getWorkflowClient()\n+ .newDeployCommand()\n+ .addWorkflowModel(WORKFLOW, \"wf.bpmn\")\n+ .send()\n+ .join();\n+\n+ clientRule.waitUntilDeploymentIsDone(deploymentEvent.getKey());\n+ }\n+\n+ @Test\n+ public void shouldOpenMessageSubscriptionsOnDifferentPartitions() {\n+ // when\n+ IntStream.range(0, 10)\n+ .forEach(\n+ i -> {\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_0));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_1));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_2));\n+ });\n+\n+ // then\n+ assertThat(\n+ RecordingExporter.messageSubscriptionRecords(MessageSubscriptionIntent.OPENED)\n+ .limit(30))\n+ .extracting(r -> tuple(r.getMetadata().getPartitionId(), r.getValue().getCorrelationKey()))\n+ .containsOnly(\n+ tuple(0, CORRELATION_KEY_PARTITION_0),\n+ tuple(1, CORRELATION_KEY_PARTITION_1),\n+ tuple(2, CORRELATION_KEY_PARTITION_2));\n+ }\n+\n+ @Test\n+ public void shouldPublishMessageOnDifferentPartitions() {\n+ // when\n+ IntStream.range(0, 10)\n+ .forEach(\n+ i -> {\n+ publishMessage(CORRELATION_KEY_PARTITION_0, Collections.singletonMap(\"p\", \"p0\"));\n+ publishMessage(CORRELATION_KEY_PARTITION_1, Collections.singletonMap(\"p\", \"p1\"));\n+ publishMessage(CORRELATION_KEY_PARTITION_2, Collections.singletonMap(\"p\", \"p2\"));\n+ });\n+\n+ // then\n+ assertThat(RecordingExporter.messageRecords(MessageIntent.PUBLISHED).limit(30))\n+ .extracting(r -> tuple(r.getMetadata().getPartitionId(), r.getValue().getCorrelationKey()))\n+ .containsOnly(\n+ tuple(0, CORRELATION_KEY_PARTITION_0),\n+ tuple(1, CORRELATION_KEY_PARTITION_1),\n+ tuple(2, CORRELATION_KEY_PARTITION_2));\n+ }\n+\n+ @Test\n+ public void shouldCorrelateMessageOnDifferentPartitions() {\n+ // given\n+ publishMessage(CORRELATION_KEY_PARTITION_0, Collections.singletonMap(\"p\", \"p0\"));\n+ publishMessage(CORRELATION_KEY_PARTITION_1, Collections.singletonMap(\"p\", \"p1\"));\n+ publishMessage(CORRELATION_KEY_PARTITION_2, Collections.singletonMap(\"p\", \"p2\"));\n+\n+ // when\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_0));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_1));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_2));\n+\n+ // then\n+ assertThat(\n+ RecordingExporter.workflowInstanceRecords(WorkflowInstanceIntent.END_EVENT_OCCURRED)\n+ .withElementId(\"end\")\n+ .limit(3))\n+ .extracting(r -> r.getValue().getPayloadAsMap().get(\"p\"))\n+ .contains(\"p0\", \"p1\", \"p2\");\n+ }\n+\n+ @Test\n+ public void shouldOpenMessageSubscriptionsOnSamePartitionsAfterRestart() {\n+ // given\n+ IntStream.range(0, 5)\n+ .forEach(\n+ i -> {\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_0));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_1));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_2));\n+ });\n+\n+ assertThat(\n+ RecordingExporter.messageSubscriptionRecords(MessageSubscriptionIntent.OPENED)\n+ .limit(15)\n+ .exists())\n+ .isTrue();\n+\n+ // when\n+ brokerRule.stopBroker();\n+ brokerRule.startBroker();\n+\n+ IntStream.range(0, 5)\n+ .forEach(\n+ i -> {\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_0));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_1));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_2));\n+ });\n+\n+ // then\n+ assertThat(\n+ RecordingExporter.messageSubscriptionRecords(MessageSubscriptionIntent.OPENED)\n+ .limit(30))\n+ .extracting(r -> tuple(r.getMetadata().getPartitionId(), r.getValue().getCorrelationKey()))\n+ .containsOnly(\n+ tuple(0, CORRELATION_KEY_PARTITION_0),\n+ tuple(1, CORRELATION_KEY_PARTITION_1),\n+ tuple(2, CORRELATION_KEY_PARTITION_2));\n+ }\n+\n+ private void createWorkflowInstance(Object payload) {\n+ clientRule\n+ .getWorkflowClient()\n+ .newCreateInstanceCommand()\n+ .bpmnProcessId(PROCESS_ID)\n+ .latestVersion()\n+ .payload(payload)\n+ .send()\n+ .join();\n+ }\n+\n+ private void publishMessage(String correlationKey, Object payload) {\n+ clientRule\n+ .getWorkflowClient()\n+ .newPublishMessageCommand()\n+ .messageName(\"message\")\n+ .correlationKey(correlationKey)\n+ .payload(payload)\n+ .send()\n+ .join();\n+ }\n+}\ndiff --git a/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/message/MessageCorrelationTest.java b/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/message/MessageCorrelationTest.java\nnew file mode 100644\nindex 0000000..3b08572\n--- /dev/null\n+++ b/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/message/MessageCorrelationTest.java\n@@ -0,0 +1,198 @@\n+/*\n+ * Copyright \u00a9 2017 camunda services GmbH ([email protected])\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package io.zeebe.broker.it.workflow.message;\n+\n+import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertElementActivated;\n+import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertElementCompleted;\n+import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertWorkflowInstanceCompleted;\n+import static org.assertj.core.api.Assertions.assertThat;\n+import static org.assertj.core.api.Assertions.assertThatThrownBy;\n+import static org.assertj.core.api.Assertions.entry;\n+\n+import io.zeebe.broker.it.GrpcClientRule;\n+import io.zeebe.broker.test.EmbeddedBrokerRule;\n+import io.zeebe.client.api.ZeebeFuture;\n+import io.zeebe.client.api.events.DeploymentEvent;\n+import io.zeebe.client.cmd.ClientException;\n+import io.zeebe.model.bpmn.Bpmn;\n+import io.zeebe.model.bpmn.BpmnModelInstance;\n+import java.time.Duration;\n+import java.util.Collections;\n+import org.junit.Before;\n+import org.junit.Rule;\n+import org.junit.Test;\n+import org.junit.rules.RuleChain;\n+\n+public class MessageCorrelationTest {\n+\n+ private static final String PROCESS_ID = \"process\";\n+\n+ public EmbeddedBrokerRule brokerRule = new EmbeddedBrokerRule();\n+ public GrpcClientRule clientRule = new GrpcClientRule(brokerRule);\n+\n+ @Rule public RuleChain ruleChain = RuleChain.outerRule(brokerRule).around(clientRule);\n+\n+ private static final BpmnModelInstance WORKFLOW =\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .intermediateCatchEvent(\"catch-event\")\n+ .message(c -> c.name(\"order canceled\").zeebeCorrelationKey(\"$.orderId\"))\n+ .endEvent()\n+ .done();\n+\n+ @Before\n+ public void init() {\n+ final DeploymentEvent deploymentEvent =\n+ clientRule\n+ .getWorkflowClient()\n+ .newDeployCommand()\n+ .addWorkflowModel(WORKFLOW, \"wf.bpmn\")\n+ .send()\n+ .join();\n+\n+ clientRule.waitUntilDeploymentIsDone(deploymentEvent.getKey());\n+ }\n+\n+ @Test\n+ public void shouldCorrelateMessage() {\n+ // given\n+ clientRule\n+ .getWorkflowClient()\n+ .newCreateInstanceCommand()\n+ .bpmnProcessId(PROCESS_ID)\n+ .latestVersion()\n+ .payload(Collections.singletonMap(\"orderId\", \"order-123\"))\n+ .send()\n+ .join();\n+\n+ // when\n+ clientRule\n+ .getWorkflowClient()\n+ .newPublishMessageCommand()\n+ .messageName(\"order canceled\")\n+ .correlationKey(\"order-123\")\n+ .payload(Collections.singletonMap(\"foo\", \"bar\"))\n+ .send()\n+ .join();\n+\n+ // then\n+ assertWorkflowInstanceCompleted(PROCESS_ID);\n+\n+ assertElementCompleted(\n+ PROCESS_ID,\n+ \"catch-event\",\n+ (catchEventOccurredEvent) ->\n+ assertThat(catchEventOccurredEvent.getPayloadAsMap())\n+ .containsExactly(entry(\"orderId\", \"order-123\"), entry(\"foo\", \"bar\")));\n+ }\n+\n+ @Test\n+ public void shouldCorrelateMessageWithZeroTTL() {\n+ // given\n+ clientRule\n+ .getWorkflowClient()\n+ .newCreateInstanceCommand()\n+ .bpmnProcessId(PROCESS_ID)\n+ .latestVersion()\n+ .payload(Collections.singletonMap(\"orderId\", \"order-123\"))\n+ .send()\n+ .join();\n+\n+ assertElementActivated(\"catch-event\");\n+\n+ // when\n+ clientRule\n+ .getWorkflowClient()\n+ .newPublishMessageCommand()\n+ .messageName(\"order canceled\")\n+ .correlationKey(\"order-123\")\n+ .timeToLive(Duration.ZERO)\n+ .send()\n+ .join();\n+\n+ // then\n+ assertElementCompleted(PROCESS_ID, \"catch-event\");\n+ }\n+\n+ @Test\n+ public void shouldNotCorrelateMessageAfterTTL() {\n+ // given\n+ clientRule\n+ .getWorkflowClient()\n+ .newPublishMessageCommand()\n+ .messageName(\"order canceled\")\n+ .correlationKey(\"order-123\")\n+ .timeToLive(Duration.ZERO)\n+ .payload(Collections.singletonMap(\"msg\", \"failure\"))\n+ .send()\n+ .join();\n+\n+ clientRule\n+ .getWorkflowClient()\n+ .newPublishMessageCommand()\n+ .messageName(\"order canceled\")\n+ .correlationKey(\"order-123\")\n+ .timeToLive(Duration.ofMinutes(1))\n+ .payload(Collections.singletonMap(\"msg\", \"expected\"))\n+ .send()\n+ .join();\n+\n+ // when\n+ clientRule\n+ .getWorkflowClient()\n+ .newCreateInstanceCommand()\n+ .bpmnProcessId(PROCESS_ID)\n+ .latestVersion()\n+ .payload(Collections.singletonMap(\"orderId\", \"order-123\"))\n+ .send()\n+ .join();\n+\n+ // then\n+ assertElementCompleted(\n+ PROCESS_ID,\n+ \"catch-event\",\n+ (catchEventOccurred) ->\n+ assertThat(catchEventOccurred.getPayloadAsMap()).contains(entry(\"msg\", \"expected\")));\n+ }\n+\n+ @Test\n+ public void shouldRejectMessageWithSameId() {\n+ // given\n+ clientRule\n+ .getWorkflowClient()\n+ .newPublishMessageCommand()\n+ .messageName(\"order canceled\")\n+ .correlationKey(\"order-123\")\n+ .messageId(\"foo\")\n+ .send()\n+ .join();\n+\n+ // when\n+ final ZeebeFuture<Void> future =\n+ clientRule\n+ .getWorkflowClient()\n+ .newPublishMessageCommand()\n+ .messageName(\"order canceled\")\n+ .correlationKey(\"order-123\")\n+ .messageId(\"foo\")\n+ .send();\n+\n+ // then\n+ assertThatThrownBy(future::join)\n+ .isInstanceOf(ClientException.class)\n+ .hasMessageContaining(\"message with id 'foo' is already published\");\n+ }\n+}\n", "diff --git a/packages/animated/package.json b/packages/animated/package.json\nindex 2249a2f..e35a1fd 100644\n--- a/packages/animated/package.json\n+++ b/packages/animated/package.json\n@@ -33,6 +33,6 @@\n \"react-layout-effect\": \"^1.0.1\"\n },\n \"peerDependencies\": {\n- \"react\": \">=16.8\"\n+ \"react\": \"^16.8.0 || ^17.0.0\"\n }\n }\ndiff --git a/packages/core/package.json b/packages/core/package.json\nindex 584bbc2..c934253 100644\n--- a/packages/core/package.json\n+++ b/packages/core/package.json\n@@ -36,7 +36,7 @@\n \"react-layout-effect\": \"^1.0.1\"\n },\n \"peerDependencies\": {\n- \"react\": \">=16.8\"\n+ \"react\": \"^16.8.0 || ^17.0.0\"\n },\n \"devDependencies\": {\n \"rafz\": \"^0.1.13\"\ndiff --git a/packages/parallax/package.json b/packages/parallax/package.json\nindex 49f8391..5a181fe 100644\n--- a/packages/parallax/package.json\n+++ b/packages/parallax/package.json\n@@ -31,6 +31,6 @@\n \"@react-spring/web\": \"~9.2.0-beta.0\"\n },\n \"peerDependencies\": {\n- \"react\": \">=16.8\"\n+ \"react\": \"^16.8.0 || ^17.0.0\"\n }\n }\ndiff --git a/packages/shared/package.json b/packages/shared/package.json\nindex 67d286c..12f7db3 100644\n--- a/packages/shared/package.json\n+++ b/packages/shared/package.json\n@@ -33,6 +33,6 @@\n \"rafz\": \"^0.1.13\"\n },\n \"peerDependencies\": {\n- \"react\": \">=16.8\"\n+ \"react\": \"^16.8.0 || ^17.0.0\"\n }\n }\ndiff --git a/targets/konva/package.json b/targets/konva/package.json\nindex 17675ac..271d58c 100644\n--- a/targets/konva/package.json\n+++ b/targets/konva/package.json\n@@ -34,7 +34,7 @@\n },\n \"peerDependencies\": {\n \"konva\": \">=2.6\",\n- \"react\": \">=16.8\",\n+ \"react\": \"^16.8.0 || ^17.0.0\",\n \"react-konva\": \">=16.8\"\n },\n \"devDependencies\": {\ndiff --git a/targets/native/package.json b/targets/native/package.json\nindex e97aa97..802a66c 100644\n--- a/targets/native/package.json\n+++ b/targets/native/package.json\n@@ -33,7 +33,7 @@\n \"@react-spring/types\": \"~9.2.0-beta.0\"\n },\n \"peerDependencies\": {\n- \"react\": \">=16.8\",\n+ \"react\": \"^16.8.0 || ^17.0.0\",\n \"react-native\": \">=0.58\"\n },\n \"devDependencies\": {\ndiff --git a/targets/web/package.json b/targets/web/package.json\nindex d74c25c..f7ac000 100644\n--- a/targets/web/package.json\n+++ b/targets/web/package.json\n@@ -33,7 +33,7 @@\n \"@react-spring/types\": \"~9.2.0-beta.0\"\n },\n \"peerDependencies\": {\n- \"react\": \">=16.8\",\n+ \"react\": \"^16.8.0 || ^17.0.0\",\n \"react-dom\": \">=16.8\"\n }\n }\ndiff --git a/targets/zdog/package.json b/targets/zdog/package.json\nindex aa57890..f65945a 100644\n--- a/targets/zdog/package.json\n+++ b/targets/zdog/package.json\n@@ -33,7 +33,7 @@\n \"@react-spring/types\": \"~9.2.0-beta.0\"\n },\n \"peerDependencies\": {\n- \"react\": \">=16.8\",\n+ \"react\": \"^16.8.0 || ^17.0.0\",\n \"react-dom\": \">=16.8\",\n \"react-zdog\": \">=1.0\",\n \"zdog\": \">=1.0\"\n"]
| 2 |
["2d416be63eeec9e7fdb90a62c40c8ad8f0672efa", "27169897c0e58bc4fbca724f290ad54fa39abec7"]
|
["test", "build"]
|
right side menus,pin version of actionlint used
|
["diff --git a/ionic/components/menu/menu-types.scss b/ionic/components/menu/menu-types.scss\nindex dbbfdda..5e4f990 100644\n--- a/ionic/components/menu/menu-types.scss\n+++ b/ionic/components/menu/menu-types.scss\n@@ -35,3 +35,7 @@ ion-menu[type=overlay] {\n }\n }\n }\n+\n+ion-menu[type=overlay][side=right] {\n+ left: 8px;\n+}\ndiff --git a/ionic/components/menu/menu-types.ts b/ionic/components/menu/menu-types.ts\nindex 360aeb4..0666a38 100644\n--- a/ionic/components/menu/menu-types.ts\n+++ b/ionic/components/menu/menu-types.ts\n@@ -10,7 +10,7 @@ import {Animation} from 'ionic/animations/animation';\n */\n export class MenuType {\n \n- constructor(menu: Menu) {\n+ constructor() {\n this.open = new Animation();\n this.close = new Animation();\n }\n@@ -88,16 +88,17 @@ class MenuRevealType extends MenuType {\n let duration = 250;\n \n let openedX = (menu.width() * (menu.side == 'right' ? -1 : 1)) + 'px';\n+ let closedX = '0px'\n \n this.open.easing(easing).duration(duration);\n this.close.easing(easing).duration(duration);\n \n let contentOpen = new Animation(menu.getContentElement());\n- contentOpen.fromTo(TRANSLATE_X, CENTER, openedX);\n+ contentOpen.fromTo(TRANSLATE_X, closedX, openedX);\n this.open.add(contentOpen);\n \n let contentClose = new Animation(menu.getContentElement());\n- contentClose.fromTo(TRANSLATE_X, openedX, CENTER);\n+ contentClose.fromTo(TRANSLATE_X, openedX, closedX);\n this.close.add(contentClose);\n }\n }\n@@ -117,13 +118,23 @@ class MenuOverlayType extends MenuType {\n let duration = 250;\n let backdropOpacity = 0.5;\n \n- let closedX = (menu.width() * (menu.side == 'right' ? 1 : -1)) + 'px';\n+ let closedX, openedX;\n+ if (menu.side == 'right') {\n+ // right side\n+ closedX = menu.platform.width() + 'px';\n+ openedX = (menu.platform.width() - menu.width() - 8) + 'px';\n+\n+ } else {\n+ // left side\n+ closedX = -menu.width() + 'px';\n+ openedX = '8px';\n+ }\n \n this.open.easing(easing).duration(duration);\n this.close.easing(easing).duration(duration);\n \n let menuOpen = new Animation(menu.getMenuElement());\n- menuOpen.fromTo(TRANSLATE_X, closedX, '8px');\n+ menuOpen.fromTo(TRANSLATE_X, closedX, openedX);\n this.open.add(menuOpen);\n \n let backdropOpen = new Animation(menu.getBackdropElement());\n@@ -131,7 +142,7 @@ class MenuOverlayType extends MenuType {\n this.open.add(backdropOpen);\n \n let menuClose = new Animation(menu.getMenuElement());\n- menuClose.fromTo(TRANSLATE_X, '8px', closedX);\n+ menuClose.fromTo(TRANSLATE_X, openedX, closedX);\n this.close.add(menuClose);\n \n let backdropClose = new Animation(menu.getBackdropElement());\n@@ -144,4 +155,3 @@ Menu.register('overlay', MenuOverlayType);\n \n const OPACITY = 'opacity';\n const TRANSLATE_X = 'translateX';\n-const CENTER = '0px';\ndiff --git a/ionic/components/menu/menu.ts b/ionic/components/menu/menu.ts\nindex d911b2e..e980069 100644\n--- a/ionic/components/menu/menu.ts\n+++ b/ionic/components/menu/menu.ts\n@@ -4,6 +4,7 @@ import {Ion} from '../ion';\n import {IonicApp} from '../app/app';\n import {IonicConfig} from '../../config/config';\n import {IonicComponent} from '../../config/annotations';\n+import {IonicPlatform} from '../../platform/platform';\n import * as gestures from './menu-gestures';\n \n \n@@ -35,10 +36,16 @@ import * as gestures from './menu-gestures';\n })\n export class Menu extends Ion {\n \n- constructor(app: IonicApp, elementRef: ElementRef, config: IonicConfig) {\n+ constructor(\n+ app: IonicApp,\n+ elementRef: ElementRef,\n+ config: IonicConfig,\n+ platform: IonicPlatform\n+ ) {\n super(elementRef, config);\n-\n this.app = app;\n+ this.platform = platform;\n+\n this.opening = new EventEmitter('opening');\n this.isOpen = false;\n this._disableTime = 0;\n@@ -46,9 +53,9 @@ export class Menu extends Ion {\n \n onInit() {\n super.onInit();\n- this.contentElement = (this.content instanceof Node) ? this.content : this.content.getNativeElement();\n+ this._cntEle = (this.content instanceof Node) ? this.content : this.content.getNativeElement();\n \n- if (!this.contentElement) {\n+ if (!this._cntEle) {\n return console.error('Menu: must have a [content] element to listen for drag events on. Example:\\n\\n<ion-menu [content]=\"content\"></ion-menu>\\n\\n<ion-content #content></ion-content>');\n }\n \n@@ -61,8 +68,8 @@ export class Menu extends Ion {\n this._initGesture();\n this._initType(this.type);\n \n- this.contentElement.classList.add('menu-content');\n- this.contentElement.classList.add('menu-content-' + this.type);\n+ this._cntEle.classList.add('menu-content');\n+ this._cntEle.classList.add('menu-content-' + this.type);\n \n let self = this;\n this.onContentClick = function(ev) {\n@@ -161,11 +168,11 @@ export class Menu extends Ion {\n \n this.isOpen = isOpen;\n \n- this.contentElement.classList[isOpen ? 'add' : 'remove']('menu-content-open');\n+ this._cntEle.classList[isOpen ? 'add' : 'remove']('menu-content-open');\n \n- this.contentElement.removeEventListener('click', this.onContentClick);\n+ this._cntEle.removeEventListener('click', this.onContentClick);\n if (isOpen) {\n- this.contentElement.addEventListener('click', this.onContentClick);\n+ this._cntEle.addEventListener('click', this.onContentClick);\n \n } else {\n this.getNativeElement().classList.remove('show-menu');\n@@ -220,7 +227,7 @@ export class Menu extends Ion {\n * @return {Element} The Menu's associated content element.\n */\n getContentElement() {\n- return this.contentElement;\n+ return this._cntEle;\n }\n \n /**\n@@ -239,7 +246,7 @@ export class Menu extends Ion {\n this.app.unregister(this.id);\n this._gesture && this._gesture.destroy();\n this._type && this._type.onDestroy();\n- this.contentElement = null;\n+ this._cntEle = null;\n }\n \n }\ndiff --git a/ionic/components/menu/test/basic/index.ts b/ionic/components/menu/test/basic/index.ts\nindex 698cec4..65952ff 100644\n--- a/ionic/components/menu/test/basic/index.ts\n+++ b/ionic/components/menu/test/basic/index.ts\n@@ -36,9 +36,9 @@ class E2EApp {\n ];\n }\n \n- openPage(menu, page) {\n+ openPage(page) {\n // close the menu when clicking a link from the menu\n- menu.close();\n+ this.app.getComponent('leftMenu').close();\n \n // Reset the content nav to have just this page\n // we wouldn't want the back button to show in this scenario\ndiff --git a/ionic/components/menu/test/basic/main.html b/ionic/components/menu/test/basic/main.html\nindex 9bdeb5c..4905ae6 100644\n--- a/ionic/components/menu/test/basic/main.html\n+++ b/ionic/components/menu/test/basic/main.html\n@@ -1,4 +1,4 @@\n-<ion-menu #menu [content]=\"content\">\n+<ion-menu [content]=\"content\" id=\"leftMenu\">\n \n <ion-toolbar secondary>\n <ion-title>Left Menu</ion-title>\n@@ -8,11 +8,35 @@\n \n <ion-list>\n \n- <button ion-item *ng-for=\"#p of pages\" (click)=\"openPage(menu, p)\">\n+ <button ion-item *ng-for=\"#p of pages\" (click)=\"openPage(p)\">\n {{p.title}}\n </button>\n \n- <button ion-item menu-toggle no-forward-icon class=\"e2eCloseMenu\">\n+ <button ion-item menu-toggle=\"leftMenu\" no-forward-icon class=\"e2eCloseMenu\">\n+ Close Menu\n+ </button>\n+\n+ </ion-list>\n+ </ion-content>\n+\n+</ion-menu>\n+\n+\n+<ion-menu side=\"right\" [content]=\"content\" id=\"rightMenu\">\n+\n+ <ion-toolbar secondary>\n+ <ion-title>Right Menu</ion-title>\n+ </ion-toolbar>\n+\n+ <ion-content>\n+\n+ <ion-list>\n+\n+ <button ion-item *ng-for=\"#p of pages\" (click)=\"openPage(p)\">\n+ {{p.title}}\n+ </button>\n+\n+ <button ion-item menu-toggle=\"rightMenu\" no-forward-icon class=\"e2eCloseMenu\">\n Close Menu\n </button>\n \ndiff --git a/ionic/components/menu/test/basic/page1.html b/ionic/components/menu/test/basic/page1.html\nindex 1881d9e..2bc5c79 100644\n--- a/ionic/components/menu/test/basic/page1.html\n+++ b/ionic/components/menu/test/basic/page1.html\n@@ -1,7 +1,7 @@\n \n <ion-navbar *navbar>\n \n- <a menu-toggle>\n+ <a menu-toggle=\"leftMenu\">\n <icon menu></icon>\n </a>\n \n@@ -21,19 +21,23 @@\n </button>\n </ion-nav-items>\n \n- <a menu-toggle secondary>\n+ <a menu-toggle=\"rightMenu\" secondary>\n <icon menu></icon>\n </a>\n \n </ion-navbar>\n \n \n-<ion-content #content padding>\n+<ion-content padding>\n \n <h3>Page 1</h3>\n \n <p>\n- <button class=\"e2eContentToggleMenu\" menu-toggle>Toggle Menu</button>\n+ <button class=\"e2eContentToggleMenu\" menu-toggle=\"leftMenu\">Toggle Left Menu</button>\n+ </p>\n+\n+ <p>\n+ <button class=\"e2eContentToggleMenu\" menu-toggle=\"rightMenu\">Toggle Right Menu</button>\n </p>\n \n <f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>\ndiff --git a/ionic/components/menu/test/basic/page2.html b/ionic/components/menu/test/basic/page2.html\nindex 9801c4f..098f3e1 100644\n--- a/ionic/components/menu/test/basic/page2.html\n+++ b/ionic/components/menu/test/basic/page2.html\n@@ -1,7 +1,7 @@\n \n <ion-navbar *navbar>\n \n- <a menu-toggle>\n+ <a menu-toggle=\"leftMenu\">\n <icon menu></icon>\n </a>\n \n@@ -11,12 +11,12 @@\n \n </ion-navbar>\n \n-<ion-content #content padding>\n+<ion-content padding>\n \n <h3>Page 2</h3>\n \n <p>\n- <button menu-toggle class=\"e2eContentToggleMenu\">Toggle Menu</button>\n+ <button menu-toggle=\"leftMenu\" class=\"e2eContentToggleMenu\">Toggle Left Menu</button>\n </p>\n \n <p>\ndiff --git a/ionic/components/menu/test/basic/page3.html b/ionic/components/menu/test/basic/page3.html\nindex a2d65e2..079a3e9 100644\n--- a/ionic/components/menu/test/basic/page3.html\n+++ b/ionic/components/menu/test/basic/page3.html\n@@ -1,7 +1,7 @@\n \n <ion-navbar *navbar>\n \n- <a menu-toggle>\n+ <a menu-toggle=\"leftMenu\">\n <icon menu></icon>\n </a>\n \n@@ -12,12 +12,12 @@\n </ion-navbar>\n \n \n-<ion-content #content padding>\n+<ion-content padding>\n \n <h3>Page 3</h3>\n \n <p>\n- <button menu-toggle>Toggle Menu</button>\n+ <button menu-toggle=\"leftMenu\">Toggle Left Menu</button>\n </p>\n \n <f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>\ndiff --git a/ionic/components/toolbar/modes/md.scss b/ionic/components/toolbar/modes/md.scss\nindex 984e758..339169a 100644\n--- a/ionic/components/toolbar/modes/md.scss\n+++ b/ionic/components/toolbar/modes/md.scss\n@@ -43,6 +43,12 @@ $toolbar-md-button-font-size: 1.4rem !default;\n }\n }\n \n+ [menu-toggle][secondary],\n+ [menu-toggle][secondary].activated {\n+ margin: 0 2px;\n+ min-width: 28px;\n+ }\n+\n }\n \n ion-title {\n", "diff --git a/.github/workflows/introspect.yml b/.github/workflows/introspect.yml\nindex b6d9125..82d22a5 100644\n--- a/.github/workflows/introspect.yml\n+++ b/.github/workflows/introspect.yml\n@@ -25,5 +25,5 @@ jobs:\n # From https://github.com/rhysd/actionlint/blob/main/docs/usage.md#use-actionlint-on-github-actions\n - name: Check workflow files\n run: |\n- bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/590d3bd9dde0c91f7a66071d40eb84716526e5a6/scripts/download-actionlint.bash)\n+ bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/590d3bd9dde0c91f7a66071d40eb84716526e5a6/scripts/download-actionlint.bash) 1.6.25\n ./actionlint -color -shellcheck=\"\"\n"]
| 2 |
["1a60540f2bcda48d33f015e31f3728ac2c59a159", "b702adc245f679ae20d84de39f0d63b14aabed5d"]
|
["feat", "ci"]
|
exception for non-executable processes
related to #36,ignore all markdown files for backend and main test suites
|
["diff --git a/qa/integration-tests/src/test/java/org/camunda/bpm/broker/it/process/DeployBpmnResourceTest.java b/qa/integration-tests/src/test/java/org/camunda/bpm/broker/it/process/DeployBpmnResourceTest.java\nindex 3c68047..4668708 100644\n--- a/qa/integration-tests/src/test/java/org/camunda/bpm/broker/it/process/DeployBpmnResourceTest.java\n+++ b/qa/integration-tests/src/test/java/org/camunda/bpm/broker/it/process/DeployBpmnResourceTest.java\n@@ -80,4 +80,22 @@ public class DeployBpmnResourceTest\n .execute();\n }\n \n+ @Test\n+ public void shouldNotDeployNonExecutableModel()\n+ {\n+ // given\n+ final TngpClient client = clientRule.getClient();\n+ final WorkflowsClient workflowService = client.workflows();\n+\n+ // then\n+ exception.expect(BrokerRequestException.class);\n+ exception.expectMessage(containsString(\"ERROR 203\"));\n+ exception.expect(BrokerRequestExceptionMatcher.brokerException(1, 1));\n+\n+ // when\n+ workflowService.deploy()\n+ .bpmnModelInstance(Bpmn.createProcess().startEvent().endEvent().done())\n+ .execute();\n+ }\n+\n }\n", "diff --git a/.github/workflows/ibis-backends-skip-helper.yml b/.github/workflows/ibis-backends-skip-helper.yml\nindex efd0953..058f8b6 100644\n--- a/.github/workflows/ibis-backends-skip-helper.yml\n+++ b/.github/workflows/ibis-backends-skip-helper.yml\n@@ -7,6 +7,7 @@ on:\n paths:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\n@@ -14,6 +15,7 @@ on:\n paths:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\ndiff --git a/.github/workflows/ibis-backends.yml b/.github/workflows/ibis-backends.yml\nindex d18e62d..144562c 100644\n--- a/.github/workflows/ibis-backends.yml\n+++ b/.github/workflows/ibis-backends.yml\n@@ -3,18 +3,20 @@ name: Backends\n \n on:\n push:\n- # Skip the backend suite if all changes are in the docs directory\n+ # Skip the backend suite if all changes are docs\n paths-ignore:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\n pull_request:\n- # Skip the backend suite if all changes are in the docs directory\n+ # Skip the backend suite if all changes are docs\n paths-ignore:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\ndiff --git a/.github/workflows/ibis-main-skip-helper.yml b/.github/workflows/ibis-main-skip-helper.yml\nindex f6086e1..7d79af7 100644\n--- a/.github/workflows/ibis-main-skip-helper.yml\n+++ b/.github/workflows/ibis-main-skip-helper.yml\n@@ -7,6 +7,7 @@ on:\n paths:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\n@@ -14,6 +15,7 @@ on:\n paths:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\ndiff --git a/.github/workflows/ibis-main.yml b/.github/workflows/ibis-main.yml\nindex d5b0735..3d22bff 100644\n--- a/.github/workflows/ibis-main.yml\n+++ b/.github/workflows/ibis-main.yml\n@@ -7,6 +7,7 @@ on:\n paths-ignore:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\n@@ -15,6 +16,7 @@ on:\n paths-ignore:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\n"]
| 2 |
["21c004b3c40bd3d68f0d32d173a29632765666c8", "370830b8c9f971fa537f42308ab5e3ff356919f8"]
|
["test", "ci"]
|
test,update version (v0.6.18)
|
["diff --git a/tests/playwright/pages/Dashboard/Command/CmdKPage.ts b/tests/playwright/pages/Dashboard/Command/CmdKPage.ts\nindex 5ac62b2..0457243 100644\n--- a/tests/playwright/pages/Dashboard/Command/CmdKPage.ts\n+++ b/tests/playwright/pages/Dashboard/Command/CmdKPage.ts\n@@ -21,6 +21,7 @@ export class CmdK extends BasePage {\n async searchText(text: string) {\n await this.dashboardPage.rootPage.fill('.cmdk-input', text);\n await this.rootPage.keyboard.press('Enter');\n+ await this.rootPage.keyboard.press('Enter');\n }\n \n async isCmdKVisible() {\n", "diff --git a/Cargo.lock b/Cargo.lock\nindex c32d8b4..599790e 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -94,7 +94,7 @@ dependencies = [\n \n [[package]]\n name = \"els\"\n-version = \"0.1.30-nightly.2\"\n+version = \"0.1.30\"\n dependencies = [\n \"erg_common\",\n \"erg_compiler\",\n@@ -105,7 +105,7 @@ dependencies = [\n \n [[package]]\n name = \"erg\"\n-version = \"0.6.18-nightly.2\"\n+version = \"0.6.18\"\n dependencies = [\n \"els\",\n \"erg_common\",\n@@ -115,7 +115,7 @@ dependencies = [\n \n [[package]]\n name = \"erg_common\"\n-version = \"0.6.18-nightly.2\"\n+version = \"0.6.18\"\n dependencies = [\n \"backtrace-on-stack-overflow\",\n \"crossterm\",\n@@ -125,7 +125,7 @@ dependencies = [\n \n [[package]]\n name = \"erg_compiler\"\n-version = \"0.6.18-nightly.2\"\n+version = \"0.6.18\"\n dependencies = [\n \"erg_common\",\n \"erg_parser\",\n@@ -133,7 +133,7 @@ dependencies = [\n \n [[package]]\n name = \"erg_parser\"\n-version = \"0.6.18-nightly.2\"\n+version = \"0.6.18\"\n dependencies = [\n \"erg_common\",\n \"unicode-xid\",\ndiff --git a/Cargo.toml b/Cargo.toml\nindex baaa0ac..5082cd3 100644\n--- a/Cargo.toml\n+++ b/Cargo.toml\n@@ -20,7 +20,7 @@ members = [\n ]\n \n [workspace.package]\n-version = \"0.6.18-nightly.2\"\n+version = \"0.6.18\"\n authors = [\"erg-lang team <[email protected]>\"]\n license = \"MIT OR Apache-2.0\"\n edition = \"2021\"\n@@ -64,10 +64,10 @@ full = [\"els\", \"full-repl\", \"unicode\", \"pretty\"]\n experimental = [\"erg_common/experimental\", \"erg_parser/experimental\", \"erg_compiler/experimental\"]\n \n [workspace.dependencies]\n-erg_common = { version = \"0.6.18-nightly.2\", path = \"./crates/erg_common\" }\n-erg_parser = { version = \"0.6.18-nightly.2\", path = \"./crates/erg_parser\" }\n-erg_compiler = { version = \"0.6.18-nightly.2\", path = \"./crates/erg_compiler\" }\n-els = { version = \"0.1.30-nightly.2\", path = \"./crates/els\" }\n+erg_common = { version = \"0.6.18\", path = \"./crates/erg_common\" }\n+erg_parser = { version = \"0.6.18\", path = \"./crates/erg_parser\" }\n+erg_compiler = { version = \"0.6.18\", path = \"./crates/erg_compiler\" }\n+els = { version = \"0.1.30\", path = \"./crates/els\" }\n \n [dependencies]\n erg_common = { workspace = true }\ndiff --git a/crates/els/Cargo.toml b/crates/els/Cargo.toml\nindex 3efbf4e..9f902fa 100644\n--- a/crates/els/Cargo.toml\n+++ b/crates/els/Cargo.toml\n@@ -2,7 +2,7 @@\n name = \"els\"\n description = \"An Erg compiler frontend for IDEs, implements LSP.\"\n documentation = \"http://docs.rs/els\"\n-version = \"0.1.30-nightly.2\"\n+version = \"0.1.30\"\n authors.workspace = true\n license.workspace = true\n edition.workspace = true\n"]
| 2 |
["990699ff4a84a5bac3abfecbec002f30e2714de9", "bb3e3d9b96e435c3b92fc208bca93d1ad7e1ad50"]
|
["test", "build"]
|
add style prop to FAB group action items. closes #475,add unit test for query API
|
["diff --git a/src/components/FAB/FABGroup.js b/src/components/FAB/FABGroup.js\nindex 424a178..11bd10f 100644\n--- a/src/components/FAB/FABGroup.js\n+++ b/src/components/FAB/FABGroup.js\n@@ -25,6 +25,7 @@ type Props = {\n * - `label`: optional label text\n * - `accessibilityLabel`: accessibility label for the action, uses label by default if specified\n * - `color`: custom icon color of the action item\n+ * - `style`: pass additional styles for the fab item, for example, `backgroundColor`\n * - `onPress`: callback that is called when `FAB` is pressed (required)\n */\n actions: Array<{\n@@ -32,6 +33,7 @@ type Props = {\n label?: string,\n color?: string,\n accessibilityLabel?: string,\n+ style?: any,\n onPress: () => mixed,\n }>,\n /**\n@@ -44,7 +46,7 @@ type Props = {\n */\n accessibilityLabel?: string,\n /**\n- * Custom icon color for the `FAB`.\n+ * Custom color for the `FAB`.\n */\n color?: string,\n /**\n@@ -252,9 +254,7 @@ class FABGroup extends React.Component<Props, State> {\n <Card\n style={[\n styles.label,\n- {\n- transform: [{ scale: scales[i] }],\n- },\n+ { transform: [{ scale: scales[i] }] },\n ]}\n onPress={() => {\n it.onPress();\n@@ -280,6 +280,7 @@ class FABGroup extends React.Component<Props, State> {\n transform: [{ scale: scales[i] }],\n backgroundColor: theme.colors.surface,\n },\n+ it.style,\n ]}\n onPress={() => {\n it.onPress();\n", "diff --git a/gateway/src/test/java/io/camunda/zeebe/gateway/api/util/StubbedBrokerClient.java b/gateway/src/test/java/io/camunda/zeebe/gateway/api/util/StubbedBrokerClient.java\nindex 2d2d084..38261ad 100644\n--- a/gateway/src/test/java/io/camunda/zeebe/gateway/api/util/StubbedBrokerClient.java\n+++ b/gateway/src/test/java/io/camunda/zeebe/gateway/api/util/StubbedBrokerClient.java\n@@ -25,6 +25,7 @@ import java.util.HashMap;\n import java.util.List;\n import java.util.Map;\n import java.util.concurrent.CompletableFuture;\n+import java.util.concurrent.TimeUnit;\n import java.util.function.Consumer;\n \n public final class StubbedBrokerClient implements BrokerClient {\n@@ -67,7 +68,15 @@ public final class StubbedBrokerClient implements BrokerClient {\n @Override\n public <T> CompletableFuture<BrokerResponse<T>> sendRequestWithRetry(\n final BrokerRequest<T> request, final Duration requestTimeout) {\n- throw new UnsupportedOperationException(\"not implemented\");\n+ final CompletableFuture<BrokerResponse<T>> result = new CompletableFuture<>();\n+\n+ sendRequestWithRetry(\n+ request,\n+ (key, response) ->\n+ result.complete(new BrokerResponse<>(response, Protocol.decodePartitionId(key), key)),\n+ result::completeExceptionally);\n+\n+ return result.orTimeout(requestTimeout.toNanos(), TimeUnit.NANOSECONDS);\n }\n \n @Override\ndiff --git a/gateway/src/test/java/io/camunda/zeebe/gateway/query/QueryApiTest.java b/gateway/src/test/java/io/camunda/zeebe/gateway/query/QueryApiTest.java\nnew file mode 100644\nindex 0000000..ec9ec80\n--- /dev/null\n+++ b/gateway/src/test/java/io/camunda/zeebe/gateway/query/QueryApiTest.java\n@@ -0,0 +1,91 @@\n+/*\n+ * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH under\n+ * one or more contributor license agreements. See the NOTICE file distributed\n+ * with this work for additional information regarding copyright ownership.\n+ * Licensed under the Zeebe Community License 1.1. You may not use this file\n+ * except in compliance with the Zeebe Community License 1.1.\n+ */\n+package io.camunda.zeebe.gateway.query;\n+\n+import static org.assertj.core.api.Assertions.assertThat;\n+\n+import io.camunda.zeebe.gateway.api.util.GatewayTest;\n+import io.camunda.zeebe.gateway.cmd.BrokerErrorException;\n+import io.camunda.zeebe.gateway.impl.broker.response.BrokerError;\n+import io.camunda.zeebe.gateway.impl.broker.response.BrokerErrorResponse;\n+import io.camunda.zeebe.gateway.impl.broker.response.BrokerResponse;\n+import io.camunda.zeebe.gateway.query.impl.QueryApiImpl;\n+import io.camunda.zeebe.protocol.Protocol;\n+import io.camunda.zeebe.protocol.record.ErrorCode;\n+import java.time.Duration;\n+import java.util.concurrent.CompletionStage;\n+import java.util.concurrent.ExecutionException;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.junit.runners.Parameterized;\n+import org.junit.runners.Parameterized.Parameter;\n+import org.junit.runners.Parameterized.Parameters;\n+\n+@RunWith(Parameterized.class)\n+public final class QueryApiTest extends GatewayTest {\n+ @Parameter(0)\n+ public String name;\n+\n+ @Parameter(1)\n+ public Querier querier;\n+\n+ @Parameters(name = \"{index}: {0}\")\n+ public static Object[][] queries() {\n+ return new Object[][] {\n+ new Object[] {\"getBpmnProcessIdForProcess\", (Querier) QueryApi::getBpmnProcessIdFromProcess},\n+ new Object[] {\n+ \"getBpmnProcessIdForProcessInstance\",\n+ (Querier) QueryApi::getBpmnProcessIdFromProcessInstance\n+ },\n+ new Object[] {\"getBpmnProcessIdForProcessJob\", (Querier) QueryApi::getBpmnProcessIdFromJob},\n+ };\n+ }\n+\n+ @Test\n+ public void shouldGetBpmnProcessId() {\n+ // given\n+ final var key = Protocol.encodePartitionId(1, 1);\n+ final var api = new QueryApiImpl(brokerClient);\n+ final var timeout = Duration.ofSeconds(5);\n+ final var stub = new QueryStub(new BrokerResponse<>(\"myProcess\", 1, 1));\n+ stub.registerWith(brokerClient);\n+\n+ // when\n+ final var result = querier.query(api, key, timeout);\n+\n+ // then\n+ assertThat(result).succeedsWithin(timeout).isEqualTo(\"myProcess\");\n+ }\n+\n+ @Test\n+ public void shouldCompleteExceptionallyOnError() {\n+ // given\n+ final var key = Protocol.encodePartitionId(1, 1);\n+ final var api = new QueryApiImpl(brokerClient);\n+ final var timeout = Duration.ofSeconds(5);\n+ final var stub =\n+ new QueryStub(\n+ new BrokerErrorResponse<>(\n+ new BrokerError(ErrorCode.PARTITION_LEADER_MISMATCH, \"Leader mismatch\")));\n+ stub.registerWith(brokerClient);\n+\n+ // when\n+ final var result = querier.query(api, key, timeout);\n+\n+ // then\n+ assertThat(result)\n+ .failsWithin(timeout)\n+ .withThrowableOfType(ExecutionException.class)\n+ .havingRootCause()\n+ .isInstanceOf(BrokerErrorException.class);\n+ }\n+\n+ private interface Querier {\n+ CompletionStage<String> query(final QueryApi api, final long key, final Duration timeout);\n+ }\n+}\ndiff --git a/gateway/src/test/java/io/camunda/zeebe/gateway/query/QueryStub.java b/gateway/src/test/java/io/camunda/zeebe/gateway/query/QueryStub.java\nnew file mode 100644\nindex 0000000..2f8334e\n--- /dev/null\n+++ b/gateway/src/test/java/io/camunda/zeebe/gateway/query/QueryStub.java\n@@ -0,0 +1,31 @@\n+/*\n+ * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH under\n+ * one or more contributor license agreements. See the NOTICE file distributed\n+ * with this work for additional information regarding copyright ownership.\n+ * Licensed under the Zeebe Community License 1.1. You may not use this file\n+ * except in compliance with the Zeebe Community License 1.1.\n+ */\n+package io.camunda.zeebe.gateway.query;\n+\n+import io.camunda.zeebe.gateway.api.util.StubbedBrokerClient;\n+import io.camunda.zeebe.gateway.api.util.StubbedBrokerClient.RequestStub;\n+import io.camunda.zeebe.gateway.impl.broker.response.BrokerResponse;\n+import io.camunda.zeebe.gateway.query.impl.BrokerExecuteQuery;\n+\n+final class QueryStub implements RequestStub<BrokerExecuteQuery, BrokerResponse<String>> {\n+ private final BrokerResponse<String> response;\n+\n+ public QueryStub(final BrokerResponse<String> response) {\n+ this.response = response;\n+ }\n+\n+ @Override\n+ public void registerWith(final StubbedBrokerClient gateway) {\n+ gateway.registerHandler(BrokerExecuteQuery.class, this);\n+ }\n+\n+ @Override\n+ public BrokerResponse<String> handle(final BrokerExecuteQuery request) throws Exception {\n+ return response;\n+ }\n+}\n"]
| 2 |
["8b9176b44bb01a1eef497a403b0304bc389c9aee", "bed86aeae8dad2dd6371635cd24bf8ef3db80361"]
|
["feat", "test"]
|
bump version
Signed-off-by: rjshrjndrn <[email protected]>,update basic test with colors
|
["diff --git a/scripts/helmcharts/init.sh b/scripts/helmcharts/init.sh\nindex 5a2b4b0..69a6944 100644\n--- a/scripts/helmcharts/init.sh\n+++ b/scripts/helmcharts/init.sh\n@@ -26,7 +26,7 @@ usr=$(whoami)\n \n # Installing k3s\n function install_k8s() {\n- curl -sL https://get.k3s.io | sudo K3S_KUBECONFIG_MODE=\"644\" INSTALL_K3S_VERSION='v1.22.8+k3s1' INSTALL_K3S_EXEC=\"--no-deploy=traefik\" sh -\n+ curl -sL https://get.k3s.io | sudo K3S_KUBECONFIG_MODE=\"644\" INSTALL_K3S_VERSION='v1.25.6+k3s1' INSTALL_K3S_EXEC=\"--disable=traefik\" sh -\n [[ -d ~/.kube ]] || mkdir ~/.kube\n sudo cp /etc/rancher/k3s/k3s.yaml ~/.kube/config\n sudo chmod 0644 ~/.kube/config\n", "diff --git a/core/src/components/label/test/basic/index.html b/core/src/components/label/test/basic/index.html\nindex d0b566c..377e58c 100644\n--- a/core/src/components/label/test/basic/index.html\n+++ b/core/src/components/label/test/basic/index.html\n@@ -19,12 +19,32 @@\n </ion-header>\n \n <ion-content>\n+ <div padding>\n+ <ion-label>Default</ion-label>\n+\n+ <ion-label color=\"secondary\">Secondary</ion-label>\n+\n+ <ion-label color=\"tertiary\">Tertiary</ion-label>\n+\n+ <ion-label color=\"danger\">Danger</ion-label>\n+\n+ <ion-label class=\"custom\">Custom</ion-label>\n+ </div>\n+\n <ion-list>\n <ion-item>\n <ion-label>Default</ion-label>\n <ion-input></ion-input>\n </ion-item>\n <ion-item>\n+ <ion-label color=\"tertiary\">Tertiary</ion-label>\n+ <ion-input></ion-input>\n+ </ion-item>\n+ <ion-item>\n+ <ion-label class=\"custom\">Custom</ion-label>\n+ <ion-input></ion-input>\n+ </ion-item>\n+ <ion-item>\n <ion-label text-wrap>Wrap label this label just goes on and on and on</ion-label>\n <ion-input></ion-input>\n </ion-item>\n@@ -42,6 +62,12 @@\n </ion-item>\n </ion-list>\n </ion-content>\n+\n+ <style>\n+ .custom {\n+ color: lightblue;\n+ }\n+ </style>\n </ion-app>\n </body>\n \n"]
| 2 |
["9a25fe59dfb63d32505afcea3a164ff0b8ea4c71", "c3b5dc77ff3d89d389f6f3a868b17d0a8ca63074"]
|
["build", "test"]
|
added resize observer, this will replace window.resize if available,do not check mkdocs for older versions used in deployments
|
["diff --git a/engine/src/Utils/EventListeners.ts b/engine/src/Utils/EventListeners.ts\nindex 9e7b189..a29cab4 100644\n--- a/engine/src/Utils/EventListeners.ts\n+++ b/engine/src/Utils/EventListeners.ts\n@@ -47,6 +47,7 @@ export class EventListeners {\n \n private canPush: boolean;\n private resizeTimeout?: NodeJS.Timeout;\n+ private resizeObserver?: ResizeObserver;\n \n /**\n * Events listener constructor\n@@ -144,7 +145,31 @@ export class EventListeners {\n }\n \n if (options.interactivity.events.resize) {\n- manageListener(window, Constants.resizeEvent, this.resizeHandler, add);\n+ if (typeof ResizeObserver !== \"undefined\") {\n+ if (this.resizeObserver && !add) {\n+ if (container.canvas.element) {\n+ this.resizeObserver.unobserve(container.canvas.element);\n+ }\n+\n+ this.resizeObserver.disconnect();\n+\n+ delete this.resizeObserver;\n+ } else if (!this.resizeObserver && add && container.canvas.element) {\n+ this.resizeObserver = new ResizeObserver((entries) => {\n+ const entry = entries.find((e) => e.target === container.canvas.element);\n+\n+ if (!entry) {\n+ return;\n+ }\n+\n+ this.handleWindowResize();\n+ });\n+\n+ this.resizeObserver.observe(container.canvas.element);\n+ }\n+ } else {\n+ manageListener(window, Constants.resizeEvent, this.resizeHandler, add);\n+ }\n }\n \n if (document) {\n", "diff --git a/.github/workflows/ibis-docs-lint.yml b/.github/workflows/ibis-docs-lint.yml\nindex 57d94a4..04de03b 100644\n--- a/.github/workflows/ibis-docs-lint.yml\n+++ b/.github/workflows/ibis-docs-lint.yml\n@@ -206,7 +206,7 @@ jobs:\n - name: build and push dev docs\n run: |\n nix develop --ignore-environment -c \\\n- mkdocs gh-deploy --message 'docs: ibis@${{ github.sha }}'\n+ mkdocs gh-deploy --message 'docs: ibis@${{ github.sha }}' --ignore-version\n \n simulate_release:\n runs-on: ubuntu-latest\n"]
| 2 |
["4197f2654e8767039dbfd66eca34f261ee3d88c8", "21228c55b7045d9b2225f65e6231184ff332b071"]
|
["feat", "ci"]
|
remove duplicated code,fixa few issues
|
["diff --git a/packages/core/src/components/action-sheet/action-sheet.tsx b/packages/core/src/components/action-sheet/action-sheet.tsx\nindex 7166508..dad7daf 100644\n--- a/packages/core/src/components/action-sheet/action-sheet.tsx\n+++ b/packages/core/src/components/action-sheet/action-sheet.tsx\n@@ -1,9 +1,9 @@\n import { Component, CssClassMap, Element, Event, EventEmitter, Listen, Method, Prop } from '@stencil/core';\n-import { Animation, AnimationBuilder, AnimationController, Config, DomController, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';\n+import { Animation, AnimationBuilder, Config, DomController, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';\n \n-import { domControllerAsync, isDef, playAnimationAsync } from '../../utils/helpers';\n+import { domControllerAsync } from '../../utils/helpers';\n import { createThemedClasses, getClassMap } from '../../utils/theme';\n-import { OverlayInterface, BACKDROP } from '../../utils/overlays';\n+import { OverlayInterface, BACKDROP, overlayAnimation } from '../../utils/overlays';\n \n import iosEnterAnimation from './animations/ios.enter';\n import iosLeaveAnimation from './animations/ios.leave';\n@@ -23,15 +23,15 @@ import mdLeaveAnimation from './animations/md.leave';\n })\n export class ActionSheet implements OverlayInterface {\n \n+ private presented = false;\n+\n mode: string;\n color: string;\n-\n- private presented = false;\n- private animation: Animation | null = null;\n+ animation: Animation;\n \n @Element() private el: HTMLElement;\n \n- @Prop({ connect: 'ion-animation-controller' }) animationCtrl: AnimationController;\n+ @Prop({ connect: 'ion-animation-controller' }) animationCtrl: HTMLIonAnimationControllerElement;\n @Prop({ context: 'config' }) config: Config;\n @Prop({ context: 'dom' }) dom: DomController;\n @Prop() overlayId: number;\n@@ -178,25 +178,8 @@ export class ActionSheet implements OverlayInterface {\n });\n }\n \n- private playAnimation(animationBuilder: AnimationBuilder) {\n- if (this.animation) {\n- this.animation.destroy();\n- this.animation = null;\n- }\n-\n- return this.animationCtrl.create(animationBuilder, this.el).then(animation => {\n- this.animation = animation;\n- // Check if prop animate is false or if the config for animate is defined/false\n- if (!this.willAnimate || (isDef(this.config.get('willAnimate')) && this.config.get('willAnimate') === false)) {\n- // if the duration is 0, it won't actually animate I don't think\n- // TODO - validate this\n- this.animation = animation.duration(0);\n- }\n- return playAnimationAsync(animation);\n- }).then((animation) => {\n- animation.destroy();\n- this.animation = null;\n- });\n+ private playAnimation(animationBuilder: AnimationBuilder): Promise<void> {\n+ return overlayAnimation(this, animationBuilder, this.willAnimate, this.el, undefined);\n }\n \n protected buttonClick(button: ActionSheetButton) {\ndiff --git a/packages/core/src/components/alert/alert.tsx b/packages/core/src/components/alert/alert.tsx\nindex 800b77b..bdf4fc5 100644\n--- a/packages/core/src/components/alert/alert.tsx\n+++ b/packages/core/src/components/alert/alert.tsx\n@@ -1,8 +1,8 @@\n import { Component, CssClassMap, Element, Event, EventEmitter, Listen, Method, Prop } from '@stencil/core';\n-import { Animation, AnimationBuilder, AnimationController, Config, DomController, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';\n-import { domControllerAsync, playAnimationAsync, autoFocus } from '../../utils/helpers';\n+import { Animation, AnimationBuilder, Config, DomController, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';\n+import { domControllerAsync, autoFocus } from '../../utils/helpers';\n import { createThemedClasses, getClassMap } from '../../utils/theme';\n-import { OverlayInterface, BACKDROP } from '../../utils/overlays';\n+import { OverlayInterface, BACKDROP, overlayAnimation } from '../../utils/overlays';\n \n import iosEnterAnimation from './animations/ios.enter';\n import iosLeaveAnimation from './animations/ios.leave';\n@@ -21,18 +21,19 @@ import mdLeaveAnimation from './animations/md.leave';\n }\n })\n export class Alert implements OverlayInterface {\n- mode: string;\n- color: string;\n \n private presented = false;\n- private animation: Animation | null = null;\n private activeId: string;\n private inputType: string | null = null;\n private hdrId: string;\n \n+ animation: Animation;\n+ mode: string;\n+ color: string;\n+\n @Element() private el: HTMLElement;\n \n- @Prop({ connect: 'ion-animation-controller' }) animationCtrl: AnimationController;\n+ @Prop({ connect: 'ion-animation-controller' }) animationCtrl: HTMLIonAnimationControllerElement;\n @Prop({ context: 'config' }) config: Config;\n @Prop({ context: 'dom' }) dom: DomController;\n @Prop() overlayId: number;\n@@ -264,25 +265,10 @@ export class Alert implements OverlayInterface {\n return values;\n }\n \n- private playAnimation(animationBuilder: AnimationBuilder) {\n- if (this.animation) {\n- this.animation.destroy();\n- this.animation = null;\n- }\n-\n- return this.animationCtrl.create(animationBuilder, this.el).then(animation => {\n- this.animation = animation;\n- if (!this.willAnimate) {\n- animation.duration(0);\n- }\n- return playAnimationAsync(animation);\n- }).then(animation => {\n- animation.destroy();\n- this.animation = null;\n- });\n+ private playAnimation(animationBuilder: AnimationBuilder): Promise<void> {\n+ return overlayAnimation(this, animationBuilder, this.willAnimate, this.el, undefined);\n }\n \n-\n private renderCheckbox(inputs: AlertInput[]) {\n if (inputs.length === 0) return null;\n \ndiff --git a/packages/core/src/components/loading/loading.tsx b/packages/core/src/components/loading/loading.tsx\nindex f45eaf1..cc4f511 100644\n--- a/packages/core/src/components/loading/loading.tsx\n+++ b/packages/core/src/components/loading/loading.tsx\n@@ -1,13 +1,13 @@\n import { Component, Element, Event, EventEmitter, Listen, Method, Prop } from '@stencil/core';\n-import { Animation, AnimationBuilder, AnimationController, Config, DomController, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';\n-import { domControllerAsync, playAnimationAsync } from '../../utils/helpers';\n+import { Animation, AnimationBuilder, Config, DomController, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';\n+import { domControllerAsync } from '../../utils/helpers';\n import { createThemedClasses, getClassMap } from '../../utils/theme';\n \n import iosEnterAnimation from './animations/ios.enter';\n import iosLeaveAnimation from './animations/ios.leave';\n import mdEnterAnimation from './animations/md.enter';\n import mdLeaveAnimation from './animations/md.leave';\n-import { OverlayInterface, BACKDROP } from '../../utils/overlays';\n+import { OverlayInterface, BACKDROP, overlayAnimation } from '../../utils/overlays';\n \n @Component({\n tag: 'ion-loading',\n@@ -21,16 +21,17 @@ import { OverlayInterface, BACKDROP } from '../../utils/overlays';\n })\n \n export class Loading implements OverlayInterface {\n- color: string;\n- mode: string;\n \n private presented = false;\n- private animation: Animation;\n private durationTimeout: any;\n \n+ animation: Animation;\n+ color: string;\n+ mode: string;\n+\n @Element() private el: HTMLElement;\n \n- @Prop({ connect: 'ion-animation-controller' }) animationCtrl: AnimationController;\n+ @Prop({ connect: 'ion-animation-controller' }) animationCtrl: HTMLIonAnimationControllerElement;\n @Prop({ context: 'config' }) config: Config;\n @Prop({ context: 'dom' }) dom: DomController;\n @Prop() overlayId: number;\n@@ -199,24 +200,8 @@ export class Loading implements OverlayInterface {\n });\n }\n \n- private playAnimation(animationBuilder: AnimationBuilder) {\n- if (this.animation) {\n- this.animation.destroy();\n- this.animation = null;\n- }\n-\n- return this.animationCtrl.create(animationBuilder, this.el).then(animation => {\n- this.animation = animation;\n- if (!this.willAnimate) {\n- // if the duration is 0, it won't actually animate I don't think\n- // TODO - validate this\n- animation.duration(0);\n- }\n- return playAnimationAsync(animation);\n- }).then(animation => {\n- animation.destroy();\n- this.animation = null;\n- });\n+ private playAnimation(animationBuilder: AnimationBuilder): Promise<void> {\n+ return overlayAnimation(this, animationBuilder, this.willAnimate, this.el, undefined);\n }\n \n hostData() {\ndiff --git a/packages/core/src/components/modal/modal.tsx b/packages/core/src/components/modal/modal.tsx\nindex af50d63..2b7510c 100644\n--- a/packages/core/src/components/modal/modal.tsx\n+++ b/packages/core/src/components/modal/modal.tsx\n@@ -1,10 +1,10 @@\n import { Component, Element, Event, EventEmitter, Listen, Method, Prop } from '@stencil/core';\n-import { Animation, AnimationBuilder, AnimationController, Config, DomController, FrameworkDelegate, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';\n+import { Animation, AnimationBuilder, Config, DomController, FrameworkDelegate, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';\n \n import { DomFrameworkDelegate } from '../../utils/dom-framework-delegate';\n-import { domControllerAsync, playAnimationAsync } from '../../utils/helpers';\n+import { domControllerAsync } from '../../utils/helpers';\n import { createThemedClasses } from '../../utils/theme';\n-import { OverlayInterface, BACKDROP } from '../../utils/overlays';\n+import { OverlayInterface, BACKDROP, overlayAnimation } from '../../utils/overlays';\n \n import iosEnterAnimation from './animations/ios.enter';\n import iosLeaveAnimation from './animations/ios.leave';\n@@ -25,14 +25,16 @@ import mdLeaveAnimation from './animations/md.leave';\n export class Modal implements OverlayInterface {\n \n private presented = false;\n- private animation: Animation;\n private usersComponentElement: HTMLElement;\n \n+ animation: Animation;\n+\n @Element() private el: HTMLElement;\n \n- @Prop({ connect: 'ion-animation-controller' }) animationCtrl: AnimationController;\n+ @Prop({ connect: 'ion-animation-controller' }) animationCtrl: HTMLIonAnimationControllerElement;\n @Prop({ context: 'config' }) config: Config;\n @Prop({ context: 'dom' }) dom: DomController;\n+\n @Prop() overlayId: number;\n @Prop({ mutable: true }) delegate: FrameworkDelegate;\n \n@@ -208,22 +210,8 @@ export class Modal implements OverlayInterface {\n });\n }\n \n- private playAnimation(animationBuilder: AnimationBuilder) {\n- if (this.animation) {\n- this.animation.destroy();\n- this.animation = null;\n- }\n-\n- return this.animationCtrl.create(animationBuilder, this.el).then(animation => {\n- this.animation = animation;\n- if (!this.willAnimate) {\n- animation.duration(0);\n- }\n- return playAnimationAsync(animation);\n- }).then((animation) => {\n- animation.destroy();\n- this.animation = null;\n- });\n+ private playAnimation(animationBuilder: AnimationBuilder): Promise<void> {\n+ return overlayAnimation(this, animationBuilder, this.willAnimate, this.el, undefined);\n }\n \n @Method()\ndiff --git a/packages/core/src/components/picker/picker.tsx b/packages/core/src/components/picker/picker.tsx\nindex 13faa3e..d70381e 100644\n--- a/packages/core/src/components/picker/picker.tsx\n+++ b/packages/core/src/components/picker/picker.tsx\n@@ -1,9 +1,9 @@\n import { Component, CssClassMap, Element, Event, EventEmitter, Listen, Method, Prop, State } from '@stencil/core';\n-import { Animation, AnimationBuilder, AnimationController, Config, DomController, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';\n+import { Animation, AnimationBuilder, Config, DomController, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';\n \n-import { domControllerAsync, playAnimationAsync } from '../../utils/helpers';\n+import { domControllerAsync } from '../../utils/helpers';\n import { getClassMap } from '../../utils/theme';\n-import { OverlayInterface } from '../../utils/overlays';\n+import { OverlayInterface, overlayAnimation } from '../../utils/overlays';\n \n import iosEnterAnimation from './animations/ios.enter';\n import iosLeaveAnimation from './animations/ios.leave';\n@@ -21,16 +21,17 @@ import iosLeaveAnimation from './animations/ios.leave';\n export class Picker implements OverlayInterface {\n \n private presented = false;\n- private animation: Animation;\n private durationTimeout: any;\n private mode: string;\n \n+ animation: Animation;\n+\n @Element() private el: HTMLElement;\n \n @State() private showSpinner: boolean = null;\n @State() private spinner: string;\n \n- @Prop({ connect: 'ion-animation-controller' }) animationCtrl: AnimationController;\n+ @Prop({ connect: 'ion-animation-controller' }) animationCtrl: HTMLIonAnimationControllerElement;\n @Prop({ context: 'config' }) config: Config;\n @Prop({ context: 'dom' }) dom: DomController;\n @Prop() overlayId: number;\n@@ -231,22 +232,8 @@ export class Picker implements OverlayInterface {\n return this.columns;\n }\n \n- private playAnimation(animationBuilder: AnimationBuilder) {\n- if (this.animation) {\n- this.animation.destroy();\n- this.animation = null;\n- }\n-\n- return this.animationCtrl.create(animationBuilder, this.el).then(animation => {\n- this.animation = animation;\n- if (!this.willAnimate) {\n- animation.duration(0);\n- }\n- return playAnimationAsync(animation);\n- }).then(animation => {\n- animation.destroy();\n- this.animation = null;\n- })\n+ private playAnimation(animationBuilder: AnimationBuilder): Promise<void> {\n+ return overlayAnimation(this, animationBuilder, this.willAnimate, this.el, undefined);\n }\n \n private buttonClick(button: PickerButton) {\ndiff --git a/packages/core/src/components/popover/popover.tsx b/packages/core/src/components/popover/popover.tsx\nindex 65031ff..6a47bf6 100644\n--- a/packages/core/src/components/popover/popover.tsx\n+++ b/packages/core/src/components/popover/popover.tsx\n@@ -1,10 +1,10 @@\n import { Component, Element, Event, EventEmitter, Listen, Method, Prop } from '@stencil/core';\n-import { Animation, AnimationBuilder, AnimationController, Config, DomController, FrameworkDelegate, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';\n+import { Animation, AnimationBuilder, Config, DomController, FrameworkDelegate, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';\n \n import { DomFrameworkDelegate } from '../../utils/dom-framework-delegate';\n-import { domControllerAsync, playAnimationAsync } from '../../utils/helpers';\n+import { domControllerAsync } from '../../utils/helpers';\n import { createThemedClasses } from '../../utils/theme';\n-import { OverlayInterface, BACKDROP } from '../../utils/overlays';\n+import { OverlayInterface, BACKDROP, overlayAnimation } from '../../utils/overlays';\n \n import iosEnterAnimation from './animations/ios.enter';\n import iosLeaveAnimation from './animations/ios.leave';\n@@ -24,12 +24,13 @@ import mdLeaveAnimation from './animations/md.leave';\n export class Popover implements OverlayInterface {\n \n private presented = false;\n- private animation: Animation;\n private usersComponentElement: HTMLElement;\n \n+ animation: Animation;\n+\n @Element() private el: HTMLElement;\n \n- @Prop({ connect: 'ion-animation-controller' }) animationCtrl: AnimationController;\n+ @Prop({ connect: 'ion-animation-controller' }) animationCtrl: HTMLIonAnimationControllerElement;\n @Prop({ context: 'config' }) config: Config;\n @Prop({ context: 'dom' }) dom: DomController;\n @Prop({ mutable: true }) delegate: FrameworkDelegate;\n@@ -224,22 +225,8 @@ export class Popover implements OverlayInterface {\n });\n }\n \n- private playAnimation(animationBuilder: AnimationBuilder) {\n- if (this.animation) {\n- this.animation.destroy();\n- this.animation = null;\n- }\n-\n- return this.animationCtrl.create(animationBuilder, this.el, this.ev).then((animation) => {\n- this.animation = animation;\n- if (!this.willAnimate) {\n- animation.duration(0);\n- }\n- return playAnimationAsync(animation);\n- }).then(animation => {\n- animation.destroy();\n- this.animation = null;\n- })\n+ private playAnimation(animationBuilder: AnimationBuilder): Promise<void> {\n+ return overlayAnimation(this, animationBuilder, this.willAnimate, this.el, this.ev);\n }\n \n hostData() {\ndiff --git a/packages/core/src/components/toast/toast.tsx b/packages/core/src/components/toast/toast.tsx\nindex 1afa318..372070a 100644\n--- a/packages/core/src/components/toast/toast.tsx\n+++ b/packages/core/src/components/toast/toast.tsx\n@@ -1,9 +1,9 @@\n import { Component, Element, Event, EventEmitter, Listen, Method, Prop } from '@stencil/core';\n-import { Animation, AnimationBuilder, AnimationController, Config, CssClassMap, DomController, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';\n+import { Animation, AnimationBuilder, Config, CssClassMap, DomController, OverlayDismissEvent, OverlayDismissEventDetail } from '../../index';\n \n-import { domControllerAsync, playAnimationAsync } from '../../utils/helpers';\n+import { domControllerAsync } from '../../utils/helpers';\n import { createThemedClasses, getClassMap } from '../../utils/theme';\n-import { OverlayInterface } from '../../utils/overlays';\n+import { OverlayInterface, overlayAnimation } from '../../utils/overlays';\n \n import iosEnterAnimation from './animations/ios.enter';\n import iosLeaveAnimation from './animations/ios.leave';\n@@ -24,14 +24,14 @@ import mdLeaveAnimation from './animations/md.leave';\n export class Toast implements OverlayInterface {\n \n private presented = false;\n- private animation: Animation | null;\n \n @Element() private el: HTMLElement;\n \n mode: string;\n color: string;\n+ animation: Animation | null;\n \n- @Prop({ connect: 'ion-animation-controller' }) animationCtrl: AnimationController;\n+ @Prop({ connect: 'ion-animation-controller' }) animationCtrl: HTMLIonAnimationControllerElement;\n @Prop({ context: 'config' }) config: Config;\n @Prop({ context: 'dom' }) dom: DomController;\n @Prop() overlayId: number;\n@@ -123,6 +123,22 @@ export class Toast implements OverlayInterface {\n */\n @Event() ionToastDidUnload: EventEmitter<ToastEventDetail>;\n \n+ componentDidLoad() {\n+ this.ionToastDidLoad.emit();\n+ }\n+\n+ componentDidUnload() {\n+ this.ionToastDidUnload.emit();\n+ }\n+\n+ @Listen('ionDismiss')\n+ protected onDismiss(ev: UIEvent) {\n+ ev.stopPropagation();\n+ ev.preventDefault();\n+\n+ this.dismiss();\n+ }\n+\n /**\n * Present the toast overlay after it has been created.\n */\n@@ -169,38 +185,8 @@ export class Toast implements OverlayInterface {\n });\n }\n \n- playAnimation(animationBuilder: AnimationBuilder) {\n- if (this.animation) {\n- this.animation.destroy();\n- this.animation = null;\n- }\n-\n- return this.animationCtrl.create(animationBuilder, this.el, this.position).then(animation => {\n- this.animation = animation;\n- if (!this.willAnimate) {\n- animation.duration(0);\n- }\n- return playAnimationAsync(animation);\n- }).then((animation) => {\n- animation.destroy();\n- this.animation = null;\n- });\n- }\n-\n- componentDidLoad() {\n- this.ionToastDidLoad.emit();\n- }\n-\n- componentDidUnload() {\n- this.ionToastDidUnload.emit();\n- }\n-\n- @Listen('ionDismiss')\n- protected onDismiss(ev: UIEvent) {\n- ev.stopPropagation();\n- ev.preventDefault();\n-\n- this.dismiss();\n+ private playAnimation(animationBuilder: AnimationBuilder): Promise<void> {\n+ return overlayAnimation(this, animationBuilder, this.willAnimate, this.el, this.position);\n }\n \n private wrapperClass(): CssClassMap {\ndiff --git a/packages/core/src/utils/overlays.ts b/packages/core/src/utils/overlays.ts\nindex 8926544..634df43 100644\n--- a/packages/core/src/utils/overlays.ts\n+++ b/packages/core/src/utils/overlays.ts\n@@ -1,3 +1,5 @@\n+import { AnimationBuilder, Animation } from \"..\";\n+import { playAnimationAsync } from \"./helpers\";\n \n let lastId = 1;\n \n@@ -56,8 +58,33 @@ export function removeLastOverlay(overlays: OverlayMap) {\n return toRemove ? toRemove.dismiss() : Promise.resolve();\n }\n \n+export function overlayAnimation(\n+ overlay: OverlayInterface,\n+ animationBuilder: AnimationBuilder,\n+ animate: boolean,\n+ baseEl: HTMLElement,\n+ opts: any\n+): Promise<void> {\n+ if (overlay.animation) {\n+ overlay.animation.destroy();\n+ overlay.animation = null;\n+ }\n+ return overlay.animationCtrl.create(animationBuilder, baseEl, opts).then(animation => {\n+ overlay.animation = animation;\n+ if (!animate) {\n+ animation.duration(0);\n+ }\n+ return playAnimationAsync(animation);\n+ }).then((animation) => {\n+ animation.destroy();\n+ overlay.animation = null;\n+ });\n+}\n+\n export interface OverlayInterface {\n overlayId: number;\n+ animation: Animation;\n+ animationCtrl: HTMLIonAnimationControllerElement;\n \n present(): Promise<void>;\n dismiss(data?: any, role?: string): Promise<void>;\n", "diff --git a/README.md b/README.md\nindex d944d22..5099f03 100644\n--- a/README.md\n+++ b/README.md\n@@ -10,9 +10,8 @@ React state management with a minimal API. Made with :heart: and ES6 Proxies.\n \n <!-- toc -->\n \n-* [Motivation](#motivation)\n+* [Introduction](#introduction)\n * [Installation](#installation)\n- + [Setting up a quick project](#setting-up-a-quick-project)\n * [Usage](#usage)\n + [Creating stores](#creating-stores)\n + [Creating reactive views](#creating-reactive-views)\n@@ -35,12 +34,14 @@ React state management with a minimal API. Made with :heart: and ES6 Proxies.\n Easy State consists of two wrapper functions only. `store` creates state stores and `view` creates reactive components, which re-render whenever state stores are mutated. The rest is just plain JavaScript.\n \n ```js\n-import React, from 'react'\n+import React from 'react'\n import { store, view } from 'react-easy-state'\n \n+// stores are normal objects\n const clock = store({ time: new Date() })\n setInterval(() => clock.time = new Date(), 1000)\n \n+// reactive components re-render on store mutations\n function ClockComp () {\n return <div>{clock.time}</div>\n }\n"]
| 2 |
["9e3f295bbfd4098ffda1ae6656699f60b86c1f92", "b8a664c1b10f4e30a3e221a14211a3cdaf90b7f4"]
|
["refactor", "docs"]
|
replace api call which requires auth token in public page
re #4694
Signed-off-by: Pranav C <[email protected]>,auto focus inputs in survey form
|
["diff --git a/packages/nc-gui/composables/useSharedView.ts b/packages/nc-gui/composables/useSharedView.ts\nindex cb0c5ea..f67a6c9 100644\n--- a/packages/nc-gui/composables/useSharedView.ts\n+++ b/packages/nc-gui/composables/useSharedView.ts\n@@ -17,7 +17,7 @@ export function useSharedView() {\n \n const { appInfo } = $(useGlobal())\n \n- const { loadProject } = useProject()\n+ const { project } = useProject()\n \n const appInfoDefaultLimit = appInfo.defaultLimit || 25\n \n@@ -76,7 +76,16 @@ export function useSharedView() {\n \n await setMeta(viewMeta.model)\n \n- await loadProject(true, viewMeta.project_id)\n+ // if project is not defined then set it with an object containing base\n+ if (!project.value?.bases)\n+ project.value = {\n+ bases: [\n+ {\n+ id: viewMeta.base_id,\n+ type: viewMeta.client,\n+ },\n+ ],\n+ }\n \n const relatedMetas = { ...viewMeta.relatedMetas }\n Object.keys(relatedMetas).forEach((key) => setMeta(relatedMetas[key]))\n", "diff --git a/packages/nc-gui/pages/[projectType]/form/[viewId]/index/survey.vue b/packages/nc-gui/pages/[projectType]/form/[viewId]/index/survey.vue\nindex b2a90d8..dbad824 100644\n--- a/packages/nc-gui/pages/[projectType]/form/[viewId]/index/survey.vue\n+++ b/packages/nc-gui/pages/[projectType]/form/[viewId]/index/survey.vue\n@@ -6,6 +6,7 @@ import {\n DropZoneRef,\n computed,\n onKeyStroke,\n+ onMounted,\n provide,\n ref,\n useEventListener,\n@@ -85,6 +86,8 @@ function transition(direction: TransitionDirection) {\n \n setTimeout(() => {\n isTransitioning.value = false\n+\n+ setTimeout(focusInput, 100)\n }, 1000)\n }\n \n@@ -113,6 +116,19 @@ async function goPrevious() {\n goToPrevious()\n }\n \n+function focusInput() {\n+ if (document && typeof document !== 'undefined') {\n+ const inputEl =\n+ (document.querySelector('.nc-cell input') as HTMLInputElement) ||\n+ (document.querySelector('.nc-cell textarea') as HTMLTextAreaElement)\n+\n+ if (inputEl) {\n+ inputEl.select()\n+ inputEl.focus()\n+ }\n+ }\n+}\n+\n useEventListener('wheel', (event) => {\n if (Math.abs(event.deltaX) < Math.abs(event.deltaY)) {\n // Scrolling more vertically than horizontally\n@@ -130,6 +146,8 @@ useEventListener('wheel', (event) => {\n \n onKeyStroke(['ArrowLeft', 'ArrowDown'], goPrevious)\n onKeyStroke(['ArrowRight', 'ArrowUp', 'Enter', 'Space'], goNext)\n+\n+onMounted(focusInput)\n </script>\n \n <template>\n"]
| 2 |
["4986a5892fb00bd5a6b2065ad8cfefbc36052dd7", "5373c3036866db58b322b424d3be9dedff57a376"]
|
["fix", "feat"]
|
init environ cache,remove unnecessary import
|
["diff --git a/src/environment.go b/src/environment.go\nindex ae5e26a..0c961c5 100644\n--- a/src/environment.go\n+++ b/src/environment.go\n@@ -229,6 +229,7 @@ func (env *environment) environ() map[string]string {\n \tif env.environCache != nil {\n \t\treturn env.environCache\n \t}\n+\tenv.environCache = make(map[string]string)\n \tconst separator = \"=\"\n \tvalues := os.Environ()\n \tfor value := range values {\n", "diff --git a/transport/src/main/java/io/camunda/zeebe/transport/stream/impl/LogicalId.java b/transport/src/main/java/io/camunda/zeebe/transport/stream/impl/LogicalId.java\nindex 14c6f30..ebaef60 100644\n--- a/transport/src/main/java/io/camunda/zeebe/transport/stream/impl/LogicalId.java\n+++ b/transport/src/main/java/io/camunda/zeebe/transport/stream/impl/LogicalId.java\n@@ -8,7 +8,6 @@\n package io.camunda.zeebe.transport.stream.impl;\n \n import io.camunda.zeebe.util.buffer.BufferUtil;\n-import org.agrona.BitUtil;\n import org.agrona.concurrent.UnsafeBuffer;\n \n /**\n"]
| 2 |
["dc50bd35462a49058c91a939fc8830ae7a9eb692", "84529bcb10c6fe02e2c0079d069ab6c6ac7683d6"]
|
["fix", "refactor"]
|
add `to_sql`
Co-authored-by: Gil Forsyth <[email protected]>,better tested publishing flow,switch QA to new testbench-1.x-prod
In order to use the new Testbench that is compatible with Zeebe 1.x
versions, this switches the client id and secrets used by the QA stage.
|
["diff --git a/docs/api/expressions/top_level.md b/docs/api/expressions/top_level.md\nindex efaffbd..34b529e 100644\n--- a/docs/api/expressions/top_level.md\n+++ b/docs/api/expressions/top_level.md\n@@ -28,7 +28,7 @@ These methods and objects are available directly in the `ibis` module.\n ::: ibis.or_\n ::: ibis.param\n ::: ibis.show_sql\n-::: ibis.sql\n+::: ibis.to_sql\n ::: ibis.random\n ::: ibis.range_window\n ::: ibis.row_number\n", "diff --git a/Makefile.toml b/Makefile.toml\nindex e7d2b20..490d6e2 100644\n--- a/Makefile.toml\n+++ b/Makefile.toml\n@@ -82,7 +82,7 @@ end\n '''\n \n [tasks.build-plugins-release]\n-env = { \"CARGO_MAKE_WORKSPACE_SKIP_MEMBERS\" = [\".\"] }\n+env = { \"CARGO_MAKE_WORKSPACE_INCLUDE_MEMBERS\" = [\"default-plugins/status-bar\", \"default-plugins/strider\", \"default-plugins/tab-bar\"] }\n run_task = { name = \"build-release\", fork = true }\n \n [tasks.wasm-opt-plugins]\n@@ -129,15 +129,16 @@ args = [\"install\", \"cross\"]\n [tasks.publish]\n clear = true\n workspace = false\n-dependencies = [\"build-plugins-release\", \"wasm-opt-plugins\", \"release-commit\", \"build-release\", \"publish-zellij-tile\", \"publish-zellij-tile-utils\", \"publish-zellij-utils\", \"publish-zellij-client\", \"publish-zellij-server\"]\n+dependencies = [\"build-plugins-release\", \"wasm-opt-plugins\", \"release-commit\"]\n run_task = \"publish-zellij\"\n \n [tasks.release-commit]\n dependencies = [\"commit-all\", \"tag-release\"]\n command = \"git\"\n-args = [\"push\", \"--atomic\", \"upstream\", \"main\", \"v${CARGO_MAKE_CRATE_VERSION}\"]\n+args = [\"push\", \"--atomic\", \"origin\", \"main\", \"v${CARGO_MAKE_CRATE_VERSION}\"]\n \n [tasks.commit-all]\n+ignore_errors = true\n command = \"git\"\n args = [\"commit\", \"-aem\", \"chore(release): v${CARGO_MAKE_CRATE_VERSION}\"]\n \n@@ -148,31 +149,32 @@ args = [\"tag\", \"v${CARGO_MAKE_CRATE_VERSION}\"]\n [tasks.publish-zellij-tile]\n ignore_errors = true\n cwd = \"zellij-tile\"\n-command = \"cargo publish && sleep 15\"\n+script = \"cargo publish && sleep 15\"\n \n [tasks.publish-zellij-client]\n+ignore_errors = true\n dependencies = [\"publish-zellij-utils\"]\n cwd = \"zellij-client\"\n-command = \"cargo publish && sleep 15\"\n+script = \"cargo publish && sleep 15\"\n \n [tasks.publish-zellij-server]\n+ignore_errors = true\n dependencies = [\"publish-zellij-utils\"]\n cwd = \"zellij-server\"\n-command = \"cargo publish && sleep 15\"\n+script = \"cargo publish && sleep 15\"\n \n [tasks.publish-zellij-utils]\n+ignore_errors = true\n dependencies = [\"publish-zellij-tile\"]\n cwd = \"zellij-utils\"\n-command = \"cargo publish && sleep 15\"\n+script = \"cargo publish && sleep 15\"\n \n [tasks.publish-zellij-tile-utils]\n ignore_errors = true\n cwd = \"zellij-tile-utils\"\n-command = \"cargo publish && sleep 15\"\n+script = \"cargo publish && sleep 15\"\n \n [tasks.publish-zellij]\n dependencies = [\"publish-zellij-client\", \"publish-zellij-server\", \"publish-zellij-utils\"]\n command = \"cargo\"\n args = [\"publish\"]\n-\n-\n", "diff --git a/Jenkinsfile b/Jenkinsfile\nindex 176ab58..bead402 100644\n--- a/Jenkinsfile\n+++ b/Jenkinsfile\n@@ -326,7 +326,7 @@ pipeline {\n TAG = \"${env.VERSION}-${env.GIT_COMMIT}\"\n DOCKER_GCR = credentials(\"zeebe-gcr-serviceaccount-json\")\n ZEEBE_AUTHORIZATION_SERVER_URL = 'https://login.cloud.ultrawombat.com/oauth/token'\n- ZEEBE_CLIENT_ID = 'W5a4JUc3I1NIetNnodo3YTvdsRIFb12w'\n+ ZEEBE_CLIENT_ID = 'ELL8eP0qDkl6dxXVps0t51x2VkCkWf~p'\n QA_RUN_VARIABLES = \"{\\\"zeebeImage\\\": \\\"${env.IMAGE}:${env.TAG}\\\", \\\"generationTemplate\\\": \\\"${params.GENERATION_TEMPLATE}\\\", \" +\n \"\\\"channel\\\": \\\"Internal Dev\\\", \\\"branch\\\": \\\"${env.BRANCH_NAME}\\\", \\\"build\\\": \\\"${currentBuild.absoluteUrl}\\\", \" +\n \"\\\"businessKey\\\": \\\"${currentBuild.absoluteUrl}\\\", \\\"processId\\\": \\\"qa-protocol\\\"}\"\n@@ -341,7 +341,7 @@ pipeline {\n withVault(\n [vaultSecrets:\n [\n- [path : 'secret/common/ci-zeebe/testbench-secrets-int',\n+ [path : 'secret/common/ci-zeebe/testbench-secrets-1.x-prod',\n secretValues:\n [\n [envVar: 'ZEEBE_CLIENT_SECRET', vaultKey: 'clientSecret'],\n"]
| 3 |
["e2821a56c7d867b8b591f1777019843a2ffca797", "65574eea5da54bf4722ecb551b42f8ff6088f33b", "c81a0c2999454c859b4bf4da5779712960d239be"]
|
["docs", "build", "ci"]
|
fix readme,add canonical `_name` to edge packages,reorder startup steps
|
["diff --git a/crates/dagger-sdk/README.md b/crates/dagger-sdk/README.md\nindex ed96be1..974fb7f 100644\n--- a/crates/dagger-sdk/README.md\n+++ b/crates/dagger-sdk/README.md\n@@ -29,9 +29,9 @@ fn main() -> eyre::Result<()> {\n let client = dagger_sdk::connect()?;\n \n let version = client\n- .container(None)\n- .from(\"golang:1.19\".into())\n- .with_exec(vec![\"go\".into(), \"version\".into()], None)\n+ .container()\n+ .from(\"golang:1.19\")\n+ .with_exec(vec![\"go\", \"version\"])\n .stdout()?;\n \n println!(\"Hello from Dagger and {}\", version.trim());\n", "diff --git a/scripts/bump-edge.ts b/scripts/bump-edge.ts\nindex e92e3c9..0b7a11a 100644\n--- a/scripts/bump-edge.ts\n+++ b/scripts/bump-edge.ts\n@@ -53,6 +53,7 @@ async function loadWorkspace (dir: string) {\n }\n \n const rename = (from: string, to: string) => {\n+ find(from).data._name = find(from).data.name\n find(from).data.name = to\n for (const pkg of packages) {\n pkg.updateDeps((dep) => {\n", "diff --git a/broker/src/main/java/io/camunda/zeebe/broker/bootstrap/BrokerStartupProcess.java b/broker/src/main/java/io/camunda/zeebe/broker/bootstrap/BrokerStartupProcess.java\nindex 52fa3a9..d81c27a 100644\n--- a/broker/src/main/java/io/camunda/zeebe/broker/bootstrap/BrokerStartupProcess.java\n+++ b/broker/src/main/java/io/camunda/zeebe/broker/bootstrap/BrokerStartupProcess.java\n@@ -50,21 +50,20 @@ public final class BrokerStartupProcess {\n // must be executed before any disk space usage listeners are registered\n result.add(new DiskSpaceUsageMonitorStep());\n }\n-\n result.add(new MonitoringServerStep());\n result.add(new BrokerAdminServiceStep());\n+\n result.add(new ClusterServicesCreationStep());\n+ result.add(new ClusterServicesStep());\n \n result.add(new CommandApiServiceStep());\n result.add(new SubscriptionApiStep());\n-\n- result.add(new ClusterServicesStep());\n+ result.add(new LeaderManagementRequestHandlerStep());\n \n if (config.getGateway().isEnable()) {\n result.add(new EmbeddedGatewayServiceStep());\n }\n \n- result.add(new LeaderManagementRequestHandlerStep());\n result.add(new PartitionManagerStep());\n \n return result;\n"]
| 3 |
["04e70ce964b343e28b3dbd0c46d10ccda958ab8c", "573f87edf9bdc19c9c4c3a978fad6ed3ce788f5f", "3e0c4cbf91fe5efc9b93baba93e4df93ef4ab5cd"]
|
["docs", "build", "refactor"]
|
create mock img server,added components pages to typedoc output,selenium java 4.8.1
|
["diff --git a/scripts/gulp/tasks/test.ts b/scripts/gulp/tasks/test.ts\nindex 8014b12..d10c1aa 100644\n--- a/scripts/gulp/tasks/test.ts\n+++ b/scripts/gulp/tasks/test.ts\n@@ -26,12 +26,18 @@ task('test.imageserver', () => {\n function handleRequest(req, res) {\n const urlParse = url.parse(req.url, true);\n \n+ res.setHeader('Access-Control-Allow-Origin', '*');\n+ res.setHeader('Access-Control-Allow-Methods', 'GET');\n+ res.setHeader('Connection', 'keep-alive');\n+ res.setHeader('Age', '0');\n+ res.setHeader('cache-control', 'no-store');\n+\n if (urlParse.pathname === '/reset') {\n console.log('Image Server Reset');\n console.log('---------------------------');\n requestedUrls.length = 0;\n start = Date.now();\n- res.setHeader('Access-Control-Allow-Origin', '*');\n+ res.setHeader('Content-Type', 'text/plain');\n res.end('reset');\n return;\n }\n@@ -48,9 +54,8 @@ task('test.imageserver', () => {\n \n setTimeout(() => {\n res.setHeader('Content-Type', 'image/svg+xml');\n- res.setHeader('Access-Control-Allow-Origin', '*');\n res.end(`<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n- style=\"background-color: ${color}; width: ${width}px; height: ${height}px;\">\n+ viewBox=\"0 0 ${width} ${height}\" style=\"background-color: ${color};\">\n <text x=\"5\" y=\"22\" style=\"font-family: Courier; font-size: 24px\">${id}</text>\n </svg>`);\n }, delay);\n", "diff --git a/core/main/tsconfig.json b/core/main/tsconfig.json\nindex c4474a7..7916bc5 100644\n--- a/core/main/tsconfig.json\n+++ b/core/main/tsconfig.json\n@@ -96,11 +96,35 @@\n \"particles\": {\n \"groups\": [\n {\n- \"title\": \"Documentation\",\n+ \"title\": \"Components\",\n \"pages\": [\n {\n- \"title\": \"My Page\",\n- \"source\": \"./markdown/pages/index.md\"\n+ \"title\": \"Angular\",\n+ \"source\": \"../../components/angular/README.md\"\n+ },\n+ {\n+ \"title\": \"React\",\n+ \"source\": \"../../components/react/README.md\"\n+ },\n+ {\n+ \"title\": \"Vue\",\n+ \"source\": \"../../components/vue/README.md\"\n+ },\n+ {\n+ \"title\": \"Svelte\",\n+ \"source\": \"../../components/svelte/README.md\"\n+ },\n+ {\n+ \"title\": \"jQuery\",\n+ \"source\": \"../../components/jquery/README.md\"\n+ },\n+ {\n+ \"title\": \"Preact\",\n+ \"source\": \"../../components/preact/README.md\"\n+ },\n+ {\n+ \"title\": \"Inferno\",\n+ \"source\": \"../../components/inferno/README.md\"\n }\n ]\n }\n", "diff --git a/pom.xml b/pom.xml\nindex f792f3c..477224a 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -60,8 +60,8 @@\n <codehaus-groovy.version>3.0.11</codehaus-groovy.version>\n <jython.version>2.7.0</jython.version>\n <docker-java.version>3.2.14</docker-java.version>\n- <selenium.version>4.8.0</selenium.version>\n- <jmeter-plugins-webdriver.version>4.8.0</jmeter-plugins-webdriver.version>\n+ <selenium.version>4.8.1</selenium.version>\n+ <jmeter-plugins-webdriver.version>4.8.1</jmeter-plugins-webdriver.version>\n <opentelemetry.version>1.22.0</opentelemetry.version>\n <oracle-database.version>19.7.0.0</oracle-database.version>\n <zookeeper.version>3.8.0</zookeeper.version>\n"]
| 3 |
["32b76173a259ea1993298289b436cf10c1e800bf", "fca2c198c6486c4d586b1af1832be46f19667235", "66f907f2d6ff0956bb5215518678bc79cab83c17"]
|
["test", "docs", "build"]
|
reintroduce timeout for assertion
The timeout had been removed by a previous commit. Without the timeout the test might be flaky.
Also removed obsolete code,tests,fix typos (#90)
|
["diff --git a/engine/src/test/java/io/camunda/zeebe/engine/processing/streamprocessor/StreamProcessorReplayModeTest.java b/engine/src/test/java/io/camunda/zeebe/engine/processing/streamprocessor/StreamProcessorReplayModeTest.java\nindex d0ee4f3..c2ab83c 100644\n--- a/engine/src/test/java/io/camunda/zeebe/engine/processing/streamprocessor/StreamProcessorReplayModeTest.java\n+++ b/engine/src/test/java/io/camunda/zeebe/engine/processing/streamprocessor/StreamProcessorReplayModeTest.java\n@@ -13,6 +13,7 @@ import static io.camunda.zeebe.protocol.record.intent.ProcessInstanceIntent.ACTI\n import static io.camunda.zeebe.protocol.record.intent.ProcessInstanceIntent.ELEMENT_ACTIVATING;\n import static java.util.function.Predicate.isEqual;\n import static org.assertj.core.api.Assertions.assertThat;\n+import static org.awaitility.Awaitility.await;\n import static org.mockito.ArgumentMatchers.any;\n import static org.mockito.ArgumentMatchers.anyLong;\n import static org.mockito.ArgumentMatchers.eq;\n@@ -30,7 +31,6 @@ import io.camunda.zeebe.protocol.record.intent.ProcessInstanceIntent;\n import io.camunda.zeebe.streamprocessor.StreamProcessor;\n import io.camunda.zeebe.streamprocessor.StreamProcessor.Phase;\n import io.camunda.zeebe.streamprocessor.StreamProcessorMode;\n-import org.awaitility.Awaitility;\n import org.junit.Rule;\n import org.junit.Test;\n import org.mockito.InOrder;\n@@ -71,7 +71,7 @@ public final class StreamProcessorReplayModeTest {\n // when\n startStreamProcessor(replayUntilEnd);\n \n- Awaitility.await()\n+ await()\n .untilAsserted(\n () -> assertThat(getCurrentPhase(replayUntilEnd)).isEqualTo(Phase.PROCESSING));\n \n@@ -163,7 +163,7 @@ public final class StreamProcessorReplayModeTest {\n command().processInstance(ACTIVATE_ELEMENT, RECORD),\n event().processInstance(ELEMENT_ACTIVATING, RECORD).causedBy(0));\n \n- Awaitility.await(\"should have replayed first events\")\n+ await(\"should have replayed first events\")\n .until(replayContinuously::getLastSuccessfulProcessedRecordPosition, (pos) -> pos > 0);\n \n // when\n@@ -210,7 +210,7 @@ public final class StreamProcessorReplayModeTest {\n command().processInstance(ACTIVATE_ELEMENT, RECORD),\n event().processInstance(ELEMENT_ACTIVATING, RECORD).causedBy(0));\n \n- Awaitility.await(\"should have replayed first events\")\n+ await(\"should have replayed first events\")\n .until(replayContinuously::getLastSuccessfulProcessedRecordPosition, (pos) -> pos > 0);\n streamProcessor.pauseProcessing().join();\n replayContinuously.writeBatch(\n@@ -244,7 +244,7 @@ public final class StreamProcessorReplayModeTest {\n // then\n verify(eventApplier, TIMEOUT).applyState(anyLong(), eq(ELEMENT_ACTIVATING), any());\n \n- Awaitility.await()\n+ await()\n .untilAsserted(\n () -> {\n final var lastProcessedPosition = getLastProcessedPosition(replayContinuously);\n@@ -273,8 +273,7 @@ public final class StreamProcessorReplayModeTest {\n \n verify(eventApplier, TIMEOUT).applyState(anyLong(), eq(ELEMENT_ACTIVATING), any());\n \n- Awaitility.await()\n- .until(() -> getLastProcessedPosition(replayContinuously), isEqual(commandPosition));\n+ await().until(() -> getLastProcessedPosition(replayContinuously), isEqual(commandPosition));\n \n // then\n assertThat(replayContinuously.getLastSuccessfulProcessedRecordPosition())\n@@ -285,7 +284,6 @@ public final class StreamProcessorReplayModeTest {\n @Test\n public void shouldNotSetLastProcessedPositionIfLessThanSnapshotPosition() {\n // given\n- final var commandPositionBeforeSnapshot = 1L;\n final var snapshotPosition = 2L;\n \n startStreamProcessor(replayContinuously);\n@@ -298,23 +296,20 @@ public final class StreamProcessorReplayModeTest {\n // when\n startStreamProcessor(replayContinuously);\n \n- Awaitility.await()\n+ await()\n .untilAsserted(\n () -> assertThat(getCurrentPhase(replayContinuously)).isEqualTo(Phase.REPLAY));\n \n- final var eventPosition =\n- replayContinuously.writeEvent(\n- ELEMENT_ACTIVATING,\n- RECORD,\n- writer -> writer.sourceRecordPosition(commandPositionBeforeSnapshot));\n-\n // then\n final var lastProcessedPositionState = replayContinuously.getLastProcessedPositionState();\n \n- assertThat(lastProcessedPositionState.getLastSuccessfulProcessedRecordPosition())\n- .describedAs(\n- \"Expected that the last processed position is not less than the snapshot position\")\n- .isEqualTo(snapshotPosition);\n+ await()\n+ .untilAsserted(\n+ () ->\n+ assertThat(lastProcessedPositionState.getLastSuccessfulProcessedRecordPosition())\n+ .describedAs(\n+ \"Expected that the last processed position is not less than the snapshot position\")\n+ .isEqualTo(snapshotPosition));\n }\n \n private StreamProcessor startStreamProcessor(final StreamProcessorRule streamProcessorRule) {\n", "diff --git a/client/src/components/Profile/__test__/EducationCard.test.tsx b/client/src/components/Profile/__test__/EducationCard.test.tsx\nindex 44b6e00..14539dd 100644\n--- a/client/src/components/Profile/__test__/EducationCard.test.tsx\n+++ b/client/src/components/Profile/__test__/EducationCard.test.tsx\n@@ -53,7 +53,7 @@ describe('EducationCard', () => {\n });\n \n describe('filterPermissions', () => {\n- it('should left only contacts in \"permissionsSettings\" object', () => {\n+ it('should left only \"isEducationVisible\" in \"permissionsSettings\" object', () => {\n const permissionsSettings = {\n isProfileVisible: { all: true },\n isAboutVisible: { all: true, mentor: true, student: true },\ndiff --git a/client/src/components/Profile/__test__/MainCard.test.tsx b/client/src/components/Profile/__test__/MainCard.test.tsx\nindex 8fb2840..552804b 100644\n--- a/client/src/components/Profile/__test__/MainCard.test.tsx\n+++ b/client/src/components/Profile/__test__/MainCard.test.tsx\n@@ -3,6 +3,8 @@ import { shallow } from 'enzyme';\n import { shallowToJson } from 'enzyme-to-json';\n import MainCard from '../MainCard';\n \n+// TODO: Known Issue: https://stackoverflow.com/questions/59942808/how-can-i-use-jest-coverage-in-next-js-styled-jsx\n+\n describe('MainCard', () => {\n describe('Should render correctly', () => {\n it('if is editing mode disabled', () => {\n@@ -21,49 +23,89 @@ describe('MainCard', () => {\n );\n expect(shallowToJson(output)).toMatchSnapshot();\n });\n+ it('if is editing mode enabled', () => {\n+ const output = shallow(\n+ <MainCard\n+ data={{\n+ name: 'Petr Pervyi',\n+ githubId: 'piter',\n+ locationName: 'SPB',\n+ locationId: '1',\n+ }}\n+ isEditingModeEnabled={true}\n+ onPermissionsSettingsChange={() => {}}\n+ onProfileSettingsChange={() => {}}\n+ />,\n+ );\n+ expect(shallowToJson(output)).toMatchSnapshot();\n+ });\n });\n \n- // const wrapper = shallow(\n- // <MainCard\n- // data={{\n- // name: 'Petr Pervyi',\n- // githubId: 'piter',\n- // locationName: 'SPB',\n- // locationId: '1',\n- // }}\n- // isEditingModeEnabled={false}\n- // onPermissionsSettingsChange={() => {}}\n- // onProfileSettingsChange={() => {}}\n- // />);\n- // const instance = wrapper.instance();\n- // describe('showVisibilitySettings', () => {\n- // it('should set \"state.isVisibilitySettingsVisible\" as \"true\"', () => {\n- // expect(instance.state.isVisibilitySettingsVisible).toBe(false);\n- // instance.showVisibilitySettings();\n- // expect(instance.state.isVisibilitySettingsVisible).toBe(true);\n- // });\n- // });\n- // describe('hideVisibilitySettings', () => {\n- // it('should set \"state.isVisibilitySettingsVisible\" as \"false\"', () => {\n- // instance.state.isVisibilitySettingsVisible = true;\n- // expect(instance.state.isVisibilitySettingsVisible).toBe(true);\n- // instance.hideVisibilitySettings();\n- // expect(instance.state.isVisibilitySettingsVisible).toBe(false);\n- // });\n- // });\n- // describe('showProfileSettings', () => {\n- // it('should set \"state.isProfileSettingsVisible\" as \"true\"', () => {\n- // expect(instance.state.isProfileSettingsVisible).toBe(false);\n- // instance.showProfileSettings();\n- // expect(instance.state.isProfileSettingsVisible).toBe(true);\n- // });\n- // });\n- // describe('hideProfileSettings', () => {\n- // it('should set \"state.isProfileSettingsVisible\" as \"false\"', () => {\n- // instance.state.isProfileSettingsVisible = true;\n- // expect(instance.state.isProfileSettingsVisible).toBe(true);\n- // instance.hideProfileSettings();\n- // expect(instance.state.isProfileSettingsVisible).toBe(false);\n- // });\n- // });\n+ const wrapper = shallow(\n+ <MainCard\n+ data={{\n+ name: 'Petr Pervyi',\n+ githubId: 'piter',\n+ locationName: 'SPB',\n+ locationId: '1',\n+ }}\n+ isEditingModeEnabled={false}\n+ onPermissionsSettingsChange={() => {}}\n+ onProfileSettingsChange={() => {}}\n+ />);\n+ const instance = wrapper.instance();\n+ describe('showVisibilitySettings', () => {\n+ it('should set \"state.isVisibilitySettingsVisible\" as \"true\"', () => {\n+ expect(instance.state.isVisibilitySettingsVisible).toBe(false);\n+ instance.showVisibilitySettings();\n+ expect(instance.state.isVisibilitySettingsVisible).toBe(true);\n+ });\n+ });\n+ describe('hideVisibilitySettings', () => {\n+ it('should set \"state.isVisibilitySettingsVisible\" as \"false\"', () => {\n+ instance.state.isVisibilitySettingsVisible = true;\n+ expect(instance.state.isVisibilitySettingsVisible).toBe(true);\n+ instance.hideVisibilitySettings();\n+ expect(instance.state.isVisibilitySettingsVisible).toBe(false);\n+ });\n+ });\n+ describe('showProfileSettings', () => {\n+ it('should set \"state.isProfileSettingsVisible\" as \"true\"', () => {\n+ expect(instance.state.isProfileSettingsVisible).toBe(false);\n+ instance.showProfileSettings();\n+ expect(instance.state.isProfileSettingsVisible).toBe(true);\n+ });\n+ });\n+ describe('hideProfileSettings', () => {\n+ it('should set \"state.isProfileSettingsVisible\" as \"false\"', () => {\n+ instance.state.isProfileSettingsVisible = true;\n+ expect(instance.state.isProfileSettingsVisible).toBe(true);\n+ instance.hideProfileSettings();\n+ expect(instance.state.isProfileSettingsVisible).toBe(false);\n+ });\n+ });\n+ describe('filterPermissions', () => {\n+ it('should left only \"isProfileVisible\" in \"permissionsSettings\" object', () => {\n+ const permissionsSettings = {\n+ isProfileVisible: { all: true },\n+ isAboutVisible: { all: true, mentor: true, student: true },\n+ isEducationVisible: { all: true, mentor: true, student: true },\n+ isEnglishVisible: { all: false, student: false },\n+ isEmailVisible: { all: true, student: true },\n+ isTelegramVisible: { all: false, student: false },\n+ isSkypeVisible: { all: true, student: true },\n+ isPhoneVisible: { all: false, student: false },\n+ isContactsNotesVisible: { all: true, student: true },\n+ isLinkedInVisible: { all: false, mentor: false, student: false },\n+ isPublicFeedbackVisible: { all: true, mentor: true, student: true },\n+ isMentorStatsVisible: { all: true, mentor: true, student: true },\n+ isStudentStatsVisible: { all: true, student: true },\n+ };\n+ const instance = wrapper.instance();\n+ const result = instance.filterPermissions(permissionsSettings);\n+ expect(result).toEqual({\n+ isProfileVisible: { all: true },\n+ });\n+ });\n+ });\n });\ndiff --git a/client/src/components/Profile/__test__/__snapshots__/MainCard.test.tsx.snap b/client/src/components/Profile/__test__/__snapshots__/MainCard.test.tsx.snap\nindex 40331eb..fef20dd 100644\n--- a/client/src/components/Profile/__test__/__snapshots__/MainCard.test.tsx.snap\n+++ b/client/src/components/Profile/__test__/__snapshots__/MainCard.test.tsx.snap\n@@ -71,3 +71,158 @@ exports[`MainCard Should render correctly if is editing mode disabled 1`] = `\n </Card>\n </Fragment>\n `;\n+\n+exports[`MainCard Should render correctly if is editing mode enabled 1`] = `\n+<Fragment>\n+ <Card\n+ actions={\n+ Array [\n+ <ForwardRef(EditOutlined)\n+ onClick={[Function]}\n+ />,\n+ <ForwardRef(SettingOutlined)\n+ onClick={[Function]}\n+ />,\n+ ]\n+ }\n+ >\n+ <GithubAvatar\n+ githubId=\"piter\"\n+ size={96}\n+ style={\n+ Object {\n+ \"display\": \"block\",\n+ \"margin\": \"0 auto 10px\",\n+ }\n+ }\n+ />\n+ <Title\n+ level={1}\n+ style={\n+ Object {\n+ \"fontSize\": 24,\n+ \"margin\": 0,\n+ \"textAlign\": \"center\",\n+ }\n+ }\n+ >\n+ Petr Pervyi\n+ </Title>\n+ <Paragraph\n+ style={\n+ Object {\n+ \"marginBottom\": 20,\n+ \"textAlign\": \"center\",\n+ }\n+ }\n+ >\n+ <a\n+ href=\"https://github.com/piter\"\n+ style={\n+ Object {\n+ \"fontSize\": 16,\n+ \"marginLeft\": \"-14px\",\n+ }\n+ }\n+ target=\"_blank\"\n+ >\n+ <ForwardRef(GithubFilled) />\n+ \n+ piter\n+ </a>\n+ </Paragraph>\n+ <Paragraph\n+ style={\n+ Object {\n+ \"margin\": 0,\n+ \"textAlign\": \"center\",\n+ }\n+ }\n+ >\n+ <span\n+ style={\n+ Object {\n+ \"marginLeft\": \"-14px\",\n+ }\n+ }\n+ >\n+ <ForwardRef(EnvironmentFilled) />\n+ \n+ SPB\n+ </span>\n+ </Paragraph>\n+ <PermissionsSettingsDrawer\n+ hideSettings={[Function]}\n+ isSettingsVisible={false}\n+ onPermissionsSettingsChange={[Function]}\n+ />\n+ <ProfileSettingsDrawer\n+ content={\n+ <div>\n+ <p\n+ style={\n+ Object {\n+ \"fontSize\": 18,\n+ \"marginBottom\": 5,\n+ }\n+ }\n+ >\n+ <Text\n+ strong={true}\n+ >\n+ Name:\n+ </Text>\n+ </p>\n+ <p\n+ style={\n+ Object {\n+ \"marginBottom\": 20,\n+ }\n+ }\n+ >\n+ <Input\n+ onChange={[Function]}\n+ placeholder=\"Firstname Lastname\"\n+ type=\"text\"\n+ value=\"Petr Pervyi\"\n+ />\n+ </p>\n+ <p\n+ style={\n+ Object {\n+ \"fontSize\": 18,\n+ \"marginBottom\": 5,\n+ }\n+ }\n+ >\n+ <Text\n+ strong={true}\n+ >\n+ Location:\n+ </Text>\n+ </p>\n+ <div\n+ style={\n+ Object {\n+ \"marginBottom\": 5,\n+ }\n+ }\n+ >\n+ <LocationSelect\n+ defaultValue=\"1\"\n+ onChange={[Function]}\n+ style={\n+ Object {\n+ \"width\": \"100%\",\n+ }\n+ }\n+ />\n+ </div>\n+ </div>\n+ }\n+ hideSettings={[Function]}\n+ isSettingsVisible={false}\n+ />\n+ </Card>\n+</Fragment>\n+`;\ndiff --git a/client/src/jest.config.js b/client/src/jest.config.js\nindex df39788..654f9f3 100644\n--- a/client/src/jest.config.js\n+++ b/client/src/jest.config.js\n@@ -7,4 +7,5 @@ module.exports = {\n '^services(.*)$': '<rootDir>/services/$1',\n '^utils(.*)$': '<rootDir>/utils/$1',\n },\n+ verbose: true,\n };\n", "diff --git a/README.md b/README.md\nindex de15ac5..5ad8b47 100755\n--- a/README.md\n+++ b/README.md\n@@ -16,13 +16,13 @@ content that will be loaded, similar to Facebook cards loaders.\n \n ## Features\n \n-* :gear: **Complety customizable:** you can change the colors, speed and sizes;\n+* :gear: **Completely customizable:** you can change the colors, speed and sizes;\n * :pencil2: **Create your own loading:** use the\n [create-react-content-loader](https://danilowoz.github.io/create-react-content-loader/) to create\n- your customs loadings easily;\n+ your custom loadings easily;\n * :ok_hand: **You can use right now:** there are a lot of presets to use the loader, see the\n [options](#options);\n-* :rocket: **Perfomance:** react-content-loader uses pure SVG to work, so it's works without any extra scritpt,\n+* :rocket: **Performance:** react-content-loader uses pure SVG to work, so it works without any extra scripts,\n canvas, etc;\n \n ## Usage\n"]
| 3 |
["0d23f1b3ed22e615b9611bb4eae01d2241e64dff", "f87659953e9af59bc7cb314a22dd076d988ef607", "88257ee720ed8ba136d49087c0d31373e8397dd5"]
|
["refactor", "test", "docs"]
|
fix `memtable` docstrings,add test for clickhouse-specific `create_table` parameters,add classname and style props for Playground
|
["diff --git a/ibis/expr/api.py b/ibis/expr/api.py\nindex 93fabaa..66a2ea9 100644\n--- a/ibis/expr/api.py\n+++ b/ibis/expr/api.py\n@@ -403,15 +403,21 @@ def memtable(\n >>> import ibis\n >>> t = ibis.memtable([{\"a\": 1}, {\"a\": 2}])\n >>> t\n+ PandasInMemoryTable\n+ data:\n+ DataFrameProxy:\n+ a\n+ 0 1\n+ 1 2\n \n >>> t = ibis.memtable([{\"a\": 1, \"b\": \"foo\"}, {\"a\": 2, \"b\": \"baz\"}])\n >>> t\n PandasInMemoryTable\n data:\n- ((1, 'foo'), (2, 'baz'))\n- schema:\n- a int8\n- b string\n+ DataFrameProxy:\n+ a b\n+ 0 1 foo\n+ 1 2 baz\n \n Create a table literal without column names embedded in the data and pass\n `columns`\n@@ -420,10 +426,22 @@ def memtable(\n >>> t\n PandasInMemoryTable\n data:\n- ((1, 'foo'), (2, 'baz'))\n- schema:\n- a int8\n- b string\n+ DataFrameProxy:\n+ a b\n+ 0 1 foo\n+ 1 2 baz\n+\n+ Create a table literal without column names embedded in the data. Ibis\n+ generates column names if none are provided.\n+\n+ >>> t = ibis.memtable([(1, \"foo\"), (2, \"baz\")])\n+ >>> t\n+ PandasInMemoryTable\n+ data:\n+ DataFrameProxy:\n+ col0 col1\n+ 0 1 foo\n+ 1 2 baz\n \"\"\"\n if columns is not None and schema is not None:\n raise NotImplementedError(\n", "diff --git a/ibis/backends/clickhouse/tests/test_client.py b/ibis/backends/clickhouse/tests/test_client.py\nindex 678683d..c4e2aec 100644\n--- a/ibis/backends/clickhouse/tests/test_client.py\n+++ b/ibis/backends/clickhouse/tests/test_client.py\n@@ -224,6 +224,21 @@ def test_create_table_data(con, data, engine, temp_table):\n assert len(t.execute()) == 3\n \n \n+def test_create_table_with_properties(con, temp_table):\n+ data = pd.DataFrame({\"a\": list(\"abcde\" * 20), \"b\": [1, 2, 3, 4, 5] * 20})\n+ n = len(data)\n+ t = con.create_table(\n+ temp_table,\n+ data,\n+ schema=ibis.schema(dict(a=\"string\", b=\"!uint32\")),\n+ order_by=[\"a\", \"b\"],\n+ partition_by=[\"a\"],\n+ sample_by=[\"b\"],\n+ settings={\"allow_nullable_key\": \"1\"},\n+ )\n+ assert t.count().execute() == n\n+\n+\n @pytest.mark.parametrize(\n \"engine\",\n [\n", "diff --git a/packages/docz-theme-default/src/components/ui/Render.tsx b/packages/docz-theme-default/src/components/ui/Render.tsx\nindex 197359b..943f9ab 100644\n--- a/packages/docz-theme-default/src/components/ui/Render.tsx\n+++ b/packages/docz-theme-default/src/components/ui/Render.tsx\n@@ -24,9 +24,16 @@ const Code = styled('div')`\n }\n `\n \n-export const Render: RenderComponent = ({ component, code }) => (\n+export const Render: RenderComponent = ({\n+ component,\n+ code,\n+ className,\n+ style,\n+}) => (\n <Fragment>\n- <Playground>{component}</Playground>\n+ <Playground className={className} style={style}>\n+ {component}\n+ </Playground>\n <Code>{code}</Code>\n </Fragment>\n )\ndiff --git a/packages/docz/src/components/DocPreview.tsx b/packages/docz/src/components/DocPreview.tsx\nindex ca2d88f..ee8f7c0 100644\n--- a/packages/docz/src/components/DocPreview.tsx\n+++ b/packages/docz/src/components/DocPreview.tsx\n@@ -16,6 +16,8 @@ const DefaultLoading: SFC = () => null\n export type RenderComponent = ComponentType<{\n component: JSX.Element\n code: any\n+ className?: string\n+ style?: any\n }>\n \n export const DefaultRender: RenderComponent = ({ component, code }) => (\ndiff --git a/packages/docz/src/components/Playground.tsx b/packages/docz/src/components/Playground.tsx\nindex d6ff5a3..418c82e 100644\n--- a/packages/docz/src/components/Playground.tsx\n+++ b/packages/docz/src/components/Playground.tsx\n@@ -9,15 +9,21 @@ export interface PlaygroundProps {\n __code: (components: ComponentsMap) => any\n children: any\n components: ComponentsMap\n+ className?: string\n+ style?: any\n }\n \n const BasePlayground: SFC<PlaygroundProps> = ({\n components,\n children,\n __code,\n+ className,\n+ style,\n }) => {\n return components && components.render ? (\n <components.render\n+ className={className}\n+ style={style}\n component={isFn(children) ? children() : children}\n code={__code(components)}\n />\n"]
| 3 |
["72bc0f5172c0a3d17bde29cfc00db4c60d2fee3a", "7e1ece7d3fd41d1e3ee38e479c119494bb269966", "1b64ed30a2e3c41abf3976efee4c7463044b2ef1"]
|
["docs", "test", "feat"]
|
Deploy utilities from correct folder
Signed-off-by: rjshrjndrn <[email protected]>,add canonical `_name` to edge packages,implement array flatten support
|
["diff --git a/.github/workflows/utilities.yaml b/.github/workflows/utilities.yaml\nindex 92e130c..afbc850 100644\n--- a/.github/workflows/utilities.yaml\n+++ b/.github/workflows/utilities.yaml\n@@ -43,7 +43,7 @@ jobs:\n PUSH_IMAGE=1 bash build.sh\n - name: Deploy to kubernetes\n run: |\n- cd scripts/helm/\n+ cd scripts/helmcharts/\n sed -i \"s#openReplayContainerRegistry.*#openReplayContainerRegistry: \\\"${{ secrets.OSS_REGISTRY_URL }}\\\"#g\" vars.yaml\n sed -i \"s#minio_access_key.*#minio_access_key: \\\"${{ secrets.OSS_MINIO_ACCESS_KEY }}\\\" #g\" vars.yaml\n sed -i \"s#minio_secret_key.*#minio_secret_key: \\\"${{ secrets.OSS_MINIO_SECRET_KEY }}\\\" #g\" vars.yaml\n", "diff --git a/scripts/bump-edge.ts b/scripts/bump-edge.ts\nindex e92e3c9..0b7a11a 100644\n--- a/scripts/bump-edge.ts\n+++ b/scripts/bump-edge.ts\n@@ -53,6 +53,7 @@ async function loadWorkspace (dir: string) {\n }\n \n const rename = (from: string, to: string) => {\n+ find(from).data._name = find(from).data.name\n find(from).data.name = to\n for (const pkg of packages) {\n pkg.updateDeps((dep) => {\n", "diff --git a/ibis/backends/snowflake/registry.py b/ibis/backends/snowflake/registry.py\nindex 2373dd7..4ce03b0 100644\n--- a/ibis/backends/snowflake/registry.py\n+++ b/ibis/backends/snowflake/registry.py\n@@ -422,6 +422,7 @@ operation_registry.update(\n ops.ArrayZip: _array_zip,\n ops.ArraySort: unary(sa.func.array_sort),\n ops.ArrayRepeat: fixed_arity(sa.func.ibis_udfs.public.array_repeat, 2),\n+ ops.ArrayFlatten: fixed_arity(sa.func.array_flatten, 1),\n ops.StringSplit: fixed_arity(sa.func.split, 2),\n # snowflake typeof only accepts VARIANT, so we cast\n ops.TypeOf: unary(lambda arg: sa.func.typeof(sa.func.to_variant(arg))),\n"]
| 3 |
["2ebf04099353ef70395b8c8f5e130f70e1ed0814", "573f87edf9bdc19c9c4c3a978fad6ed3ce788f5f", "d3c754f09502be979e5dcc79f968b15052590bd0"]
|
["ci", "build", "feat"]
|
Use arm64v8 postfix for Cube Store :dev build,fix build,101: fix import key cmd
Signed-off-by: Sam Alba <[email protected]>
|
["diff --git a/.github/workflows/rust-cubestore-master.yml b/.github/workflows/rust-cubestore-master.yml\nindex 4a84984..bb07cd7 100644\n--- a/.github/workflows/rust-cubestore-master.yml\n+++ b/.github/workflows/rust-cubestore-master.yml\n@@ -115,9 +115,9 @@ jobs:\n if [[ $VERSION =~ ^v[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}$ ]]; then\n MINOR=${VERSION%.*}\n MAJOR=${MINOR%.*}\n- TAGS=\"$TAGS,${DOCKER_IMAGE}:${MINOR},${DOCKER_IMAGE}:${MAJOR},${DOCKER_IMAGE}:latest\"\n+ TAGS=\"$TAGS,${DOCKER_IMAGE}:${MINOR},${DOCKER_IMAGE}:${MAJOR}\"\n elif [ \"${{ github.event_name }}\" = \"push\" ]; then\n- TAGS=\"$TAGS,${DOCKER_IMAGE}:build-1${GITHUB_RUN_NUMBER}\"\n+ TAGS=\"$TAGS,${DOCKER_IMAGE}:build-1${GITHUB_RUN_NUMBER}${{ matrix.postfix }}\"\n fi\n \n echo ::set-output name=version::${VERSION}\n", "diff --git a/server/Dockerfile b/server/Dockerfile\nindex 2f203bb..a84c31e 100755\n--- a/server/Dockerfile\n+++ b/server/Dockerfile\n@@ -9,9 +9,11 @@ ENV TZ utc\n WORKDIR /src\n \n COPY package.json /src\n+COPY package-lock.json /src\n+COPY tsconfig.json /src\n RUN npm install --production --no-optional\n \n COPY public /src/public\n COPY dist /src\n \n-CMD [ \"node\", \"./server/index.js\" ]\n+CMD [ \"node\", \"-r\", \"tsconfig-paths/register\", \"./server/index.js\" ]\ndiff --git a/server/package-lock.json b/server/package-lock.json\nindex 6cacfa2..236f1bb 100644\n--- a/server/package-lock.json\n+++ b/server/package-lock.json\n@@ -2164,8 +2164,7 @@\n \"@types/json5\": {\n \"version\": \"0.0.29\",\n \"resolved\": \"https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz\",\n- \"integrity\": \"sha1-7ihweulOEdK4J7y+UnC86n8+ce4=\",\n- \"dev\": true\n+ \"integrity\": \"sha1-7ihweulOEdK4J7y+UnC86n8+ce4=\"\n },\n \"@types/jsonwebtoken\": {\n \"version\": \"8.3.5\",\n@@ -9246,8 +9245,7 @@\n \"strip-bom\": {\n \"version\": \"3.0.0\",\n \"resolved\": \"https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz\",\n- \"integrity\": \"sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=\",\n- \"dev\": true\n+ \"integrity\": \"sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=\"\n },\n \"strip-final-newline\": {\n \"version\": \"2.0.0\",\n@@ -9524,7 +9522,6 @@\n \"version\": \"3.9.0\",\n \"resolved\": \"https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz\",\n \"integrity\": \"sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==\",\n- \"dev\": true,\n \"requires\": {\n \"@types/json5\": \"^0.0.29\",\n \"json5\": \"^1.0.1\",\n@@ -9536,7 +9533,6 @@\n \"version\": \"1.0.1\",\n \"resolved\": \"https://registry.npmjs.org/json5/-/json5-1.0.1.tgz\",\n \"integrity\": \"sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==\",\n- \"dev\": true,\n \"requires\": {\n \"minimist\": \"^1.2.0\"\n }\n@@ -9544,8 +9540,7 @@\n \"minimist\": {\n \"version\": \"1.2.5\",\n \"resolved\": \"https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz\",\n- \"integrity\": \"sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==\",\n- \"dev\": true\n+ \"integrity\": \"sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==\"\n }\n }\n },\ndiff --git a/server/package.json b/server/package.json\nindex 35426e9..896e9b3 100644\n--- a/server/package.json\n+++ b/server/package.json\n@@ -41,6 +41,7 @@\n \"pino-cloudwatch\": \"0.7.0\",\n \"pino-multi-stream\": \"4.2.0\",\n \"reflect-metadata\": \"0.1.13\",\n+ \"tsconfig-paths\": \"3.9.0\",\n \"typeorm\": \"0.2.37\"\n },\n \"devDependencies\": {\n@@ -69,7 +70,6 @@\n \"pino-pretty\": \"3.6.1\",\n \"ts-jest\": \"27.0.7\",\n \"ts-node-dev\": \"1.1.8\",\n- \"tsconfig-paths\": \"3.9.0\",\n \"typescript\": \"4.3.5\"\n },\n \"jest-junit\": {\n", "diff --git a/docs/learn/101-use.md b/docs/learn/101-use.md\nindex 283c1c1..2ec10f9 100644\n--- a/docs/learn/101-use.md\n+++ b/docs/learn/101-use.md\n@@ -41,8 +41,7 @@ cd ./examples/todoapp\n The example app contains encrypted secrets and other pre-configured inputs, here is how to decrypt them:\n \n ```sh\n-curl -sfL https://releases.dagger.io/examples/key.txt >> ~/.config/dagger/keys.txt\n-dagger input list\n+dagger input list || curl -sfL https://releases.dagger.io/examples/key.txt >> ~/.config/dagger/keys.txt\n ```\n \n **Step 4**: Deploy!\n"]
| 3 |
["10bdcb452ff9d2b884d45a9c43a4b8a20fc4a883", "a827777f41e90b6332c191d05bae8db525de6f38", "2b01808ec86fe9d8b4a93141a1b7f95e11fd6010"]
|
["ci", "build", "docs"]
|
post installers compatiblity with Windows #2520,get ip from forwarded header,create mock img server
|
["diff --git a/packages/cubejs-databricks-jdbc-driver/package.json b/packages/cubejs-databricks-jdbc-driver/package.json\nindex cc164f0..fd7ad45 100644\n--- a/packages/cubejs-databricks-jdbc-driver/package.json\n+++ b/packages/cubejs-databricks-jdbc-driver/package.json\n@@ -14,13 +14,16 @@\n },\n \"main\": \"dist/src/index.js\",\n \"typings\": \"dist/src/index.d.ts\",\n+ \"bin\": {\n+ \"databricks-jdbc-installer\": \"bin/post-install\"\n+ },\n \"scripts\": {\n \"build\": \"rm -rf dist && npm run tsc\",\n \"tsc\": \"tsc\",\n \"watch\": \"tsc -w\",\n \"lint\": \"eslint src/* --ext .ts\",\n \"lint:fix\": \"eslint --fix src/* --ext .ts\",\n- \"postinstall\": \"bin/post-install\"\n+ \"postinstall\": \"databricks-jdbc-installer\"\n },\n \"files\": [\n \"README.md\",\ndiff --git a/rust/package.json b/rust/package.json\nindex b139279..5bf6446 100644\n--- a/rust/package.json\n+++ b/rust/package.json\n@@ -8,7 +8,8 @@\n \"node\": \">=10.8.0\"\n },\n \"bin\": {\n- \"cubestore-dev\": \"bin/cubestore-dev\"\n+ \"cubestore-dev\": \"bin/cubestore-dev\",\n+ \"cubestore-installer\": \"bin/post-install\"\n },\n \"scripts\": {\n \"build\": \"rm -rf dist && npm run tsc\",\n@@ -18,7 +19,7 @@\n \"lint:fix\": \"eslint --fix js-wrapper/* --ext .ts,js\",\n \"unit\": \"jest\",\n \"unit:debug\": \"jest --runInBand\",\n- \"postinstall\": \"bin/post-install\"\n+ \"postinstall\": \"cubestore-installer\"\n },\n \"files\": [\n \"dist\",\ndiff --git a/yarn.lock b/yarn.lock\nindex d2a4038..b59bb77 100644\n--- a/yarn.lock\n+++ b/yarn.lock\n@@ -4036,9 +4036,9 @@\n integrity sha512-7btbphLrKvo5yl/5CC2OCxUSMx1wV1wvGT1qDXkSt7yi00/YW7E8k6qzXqJHsp+WU0eoG7r6MTQQXI9lIvd0qA==\n \n \"@types/fs-extra@^9.0.1\", \"@types/fs-extra@^9.0.2\", \"@types/fs-extra@^9.0.8\":\n- version \"9.0.10\"\n- resolved \"https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.10.tgz#8023a72e3d06cf54929ea47ec7634e47f33f4046\"\n- integrity sha512-O9T2LLkRDiTlalOBdjEkcnT0MRdT2+wglCl7pJUJ3mkWkR8hX4K+5bg2raQNJcLv4V8zGuTXe7Ud3wSqkTyuyQ==\n+ version \"9.0.11\"\n+ resolved \"https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz#8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87\"\n+ integrity sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==\n dependencies:\n \"@types/node\" \"*\"\n \n@@ -5306,9 +5306,9 @@ acorn@^7.0.0, acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0:\n integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==\n \n acorn@^8.1.0:\n- version \"8.1.0\"\n- resolved \"https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz#52311fd7037ae119cbb134309e901aa46295b3fe\"\n- integrity sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==\n+ version \"8.1.1\"\n+ resolved \"https://registry.yarnpkg.com/acorn/-/acorn-8.1.1.tgz#fb0026885b9ac9f48bac1e185e4af472971149ff\"\n+ integrity sha512-xYiIVjNuqtKXMxlRMDc6mZUhXehod4a3gbZ1qRlM7icK4EbxUFNLhWoPblCvFtB2Y9CIqHP3CF/rdxLItaQv8g==\n \n adal-node@^0.1.28:\n version \"0.1.28\"\n@@ -5441,9 +5441,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv\n uri-js \"^4.2.2\"\n \n ajv@^8.0.1:\n- version \"8.0.5\"\n- resolved \"https://registry.yarnpkg.com/ajv/-/ajv-8.0.5.tgz#f07d6fdeffcdbb80485570ce3f1bc845fcc812b9\"\n- integrity sha512-RkiLa/AeJx7+9OvniQ/qeWu0w74A8DiPPBclQ6ji3ZQkv5KamO+QGpqmi7O4JIw3rHGUXZ6CoP9tsAkn3gyazg==\n+ version \"8.1.0\"\n+ resolved \"https://registry.yarnpkg.com/ajv/-/ajv-8.1.0.tgz#45d5d3d36c7cdd808930cc3e603cf6200dbeb736\"\n+ integrity sha512-B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ==\n dependencies:\n fast-deep-equal \"^3.1.1\"\n json-schema-traverse \"^1.0.0\"\n@@ -6828,15 +6828,15 @@ [email protected]:\n node-releases \"^1.1.61\"\n \n browserslist@^4.0.0, browserslist@^4.11.1, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.3.4, browserslist@^4.6.2, browserslist@^4.6.4, browserslist@^4.7.0, browserslist@^4.9.1:\n- version \"4.16.3\"\n- resolved \"https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717\"\n- integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==\n+ version \"4.16.4\"\n+ resolved \"https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.4.tgz#7ebf913487f40caf4637b892b268069951c35d58\"\n+ integrity sha512-d7rCxYV8I9kj41RH8UKYnvDYCRENUlHRgyXy/Rhr/1BaeLGfiCptEdFE8MIrvGfWbBFNjVYx76SQWvNX1j+/cQ==\n dependencies:\n- caniuse-lite \"^1.0.30001181\"\n- colorette \"^1.2.1\"\n- electron-to-chromium \"^1.3.649\"\n+ caniuse-lite \"^1.0.30001208\"\n+ colorette \"^1.2.2\"\n+ electron-to-chromium \"^1.3.712\"\n escalade \"^3.1.1\"\n- node-releases \"^1.1.70\"\n+ node-releases \"^1.1.71\"\n \n [email protected]:\n version \"0.2.6\"\n@@ -7217,7 +7217,7 @@ caniuse-api@^3.0.0:\n lodash.memoize \"^4.1.2\"\n lodash.uniq \"^4.5.0\"\n \n-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001061, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001181:\n+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001061, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001208:\n version \"1.0.30001208\"\n resolved \"https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz#a999014a35cebd4f98c405930a057a0d75352eb9\"\n integrity sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==\n@@ -9549,10 +9549,10 @@ ejs@^2.6.1:\n resolved \"https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba\"\n integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==\n \n-electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.649:\n- version \"1.3.711\"\n- resolved \"https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.711.tgz#92c3caf7ffed5e18bf63f66b4b57b4db2409c450\"\n- integrity sha512-XbklBVCDiUeho0PZQCjC25Ha6uBwqqJeyDhPLwLwfWRAo4x+FZFsmu1pPPkXT+B4MQMQoQULfyaMltDopfeiHQ==\n+electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.712:\n+ version \"1.3.712\"\n+ resolved \"https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.712.tgz#ae467ffe5f95961c6d41ceefe858fc36eb53b38f\"\n+ integrity sha512-3kRVibBeCM4vsgoHHGKHmPocLqtFAGTrebXxxtgKs87hNUzXrX2NuS3jnBys7IozCnw7viQlozxKkmty2KNfrw==\n \n elegant-spinner@^1.0.1:\n version \"1.0.1\"\n@@ -9945,9 +9945,9 @@ eslint-plugin-import@^2.16.0, eslint-plugin-import@^2.18.2, eslint-plugin-import\n tsconfig-paths \"^3.9.0\"\n \n eslint-plugin-jest@^24.1.0:\n- version \"24.3.4\"\n- resolved \"https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.4.tgz#6d90c3554de0302e879603dd6405474c98849f19\"\n- integrity sha512-3n5oY1+fictanuFkTWPwSlehugBTAgwLnYLFsCllzE3Pl1BwywHl5fL0HFxmMjoQY8xhUDk8uAWc3S4JOHGh3A==\n+ version \"24.3.5\"\n+ resolved \"https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.5.tgz#71f0b580f87915695c286c3f0eb88cf23664d044\"\n+ integrity sha512-XG4rtxYDuJykuqhsOqokYIR84/C8pRihRtEpVskYLbIIKGwPNW2ySxdctuVzETZE+MbF/e7wmsnbNVpzM0rDug==\n dependencies:\n \"@typescript-eslint/experimental-utils\" \"^4.0.1\"\n \n@@ -12140,12 +12140,11 @@ [email protected]:\n micromatch \"^3.1.10\"\n \n http-proxy-middleware@^1.0.0:\n- version \"1.1.0\"\n- resolved \"https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.1.0.tgz#b896b2cc6836019af4a4f2d5f7b21b99c77ea13f\"\n- integrity sha512-OnjU5vyVgcZVe2AjLJyMrk8YLNOC2lspCHirB5ldM+B/dwEfZ5bgVTrFyzE9R7xRWAP/i/FXtvIqKjTNEZBhBg==\n+ version \"1.1.1\"\n+ resolved \"https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.1.1.tgz#48900a68cd9d388c735d1dd97302c919b7e94a13\"\n+ integrity sha512-FIDg9zPvOwMhQ3XKB2+vdxK6WWbVAH7s5QpqQCif7a1TNL76GNAATWA1sy6q2gSfss8UJ/Nwza3N6QnFkKclpA==\n dependencies:\n \"@types/http-proxy\" \"^1.17.5\"\n- camelcase \"^6.2.0\"\n http-proxy \"^1.18.1\"\n is-glob \"^4.0.1\"\n is-plain-obj \"^3.0.0\"\n@@ -14341,9 +14340,9 @@ jsdom@^15.2.1:\n xml-name-validator \"^3.0.0\"\n \n jsdom@^16.4.0:\n- version \"16.5.2\"\n- resolved \"https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.2.tgz#583fac89a0aea31dbf6237e7e4bedccd9beab472\"\n- integrity sha512-JxNtPt9C1ut85boCbJmffaQ06NBnzkQY/MWO3YxPW8IWS38A26z+B1oBvA9LwKrytewdfymnhi4UNH3/RAgZrg==\n+ version \"16.5.3\"\n+ resolved \"https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz#13a755b3950eb938b4482c407238ddf16f0d2136\"\n+ integrity sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA==\n dependencies:\n abab \"^2.0.5\"\n acorn \"^8.1.0\"\n@@ -15590,12 +15589,12 @@ micromatch@^3.1.10, micromatch@^3.1.4:\n to-regex \"^3.0.2\"\n \n micromatch@^4.0.2:\n- version \"4.0.3\"\n- resolved \"https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.3.tgz#fdad8352bf0cbeb89b391b5d244bc22ff3dd4ec8\"\n- integrity sha512-ueuSaP4i67F/FAUac9zzZ0Dz/5KeKDkITYIS/k4fps+9qeh1SkeH6gbljcqz97mNBOsaWZ+iv2UobMKK/yD+aw==\n+ version \"4.0.4\"\n+ resolved \"https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9\"\n+ integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==\n dependencies:\n braces \"^3.0.1\"\n- picomatch \"^2.2.1\"\n+ picomatch \"^2.2.3\"\n \n miller-rabin@^4.0.0:\n version \"4.0.1\"\n@@ -16356,7 +16355,7 @@ node-pre-gyp@^0.11.0:\n semver \"^5.3.0\"\n tar \"^4\"\n \n-node-releases@^1.1.61, node-releases@^1.1.70:\n+node-releases@^1.1.61, node-releases@^1.1.71:\n version \"1.1.71\"\n resolved \"https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb\"\n integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==\n@@ -17571,10 +17570,10 @@ [email protected]:\n dependencies:\n split2 \"^3.1.1\"\n \n-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2:\n- version \"2.2.2\"\n- resolved \"https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad\"\n- integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==\n+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3:\n+ version \"2.2.3\"\n+ resolved \"https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d\"\n+ integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==\n \n pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:\n version \"2.3.0\"\n@@ -18446,9 +18445,9 @@ postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, po\n supports-color \"^6.1.0\"\n \n postcss@^8.1.0, postcss@^8.2.8:\n- version \"8.2.9\"\n- resolved \"https://registry.yarnpkg.com/postcss/-/postcss-8.2.9.tgz#fd95ff37b5cee55c409b3fdd237296ab4096fba3\"\n- integrity sha512-b+TmuIL4jGtCHtoLi+G/PisuIl9avxs8IZMSmlABRwNz5RLUUACrC+ws81dcomz1nRezm5YPdXiMEzBEKgYn+Q==\n+ version \"8.2.10\"\n+ resolved \"https://registry.yarnpkg.com/postcss/-/postcss-8.2.10.tgz#ca7a042aa8aff494b334d0ff3e9e77079f6f702b\"\n+ integrity sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw==\n dependencies:\n colorette \"^1.2.2\"\n nanoid \"^3.1.22\"\n@@ -19318,9 +19317,9 @@ rc-tree@^4.0.0, rc-tree@~4.1.0:\n rc-virtual-list \"^3.0.1\"\n \n rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2, rc-trigger@^5.2.1:\n- version \"5.2.3\"\n- resolved \"https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.2.3.tgz#8c55046ab432d7b52d51c69afb57ebb5bbe37e17\"\n- integrity sha512-6Fokao07HUbqKIDkDRFEM0AGZvsvK0Fbp8A/KFgl1ngaqfO1nY037cISCG1Jm5fxImVsXp9awdkP7Vu5cxjjog==\n+ version \"5.2.4\"\n+ resolved \"https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.2.4.tgz#f1cca4a6c1f378a5d6fadec010292250772069d3\"\n+ integrity sha512-nLZa4XYo3hOAVauQr7HsGrBtE8/pyoIWhHZnpr7x/H/dd6pPeRzH0//+1TzaBAXylbFgsY6hogKAMeJwaKeDFw==\n dependencies:\n \"@babel/runtime\" \"^7.11.2\"\n classnames \"^2.2.6\"\n@@ -20516,9 +20515,9 @@ rollup@^1.31.1:\n acorn \"^7.1.0\"\n \n rollup@^2.40.0, rollup@^2.8.0:\n- version \"2.45.0\"\n- resolved \"https://registry.yarnpkg.com/rollup/-/rollup-2.45.0.tgz#bfcce2347c96f15f5c78ac860bc38e3349ba27c9\"\n- integrity sha512-JJznbtGIsHZfKH0Sa9RpCAy5JarH8SWvBzRAGuRkgzAafb8e8D7VSMJ0O1Bsix1nn91koN/Ecvl2+ZWhljcuTw==\n+ version \"2.45.1\"\n+ resolved \"https://registry.yarnpkg.com/rollup/-/rollup-2.45.1.tgz#eae2b94dc2088b4e0a3b7197a5a1ee0bdd589d5c\"\n+ integrity sha512-vPD+JoDj3CY8k6m1bLcAFttXMe78P4CMxoau0iLVS60+S9kLsv2379xaGy4NgYWu+h2WTlucpoLPAoUoixFBag==\n optionalDependencies:\n fsevents \"~2.3.1\"\n \n@@ -22971,9 +22970,9 @@ typescript@~4.1.5:\n integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==\n \n ua-parser-js@^0.7.18:\n- version \"0.7.27\"\n- resolved \"https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.27.tgz#b54f8ce9eb6c7abf3584edeaf9a3d8b3bd92edba\"\n- integrity sha512-eXMaRYK2skomGocoX0x9sBXzx5A1ZVQgXfrW4mTc8dT0zS7olEcyfudAzRC5tIIRgLxQ69B6jut3DI+n5hslPA==\n+ version \"0.7.28\"\n+ resolved \"https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31\"\n+ integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==\n \n [email protected]:\n version \"3.4.10\"\n@@ -22984,9 +22983,9 @@ [email protected]:\n source-map \"~0.6.1\"\n \n uglify-js@^3.1.4, uglify-js@^3.4.9:\n- version \"3.13.3\"\n- resolved \"https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.3.tgz#ce72a1ad154348ea2af61f50933c76cc8802276e\"\n- integrity sha512-otIc7O9LyxpUcQoXzj2hL4LPWKklO6LJWoJUzNa8A17Xgi4fOeDC8FBDOLHnC/Slo1CQgsZMcM6as0M76BZaig==\n+ version \"3.13.4\"\n+ resolved \"https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.4.tgz#592588bb9f47ae03b24916e2471218d914955574\"\n+ integrity sha512-kv7fCkIXyQIilD5/yQy8O+uagsYIOt5cZvs890W40/e/rvjMSzJw81o9Bg0tkURxzZBROtDQhW2LFjOGoK3RZw==\n \n [email protected]:\n version \"0.0.6\"\n", "diff --git a/kousa/lib/broth/socket_handler.ex b/kousa/lib/broth/socket_handler.ex\nindex d142135..5828f30 100644\n--- a/kousa/lib/broth/socket_handler.ex\n+++ b/kousa/lib/broth/socket_handler.ex\n@@ -22,7 +22,7 @@ defmodule Broth.SocketHandler do\n ## initialization boilerplate\n \n @impl true\n- def init(request = %{peer: {ip, _reverse_port}}, _state) do\n+ def init(request, _state) do\n props = :cowboy_req.parse_qs(request)\n \n compression =\n@@ -37,10 +37,16 @@ defmodule Broth.SocketHandler do\n _ -> :json\n end\n \n+ ip =\n+ case request.headers do\n+ %{\"x-forwarded-for\" => v} -> v\n+ _ -> nil\n+ end\n+\n state = %__MODULE__{\n awaiting_init: true,\n user_id: nil,\n- ip: IP.to_string(ip),\n+ ip: ip,\n encoding: encoding,\n compression: compression,\n callers: get_callers(request)\ndiff --git a/kousa/test/_support/ws_client.ex b/kousa/test/_support/ws_client.ex\nindex aeca704..125da17 100644\n--- a/kousa/test/_support/ws_client.ex\n+++ b/kousa/test/_support/ws_client.ex\n@@ -19,7 +19,9 @@ defmodule BrothTest.WsClient do\n \n @api_url\n |> Path.join(\"socket\")\n- |> WebSockex.start_link(__MODULE__, nil, extra_headers: [{\"user-agent\", ancestors}])\n+ |> WebSockex.start_link(__MODULE__, nil,\n+ extra_headers: [{\"user-agent\", ancestors}, {\"x-forwarded-for\", \"127.0.0.1\"}]\n+ )\n end\n \n ###########################################################################\n", "diff --git a/scripts/gulp/tasks/test.ts b/scripts/gulp/tasks/test.ts\nindex 8014b12..d10c1aa 100644\n--- a/scripts/gulp/tasks/test.ts\n+++ b/scripts/gulp/tasks/test.ts\n@@ -26,12 +26,18 @@ task('test.imageserver', () => {\n function handleRequest(req, res) {\n const urlParse = url.parse(req.url, true);\n \n+ res.setHeader('Access-Control-Allow-Origin', '*');\n+ res.setHeader('Access-Control-Allow-Methods', 'GET');\n+ res.setHeader('Connection', 'keep-alive');\n+ res.setHeader('Age', '0');\n+ res.setHeader('cache-control', 'no-store');\n+\n if (urlParse.pathname === '/reset') {\n console.log('Image Server Reset');\n console.log('---------------------------');\n requestedUrls.length = 0;\n start = Date.now();\n- res.setHeader('Access-Control-Allow-Origin', '*');\n+ res.setHeader('Content-Type', 'text/plain');\n res.end('reset');\n return;\n }\n@@ -48,9 +54,8 @@ task('test.imageserver', () => {\n \n setTimeout(() => {\n res.setHeader('Content-Type', 'image/svg+xml');\n- res.setHeader('Access-Control-Allow-Origin', '*');\n res.end(`<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n- style=\"background-color: ${color}; width: ${width}px; height: ${height}px;\">\n+ viewBox=\"0 0 ${width} ${height}\" style=\"background-color: ${color};\">\n <text x=\"5\" y=\"22\" style=\"font-family: Courier; font-size: 24px\">${id}</text>\n </svg>`);\n }, delay);\n"]
| 3 |
["7e9bd7c86df1032d53e752654fe4a446951480bb", "2f5718743a830d40ddf272ad46f253dbb6d08cff", "32b76173a259ea1993298289b436cf10c1e800bf"]
|
["build", "fix", "test"]
|
verify process can start at supported element types
Verifies a PI can be started at specific element types. The test will deploy the process, start an instance at the desired start element and verify that it has been activated succesfully.,get ip from forwarded header,update pr condition
|
["diff --git a/engine/src/test/java/io/camunda/zeebe/engine/processing/processinstance/CreateProcessInstanceSupportedElementTest.java b/engine/src/test/java/io/camunda/zeebe/engine/processing/processinstance/CreateProcessInstanceSupportedElementTest.java\nnew file mode 100644\nindex 0000000..a505307\n--- /dev/null\n+++ b/engine/src/test/java/io/camunda/zeebe/engine/processing/processinstance/CreateProcessInstanceSupportedElementTest.java\n@@ -0,0 +1,233 @@\n+/*\n+ * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH under\n+ * one or more contributor license agreements. See the NOTICE file distributed\n+ * with this work for additional information regarding copyright ownership.\n+ * Licensed under the Zeebe Community License 1.1. You may not use this file\n+ * except in compliance with the Zeebe Community License 1.1.\n+ */\n+package io.camunda.zeebe.engine.processing.processinstance;\n+\n+import static org.assertj.core.api.Assertions.assertThat;\n+import static org.assertj.core.groups.Tuple.tuple;\n+\n+import io.camunda.zeebe.engine.util.EngineRule;\n+import io.camunda.zeebe.model.bpmn.Bpmn;\n+import io.camunda.zeebe.model.bpmn.BpmnModelInstance;\n+import io.camunda.zeebe.protocol.record.Record;\n+import io.camunda.zeebe.protocol.record.intent.ProcessInstanceIntent;\n+import io.camunda.zeebe.protocol.record.value.BpmnElementType;\n+import io.camunda.zeebe.test.util.record.RecordingExporter;\n+import io.camunda.zeebe.test.util.record.RecordingExporterTestWatcher;\n+import java.util.Collection;\n+import java.util.Collections;\n+import java.util.List;\n+import java.util.Map;\n+import org.junit.ClassRule;\n+import org.junit.Rule;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.junit.runners.Parameterized;\n+import org.junit.runners.Parameterized.Parameters;\n+\n+@RunWith(Parameterized.class)\n+public class CreateProcessInstanceSupportedElementTest {\n+\n+ @ClassRule public static final EngineRule ENGINE = EngineRule.singlePartition();\n+ private static final String PROCESS_ID = \"processId\";\n+ private static final String CHILD_PROCESS_ID = \"childProcessId\";\n+ private static final String START_ELEMENT_ID = \"startElement\";\n+ private static final String MESSAGE = \"message\";\n+ private static final String JOBTYPE = \"jobtype\";\n+\n+ @Rule\n+ public final RecordingExporterTestWatcher recordingExporterTestWatcher =\n+ new RecordingExporterTestWatcher();\n+\n+ private final Scenario scenario;\n+\n+ public CreateProcessInstanceSupportedElementTest(final Scenario scenario) {\n+ this.scenario = scenario;\n+ }\n+\n+ @Parameters(name = \"{0}\")\n+ public static Collection<Object> scenarios() {\n+ return List.of(\n+ new Scenario(\n+ BpmnElementType.SUB_PROCESS,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .subProcess(START_ELEMENT_ID)\n+ .embeddedSubProcess()\n+ .startEvent()\n+ .subProcessDone()\n+ .done(),\n+ Collections.emptyMap()),\n+ new Scenario(\n+ BpmnElementType.EVENT_SUB_PROCESS,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .eventSubProcess(\n+ START_ELEMENT_ID, e -> e.startEvent().timerWithDuration(\"PT1H\").endEvent())\n+ .startEvent()\n+ .endEvent()\n+ .done(),\n+ Collections.emptyMap()),\n+ new Scenario(\n+ BpmnElementType.INTERMEDIATE_CATCH_EVENT,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .intermediateCatchEvent(START_ELEMENT_ID)\n+ .message(b -> b.name(MESSAGE).zeebeCorrelationKeyExpression(\"correlationKey\"))\n+ .done(),\n+ Map.of(\"correlationKey\", \"value\")),\n+ new Scenario(\n+ BpmnElementType.INTERMEDIATE_THROW_EVENT,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .intermediateThrowEvent(START_ELEMENT_ID)\n+ .endEvent()\n+ .done(),\n+ Collections.emptyMap()),\n+ new Scenario(\n+ BpmnElementType.END_EVENT,\n+ Bpmn.createExecutableProcess(PROCESS_ID).startEvent().endEvent(START_ELEMENT_ID).done(),\n+ Collections.emptyMap()),\n+ new Scenario(\n+ BpmnElementType.SERVICE_TASK,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .serviceTask(START_ELEMENT_ID, b -> b.zeebeJobType(JOBTYPE))\n+ .done(),\n+ Collections.emptyMap()),\n+ new Scenario(\n+ BpmnElementType.RECEIVE_TASK,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .receiveTask(START_ELEMENT_ID)\n+ .message(b -> b.name(MESSAGE).zeebeCorrelationKeyExpression(\"correlationKey\"))\n+ .done(),\n+ Map.of(\"correlationKey\", \"value\")),\n+ new Scenario(\n+ BpmnElementType.USER_TASK,\n+ Bpmn.createExecutableProcess(PROCESS_ID).startEvent().userTask(START_ELEMENT_ID).done(),\n+ Collections.emptyMap()),\n+ new Scenario(\n+ BpmnElementType.MANUAL_TASK,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .manualTask(START_ELEMENT_ID)\n+ .endEvent()\n+ .done(),\n+ Collections.emptyMap()),\n+ new Scenario(\n+ BpmnElementType.EXCLUSIVE_GATEWAY,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .exclusiveGateway(START_ELEMENT_ID)\n+ .defaultFlow()\n+ .endEvent()\n+ .done(),\n+ Collections.emptyMap()),\n+ new Scenario(\n+ BpmnElementType.PARALLEL_GATEWAY,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .parallelGateway(START_ELEMENT_ID)\n+ .endEvent()\n+ .done(),\n+ Collections.emptyMap()),\n+ new Scenario(\n+ BpmnElementType.EVENT_BASED_GATEWAY,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .eventBasedGateway(START_ELEMENT_ID)\n+ .intermediateCatchEvent()\n+ .message(b -> b.name(MESSAGE).zeebeCorrelationKeyExpression(\"correlationKey\"))\n+ .moveToLastGateway()\n+ .intermediateCatchEvent()\n+ .timerWithDuration(\"PT1H\")\n+ .done(),\n+ Map.of(\"correlationKey\", \"value\")),\n+ new Scenario(\n+ BpmnElementType.MULTI_INSTANCE_BODY,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .serviceTask(\n+ START_ELEMENT_ID,\n+ t ->\n+ t.zeebeJobType(JOBTYPE)\n+ .multiInstance(m -> m.parallel().zeebeInputCollectionExpression(\"[1]\")))\n+ .endEvent()\n+ .done(),\n+ Collections.emptyMap()),\n+ new Scenario(\n+ BpmnElementType.CALL_ACTIVITY,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .callActivity(START_ELEMENT_ID, c -> c.zeebeProcessId(CHILD_PROCESS_ID))\n+ .endEvent()\n+ .done(),\n+ Collections.emptyMap()),\n+ new Scenario(\n+ BpmnElementType.BUSINESS_RULE_TASK,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .businessRuleTask(START_ELEMENT_ID, b -> b.zeebeJobType(JOBTYPE))\n+ .done(),\n+ Collections.emptyMap()),\n+ new Scenario(\n+ BpmnElementType.SCRIPT_TASK,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .scriptTask(START_ELEMENT_ID, b -> b.zeebeJobType(JOBTYPE))\n+ .done(),\n+ Collections.emptyMap()),\n+ new Scenario(\n+ BpmnElementType.SEND_TASK,\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .sendTask(START_ELEMENT_ID, b -> b.zeebeJobType(JOBTYPE))\n+ .done(),\n+ Collections.emptyMap()));\n+ }\n+\n+ @Test\n+ public void testProcessInstanceCanStartAtElementType() {\n+ // given\n+ ENGINE.deployment().withXmlResource(scenario.modelInstance).deploy();\n+ if (scenario.type == BpmnElementType.CALL_ACTIVITY) {\n+ ENGINE.deployment().withXmlResource(getChildProcess()).deploy();\n+ }\n+\n+ // when\n+ final long instanceKey =\n+ ENGINE\n+ .processInstance()\n+ .ofBpmnProcessId(PROCESS_ID)\n+ .withStartInstruction(START_ELEMENT_ID)\n+ .withVariables(scenario.variables)\n+ .create();\n+\n+ // then\n+ assertThat(\n+ RecordingExporter.processInstanceRecords()\n+ .withProcessInstanceKey(instanceKey)\n+ .onlyEvents()\n+ .limit(\n+ r ->\n+ r.getValue().getBpmnElementType() == scenario.type\n+ && r.getIntent() == ProcessInstanceIntent.ELEMENT_ACTIVATED))\n+ .extracting(record -> record.getValue().getBpmnElementType(), Record::getIntent)\n+ .containsSequence(\n+ tuple(BpmnElementType.PROCESS, ProcessInstanceIntent.ELEMENT_ACTIVATING),\n+ tuple(BpmnElementType.PROCESS, ProcessInstanceIntent.ELEMENT_ACTIVATED),\n+ tuple(scenario.type, ProcessInstanceIntent.ELEMENT_ACTIVATING),\n+ tuple(scenario.type, ProcessInstanceIntent.ELEMENT_ACTIVATED));\n+ }\n+\n+ private BpmnModelInstance getChildProcess() {\n+ return Bpmn.createExecutableProcess(CHILD_PROCESS_ID).startEvent().endEvent().done();\n+ }\n+\n+ record Scenario(\n+ BpmnElementType type, BpmnModelInstance modelInstance, Map<String, Object> variables) {}\n+}\n", "diff --git a/kousa/lib/broth/socket_handler.ex b/kousa/lib/broth/socket_handler.ex\nindex d142135..5828f30 100644\n--- a/kousa/lib/broth/socket_handler.ex\n+++ b/kousa/lib/broth/socket_handler.ex\n@@ -22,7 +22,7 @@ defmodule Broth.SocketHandler do\n ## initialization boilerplate\n \n @impl true\n- def init(request = %{peer: {ip, _reverse_port}}, _state) do\n+ def init(request, _state) do\n props = :cowboy_req.parse_qs(request)\n \n compression =\n@@ -37,10 +37,16 @@ defmodule Broth.SocketHandler do\n _ -> :json\n end\n \n+ ip =\n+ case request.headers do\n+ %{\"x-forwarded-for\" => v} -> v\n+ _ -> nil\n+ end\n+\n state = %__MODULE__{\n awaiting_init: true,\n user_id: nil,\n- ip: IP.to_string(ip),\n+ ip: ip,\n encoding: encoding,\n compression: compression,\n callers: get_callers(request)\ndiff --git a/kousa/test/_support/ws_client.ex b/kousa/test/_support/ws_client.ex\nindex aeca704..125da17 100644\n--- a/kousa/test/_support/ws_client.ex\n+++ b/kousa/test/_support/ws_client.ex\n@@ -19,7 +19,9 @@ defmodule BrothTest.WsClient do\n \n @api_url\n |> Path.join(\"socket\")\n- |> WebSockex.start_link(__MODULE__, nil, extra_headers: [{\"user-agent\", ancestors}])\n+ |> WebSockex.start_link(__MODULE__, nil,\n+ extra_headers: [{\"user-agent\", ancestors}, {\"x-forwarded-for\", \"127.0.0.1\"}]\n+ )\n end\n \n ###########################################################################\n", "diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml\nindex 697ca8e..23f4475 100644\n--- a/.github/workflows/release-pr.yml\n+++ b/.github/workflows/release-pr.yml\n@@ -3,7 +3,6 @@ name: release\n on:\n issue_comment:\n types: [created]\n- contains: \"/trigger release\"\n \n env:\n # 7 GiB by default on GitHub, setting to 6 GiB\n@@ -11,6 +10,7 @@ env:\n \n jobs:\n release-pr:\n+ if: ${{ github.event.issue.pull_request && github.event.comment.body == '/trigger release' }}\n permissions:\n id-token: write\n runs-on: ubuntu-latest\n"]
| 3 |
["a5ecfdf49b0d4c43fbbbf7947be7c0327ccb3415", "2f5718743a830d40ddf272ad46f253dbb6d08cff", "f8c7b34bdeedcf1a4628cd50b23920afeaf57cb6"]
|
["test", "fix", "ci"]
|
remove unnecessary lines from verify-wal test,add Expr.equals benchmark,Downgrade @azure/* deps for Node.sj 10 compability
|
["diff --git a/storage/wal/verifier_test.go b/storage/wal/verifier_test.go\nindex 61e1536..a44755f 100644\n--- a/storage/wal/verifier_test.go\n+++ b/storage/wal/verifier_test.go\n@@ -138,22 +138,13 @@ func writeCorruptEntries(file *os.File, t *testing.T, n int) {\n \t\t}\n \t}\n \n-\n \t// Write some random bytes to the file to simulate corruption.\n \tif _, err := file.Write(corruption); err != nil {\n \t\tfatal(t, \"corrupt WAL segment\", err)\n \t}\n-\tcorrupt := []byte{1, 255, 0, 3, 45, 26, 110}\n-\n-\twrote, err := file.Write(corrupt)\n-\tif err != nil {\n-\t\tt.Fatal(err)\n-\t} else if wrote != len(corrupt) {\n-\t\tt.Fatal(\"Error writing corrupt data to file\")\n-\t}\n \n \tif err := file.Close(); err != nil {\n-\t\tt.Fatalf(\"Error: filed to close file: %v\\n\", err)\n+\t\tt.Fatalf(\"Error: failed to close file: %v\\n\", err)\n \t}\n }\n \n", "diff --git a/ibis/tests/benchmarks/test_benchmarks.py b/ibis/tests/benchmarks/test_benchmarks.py\nindex 78305bb..9c7e6d7 100644\n--- a/ibis/tests/benchmarks/test_benchmarks.py\n+++ b/ibis/tests/benchmarks/test_benchmarks.py\n@@ -1,3 +1,4 @@\n+import copy\n import functools\n import itertools\n import string\n@@ -340,8 +341,9 @@ def test_execute(benchmark, expression_fn, pt):\n benchmark(expr.execute)\n \n \n-def test_repr_tpc_h02(benchmark):\n- part = ibis.table(\[email protected]\n+def part():\n+ return ibis.table(\n dict(\n p_partkey=\"int64\",\n p_size=\"int64\",\n@@ -350,7 +352,11 @@ def test_repr_tpc_h02(benchmark):\n ),\n name=\"part\",\n )\n- supplier = ibis.table(\n+\n+\[email protected]\n+def supplier():\n+ return ibis.table(\n dict(\n s_suppkey=\"int64\",\n s_nationkey=\"int64\",\n@@ -362,7 +368,11 @@ def test_repr_tpc_h02(benchmark):\n ),\n name=\"supplier\",\n )\n- partsupp = ibis.table(\n+\n+\[email protected]\n+def partsupp():\n+ return ibis.table(\n dict(\n ps_partkey=\"int64\",\n ps_suppkey=\"int64\",\n@@ -370,14 +380,25 @@ def test_repr_tpc_h02(benchmark):\n ),\n name=\"partsupp\",\n )\n- nation = ibis.table(\n+\n+\[email protected]\n+def nation():\n+ return ibis.table(\n dict(n_nationkey=\"int64\", n_regionkey=\"int64\", n_name=\"string\"),\n name=\"nation\",\n )\n- region = ibis.table(\n+\n+\[email protected]\n+def region():\n+ return ibis.table(\n dict(r_regionkey=\"int64\", r_name=\"string\"), name=\"region\"\n )\n \n+\[email protected]\n+def tpc_h02(part, supplier, partsupp, nation, region):\n REGION = \"EUROPE\"\n SIZE = 25\n TYPE = \"BRASS\"\n@@ -420,7 +441,7 @@ def test_repr_tpc_h02(benchmark):\n ]\n )\n \n- expr = q.sort_by(\n+ return q.sort_by(\n [\n ibis.desc(q.s_acctbal),\n q.n_name,\n@@ -429,7 +450,9 @@ def test_repr_tpc_h02(benchmark):\n ]\n ).limit(100)\n \n- benchmark(repr, expr)\n+\n+def test_repr_tpc_h02(benchmark, tpc_h02):\n+ benchmark(repr, tpc_h02)\n \n \n def test_repr_huge_union(benchmark):\n@@ -478,3 +501,7 @@ def test_complex_datatype_builtins(benchmark, func):\n )\n )\n benchmark(func, datatype)\n+\n+\n+def test_large_expr_equals(benchmark, tpc_h02):\n+ benchmark(ir.Expr.equals, tpc_h02, copy.deepcopy(tpc_h02))\n", "diff --git a/package.json b/package.json\nindex 911f8cd..ac29f54 100644\n--- a/package.json\n+++ b/package.json\n@@ -79,7 +79,13 @@\n \"resolutions\": {\n \"@types/ramda\": \"0.27.40\",\n \"rc-tree\": \"4.1.5\",\n+ \"@azure/storage-blob\": \"12.7.0\",\n+ \"@azure/core-paging\": \"1.1.3\",\n+ \"@azure/logger\": \"1.0.0\",\n \"@azure/core-auth\": \"1.2.0\",\n+ \"@azure/core-lro\": \"1.0.5\",\n+ \"@azure/core-tracing\": \"1.0.0-preview.10\",\n+ \"@azure/core-http\": \"1.2.6\",\n \"testcontainers\": \"7.12.1\"\n },\n \"license\": \"MIT\"\ndiff --git a/yarn.lock b/yarn.lock\nindex 5019f68..99235b5 100644\n--- a/yarn.lock\n+++ b/yarn.lock\n@@ -1144,19 +1144,19 @@\n \"@azure/abort-controller\" \"^1.0.0\"\n tslib \"^2.0.0\"\n \n-\"@azure/core-http@^2.0.0\":\n- version \"2.2.2\"\n- resolved \"https://registry.yarnpkg.com/@azure/core-http/-/core-http-2.2.2.tgz#573798f087d808d39aa71fd7c52b8d7b89f440da\"\n- integrity sha512-V1DdoO9V/sFimKpdWoNBgsE+QUjQgpXYnxrTdUp5RyhsTJjvEVn/HKmTQXIHuLUUo6IyIWj+B+Dg4VaXse9dIA==\n+\"@azure/[email protected]\", \"@azure/core-http@^1.2.0\", \"@azure/core-http@^2.0.0\":\n+ version \"1.2.6\"\n+ resolved \"https://registry.yarnpkg.com/@azure/core-http/-/core-http-1.2.6.tgz#9cd508418572d2062fd3175274219438772bdb65\"\n+ integrity sha512-odtH7UMKtekc5YQ86xg9GlVHNXR6pq2JgJ5FBo7/jbOjNGdBqcrIVrZx2bevXVJz/uUTSx6vUf62gzTXTfqYSQ==\n dependencies:\n \"@azure/abort-controller\" \"^1.0.0\"\n \"@azure/core-asynciterator-polyfill\" \"^1.0.0\"\n \"@azure/core-auth\" \"^1.3.0\"\n- \"@azure/core-tracing\" \"1.0.0-preview.13\"\n+ \"@azure/core-tracing\" \"1.0.0-preview.11\"\n \"@azure/logger\" \"^1.0.0\"\n \"@types/node-fetch\" \"^2.5.0\"\n- \"@types/tunnel\" \"^0.0.3\"\n- form-data \"^4.0.0\"\n+ \"@types/tunnel\" \"^0.0.1\"\n+ form-data \"^3.0.0\"\n node-fetch \"^2.6.0\"\n process \"^0.11.10\"\n tough-cookie \"^4.0.0\"\n@@ -1165,38 +1165,39 @@\n uuid \"^8.3.0\"\n xml2js \"^0.4.19\"\n \n-\"@azure/core-lro@^2.2.0\":\n- version \"2.2.1\"\n- resolved \"https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.2.1.tgz#5527b41037c658d3aefc19d68633e51e53d6e6a3\"\n- integrity sha512-HE6PBl+mlKa0eBsLwusHqAqjLc5n9ByxeDo3Hz4kF3B1hqHvRkBr4oMgoT6tX7Hc3q97KfDctDUon7EhvoeHPA==\n+\"@azure/[email protected]\", \"@azure/core-lro@^2.0.0\":\n+ version \"1.0.5\"\n+ resolved \"https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-1.0.5.tgz#856a2cb6a9bec739ee9cde33a27cc28f81ac0522\"\n+ integrity sha512-0EFCFZxARrIoLWMIRt4vuqconRVIO2Iin7nFBfJiYCCbKp5eEmxutNk8uqudPmG0XFl5YqlVh68/al/vbE5OOg==\n dependencies:\n \"@azure/abort-controller\" \"^1.0.0\"\n- \"@azure/core-tracing\" \"1.0.0-preview.13\"\n- \"@azure/logger\" \"^1.0.0\"\n- tslib \"^2.2.0\"\n+ \"@azure/core-http\" \"^1.2.0\"\n+ \"@azure/core-tracing\" \"1.0.0-preview.11\"\n+ events \"^3.0.0\"\n+ tslib \"^2.0.0\"\n \n-\"@azure/core-paging@^1.1.1\":\n- version \"1.2.0\"\n- resolved \"https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.2.0.tgz#3754da429e8687bdc3613c750e79a564582e802b\"\n- integrity sha512-ZX1bCjm/MjKPCN6kQD/9GJErYSoKA8YWp6YWoo5EIzcTWlSBLXu3gNaBTUl8usGl+UShiKo7b4Gdy1NSTIlpZg==\n+\"@azure/[email protected]\", \"@azure/core-paging@^1.1.1\":\n+ version \"1.1.3\"\n+ resolved \"https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.1.3.tgz#3587c9898a0530cacb64bab216d7318468aa5efc\"\n+ integrity sha512-his7Ah40ThEYORSpIAwuh6B8wkGwO/zG7gqVtmSE4WAJ46e36zUDXTKReUCLBDc6HmjjApQQxxcRFy5FruG79A==\n dependencies:\n \"@azure/core-asynciterator-polyfill\" \"^1.0.0\"\n- tslib \"^2.2.0\"\n \n-\"@azure/[email protected]\":\n- version \"1.0.0-preview.13\"\n- resolved \"https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz#55883d40ae2042f6f1e12b17dd0c0d34c536d644\"\n- integrity sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==\n+\"@azure/[email protected]\", \"@azure/[email protected]\", \"@azure/[email protected]\":\n+ version \"1.0.0-preview.10\"\n+ resolved \"https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.10.tgz#e7060272145dddad4486765030d1b037cd52a8ea\"\n+ integrity sha512-iIwjtMwQnsxB7cYkugMx+s4W1nfy3+pT/ceo+uW1fv4YDgYe84nh+QP0fEC9IH/3UATLSWbIBemdMHzk2APUrw==\n dependencies:\n- \"@opentelemetry/api\" \"^1.0.1\"\n- tslib \"^2.2.0\"\n+ \"@opencensus/web-types\" \"0.0.7\"\n+ \"@opentelemetry/api\" \"^0.10.2\"\n+ tslib \"^2.0.0\"\n \n-\"@azure/logger@^1.0.0\":\n- version \"1.0.3\"\n- resolved \"https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.3.tgz#6e36704aa51be7d4a1bae24731ea580836293c96\"\n- integrity sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==\n+\"@azure/[email protected]\", \"@azure/logger@^1.0.0\":\n+ version \"1.0.0\"\n+ resolved \"https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.0.tgz#48b371dfb34288c8797e5c104f6c4fb45bf1772c\"\n+ integrity sha512-g2qLDgvmhyIxR3JVS8N67CyIOeFRKQlX/llxYJQr1OSGQqM3HTpVP8MjmjcEKbL/OIt2N9C9UFaNQuKOw1laOA==\n dependencies:\n- tslib \"^2.2.0\"\n+ tslib \"^1.9.3\"\n \n \"@azure/ms-rest-azure-env@^2.0.0\":\n version \"2.0.0\"\n@@ -1227,19 +1228,19 @@\n \"@azure/ms-rest-js\" \"^2.0.4\"\n adal-node \"^0.2.2\"\n \n-\"@azure/storage-blob@^12.5.0\":\n- version \"12.8.0\"\n- resolved \"https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.8.0.tgz#97b7ecc6c7b17bcbaf0281c79c16af6f512d6130\"\n- integrity sha512-c8+Wz19xauW0bGkTCoqZH4dYfbtBniPiGiRQOn1ca6G5jsjr4azwaTk9gwjVY8r3vY2Taf95eivLzipfIfiS4A==\n+\"@azure/[email protected]\", \"@azure/storage-blob@^12.5.0\":\n+ version \"12.7.0\"\n+ resolved \"https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.7.0.tgz#f17f278000a46bca516e5864d846cd8fa57d6d7d\"\n+ integrity sha512-7YEWEx03Us/YBxthzBv788R7jokwpCD5KcIsvtE5xRaijNX9o80KXpabhEwLR9DD9nmt/AlU/c1R+aXydgCduQ==\n dependencies:\n \"@azure/abort-controller\" \"^1.0.0\"\n \"@azure/core-http\" \"^2.0.0\"\n- \"@azure/core-lro\" \"^2.2.0\"\n+ \"@azure/core-lro\" \"^2.0.0\"\n \"@azure/core-paging\" \"^1.1.1\"\n \"@azure/core-tracing\" \"1.0.0-preview.13\"\n \"@azure/logger\" \"^1.0.0\"\n events \"^3.0.0\"\n- tslib \"^2.2.0\"\n+ tslib \"^2.0.0\"\n \n \"@babel/cli@^7.5.5\":\n version \"7.16.0\"\n@@ -2888,9 +2889,9 @@\n integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==\n \n \"@google-cloud/bigquery@^5.6.0\":\n- version \"5.9.1\"\n- resolved \"https://registry.yarnpkg.com/@google-cloud/bigquery/-/bigquery-5.9.1.tgz#96cee86fa0caef4a7e1470efde9295bc09f5981f\"\n- integrity sha512-80pMzhAC299CSiXW9TvR8AARLaPRDeQg8pSAvrVcLXcUkx1hWvVx2m94nBZ4KUoZb4LVWIHHYhvFB6XvIcxqjw==\n+ version \"5.9.2\"\n+ resolved \"https://registry.yarnpkg.com/@google-cloud/bigquery/-/bigquery-5.9.2.tgz#d53eac984fdd256d31be490762157e5f6c5b82c3\"\n+ integrity sha512-lJiMsSekcnhrzzR9e48yx8iOx+ElP3r/wOoionXL6eDPbA41RgP12if5NmMqHZzfWdKlWV2plspEPrbjhJAzCw==\n dependencies:\n \"@google-cloud/common\" \"^3.1.0\"\n \"@google-cloud/paginator\" \"^3.0.0\"\n@@ -4831,11 +4832,28 @@\n resolved \"https://registry.yarnpkg.com/@oozcitak/util/-/util-8.3.8.tgz#10f65fe1891fd8cde4957360835e78fd1936bfdd\"\n integrity sha512-T8TbSnGsxo6TDBJx/Sgv/BlVJL3tshxZP7Aq5R1mSnM5OcHY2dQaxLMu2+E8u3gN0MLOzdjurqN4ZRVuzQycOQ==\n \n-\"@opentelemetry/api@^1.0.0\", \"@opentelemetry/api@^1.0.1\":\n+\"@opencensus/[email protected]\":\n+ version \"0.0.7\"\n+ resolved \"https://registry.yarnpkg.com/@opencensus/web-types/-/web-types-0.0.7.tgz#4426de1fe5aa8f624db395d2152b902874f0570a\"\n+ integrity sha512-xB+w7ZDAu3YBzqH44rCmG9/RlrOmFuDPt/bpf17eJr8eZSrLt7nc7LnWdxM9Mmoj/YKMHpxRg28txu3TcpiL+g==\n+\n+\"@opentelemetry/api@^0.10.2\":\n+ version \"0.10.2\"\n+ resolved \"https://registry.yarnpkg.com/@opentelemetry/api/-/api-0.10.2.tgz#9647b881f3e1654089ff7ea59d587b2d35060654\"\n+ integrity sha512-GtpMGd6vkzDMYcpu2t9LlhEgMy/SzBwRnz48EejlRArYqZzqSzAsKmegUK7zHgl+EOIaK9mKHhnRaQu3qw20cA==\n+ dependencies:\n+ \"@opentelemetry/context-base\" \"^0.10.2\"\n+\n+\"@opentelemetry/api@^1.0.0\":\n version \"1.0.3\"\n resolved \"https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.0.3.tgz#13a12ae9e05c2a782f7b5e84c3cbfda4225eaf80\"\n integrity sha512-puWxACExDe9nxbBB3lOymQFrLYml2dVOrd7USiVRnSbgXE+KwBu+HxFvxrzfqsiSda9IWsXJG1ef7C1O2/GmKQ==\n \n+\"@opentelemetry/context-base@^0.10.2\":\n+ version \"0.10.2\"\n+ resolved \"https://registry.yarnpkg.com/@opentelemetry/context-base/-/context-base-0.10.2.tgz#55bea904b2b91aa8a8675df9eaba5961bddb1def\"\n+ integrity sha512-hZNKjKOYsckoOEgBziGMnBcX0M7EtstnCmwz5jZUOUYwlZ+/xxX6z3jPu1XVO2Jivk0eLfuP9GP+vFD49CMetw==\n+\n \"@opentelemetry/semantic-conventions@^0.24.0\":\n version \"0.24.0\"\n resolved \"https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-0.24.0.tgz#1028ef0e0923b24916158d80d2ddfd67ea8b6740\"\n@@ -5564,9 +5582,9 @@\n integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=\n \n \"@types/jsonwebtoken@^8.5.0\":\n- version \"8.5.5\"\n- resolved \"https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.5.5.tgz#da5f2f4baee88f052ef3e4db4c1a0afb46cff22c\"\n- integrity sha512-OGqtHQ7N5/Ap/TUwO6IgHDuLiAoTmHhGpNvgkCm/F4N6pKzx/RBSfr2OXZSwC6vkfnsEdb6+7DNZVtiXiwdwFw==\n+ version \"8.5.6\"\n+ resolved \"https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.5.6.tgz#1913e5a61e70a192c5a444623da4901a7b1a9d42\"\n+ integrity sha512-+P3O/xC7nzVizIi5VbF34YtqSonFsdnbXBnWUCYRiKOi1f9gA4sEFvXkrGr/QVV23IbMYvcoerI7nnhDUiWXRQ==\n dependencies:\n \"@types/node\" \"*\"\n \n@@ -5753,18 +5771,18 @@\n \"@types/react\" \"*\"\n \n \"@types/react@*\", \"@types/react@^17.0.3\":\n- version \"17.0.34\"\n- resolved \"https://registry.yarnpkg.com/@types/react/-/react-17.0.34.tgz#797b66d359b692e3f19991b6b07e4b0c706c0102\"\n- integrity sha512-46FEGrMjc2+8XhHXILr+3+/sTe3OfzSPU9YGKILLrUYbQ1CLQC9Daqo1KzENGXAWwrFwiY0l4ZbF20gRvgpWTg==\n+ version \"17.0.35\"\n+ resolved \"https://registry.yarnpkg.com/@types/react/-/react-17.0.35.tgz#217164cf830267d56cd1aec09dcf25a541eedd4c\"\n+ integrity sha512-r3C8/TJuri/SLZiiwwxQoLAoavaczARfT9up9b4Jr65+ErAUX3MIkU0oMOQnrpfgHme8zIqZLX7O5nnjm5Wayw==\n dependencies:\n \"@types/prop-types\" \"*\"\n \"@types/scheduler\" \"*\"\n csstype \"^3.0.2\"\n \n \"@types/react@^16.9.41\":\n- version \"16.14.20\"\n- resolved \"https://registry.yarnpkg.com/@types/react/-/react-16.14.20.tgz#ff6e932ad71d92c27590e4a8667c7a53a7d0baad\"\n- integrity sha512-SV7TaVc8e9E/5Xuv6TIyJ5VhQpZoVFJqX6IZgj5HZoFCtIDCArE3qXkcHlc6O/Ud4UwcMoX+tlvDA95YrKdLgA==\n+ version \"16.14.21\"\n+ resolved \"https://registry.yarnpkg.com/@types/react/-/react-16.14.21.tgz#35199b21a278355ec7a3c40003bd6a334bd4ae4a\"\n+ integrity sha512-rY4DzPKK/4aohyWiDRHS2fotN5rhBSK6/rz1X37KzNna9HJyqtaGAbq9fVttrEPWF5ywpfIP1ITL8Xi2QZn6Eg==\n dependencies:\n \"@types/prop-types\" \"*\"\n \"@types/scheduler\" \"*\"\n@@ -5950,10 +5968,10 @@\n resolved \"https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.1.tgz#8f80dd965ad81f3e1bc26d6f5c727e132721ff40\"\n integrity sha512-Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg==\n \n-\"@types/tunnel@^0.0.3\":\n- version \"0.0.3\"\n- resolved \"https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.3.tgz#f109e730b072b3136347561fc558c9358bb8c6e9\"\n- integrity sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==\n+\"@types/tunnel@^0.0.1\":\n+ version \"0.0.1\"\n+ resolved \"https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.1.tgz#0d72774768b73df26f25df9184273a42da72b19c\"\n+ integrity sha512-AOqu6bQu5MSWwYvehMXLukFHnupHrpZ8nvgae5Ggie9UwzDR1CCwoXgSSWNZJuyOlCdfdsWMA5F2LlmvyoTv8A==\n dependencies:\n \"@types/node\" \"*\"\n \n@@ -5999,9 +6017,9 @@\n source-map \"^0.6.1\"\n \n \"@types/webpack@^4\", \"@types/webpack@^4.0.0\", \"@types/webpack@^4.41.8\":\n- version \"4.41.31\"\n- resolved \"https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.31.tgz#c35f252a3559ddf9c85c0d8b0b42019025e581aa\"\n- integrity sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==\n+ version \"4.41.32\"\n+ resolved \"https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.32.tgz#a7bab03b72904070162b2f169415492209e94212\"\n+ integrity sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg==\n dependencies:\n \"@types/node\" \"*\"\n \"@types/tapable\" \"^1\"\n@@ -7624,9 +7642,9 @@ autoprefixer@^9.6.1, autoprefixer@^9.6.5, autoprefixer@^9.8.6:\n postcss-value-parser \"^4.1.0\"\n \n aws-sdk@^2.404.0, aws-sdk@^2.787.0, aws-sdk@^2.819.0, aws-sdk@^2.878.0:\n- version \"2.1028.0\"\n- resolved \"https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1028.0.tgz#ce076076174afa9bd311406b8186ea90163e3331\"\n- integrity sha512-OmR0NcpU8zsDcUOZhM+eZ6CzlUFtuaEuRyjm6mxDO0KI7lJAp7/NzB6tcellRrgWxL+NO7b5TSxi+m28qu5ocQ==\n+ version \"2.1029.0\"\n+ resolved \"https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1029.0.tgz#702d4d6092adcf0ceaf37ae0da6fee07a71f39dd\"\n+ integrity sha512-nCmaMPkJr3EATXaeqR3JeNC0GTDH2lJZ3Xq/ZCAW+yrfaPQWv8HqJJHBCNGtmk3FmcCoxc7ed/gEB8XSl0tocA==\n dependencies:\n buffer \"4.9.2\"\n events \"1.1.1\"\n@@ -8596,11 +8614,16 @@ [email protected]:\n resolved \"https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048\"\n integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=\n \[email protected], bytes@^3.1.0:\[email protected]:\n version \"3.1.0\"\n resolved \"https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6\"\n integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==\n \n+bytes@^3.1.0:\n+ version \"3.1.1\"\n+ resolved \"https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a\"\n+ integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==\n+\n [email protected]:\n version \"15.0.3\"\n resolved \"https://registry.yarnpkg.com/cacache/-/cacache-15.0.3.tgz#2225c2d1dd8e872339950d6a39c051e0e9334392\"\n@@ -11359,9 +11382,9 @@ ejs@^2.6.1:\n integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==\n \n electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.896:\n- version \"1.3.896\"\n- resolved \"https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.896.tgz#4a94efe4870b1687eafd5c378198a49da06e8a1b\"\n- integrity sha512-NcGkBVXePiuUrPLV8IxP43n1EOtdg+dudVjrfVEUd/bOqpQUFZ2diL5PPYzbgEhZFEltdXV3AcyKwGnEQ5lhMA==\n+ version \"1.3.899\"\n+ resolved \"https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.899.tgz#4d7d040e73def3d5f5bd6b8a21049025dce6fce0\"\n+ integrity sha512-w16Dtd2zl7VZ4N4Db+FIa7n36sgPGCKjrKvUUmp5ialsikvcQLjcJR9RWnlYNxIyEHLdHaoIZEqKsPxU9MdyBg==\n \n elegant-spinner@^1.0.1:\n version \"1.0.1\"\n@@ -12887,15 +12910,6 @@ form-data@^3.0.0:\n combined-stream \"^1.0.8\"\n mime-types \"^2.1.12\"\n \n-form-data@^4.0.0:\n- version \"4.0.0\"\n- resolved \"https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452\"\n- integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==\n- dependencies:\n- asynckit \"^0.4.0\"\n- combined-stream \"^1.0.8\"\n- mime-types \"^2.1.12\"\n-\n form-data@~2.3.2:\n version \"2.3.3\"\n resolved \"https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6\"\n@@ -21198,11 +21212,13 @@ proto-list@~1.2.1:\n integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=\n \n proto3-json-serializer@^0.1.5:\n- version \"0.1.5\"\n- resolved \"https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-0.1.5.tgz#c619769a59dc7fd8adf4e6c5060b9bf3039c8304\"\n- integrity sha512-G395jcZkgNXNeS+6FGqd09TsXeoCs9wmBWByDiwFy7Yd7HD8pyfyvf6q+rGh7PhT4AshRpG4NowzoKYUtkNjKg==\n+ version \"0.1.6\"\n+ resolved \"https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-0.1.6.tgz#67cf3b8d5f4c8bebfc410698ad3b1ed64da39c7b\"\n+ integrity sha512-tGbV6m6Kad8NqxMh5hw87euPS0YoZSAOIfvR01zYkQV8Gpx1V/8yU/0gCKCvfCkhAJsjvzzhnnsdQxA1w7PSog==\n+ dependencies:\n+ protobufjs \"^6.11.2\"\n \[email protected], protobufjs@^6.10.0:\[email protected], protobufjs@^6.10.0, protobufjs@^6.11.2:\n version \"6.11.2\"\n resolved \"https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b\"\n integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==\n"]
| 3 |
["fba4326c72fc22d81aba6976a9fef1e4b6154fd9", "b700285c1f27588922d9c56527cee721bb884682", "5ef4fd29a4cef69c6c348dd25156934df041f183"]
|
["refactor", "test", "build"]
|
add clean up test
Add another clean up test, which verifies that the state is cleaned up
after the timer (non-recurring) is triggered.,do not run tests and build when no changes reported by lerna,methods for scanning headers
|
["diff --git a/engine/src/test/java/io/camunda/zeebe/engine/state/ProcessExecutionCleanStateTest.java b/engine/src/test/java/io/camunda/zeebe/engine/state/ProcessExecutionCleanStateTest.java\nindex d36b4c9..ca5047f 100644\n--- a/engine/src/test/java/io/camunda/zeebe/engine/state/ProcessExecutionCleanStateTest.java\n+++ b/engine/src/test/java/io/camunda/zeebe/engine/state/ProcessExecutionCleanStateTest.java\n@@ -630,6 +630,40 @@ public final class ProcessExecutionCleanStateTest {\n }\n \n @Test\n+ public void testProcessWithTriggerTimerStartEvent() {\n+ // given\n+ final var deployment =\n+ engineRule\n+ .deployment()\n+ .withXmlResource(\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .timerWithDate(\"=now() + duration(\\\"PT15S\\\")\")\n+ .endEvent()\n+ .done())\n+ .deploy();\n+\n+ final var processDefinitionKey =\n+ deployment.getValue().getProcessesMetadata().get(0).getProcessDefinitionKey();\n+\n+ // when\n+ engineRule.awaitProcessingOf(\n+ RecordingExporter.timerRecords(TimerIntent.CREATED)\n+ .withProcessDefinitionKey(processDefinitionKey)\n+ .getFirst());\n+\n+ engineRule.increaseTime(Duration.ofSeconds(15));\n+\n+ RecordingExporter.processInstanceRecords(ProcessInstanceIntent.ELEMENT_COMPLETED)\n+ .withProcessDefinitionKey(processDefinitionKey)\n+ .withElementType(BpmnElementType.PROCESS)\n+ .await();\n+\n+ // then\n+ assertThatStateIsEmpty();\n+ }\n+\n+ @Test\n public void testProcessWithTimerStartEventRedeployment() {\n // given\n final var deployment =\n", "diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex ca46ca4..d69e581 100644\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@ -42,23 +42,25 @@ jobs:\n - name: Set CC Required env vars\n run: export GIT_BRANCH=$GITHUB_HEAD_REF && export GIT_COMMIT_SHA=$(git rev-parse origin/$GITHUB_HEAD_REF)\n \n- - name: Build\n- run: yarn build\n-\n - name: Lint\n run: yarn lint\n \n+ - name: Check for changes\n+ id: changed_packages\n+ run: |\n+ echo \"::set-output name=changed_packages::$(node ./node_modules/.bin/lerna changed -p | wc -l)\"\n+\n+ - name: Build\n+ if: steps.changed_packages.outputs.changed_packages != '0'\n+ run: yarn build\n+\n - name: Test\n+ if: steps.changed_packages.outputs.changed_packages != '0'\n run: |\n yarn run-rs-in-background\n yarn coverage > COVERAGE_RESULT\n echo \"$(cat COVERAGE_RESULT)\"\n \n- - name: Check for changes\n- id: changed_packages\n- run: |\n- echo \"::set-output name=changed_packages::$(node ./node_modules/.bin/lerna changed -p | wc -l)\"\n-\n - name: Release dev version for testing\n if: github.ref == 'refs/heads/master' && matrix.node-version == '15.x' && steps.changed_packages.outputs.changed_packages != '0'\n run: |\n@@ -70,11 +72,13 @@ jobs:\n NPM_TOKEN: ${{ secrets.NPM_TOKEN }}\n \n - name: Coveralls\n+ if: steps.changed_packages.outputs.changed_packages != '0'\n uses: coverallsapp/github-action@master\n with:\n github-token: ${{ secrets.GITHUB_TOKEN }}\n \n - name: Codeclimate\n+ if: steps.changed_packages.outputs.changed_packages != '0'\n uses: paambaati/[email protected]\n env:\n CC_TEST_REPORTER_ID: e2a39c5dc1a13674e97e94a467bacfaec953814982c7de89e9f0b55031e43bd8\n", "diff --git a/src/chainstate/stacks/db/headers.rs b/src/chainstate/stacks/db/headers.rs\nindex a12362d..91eb580 100644\n--- a/src/chainstate/stacks/db/headers.rs\n+++ b/src/chainstate/stacks/db/headers.rs\n@@ -31,8 +31,8 @@ use crate::core::FIRST_BURNCHAIN_CONSENSUS_HASH;\n use crate::core::FIRST_STACKS_BLOCK_HASH;\n use crate::util_lib::db::Error as db_error;\n use crate::util_lib::db::{\n- query_count, query_row, query_row_columns, query_row_panic, query_rows, DBConn, FromColumn,\n- FromRow,\n+ query_count, query_row, query_row_columns, query_row_panic, query_rows, u64_to_sql, DBConn,\n+ FromColumn, FromRow,\n };\n use clarity::vm::costs::ExecutionCost;\n \n@@ -360,4 +360,23 @@ impl StacksChainState {\n }\n Ok(ret)\n }\n+\n+ /// Get all headers at a given Stacks height\n+ pub fn get_all_headers_at_height(\n+ conn: &Connection,\n+ height: u64,\n+ ) -> Result<Vec<StacksHeaderInfo>, Error> {\n+ let qry =\n+ \"SELECT * FROM block_headers WHERE block_height = ?1 ORDER BY burn_header_height DESC\";\n+ let args: &[&dyn ToSql] = &[&u64_to_sql(height)?];\n+ query_rows(conn, qry, args).map_err(|e| e.into())\n+ }\n+\n+ /// Get the highest known header height\n+ pub fn get_max_header_height(conn: &Connection) -> Result<u64, Error> {\n+ let qry = \"SELECT block_height FROM block_headers ORDER BY block_height DESC LIMIT 1\";\n+ query_row(conn, qry, NO_PARAMS)\n+ .map(|row_opt: Option<i64>| row_opt.map(|h| h as u64).unwrap_or(0))\n+ .map_err(|e| e.into())\n+ }\n }\n"]
| 3 |
["aa746b764e6c54bbbd631210fce35df842d09b12", "155611c99fe8692f1afc092599f5a7c727893315", "6a63a9d439e18b6b8483abdf19162f476fcf8563"]
|
["test", "build", "feat"]
|
remove unnecessary `parse_json` call in `ops.StructField` impl,add test case with multiple partitions for message,add automation for rebasing `*.x.x` branches
|
["diff --git a/ibis/backends/snowflake/registry.py b/ibis/backends/snowflake/registry.py\nindex cbddf8d..d5a0859 100644\n--- a/ibis/backends/snowflake/registry.py\n+++ b/ibis/backends/snowflake/registry.py\n@@ -231,7 +231,7 @@ operation_registry.update(\n ops.DateFromYMD: fixed_arity(sa.func.date_from_parts, 3),\n ops.StringToTimestamp: fixed_arity(sa.func.to_timestamp_tz, 2),\n ops.RegexExtract: fixed_arity(sa.func.regexp_substr, 3),\n- ops.RegexSearch: fixed_arity(lambda left, right: left.op('REGEXP')(right), 2),\n+ ops.RegexSearch: fixed_arity(sa.sql.operators.custom_op(\"REGEXP\"), 2),\n ops.RegexReplace: fixed_arity(sa.func.regexp_replace, 3),\n ops.ExtractMillisecond: fixed_arity(\n lambda arg: sa.cast(\n@@ -244,8 +244,7 @@ operation_registry.update(\n t.translate(op.arg), _TIMESTAMP_UNITS_TO_SCALE[op.unit]\n ),\n ops.StructField: lambda t, op: sa.cast(\n- sa.func.parse_json(sa.func.get(t.translate(op.arg), op.field)),\n- t.get_sqla_type(op.output_dtype),\n+ sa.func.get(t.translate(op.arg), op.field), t.get_sqla_type(op.output_dtype)\n ),\n ops.NthValue: _nth_value,\n }\n", "diff --git a/broker-core/src/main/java/io/zeebe/broker/subscription/command/SubscriptionCommandSender.java b/broker-core/src/main/java/io/zeebe/broker/subscription/command/SubscriptionCommandSender.java\nindex 693d1da..e3552d4 100644\n--- a/broker-core/src/main/java/io/zeebe/broker/subscription/command/SubscriptionCommandSender.java\n+++ b/broker-core/src/main/java/io/zeebe/broker/subscription/command/SubscriptionCommandSender.java\n@@ -74,7 +74,7 @@ public class SubscriptionCommandSender {\n new CloseWorkflowInstanceSubscriptionCommand();\n \n private final ClientTransport subscriptionClient;\n- private final IntArrayList partitionIds;\n+ private final IntArrayList partitionIds = new IntArrayList();\n \n private int partitionId;\n private TopologyPartitionListenerImpl partitionListener;\n@@ -82,7 +82,6 @@ public class SubscriptionCommandSender {\n public SubscriptionCommandSender(\n final ClusterCfg clusterCfg, final ClientTransport subscriptionClient) {\n this.subscriptionClient = subscriptionClient;\n- partitionIds = new IntArrayList();\n partitionIds.addAll(clusterCfg.getPartitionIds());\n }\n \n@@ -100,7 +99,8 @@ public class SubscriptionCommandSender {\n final DirectBuffer messageName,\n final DirectBuffer correlationKey) {\n \n- final int subscriptionPartitionId = getSubscriptionPartitionId(correlationKey);\n+ final int subscriptionPartitionId =\n+ SubscriptionUtil.getSubscriptionPartitionId(correlationKey, partitionIds.size());\n \n openMessageSubscriptionCommand.setSubscriptionPartitionId(subscriptionPartitionId);\n openMessageSubscriptionCommand.setWorkflowInstanceKey(workflowInstanceKey);\n@@ -111,14 +111,6 @@ public class SubscriptionCommandSender {\n return sendSubscriptionCommand(subscriptionPartitionId, openMessageSubscriptionCommand);\n }\n \n- private int getSubscriptionPartitionId(final DirectBuffer correlationKey) {\n- if (partitionIds == null) {\n- throw new IllegalStateException(\"no partition ids available\");\n- }\n-\n- return SubscriptionUtil.getSubscriptionPartitionId(correlationKey, partitionIds.size());\n- }\n-\n public boolean openWorkflowInstanceSubscription(\n final long workflowInstanceKey,\n final long elementInstanceKey,\ndiff --git a/broker-core/src/test/java/io/zeebe/broker/workflow/message/MessageCatchElementTest.java b/broker-core/src/test/java/io/zeebe/broker/workflow/message/MessageCatchElementTest.java\nindex 4baed4f..838c9ca 100644\n--- a/broker-core/src/test/java/io/zeebe/broker/workflow/message/MessageCatchElementTest.java\n+++ b/broker-core/src/test/java/io/zeebe/broker/workflow/message/MessageCatchElementTest.java\n@@ -36,7 +36,6 @@ import io.zeebe.model.bpmn.Bpmn;\n import io.zeebe.model.bpmn.BpmnModelInstance;\n import io.zeebe.protocol.clientapi.RecordType;\n import io.zeebe.protocol.clientapi.ValueType;\n-import io.zeebe.protocol.impl.SubscriptionUtil;\n import io.zeebe.protocol.intent.DeploymentIntent;\n import io.zeebe.protocol.intent.MessageSubscriptionIntent;\n import io.zeebe.protocol.intent.WorkflowInstanceIntent;\n@@ -44,7 +43,6 @@ import io.zeebe.protocol.intent.WorkflowInstanceSubscriptionIntent;\n import io.zeebe.test.broker.protocol.clientapi.ClientApiRule;\n import io.zeebe.test.broker.protocol.clientapi.PartitionTestClient;\n import io.zeebe.test.util.record.RecordingExporter;\n-import io.zeebe.util.buffer.BufferUtil;\n import java.util.List;\n import java.util.stream.Collectors;\n import org.agrona.DirectBuffer;\n@@ -171,39 +169,6 @@ public class MessageCatchElementTest {\n }\n \n @Test\n- public void shouldOpenMessageSubscriptionsOnSamePartition() {\n- // given\n- final List<Integer> partitionIds = apiRule.getPartitionIds();\n-\n- final String correlationKey = \"order-123\";\n-\n- final PartitionTestClient workflowPartition = apiRule.partitionClient(partitionIds.get(0));\n- final PartitionTestClient subscriptionPartition =\n- apiRule.partitionClient(getPartitionId(correlationKey));\n-\n- testClient.deploy(CATCH_EVENT_WORKFLOW);\n-\n- // when\n- final long workflowInstanceKey1 =\n- workflowPartition.createWorkflowInstance(PROCESS_ID, asMsgPack(\"orderId\", correlationKey));\n-\n- final long workflowInstanceKey2 =\n- workflowPartition.createWorkflowInstance(PROCESS_ID, asMsgPack(\"orderId\", correlationKey));\n-\n- // then\n- final List<Record<MessageSubscriptionRecordValue>> subscriptions =\n- subscriptionPartition\n- .receiveMessageSubscriptions()\n- .withIntent(MessageSubscriptionIntent.OPENED)\n- .limit(2)\n- .collect(Collectors.toList());\n-\n- assertThat(subscriptions)\n- .extracting(s -> s.getValue().getWorkflowInstanceKey())\n- .contains(workflowInstanceKey1, workflowInstanceKey2);\n- }\n-\n- @Test\n public void shouldOpenWorkflowInstanceSubscription() {\n final long workflowInstanceKey =\n testClient.createWorkflowInstance(PROCESS_ID, asMsgPack(\"orderId\", \"order-123\"));\n@@ -352,10 +317,4 @@ public class MessageCatchElementTest {\n .exists())\n .isTrue();\n }\n-\n- private int getPartitionId(final String correlationKey) {\n- final List<Integer> partitionIds = apiRule.getPartitionIds();\n- return SubscriptionUtil.getSubscriptionPartitionId(\n- BufferUtil.wrapString(correlationKey), partitionIds.size());\n- }\n }\ndiff --git a/broker-core/src/test/java/io/zeebe/broker/workflow/message/MessageCorrelationMultiplePartitionsTest.java b/broker-core/src/test/java/io/zeebe/broker/workflow/message/MessageCorrelationMultiplePartitionsTest.java\nnew file mode 100644\nindex 0000000..cf8261a\n--- /dev/null\n+++ b/broker-core/src/test/java/io/zeebe/broker/workflow/message/MessageCorrelationMultiplePartitionsTest.java\n@@ -0,0 +1,134 @@\n+/*\n+ * Zeebe Broker Core\n+ * Copyright \u00a9 2017 camunda services GmbH ([email protected])\n+ *\n+ * This program is free software: you can redistribute it and/or modify\n+ * it under the terms of the GNU Affero General Public License as published by\n+ * the Free Software Foundation, either version 3 of the License, or\n+ * (at your option) any later version.\n+ *\n+ * This program is distributed in the hope that it will be useful,\n+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ * GNU Affero General Public License for more details.\n+ *\n+ * You should have received a copy of the GNU Affero General Public License\n+ * along with this program. If not, see <http://www.gnu.org/licenses/>.\n+ */\n+package io.zeebe.broker.workflow.message;\n+\n+import static io.zeebe.broker.test.EmbeddedBrokerConfigurator.setPartitionCount;\n+import static io.zeebe.test.util.MsgPackUtil.asMsgPack;\n+import static org.assertj.core.api.Assertions.assertThat;\n+import static org.assertj.core.api.Assertions.tuple;\n+\n+import io.zeebe.broker.test.EmbeddedBrokerRule;\n+import io.zeebe.model.bpmn.Bpmn;\n+import io.zeebe.model.bpmn.BpmnModelInstance;\n+import io.zeebe.protocol.impl.SubscriptionUtil;\n+import io.zeebe.protocol.intent.MessageSubscriptionIntent;\n+import io.zeebe.protocol.intent.WorkflowInstanceIntent;\n+import io.zeebe.test.broker.protocol.clientapi.ClientApiRule;\n+import io.zeebe.test.broker.protocol.clientapi.PartitionTestClient;\n+import io.zeebe.test.util.record.RecordingExporter;\n+import io.zeebe.util.buffer.BufferUtil;\n+import java.util.List;\n+import java.util.stream.IntStream;\n+import org.junit.Before;\n+import org.junit.Rule;\n+import org.junit.Test;\n+import org.junit.rules.RuleChain;\n+\n+public class MessageCorrelationMultiplePartitionsTest {\n+\n+ private static final String CORRELATION_KEY_PARTITION_0 = \"item-2\";\n+ private static final String CORRELATION_KEY_PARTITION_1 = \"item-1\";\n+ private static final String CORRELATION_KEY_PARTITION_2 = \"item-0\";\n+\n+ private static final String PROCESS_ID = \"process\";\n+\n+ private static final BpmnModelInstance WORKFLOW =\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .intermediateCatchEvent(\"receive-message\")\n+ .message(m -> m.name(\"message\").zeebeCorrelationKey(\"$.key\"))\n+ .endEvent(\"end\")\n+ .done();\n+\n+ public EmbeddedBrokerRule brokerRule = new EmbeddedBrokerRule(setPartitionCount(3));\n+\n+ public ClientApiRule apiRule = new ClientApiRule(brokerRule::getClientAddress);\n+\n+ @Rule public RuleChain ruleChain = RuleChain.outerRule(brokerRule).around(apiRule);\n+\n+ private PartitionTestClient testClient;\n+\n+ @Before\n+ public void init() {\n+ assertThat(getPartitionId(CORRELATION_KEY_PARTITION_0)).isEqualTo(0);\n+ assertThat(getPartitionId(CORRELATION_KEY_PARTITION_1)).isEqualTo(1);\n+ assertThat(getPartitionId(CORRELATION_KEY_PARTITION_2)).isEqualTo(2);\n+\n+ testClient = apiRule.partitionClient();\n+\n+ testClient.deploy(WORKFLOW);\n+ }\n+\n+ @Test\n+ public void shouldOpenMessageSubscriptionsOnDifferentPartitions() {\n+ // when\n+ IntStream.range(0, 10)\n+ .forEach(\n+ i -> {\n+ testClient.createWorkflowInstance(\n+ PROCESS_ID, asMsgPack(\"key\", CORRELATION_KEY_PARTITION_0));\n+ testClient.createWorkflowInstance(\n+ PROCESS_ID, asMsgPack(\"key\", CORRELATION_KEY_PARTITION_1));\n+ testClient.createWorkflowInstance(\n+ PROCESS_ID, asMsgPack(\"key\", CORRELATION_KEY_PARTITION_2));\n+ });\n+\n+ // then\n+ assertThat(\n+ RecordingExporter.messageSubscriptionRecords(MessageSubscriptionIntent.OPENED)\n+ .limit(30))\n+ .extracting(r -> tuple(r.getMetadata().getPartitionId(), r.getValue().getCorrelationKey()))\n+ .containsOnly(\n+ tuple(0, CORRELATION_KEY_PARTITION_0),\n+ tuple(1, CORRELATION_KEY_PARTITION_1),\n+ tuple(2, CORRELATION_KEY_PARTITION_2));\n+ }\n+\n+ @Test\n+ public void shouldCorrelateMessageOnDifferentPartitions() {\n+ // given\n+ apiRule\n+ .partitionClient(0)\n+ .publishMessage(\"message\", CORRELATION_KEY_PARTITION_0, asMsgPack(\"p\", \"p0\"));\n+ apiRule\n+ .partitionClient(1)\n+ .publishMessage(\"message\", CORRELATION_KEY_PARTITION_1, asMsgPack(\"p\", \"p1\"));\n+ apiRule\n+ .partitionClient(2)\n+ .publishMessage(\"message\", CORRELATION_KEY_PARTITION_2, asMsgPack(\"p\", \"p2\"));\n+\n+ // when\n+ testClient.createWorkflowInstance(PROCESS_ID, asMsgPack(\"key\", CORRELATION_KEY_PARTITION_0));\n+ testClient.createWorkflowInstance(PROCESS_ID, asMsgPack(\"key\", CORRELATION_KEY_PARTITION_1));\n+ testClient.createWorkflowInstance(PROCESS_ID, asMsgPack(\"key\", CORRELATION_KEY_PARTITION_2));\n+\n+ // then\n+ assertThat(\n+ RecordingExporter.workflowInstanceRecords(WorkflowInstanceIntent.END_EVENT_OCCURRED)\n+ .withElementId(\"end\")\n+ .limit(3))\n+ .extracting(r -> r.getValue().getPayloadAsMap().get(\"p\"))\n+ .contains(\"p0\", \"p1\", \"p2\");\n+ }\n+\n+ private int getPartitionId(final String correlationKey) {\n+ final List<Integer> partitionIds = apiRule.getPartitionIds();\n+ return SubscriptionUtil.getSubscriptionPartitionId(\n+ BufferUtil.wrapString(correlationKey), partitionIds.size());\n+ }\n+}\ndiff --git a/protocol-test-util/src/main/java/io/zeebe/test/broker/protocol/clientapi/PartitionTestClient.java b/protocol-test-util/src/main/java/io/zeebe/test/broker/protocol/clientapi/PartitionTestClient.java\nindex dac11a2..e2b8397 100644\n--- a/protocol-test-util/src/main/java/io/zeebe/test/broker/protocol/clientapi/PartitionTestClient.java\n+++ b/protocol-test-util/src/main/java/io/zeebe/test/broker/protocol/clientapi/PartitionTestClient.java\n@@ -329,6 +329,7 @@ public class PartitionTestClient {\n final String messageName, final String correlationKey, final byte[] payload, final long ttl) {\n return apiRule\n .createCmdRequest()\n+ .partitionId(partitionId)\n .type(ValueType.MESSAGE, MessageIntent.PUBLISH)\n .command()\n .put(\"name\", messageName)\ndiff --git a/qa/integration-tests/src/test/java/io/zeebe/broker/it/startup/BrokerReprocessingTest.java b/qa/integration-tests/src/test/java/io/zeebe/broker/it/startup/BrokerReprocessingTest.java\nindex 9a122d9..b7db67e 100644\n--- a/qa/integration-tests/src/test/java/io/zeebe/broker/it/startup/BrokerReprocessingTest.java\n+++ b/qa/integration-tests/src/test/java/io/zeebe/broker/it/startup/BrokerReprocessingTest.java\n@@ -619,14 +619,9 @@ public class BrokerReprocessingTest {\n }\n \n @Test\n- public void shouldCorrelateMessageAfterRestartIfEnteredBeforeA() throws Exception {\n+ public void shouldCorrelateMessageAfterRestartIfEnteredBefore() throws Exception {\n // given\n- clientRule\n- .getWorkflowClient()\n- .newDeployCommand()\n- .addWorkflowModel(WORKFLOW_MESSAGE, \"message.bpmn\")\n- .send()\n- .join();\n+ deploy(WORKFLOW_MESSAGE, \"message.bpmn\");\n \n final long workflowInstanceKey =\n startWorkflowInstance(PROCESS_ID, singletonMap(\"orderId\", \"order-123\"))\n@@ -658,12 +653,7 @@ public class BrokerReprocessingTest {\n @Test\n public void shouldCorrelateMessageAfterRestartIfPublishedBefore() throws Exception {\n // given\n- clientRule\n- .getWorkflowClient()\n- .newDeployCommand()\n- .addWorkflowModel(WORKFLOW_MESSAGE, \"message.bpmn\")\n- .send()\n- .join();\n+ deploy(WORKFLOW_MESSAGE, \"message.bpmn\");\n \n publishMessage(\"order canceled\", \"order-123\", singletonMap(\"foo\", \"bar\"));\n reprocessingTrigger.accept(this);\ndiff --git a/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/MessageCorrelationTest.java b/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/MessageCorrelationTest.java\ndeleted file mode 100644\nindex c6a05fb..0000000\n--- a/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/MessageCorrelationTest.java\n+++ /dev/null\n@@ -1,176 +0,0 @@\n-/*\n- * Copyright \u00a9 2017 camunda services GmbH ([email protected])\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-package io.zeebe.broker.it.workflow;\n-\n-import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertElementActivated;\n-import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertElementCompleted;\n-import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertWorkflowInstanceCompleted;\n-import static org.assertj.core.api.Assertions.assertThat;\n-import static org.assertj.core.api.Assertions.entry;\n-\n-import io.zeebe.broker.it.GrpcClientRule;\n-import io.zeebe.broker.test.EmbeddedBrokerRule;\n-import io.zeebe.client.api.events.DeploymentEvent;\n-import io.zeebe.model.bpmn.Bpmn;\n-import io.zeebe.model.bpmn.BpmnModelInstance;\n-import java.util.Collections;\n-import org.junit.Before;\n-import org.junit.Rule;\n-import org.junit.Test;\n-import org.junit.rules.RuleChain;\n-import org.junit.runner.RunWith;\n-import org.junit.runners.Parameterized;\n-import org.junit.runners.Parameterized.Parameter;\n-import org.junit.runners.Parameterized.Parameters;\n-\n-@RunWith(Parameterized.class)\n-public class MessageCorrelationTest {\n-\n- public EmbeddedBrokerRule brokerRule = new EmbeddedBrokerRule();\n- public GrpcClientRule clientRule = new GrpcClientRule(brokerRule);\n-\n- @Rule public RuleChain ruleChain = RuleChain.outerRule(brokerRule).around(clientRule);\n-\n- private static final BpmnModelInstance CATCH_EVENT_WORKFLOW =\n- Bpmn.createExecutableProcess(\"wf\")\n- .startEvent()\n- .intermediateCatchEvent(\"receive-message\")\n- .message(m -> m.name(\"order canceled\").zeebeCorrelationKey(\"$.orderId\"))\n- .sequenceFlowId(\"to-end\")\n- .endEvent()\n- .done();\n-\n- private static final BpmnModelInstance RECEIVE_TASK_WORKFLOW =\n- Bpmn.createExecutableProcess(\"wf\")\n- .startEvent()\n- .receiveTask(\"receive-message\")\n- .message(m -> m.name(\"order canceled\").zeebeCorrelationKey(\"$.orderId\"))\n- .sequenceFlowId(\"to-end\")\n- .endEvent()\n- .done();\n-\n- @Parameter(0)\n- public String elementType;\n-\n- @Parameter(1)\n- public BpmnModelInstance workflow;\n-\n- @Parameters(name = \"{0}\")\n- public static final Object[][] parameters() {\n- return new Object[][] {\n- {\"intermediate message catch event\", CATCH_EVENT_WORKFLOW},\n- {\"receive task\", RECEIVE_TASK_WORKFLOW}\n- };\n- }\n-\n- @Before\n- public void init() {\n- final DeploymentEvent deploymentEvent =\n- clientRule\n- .getWorkflowClient()\n- .newDeployCommand()\n- .addWorkflowModel(workflow, \"wf.bpmn\")\n- .send()\n- .join();\n-\n- clientRule.waitUntilDeploymentIsDone(deploymentEvent.getKey());\n- }\n-\n- @Test\n- public void shouldCorrelateMessageIfEnteredBefore() {\n- // given\n- clientRule\n- .getWorkflowClient()\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- assertElementActivated(\"receive-message\");\n-\n- // when\n- clientRule\n- .getWorkflowClient()\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .send()\n- .join();\n-\n- // then\n- assertWorkflowInstanceCompleted(\"wf\");\n- }\n-\n- @Test\n- public void shouldCorrelateMessageIfPublishedBefore() {\n- // given\n- clientRule\n- .getWorkflowClient()\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .send()\n- .join();\n-\n- // when\n- clientRule\n- .getWorkflowClient()\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- // then\n- assertWorkflowInstanceCompleted(\"wf\");\n- }\n-\n- @Test\n- public void shouldCorrelateMessageAndMergePayload() {\n- // given\n- clientRule\n- .getWorkflowClient()\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- // when\n- clientRule\n- .getWorkflowClient()\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .payload(Collections.singletonMap(\"foo\", \"bar\"))\n- .send()\n- .join();\n-\n- // then\n- assertWorkflowInstanceCompleted(\"wf\");\n-\n- assertElementCompleted(\n- \"wf\",\n- \"receive-message\",\n- (catchEventOccurredEvent) ->\n- assertThat(catchEventOccurredEvent.getPayloadAsMap())\n- .containsExactly(entry(\"orderId\", \"order-123\"), entry(\"foo\", \"bar\")));\n- }\n-}\ndiff --git a/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/PublishMessageTest.java b/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/PublishMessageTest.java\ndeleted file mode 100644\nindex 7845eec..0000000\n--- a/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/PublishMessageTest.java\n+++ /dev/null\n@@ -1,234 +0,0 @@\n-/*\n- * Copyright \u00a9 2017 camunda services GmbH ([email protected])\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-package io.zeebe.broker.it.workflow;\n-\n-import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertElementActivated;\n-import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertElementCompleted;\n-import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertWorkflowInstanceCompleted;\n-import static io.zeebe.broker.test.EmbeddedBrokerConfigurator.setPartitionCount;\n-import static org.assertj.core.api.Assertions.assertThat;\n-import static org.assertj.core.api.Assertions.assertThatThrownBy;\n-import static org.assertj.core.api.Assertions.entry;\n-\n-import io.zeebe.broker.it.GrpcClientRule;\n-import io.zeebe.broker.test.EmbeddedBrokerRule;\n-import io.zeebe.client.api.ZeebeFuture;\n-import io.zeebe.client.api.clients.WorkflowClient;\n-import io.zeebe.client.api.events.DeploymentEvent;\n-import io.zeebe.client.api.events.WorkflowInstanceEvent;\n-import io.zeebe.client.cmd.ClientException;\n-import io.zeebe.model.bpmn.Bpmn;\n-import io.zeebe.model.bpmn.BpmnModelInstance;\n-import java.time.Duration;\n-import java.util.Collections;\n-import org.junit.Before;\n-import org.junit.Rule;\n-import org.junit.Test;\n-import org.junit.rules.RuleChain;\n-\n-public class PublishMessageTest {\n-\n- private static final BpmnModelInstance WORKFLOW =\n- Bpmn.createExecutableProcess(\"wf\")\n- .startEvent()\n- .intermediateCatchEvent(\"catch-event\")\n- .message(c -> c.name(\"order canceled\").zeebeCorrelationKey(\"$.orderId\"))\n- .endEvent()\n- .done();\n- public EmbeddedBrokerRule brokerRule = new EmbeddedBrokerRule(setPartitionCount(3));\n- public GrpcClientRule clientRule = new GrpcClientRule(brokerRule);\n-\n- @Rule public RuleChain ruleChain = RuleChain.outerRule(brokerRule).around(clientRule);\n-\n- private WorkflowClient workflowClient;\n-\n- @Before\n- public void init() {\n-\n- workflowClient = clientRule.getClient().workflowClient();\n-\n- final DeploymentEvent deploymentEvent =\n- workflowClient.newDeployCommand().addWorkflowModel(WORKFLOW, \"wf.bpmn\").send().join();\n-\n- clientRule.waitUntilDeploymentIsDone(deploymentEvent.getKey());\n- }\n-\n- @Test\n- public void shouldCorrelateMessageToAllSubscriptions() {\n- // given\n- final WorkflowInstanceEvent wf =\n- workflowClient\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- final WorkflowInstanceEvent wf2 =\n- workflowClient\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- // when\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .send()\n- .join();\n-\n- // then\n- assertWorkflowInstanceCompleted(\"wf\", wf.getWorkflowInstanceKey());\n- assertWorkflowInstanceCompleted(\"wf\", wf2.getWorkflowInstanceKey());\n- }\n-\n- @Test\n- public void shouldCorrelateMessageWithZeroTTL() {\n- // given\n- workflowClient\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- assertElementActivated(\"catch-event\");\n-\n- // when\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .timeToLive(Duration.ZERO)\n- .send()\n- .join();\n-\n- // then\n- assertElementCompleted(\"wf\", \"catch-event\");\n- }\n-\n- @Test\n- public void shouldNotCorrelateMessageAfterTTL() {\n- // given\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .timeToLive(Duration.ZERO)\n- .payload(Collections.singletonMap(\"msg\", \"failure\"))\n- .send()\n- .join();\n-\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .timeToLive(Duration.ofMinutes(1))\n- .payload(Collections.singletonMap(\"msg\", \"expected\"))\n- .send()\n- .join();\n-\n- // when\n- workflowClient\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- // then\n-\n- assertElementCompleted(\n- \"wf\",\n- \"catch-event\",\n- (catchEventOccurred) ->\n- assertThat(catchEventOccurred.getPayloadAsMap()).contains(entry(\"msg\", \"expected\")));\n- }\n-\n- @Test\n- public void shouldCorrelateMessageOnDifferentPartitions() {\n- // given\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .send()\n- .join();\n-\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-124\")\n- .send()\n- .join();\n-\n- // when\n- final WorkflowInstanceEvent wf =\n- workflowClient\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-123\\\"}\")\n- .send()\n- .join();\n-\n- final WorkflowInstanceEvent wf2 =\n- workflowClient\n- .newCreateInstanceCommand()\n- .bpmnProcessId(\"wf\")\n- .latestVersion()\n- .payload(\"{\\\"orderId\\\":\\\"order-124\\\"}\")\n- .send()\n- .join();\n-\n- // then\n- assertWorkflowInstanceCompleted(\"wf\", wf.getWorkflowInstanceKey());\n- assertWorkflowInstanceCompleted(\"wf\", wf2.getWorkflowInstanceKey());\n- }\n-\n- @Test\n- public void shouldRejectMessageWithSameId() {\n- // given\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .messageId(\"foo\")\n- .send()\n- .join();\n-\n- // when\n- final ZeebeFuture<Void> future =\n- workflowClient\n- .newPublishMessageCommand()\n- .messageName(\"order canceled\")\n- .correlationKey(\"order-123\")\n- .messageId(\"foo\")\n- .send();\n-\n- // then\n- assertThatThrownBy(future::join)\n- .isInstanceOf(ClientException.class)\n- .hasMessageContaining(\"message with id 'foo' is already published\");\n- }\n-}\ndiff --git a/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/message/MessageCorrelationMultiplePartitionsTest.java b/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/message/MessageCorrelationMultiplePartitionsTest.java\nnew file mode 100644\nindex 0000000..0e37c95\n--- /dev/null\n+++ b/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/message/MessageCorrelationMultiplePartitionsTest.java\n@@ -0,0 +1,196 @@\n+/*\n+ * Copyright \u00a9 2017 camunda services GmbH ([email protected])\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package io.zeebe.broker.it.workflow.message;\n+\n+import static io.zeebe.broker.test.EmbeddedBrokerConfigurator.setPartitionCount;\n+import static org.assertj.core.api.Assertions.assertThat;\n+import static org.assertj.core.api.Assertions.tuple;\n+\n+import io.zeebe.broker.it.GrpcClientRule;\n+import io.zeebe.broker.test.EmbeddedBrokerRule;\n+import io.zeebe.client.api.events.DeploymentEvent;\n+import io.zeebe.model.bpmn.Bpmn;\n+import io.zeebe.model.bpmn.BpmnModelInstance;\n+import io.zeebe.protocol.intent.MessageIntent;\n+import io.zeebe.protocol.intent.MessageSubscriptionIntent;\n+import io.zeebe.protocol.intent.WorkflowInstanceIntent;\n+import io.zeebe.test.util.record.RecordingExporter;\n+import java.util.Collections;\n+import java.util.stream.IntStream;\n+import org.junit.Before;\n+import org.junit.Rule;\n+import org.junit.Test;\n+import org.junit.rules.RuleChain;\n+\n+public class MessageCorrelationMultiplePartitionsTest {\n+\n+ private static final String CORRELATION_KEY_PARTITION_0 = \"item-2\";\n+ private static final String CORRELATION_KEY_PARTITION_1 = \"item-1\";\n+ private static final String CORRELATION_KEY_PARTITION_2 = \"item-0\";\n+\n+ private static final String PROCESS_ID = \"process\";\n+\n+ public EmbeddedBrokerRule brokerRule = new EmbeddedBrokerRule(setPartitionCount(3));\n+ public GrpcClientRule clientRule = new GrpcClientRule(brokerRule);\n+\n+ @Rule public RuleChain ruleChain = RuleChain.outerRule(brokerRule).around(clientRule);\n+\n+ private static final BpmnModelInstance WORKFLOW =\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .intermediateCatchEvent()\n+ .message(m -> m.name(\"message\").zeebeCorrelationKey(\"$.key\"))\n+ .endEvent(\"end\")\n+ .done();\n+\n+ @Before\n+ public void init() {\n+ final DeploymentEvent deploymentEvent =\n+ clientRule\n+ .getWorkflowClient()\n+ .newDeployCommand()\n+ .addWorkflowModel(WORKFLOW, \"wf.bpmn\")\n+ .send()\n+ .join();\n+\n+ clientRule.waitUntilDeploymentIsDone(deploymentEvent.getKey());\n+ }\n+\n+ @Test\n+ public void shouldOpenMessageSubscriptionsOnDifferentPartitions() {\n+ // when\n+ IntStream.range(0, 10)\n+ .forEach(\n+ i -> {\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_0));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_1));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_2));\n+ });\n+\n+ // then\n+ assertThat(\n+ RecordingExporter.messageSubscriptionRecords(MessageSubscriptionIntent.OPENED)\n+ .limit(30))\n+ .extracting(r -> tuple(r.getMetadata().getPartitionId(), r.getValue().getCorrelationKey()))\n+ .containsOnly(\n+ tuple(0, CORRELATION_KEY_PARTITION_0),\n+ tuple(1, CORRELATION_KEY_PARTITION_1),\n+ tuple(2, CORRELATION_KEY_PARTITION_2));\n+ }\n+\n+ @Test\n+ public void shouldPublishMessageOnDifferentPartitions() {\n+ // when\n+ IntStream.range(0, 10)\n+ .forEach(\n+ i -> {\n+ publishMessage(CORRELATION_KEY_PARTITION_0, Collections.singletonMap(\"p\", \"p0\"));\n+ publishMessage(CORRELATION_KEY_PARTITION_1, Collections.singletonMap(\"p\", \"p1\"));\n+ publishMessage(CORRELATION_KEY_PARTITION_2, Collections.singletonMap(\"p\", \"p2\"));\n+ });\n+\n+ // then\n+ assertThat(RecordingExporter.messageRecords(MessageIntent.PUBLISHED).limit(30))\n+ .extracting(r -> tuple(r.getMetadata().getPartitionId(), r.getValue().getCorrelationKey()))\n+ .containsOnly(\n+ tuple(0, CORRELATION_KEY_PARTITION_0),\n+ tuple(1, CORRELATION_KEY_PARTITION_1),\n+ tuple(2, CORRELATION_KEY_PARTITION_2));\n+ }\n+\n+ @Test\n+ public void shouldCorrelateMessageOnDifferentPartitions() {\n+ // given\n+ publishMessage(CORRELATION_KEY_PARTITION_0, Collections.singletonMap(\"p\", \"p0\"));\n+ publishMessage(CORRELATION_KEY_PARTITION_1, Collections.singletonMap(\"p\", \"p1\"));\n+ publishMessage(CORRELATION_KEY_PARTITION_2, Collections.singletonMap(\"p\", \"p2\"));\n+\n+ // when\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_0));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_1));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_2));\n+\n+ // then\n+ assertThat(\n+ RecordingExporter.workflowInstanceRecords(WorkflowInstanceIntent.END_EVENT_OCCURRED)\n+ .withElementId(\"end\")\n+ .limit(3))\n+ .extracting(r -> r.getValue().getPayloadAsMap().get(\"p\"))\n+ .contains(\"p0\", \"p1\", \"p2\");\n+ }\n+\n+ @Test\n+ public void shouldOpenMessageSubscriptionsOnSamePartitionsAfterRestart() {\n+ // given\n+ IntStream.range(0, 5)\n+ .forEach(\n+ i -> {\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_0));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_1));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_2));\n+ });\n+\n+ assertThat(\n+ RecordingExporter.messageSubscriptionRecords(MessageSubscriptionIntent.OPENED)\n+ .limit(15)\n+ .exists())\n+ .isTrue();\n+\n+ // when\n+ brokerRule.stopBroker();\n+ brokerRule.startBroker();\n+\n+ IntStream.range(0, 5)\n+ .forEach(\n+ i -> {\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_0));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_1));\n+ createWorkflowInstance(Collections.singletonMap(\"key\", CORRELATION_KEY_PARTITION_2));\n+ });\n+\n+ // then\n+ assertThat(\n+ RecordingExporter.messageSubscriptionRecords(MessageSubscriptionIntent.OPENED)\n+ .limit(30))\n+ .extracting(r -> tuple(r.getMetadata().getPartitionId(), r.getValue().getCorrelationKey()))\n+ .containsOnly(\n+ tuple(0, CORRELATION_KEY_PARTITION_0),\n+ tuple(1, CORRELATION_KEY_PARTITION_1),\n+ tuple(2, CORRELATION_KEY_PARTITION_2));\n+ }\n+\n+ private void createWorkflowInstance(Object payload) {\n+ clientRule\n+ .getWorkflowClient()\n+ .newCreateInstanceCommand()\n+ .bpmnProcessId(PROCESS_ID)\n+ .latestVersion()\n+ .payload(payload)\n+ .send()\n+ .join();\n+ }\n+\n+ private void publishMessage(String correlationKey, Object payload) {\n+ clientRule\n+ .getWorkflowClient()\n+ .newPublishMessageCommand()\n+ .messageName(\"message\")\n+ .correlationKey(correlationKey)\n+ .payload(payload)\n+ .send()\n+ .join();\n+ }\n+}\ndiff --git a/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/message/MessageCorrelationTest.java b/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/message/MessageCorrelationTest.java\nnew file mode 100644\nindex 0000000..3b08572\n--- /dev/null\n+++ b/qa/integration-tests/src/test/java/io/zeebe/broker/it/workflow/message/MessageCorrelationTest.java\n@@ -0,0 +1,198 @@\n+/*\n+ * Copyright \u00a9 2017 camunda services GmbH ([email protected])\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package io.zeebe.broker.it.workflow.message;\n+\n+import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertElementActivated;\n+import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertElementCompleted;\n+import static io.zeebe.broker.it.util.ZeebeAssertHelper.assertWorkflowInstanceCompleted;\n+import static org.assertj.core.api.Assertions.assertThat;\n+import static org.assertj.core.api.Assertions.assertThatThrownBy;\n+import static org.assertj.core.api.Assertions.entry;\n+\n+import io.zeebe.broker.it.GrpcClientRule;\n+import io.zeebe.broker.test.EmbeddedBrokerRule;\n+import io.zeebe.client.api.ZeebeFuture;\n+import io.zeebe.client.api.events.DeploymentEvent;\n+import io.zeebe.client.cmd.ClientException;\n+import io.zeebe.model.bpmn.Bpmn;\n+import io.zeebe.model.bpmn.BpmnModelInstance;\n+import java.time.Duration;\n+import java.util.Collections;\n+import org.junit.Before;\n+import org.junit.Rule;\n+import org.junit.Test;\n+import org.junit.rules.RuleChain;\n+\n+public class MessageCorrelationTest {\n+\n+ private static final String PROCESS_ID = \"process\";\n+\n+ public EmbeddedBrokerRule brokerRule = new EmbeddedBrokerRule();\n+ public GrpcClientRule clientRule = new GrpcClientRule(brokerRule);\n+\n+ @Rule public RuleChain ruleChain = RuleChain.outerRule(brokerRule).around(clientRule);\n+\n+ private static final BpmnModelInstance WORKFLOW =\n+ Bpmn.createExecutableProcess(PROCESS_ID)\n+ .startEvent()\n+ .intermediateCatchEvent(\"catch-event\")\n+ .message(c -> c.name(\"order canceled\").zeebeCorrelationKey(\"$.orderId\"))\n+ .endEvent()\n+ .done();\n+\n+ @Before\n+ public void init() {\n+ final DeploymentEvent deploymentEvent =\n+ clientRule\n+ .getWorkflowClient()\n+ .newDeployCommand()\n+ .addWorkflowModel(WORKFLOW, \"wf.bpmn\")\n+ .send()\n+ .join();\n+\n+ clientRule.waitUntilDeploymentIsDone(deploymentEvent.getKey());\n+ }\n+\n+ @Test\n+ public void shouldCorrelateMessage() {\n+ // given\n+ clientRule\n+ .getWorkflowClient()\n+ .newCreateInstanceCommand()\n+ .bpmnProcessId(PROCESS_ID)\n+ .latestVersion()\n+ .payload(Collections.singletonMap(\"orderId\", \"order-123\"))\n+ .send()\n+ .join();\n+\n+ // when\n+ clientRule\n+ .getWorkflowClient()\n+ .newPublishMessageCommand()\n+ .messageName(\"order canceled\")\n+ .correlationKey(\"order-123\")\n+ .payload(Collections.singletonMap(\"foo\", \"bar\"))\n+ .send()\n+ .join();\n+\n+ // then\n+ assertWorkflowInstanceCompleted(PROCESS_ID);\n+\n+ assertElementCompleted(\n+ PROCESS_ID,\n+ \"catch-event\",\n+ (catchEventOccurredEvent) ->\n+ assertThat(catchEventOccurredEvent.getPayloadAsMap())\n+ .containsExactly(entry(\"orderId\", \"order-123\"), entry(\"foo\", \"bar\")));\n+ }\n+\n+ @Test\n+ public void shouldCorrelateMessageWithZeroTTL() {\n+ // given\n+ clientRule\n+ .getWorkflowClient()\n+ .newCreateInstanceCommand()\n+ .bpmnProcessId(PROCESS_ID)\n+ .latestVersion()\n+ .payload(Collections.singletonMap(\"orderId\", \"order-123\"))\n+ .send()\n+ .join();\n+\n+ assertElementActivated(\"catch-event\");\n+\n+ // when\n+ clientRule\n+ .getWorkflowClient()\n+ .newPublishMessageCommand()\n+ .messageName(\"order canceled\")\n+ .correlationKey(\"order-123\")\n+ .timeToLive(Duration.ZERO)\n+ .send()\n+ .join();\n+\n+ // then\n+ assertElementCompleted(PROCESS_ID, \"catch-event\");\n+ }\n+\n+ @Test\n+ public void shouldNotCorrelateMessageAfterTTL() {\n+ // given\n+ clientRule\n+ .getWorkflowClient()\n+ .newPublishMessageCommand()\n+ .messageName(\"order canceled\")\n+ .correlationKey(\"order-123\")\n+ .timeToLive(Duration.ZERO)\n+ .payload(Collections.singletonMap(\"msg\", \"failure\"))\n+ .send()\n+ .join();\n+\n+ clientRule\n+ .getWorkflowClient()\n+ .newPublishMessageCommand()\n+ .messageName(\"order canceled\")\n+ .correlationKey(\"order-123\")\n+ .timeToLive(Duration.ofMinutes(1))\n+ .payload(Collections.singletonMap(\"msg\", \"expected\"))\n+ .send()\n+ .join();\n+\n+ // when\n+ clientRule\n+ .getWorkflowClient()\n+ .newCreateInstanceCommand()\n+ .bpmnProcessId(PROCESS_ID)\n+ .latestVersion()\n+ .payload(Collections.singletonMap(\"orderId\", \"order-123\"))\n+ .send()\n+ .join();\n+\n+ // then\n+ assertElementCompleted(\n+ PROCESS_ID,\n+ \"catch-event\",\n+ (catchEventOccurred) ->\n+ assertThat(catchEventOccurred.getPayloadAsMap()).contains(entry(\"msg\", \"expected\")));\n+ }\n+\n+ @Test\n+ public void shouldRejectMessageWithSameId() {\n+ // given\n+ clientRule\n+ .getWorkflowClient()\n+ .newPublishMessageCommand()\n+ .messageName(\"order canceled\")\n+ .correlationKey(\"order-123\")\n+ .messageId(\"foo\")\n+ .send()\n+ .join();\n+\n+ // when\n+ final ZeebeFuture<Void> future =\n+ clientRule\n+ .getWorkflowClient()\n+ .newPublishMessageCommand()\n+ .messageName(\"order canceled\")\n+ .correlationKey(\"order-123\")\n+ .messageId(\"foo\")\n+ .send();\n+\n+ // then\n+ assertThatThrownBy(future::join)\n+ .isInstanceOf(ClientException.class)\n+ .hasMessageContaining(\"message with id 'foo' is already published\");\n+ }\n+}\n", "diff --git a/.github/workflows/ibis-rebase-nightly.yml b/.github/workflows/ibis-rebase-nightly.yml\nnew file mode 100644\nindex 0000000..3d2f064\n--- /dev/null\n+++ b/.github/workflows/ibis-rebase-nightly.yml\n@@ -0,0 +1,82 @@\n+name: Update Dependencies\n+on:\n+ schedule:\n+ # run every 24 hours at 1 AM\n+ - cron: \"1 */24 * * *\"\n+ workflow_dispatch:\n+\n+jobs:\n+ generate_branches:\n+ runs-on: ubuntu-latest\n+ outputs:\n+ matrix: ${{ steps.set-matrix.outputs.matrix }}\n+ steps:\n+ - name: output branches list\n+ id: set-matrix\n+ run: |\n+ set -euo pipefail\n+\n+ branches=$(git ls-remote --heads https://github.com/ibis-project/ibis.git \\\n+ | sed -e 's#\\t# #g' -e 's#refs/heads/##g' \\\n+ | cut -d ' ' -f2 \\\n+ | grep -P '\\d+\\.x\\.x' \\\n+ | xargs -I {} printf '\"%s\"' \\\n+ | jq -s '{branch: .}')\n+\n+ echo \"::set-output name=matrix::$branches\"\n+\n+ niv_update:\n+ runs-on: ubuntu-latest\n+ needs:\n+ - generate_branches\n+ strategy:\n+ matrix: ${{ fromJSON(needs.generate_branches.outputs.matrix) }}\n+ steps:\n+ - uses: actions/checkout@v3\n+\n+ - uses: tibdex/github-app-token@v1\n+ id: generate_pr_token\n+ with:\n+ app_id: ${{ secrets.SQUAWK_BOT_APP_ID }}\n+ private_key: ${{ secrets.SQUAWK_BOT_APP_PRIVATE_KEY }}\n+\n+ - uses: tibdex/github-app-token@v1\n+ id: generate_pr_approval_token\n+ with:\n+ app_id: ${{ secrets.PR_APPROVAL_BOT_APP_ID }}\n+ private_key: ${{ secrets.PR_APPROVAL_BOT_APP_PRIVATE_KEY }}\n+\n+ - uses: cpcloud/[email protected]\n+ id: compare_commits\n+ with:\n+ token: ${{ steps.generate_pr_token.outputs.token }}\n+ owner: ibis-project\n+ repo: ibis\n+ basehead: ${{ github.sha }}...${{ steps.get_current_commit.outputs.rev }}\n+ include-merge-commits: false\n+\n+ - uses: peter-evans/create-pull-request@v4\n+ id: create_pr\n+ with:\n+ token: ${{ steps.generate_pr_token.outputs.token }}\n+ commit-message: \"chore(${{ matrix.branch }}): rebase onto upstream\"\n+ branch: \"create-pull-request/rebase-${{ matrix.branch }}\"\n+ base: ${{ matrix.branch }}\n+ delete-branch: true\n+ author: \"ibis-squawk-bot[bot] <ibis-squawk-bot[bot]@users.noreply.github.com>\"\n+ title: \"chore(${{ matrix.branch }}): rebase onto upstream\"\n+ body: ${{ steps.compare_commits.outputs.differences }}\n+ labels: dependencies\n+\n+ - uses: juliangruber/[email protected]\n+ if: ${{ fromJSON(steps.create_pr.outputs.pull-request-number) != null }}\n+ with:\n+ github-token: ${{ steps.generate_pr_approval_token.outputs.token }}\n+ number: ${{ steps.create_pr.outputs.pull-request-number }}\n+\n+ - uses: peter-evans/enable-pull-request-automerge@v2\n+ if: ${{ fromJSON(steps.create_pr.outputs.pull-request-number) != null }}\n+ with:\n+ token: ${{ steps.generate_pr_token.outputs.token }}\n+ pull-request-number: ${{ steps.create_pr.outputs.pull-request-number }}\n+ merge-method: rebase\n"]
| 3 |
["9e80231539aa307e607e2b82b35df9e09ede8385", "2d416be63eeec9e7fdb90a62c40c8ad8f0672efa", "e82254c4ca73fe55834f005f08bc2a060496f815"]
|
["refactor", "test", "ci"]
|
add jackson dependencies for zb-bpmn-model,remove unnecessary lines from verify-wal test,add automation for rebasing `*.x.x` branches
|
["diff --git a/parent/pom.xml b/parent/pom.xml\nindex d475131..6290e66 100644\n--- a/parent/pom.xml\n+++ b/parent/pom.xml\n@@ -35,6 +35,7 @@\n <version.mockito>1.8.5</version.mockito>\n <version.assertj>3.8.0</version.assertj>\n <version.msgpack>0.8.13</version.msgpack>\n+ <version.jackson>2.9.0</version.jackson>\n <version.jmh>1.11.2</version.jmh>\n <version.sbe>1.5.6</version.sbe>\n <version.slf4j>1.7.23</version.slf4j>\n@@ -64,6 +65,18 @@\n </dependency>\n \n <dependency>\n+ <groupId>com.fasterxml.jackson.core</groupId>\n+ <artifactId>jackson-databind</artifactId>\n+ <version>${version.jackson}</version>\n+ </dependency>\n+\n+ <dependency>\n+ <groupId>com.fasterxml.jackson.dataformat</groupId>\n+ <artifactId>jackson-dataformat-yaml</artifactId>\n+ <version>${version.jackson}</version>\n+ </dependency>\n+\n+ <dependency>\n <groupId>org.msgpack</groupId>\n <artifactId>msgpack-core</artifactId>\n <version>${version.msgpack}</version>\n", "diff --git a/storage/wal/verifier_test.go b/storage/wal/verifier_test.go\nindex 61e1536..a44755f 100644\n--- a/storage/wal/verifier_test.go\n+++ b/storage/wal/verifier_test.go\n@@ -138,22 +138,13 @@ func writeCorruptEntries(file *os.File, t *testing.T, n int) {\n \t\t}\n \t}\n \n-\n \t// Write some random bytes to the file to simulate corruption.\n \tif _, err := file.Write(corruption); err != nil {\n \t\tfatal(t, \"corrupt WAL segment\", err)\n \t}\n-\tcorrupt := []byte{1, 255, 0, 3, 45, 26, 110}\n-\n-\twrote, err := file.Write(corrupt)\n-\tif err != nil {\n-\t\tt.Fatal(err)\n-\t} else if wrote != len(corrupt) {\n-\t\tt.Fatal(\"Error writing corrupt data to file\")\n-\t}\n \n \tif err := file.Close(); err != nil {\n-\t\tt.Fatalf(\"Error: filed to close file: %v\\n\", err)\n+\t\tt.Fatalf(\"Error: failed to close file: %v\\n\", err)\n \t}\n }\n \n", "diff --git a/.github/workflows/ibis-rebase-nightly.yml b/.github/workflows/ibis-rebase-nightly.yml\nnew file mode 100644\nindex 0000000..3d2f064\n--- /dev/null\n+++ b/.github/workflows/ibis-rebase-nightly.yml\n@@ -0,0 +1,82 @@\n+name: Update Dependencies\n+on:\n+ schedule:\n+ # run every 24 hours at 1 AM\n+ - cron: \"1 */24 * * *\"\n+ workflow_dispatch:\n+\n+jobs:\n+ generate_branches:\n+ runs-on: ubuntu-latest\n+ outputs:\n+ matrix: ${{ steps.set-matrix.outputs.matrix }}\n+ steps:\n+ - name: output branches list\n+ id: set-matrix\n+ run: |\n+ set -euo pipefail\n+\n+ branches=$(git ls-remote --heads https://github.com/ibis-project/ibis.git \\\n+ | sed -e 's#\\t# #g' -e 's#refs/heads/##g' \\\n+ | cut -d ' ' -f2 \\\n+ | grep -P '\\d+\\.x\\.x' \\\n+ | xargs -I {} printf '\"%s\"' \\\n+ | jq -s '{branch: .}')\n+\n+ echo \"::set-output name=matrix::$branches\"\n+\n+ niv_update:\n+ runs-on: ubuntu-latest\n+ needs:\n+ - generate_branches\n+ strategy:\n+ matrix: ${{ fromJSON(needs.generate_branches.outputs.matrix) }}\n+ steps:\n+ - uses: actions/checkout@v3\n+\n+ - uses: tibdex/github-app-token@v1\n+ id: generate_pr_token\n+ with:\n+ app_id: ${{ secrets.SQUAWK_BOT_APP_ID }}\n+ private_key: ${{ secrets.SQUAWK_BOT_APP_PRIVATE_KEY }}\n+\n+ - uses: tibdex/github-app-token@v1\n+ id: generate_pr_approval_token\n+ with:\n+ app_id: ${{ secrets.PR_APPROVAL_BOT_APP_ID }}\n+ private_key: ${{ secrets.PR_APPROVAL_BOT_APP_PRIVATE_KEY }}\n+\n+ - uses: cpcloud/[email protected]\n+ id: compare_commits\n+ with:\n+ token: ${{ steps.generate_pr_token.outputs.token }}\n+ owner: ibis-project\n+ repo: ibis\n+ basehead: ${{ github.sha }}...${{ steps.get_current_commit.outputs.rev }}\n+ include-merge-commits: false\n+\n+ - uses: peter-evans/create-pull-request@v4\n+ id: create_pr\n+ with:\n+ token: ${{ steps.generate_pr_token.outputs.token }}\n+ commit-message: \"chore(${{ matrix.branch }}): rebase onto upstream\"\n+ branch: \"create-pull-request/rebase-${{ matrix.branch }}\"\n+ base: ${{ matrix.branch }}\n+ delete-branch: true\n+ author: \"ibis-squawk-bot[bot] <ibis-squawk-bot[bot]@users.noreply.github.com>\"\n+ title: \"chore(${{ matrix.branch }}): rebase onto upstream\"\n+ body: ${{ steps.compare_commits.outputs.differences }}\n+ labels: dependencies\n+\n+ - uses: juliangruber/[email protected]\n+ if: ${{ fromJSON(steps.create_pr.outputs.pull-request-number) != null }}\n+ with:\n+ github-token: ${{ steps.generate_pr_approval_token.outputs.token }}\n+ number: ${{ steps.create_pr.outputs.pull-request-number }}\n+\n+ - uses: peter-evans/enable-pull-request-automerge@v2\n+ if: ${{ fromJSON(steps.create_pr.outputs.pull-request-number) != null }}\n+ with:\n+ token: ${{ steps.generate_pr_token.outputs.token }}\n+ pull-request-number: ${{ steps.create_pr.outputs.pull-request-number }}\n+ merge-method: rebase\n"]
| 3 |
["fab09655d5cc30727289cc3f26e5396fce235cd3", "fba4326c72fc22d81aba6976a9fef1e4b6154fd9", "e82254c4ca73fe55834f005f08bc2a060496f815"]
|
["build", "refactor", "ci"]
|
don't consider cases where there are no txids,fix sonar integration,offset tests for min and max read cursors
|
["diff --git a/src/main.rs b/src/main.rs\nindex 25d9580..9ba4e38 100644\n--- a/src/main.rs\n+++ b/src/main.rs\n@@ -441,6 +441,9 @@ fn main() {\n let mut delta_tx_fees = vec![];\n let empty_txids = vec![];\n let txids = tx_mined_deltas.get(&delta).unwrap_or(&empty_txids);\n+ if txids.len() == 0 {\n+ continue;\n+ }\n for txid in txids.iter() {\n delta_tx_fees.push(*tx_fees.get(txid).unwrap_or(&0));\n }\n", "diff --git a/.ci/scripts/distribution/analyse-java.sh b/.ci/scripts/distribution/analyse-java.sh\nindex a0122f7..0e965df 100755\n--- a/.ci/scripts/distribution/analyse-java.sh\n+++ b/.ci/scripts/distribution/analyse-java.sh\n@@ -23,12 +23,12 @@ else\n fi\n \n if [ \"${GIT_BRANCH}\" == \"master\" ] || [ \"${GIT_BRANCH}\" == \"develop\" ]; then\n- TARGET_BRANCH=\"master\"\n+ TARGET_BRANCH=\"${GIT_BRANCH}\"\n else\n TARGET_BRANCH=\"develop\"\n+ PROPERTIES+=(\"-Dsonar.branch.target=${TARGET_BRANCH}\")\n fi\n \n- PROPERTIES+=(\"-Dsonar.branch.target=${TARGET_BRANCH}\")\n git fetch --no-tags \"${GIT_URL}\" \"+refs/heads/${TARGET_BRANCH}:refs/remotes/origin/${TARGET_BRANCH}\"\n fi\n \ndiff --git a/parent/pom.xml b/parent/pom.xml\nindex f4c3160..d34b41f 100644\n--- a/parent/pom.xml\n+++ b/parent/pom.xml\n@@ -1570,7 +1570,7 @@\n <!-- sonarscanner integration -->\n <!-- sonar.login token must be passed at runtime to avoid sharing token -->\n <sonar.host.url>https://sonarcloud.io</sonar.host.url>\n- <sonar.organization>zeebe-io</sonar.organization>\n+ <sonar.organization>camunda-cloud</sonar.organization>\n <sonar.login>${env.SONARCLOUD_TOKEN}</sonar.login>\n <sonar.links.issue>${project.scm.url}/issues</sonar.links.issue>\n <sonar.cpd.exclusions>\n", "diff --git a/storage/reads/array_cursor_test.go b/storage/reads/array_cursor_test.go\nindex 7c7ad0c..c1e6ff9 100644\n--- a/storage/reads/array_cursor_test.go\n+++ b/storage/reads/array_cursor_test.go\n@@ -1541,6 +1541,34 @@ func TestWindowMinArrayCursor(t *testing.T) {\n \t\t\t},\n \t\t},\n \t\t{\n+\t\t\tname: \"window offset\",\n+\t\t\tevery: time.Hour,\n+\t\t\toffset: 30 * time.Minute,\n+\t\t\tinputArrays: []*cursors.IntegerArray{\n+\t\t\t\tmakeIntegerArray(\n+\t\t\t\t\t16,\n+\t\t\t\t\tmustParseTime(\"2010-01-01T00:00:00Z\"), 15*time.Minute,\n+\t\t\t\t\tfunc(i int64) int64 {\n+\t\t\t\t\t\tbase := (i / 4) * 100\n+\t\t\t\t\t\tm := (i % 4) * 15\n+\t\t\t\t\t\treturn base + m\n+\t\t\t\t\t},\n+\t\t\t\t),\n+\t\t\t},\n+\t\t\twant: []*cursors.IntegerArray{\n+\t\t\t\t{\n+\t\t\t\t\tTimestamps: []int64{\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T00:00:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T00:30:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T01:30:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T02:30:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T03:30:00Z\").UnixNano(),\n+\t\t\t\t\t},\n+\t\t\t\t\tValues: []int64{0, 30, 130, 230, 330},\n+\t\t\t\t},\n+\t\t\t},\n+\t\t},\n+\t\t{\n \t\t\tname: \"window desc values\",\n \t\t\tevery: time.Hour,\n \t\t\tinputArrays: []*cursors.IntegerArray{\n@@ -1560,6 +1588,34 @@ func TestWindowMinArrayCursor(t *testing.T) {\n \t\t\t},\n \t\t},\n \t\t{\n+\t\t\tname: \"window offset desc values\",\n+\t\t\tevery: time.Hour,\n+\t\t\toffset: 30 * time.Minute,\n+\t\t\tinputArrays: []*cursors.IntegerArray{\n+\t\t\t\tmakeIntegerArray(\n+\t\t\t\t\t16,\n+\t\t\t\t\tmustParseTime(\"2010-01-01T00:00:00Z\"), 15*time.Minute,\n+\t\t\t\t\tfunc(i int64) int64 {\n+\t\t\t\t\t\tbase := (i / 4) * 100\n+\t\t\t\t\t\tm := 60 - (i%4)*15\n+\t\t\t\t\t\treturn base + m\n+\t\t\t\t\t},\n+\t\t\t\t),\n+\t\t\t},\n+\t\t\twant: []*cursors.IntegerArray{\n+\t\t\t\t{\n+\t\t\t\t\tTimestamps: []int64{\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T00:15:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T00:45:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T01:45:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T02:45:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T03:45:00Z\").UnixNano(),\n+\t\t\t\t\t},\n+\t\t\t\t\tValues: []int64{45, 15, 115, 215, 315},\n+\t\t\t\t},\n+\t\t\t},\n+\t\t},\n+\t\t{\n \t\t\tname: \"window min int\",\n \t\t\tevery: time.Hour,\n \t\t\tinputArrays: []*cursors.IntegerArray{\n@@ -1693,6 +1749,34 @@ func TestWindowMaxArrayCursor(t *testing.T) {\n \t\t\t},\n \t\t},\n \t\t{\n+\t\t\tname: \"window offset\",\n+\t\t\tevery: time.Hour,\n+\t\t\toffset: 30 * time.Minute,\n+\t\t\tinputArrays: []*cursors.IntegerArray{\n+\t\t\t\tmakeIntegerArray(\n+\t\t\t\t\t16,\n+\t\t\t\t\tmustParseTime(\"2010-01-01T00:00:00Z\"), 15*time.Minute,\n+\t\t\t\t\tfunc(i int64) int64 {\n+\t\t\t\t\t\tbase := (i / 4) * 100\n+\t\t\t\t\t\tm := (i % 4) * 15\n+\t\t\t\t\t\treturn base + m\n+\t\t\t\t\t},\n+\t\t\t\t),\n+\t\t\t},\n+\t\t\twant: []*cursors.IntegerArray{\n+\t\t\t\t{\n+\t\t\t\t\tTimestamps: []int64{\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T00:15:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T01:15:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T02:15:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T03:15:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T03:45:00Z\").UnixNano(),\n+\t\t\t\t\t},\n+\t\t\t\t\tValues: []int64{15, 115, 215, 315, 345},\n+\t\t\t\t},\n+\t\t\t},\n+\t\t},\n+\t\t{\n \t\t\tname: \"window desc values\",\n \t\t\tevery: time.Hour,\n \t\t\tinputArrays: []*cursors.IntegerArray{\n@@ -1712,6 +1796,34 @@ func TestWindowMaxArrayCursor(t *testing.T) {\n \t\t\t},\n \t\t},\n \t\t{\n+\t\t\tname: \"window offset desc values\",\n+\t\t\tevery: time.Hour,\n+\t\t\toffset: 30 * time.Minute,\n+\t\t\tinputArrays: []*cursors.IntegerArray{\n+\t\t\t\tmakeIntegerArray(\n+\t\t\t\t\t16,\n+\t\t\t\t\tmustParseTime(\"2010-01-01T00:00:00Z\"), 15*time.Minute,\n+\t\t\t\t\tfunc(i int64) int64 {\n+\t\t\t\t\t\tbase := (i / 4) * 100\n+\t\t\t\t\t\tm := 60 - (i%4)*15\n+\t\t\t\t\t\treturn base + m\n+\t\t\t\t\t},\n+\t\t\t\t),\n+\t\t\t},\n+\t\t\twant: []*cursors.IntegerArray{\n+\t\t\t\t{\n+\t\t\t\t\tTimestamps: []int64{\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T00:00:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T01:00:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T02:00:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T03:00:00Z\").UnixNano(),\n+\t\t\t\t\t\tmustParseTime(\"2010-01-01T03:30:00Z\").UnixNano(),\n+\t\t\t\t\t},\n+\t\t\t\t\tValues: []int64{60, 160, 260, 360, 330},\n+\t\t\t\t},\n+\t\t\t},\n+\t\t},\n+\t\t{\n \t\t\tname: \"window min int\",\n \t\t\tevery: time.Hour,\n \t\t\tinputArrays: []*cursors.IntegerArray{\n"]
| 3 |
["37a1b5bbb5270befcee5d9b9621af196c787a61f", "6cbbd98dfe6c768dbe49f8d6d2448856a9a86089", "b7e2330fa3a8d7b8a9bff01b707c44e64b845c7b"]
|
["fix", "build", "test"]
|
add method to extract snapshot name from filename
also corrected pattern, where the period was meant to match a period, not any
character.
related to zeebe-io/zeebe#876,only run JMH on develop and master
- reduces test duration of feature branches
- reduces bors merge duration
- show performance impact of PRs and Releases on the respective branches
- number parallel stages to enforce ordering in Blue Ocean view
- **note**: skipping a parallel stage in Blue Ocean triggers a bug where
log will not be show until the stage finished https://issues.jenkins-ci.org/browse/JENKINS-48879,fix "types" field in dist
|
["diff --git a/logstreams/src/main/java/io/zeebe/logstreams/impl/snapshot/fs/FsSnapshotStorageConfiguration.java b/logstreams/src/main/java/io/zeebe/logstreams/impl/snapshot/fs/FsSnapshotStorageConfiguration.java\nindex d8f4d89..e54e85a 100644\n--- a/logstreams/src/main/java/io/zeebe/logstreams/impl/snapshot/fs/FsSnapshotStorageConfiguration.java\n+++ b/logstreams/src/main/java/io/zeebe/logstreams/impl/snapshot/fs/FsSnapshotStorageConfiguration.java\n@@ -23,8 +23,9 @@ public class FsSnapshotStorageConfiguration\n {\n protected static final String CHECKSUM_ALGORITHM = \"SHA1\";\n \n- protected static final String SNAPSHOT_FILE_NAME_TEMPLATE = \"%s\" + File.separatorChar + \"%s-%d.snapshot\";\n- protected static final String SNAPSHOT_FILE_NAME_PATTERN = \"%s-(\\\\d+).snapshot\";\n+ protected static final String SNAPSHOT_FILE_NAME_TEMPLATE = \"%s-%d.snapshot\";\n+ protected static final String SNAPSHOT_FILE_PATH_TEMPLATE = \"%s\" + File.separatorChar + SNAPSHOT_FILE_NAME_TEMPLATE;\n+ protected static final String SNAPSHOT_FILE_NAME_PATTERN = \"%s-(\\\\d+)\\\\.snapshot\";\n \n protected static final String CHECKSUM_FILE_NAME_TEMPLATE = \"%s\" + File.separatorChar + \"%s-%d.\" + CHECKSUM_ALGORITHM.toLowerCase();\n \n@@ -50,7 +51,7 @@ public class FsSnapshotStorageConfiguration\n \n public String snapshotFileName(String name, long logPosition)\n {\n- return String.format(SNAPSHOT_FILE_NAME_TEMPLATE, rootPath, name, logPosition);\n+ return String.format(SNAPSHOT_FILE_PATH_TEMPLATE, rootPath, name, logPosition);\n }\n \n public String checksumFileName(String name, long logPosition)\n@@ -86,7 +87,7 @@ public class FsSnapshotStorageConfiguration\n return String.format(CHECKSUM_CONTENT_TEMPLATE, checksum, dataFileName);\n }\n \n- public String extractDigetsFromChecksumContent(String content)\n+ public String extractDigestFromChecksumContent(String content)\n {\n final int indexOfSeparator = content.indexOf(CHECKSUM_CONTENT_SEPARATOR);\n if (indexOfSeparator < 0)\n@@ -108,9 +109,18 @@ public class FsSnapshotStorageConfiguration\n return content.substring(indexOfSeparator + CHECKSUM_CONTENT_SEPARATOR.length());\n }\n \n+ public String getSnapshotNameFromFileName(final String fileName)\n+ {\n+ final String suffixPattern = String.format(SNAPSHOT_FILE_NAME_PATTERN, \"\");\n+ final Pattern pattern = Pattern.compile(suffixPattern);\n+ final String[] parts = pattern.split(fileName);\n+\n+ return parts[0];\n+ }\n+\n public String getSnapshotFileNameTemplate()\n {\n- return SNAPSHOT_FILE_NAME_TEMPLATE;\n+ return SNAPSHOT_FILE_PATH_TEMPLATE;\n }\n \n public String getChecksumFileNameTemplate()\n", "diff --git a/Jenkinsfile b/Jenkinsfile\nindex 9fbd3a1..3e4f052 100644\n--- a/Jenkinsfile\n+++ b/Jenkinsfile\n@@ -29,7 +29,7 @@ pipeline {\n \n stage('Verify') {\n parallel {\n- stage('Tests') {\n+ stage('1 - Java Tests') {\n steps {\n withMaven(jdk: jdkVersion, maven: mavenVersion, mavenSettingsConfig: mavenSettingsConfig) {\n sh 'mvn -B verify -P skip-unstable-ci'\n@@ -42,7 +42,9 @@ pipeline {\n }\n }\n \n- stage('JMH') {\n+ stage('2 - JMH') {\n+ // delete this line to also run JMH on feature branch\n+ when { anyOf { branch 'master'; branch 'develop' } }\n agent { node { label 'ubuntu-large' } }\n \n steps {\n", "diff --git a/scripts/prepare.js b/scripts/prepare.js\nindex 4bab09b..55f459b 100644\n--- a/scripts/prepare.js\n+++ b/scripts/prepare.js\n@@ -96,7 +96,6 @@ async function prepare() {\n delete json.private\n delete json.scripts\n delete json.devDependencies\n- delete json.types\n \n // Add \"postinstall\" script for donations.\n if (/(native|core)$/.test(name))\n@@ -128,6 +127,7 @@ async function prepare() {\n else {\n json.main = json.main.replace(/^dist\\//, '')\n if (json.main.endsWith('.cjs.js')) {\n+ json.types = json.main.replace('.cjs.js', '.d.ts')\n json.module = json.main.replace('.cjs', '')\n }\n }\n"]
| 3 |
["7ab965c55d0e98fdb6179577d0db56599675e400", "83934807f4061980e7f5bf46d36eca70e238835d", "f14ef3809f456aadd73523e47cb16c5d15e9a9df"]
|
["feat", "ci", "build"]
|
add page balckwhitelist and pdf,svg helper,fix deploy
|
["diff --git a/src/_locales/common/messages.json b/src/_locales/common/messages.json\nindex e8524ac..3a596d6 100644\n--- a/src/_locales/common/messages.json\n+++ b/src/_locales/common/messages.json\n@@ -4,11 +4,21 @@\n \"zh_CN\": \"\u6dfb\u52a0\",\n \"zh_TW\": \"\u65b0\u589e\"\n },\n+ \"blacklist\": {\n+ \"en\": \"Blacklist\",\n+ \"zh_CN\": \"\u9ed1\u540d\u5355\",\n+ \"zh_TW\": \"\u9ed1\u540d\u55ae\"\n+ },\n \"cancel\": {\n \"en\": \"Cancel\",\n \"zh_CN\": \"\u53d6\u6d88\",\n \"zh_TW\": \"\u53d6\u6d88\"\n },\n+ \"changes_confirm\": {\n+ \"en\": \"Changes not saved. Close anyway?\",\n+ \"zh_CN\": \"\u4fee\u6539\u672a\u4fdd\u5b58\u3002\u786e\u8ba4\u5173\u95ed\uff1f\",\n+ \"zh_TW\": \"\u4fee\u6539\u672a\u4fdd\u5b58\u3002\u78ba\u5b9a\u95dc\u9589\uff1f\"\n+ },\n \"confirm\": {\n \"en\": \"Confirm\",\n \"zh_CN\": \"\u786e\u8ba4\",\n@@ -93,5 +103,10 @@\n \"en\": \"words\",\n \"zh_CN\": \"\u4e2a\",\n \"zh_TW\": \"\u4e2a\"\n+ },\n+ \"whitelist\": {\n+ \"en\": \"Whitelist\",\n+ \"zh_CN\": \"\u767d\u540d\u5355\",\n+ \"zh_TW\": \"\u767d\u540d\u55ae\"\n }\n }\ndiff --git a/src/_locales/options/messages.json b/src/_locales/options/messages.json\nindex ada2488..e7d699a 100644\n--- a/src/_locales/options/messages.json\n+++ b/src/_locales/options/messages.json\n@@ -119,6 +119,11 @@\n \"zh_CN\": \"\u53cd\u9988\u95ee\u9898\",\n \"zh_TW\": \"\u8edf\u9ad4\u4f7f\u7528\u7591\u554f\u548c\u5efa\u8a00\"\n },\n+ \"match_pattern_description\": {\n+ \"en\": \"Specify URLs as match patterns. <a href=\\\"https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns#Examples\\\" target=\\\"_blank\\\">Examples</a>. Empty fields will be removed.\",\n+ \"zh_CN\": \"\u7f51\u5740\u652f\u6301\u5339\u914d\u6a21\u5f0f\uff08<a href=\\\"https://developer.mozilla.org/zh-CN/Add-ons/WebExtensions/Match_patterns#\u8303\u4f8b\\\" target=\\\"_blank\\\">\u4f8b\u5b50</a>\uff09\u3002\u7559\u7a7a\u4fdd\u5b58\u5373\u53ef\u6e05\u9664\u3002\",\n+ \"zh_TW\": \"\u7db2\u5740\u652f\u63f4\u5339\u914d\u6a21\u5f0f\uff08<a href=\\\"https://developer.mozilla.org/zh-CN/Add-ons/WebExtensions/Match_patterns#\u8303\u4f8b\\\" target=\\\"_blank\\\">\u4f8b\u5b50</a>\uff09\u3002\u7559\u7a7a\u5132\u5b58\u5373\u53ef\u6e05\u9664\u3002\"\n+ },\n \"msg_updated\": {\n \"en\": \"Successfully updated\",\n \"zh_CN\": \"\u8bbe\u7f6e\u5df2\u66f4\u65b0\",\n@@ -319,6 +324,21 @@\n \"zh_CN\": \"\u5f00\u542f\u540e\uff0c\u672c\u6269\u5c55\u4f1a\u81ea\u52a8\u8bc6\u522b\u8f93\u5165\u6846\u4ee5\u53ca\u5e38\u89c1\u7f16\u8f91\u5668\uff0c\u5982 CodeMirror\u3001ACE \u548c Monaco\u3002\",\n \"zh_TW\": \"\u958b\u555f\u540e\uff0c\u672c\u7a0b\u5f0f\u6703\u81ea\u52d5\u8b58\u5225\u8f38\u5165\u6846\u4ee5\u53ca\u5e38\u898b\u7de8\u8f2f\u5668\uff0c\u5982 CodeMirror\u3001ACE \u548c Monaco\u3002\"\n },\n+ \"opt_pdf_blackwhitelist_help\": {\n+ \"en\": \"Blacklisted PDF links will not jump to Saladict PDF Viewer.\",\n+ \"zh_CN\": \"\u9ed1\u540d\u5355\u5339\u914d\u7684 PDF \u94fe\u63a5\u5c06\u4e0d\u4f1a\u8df3\u8f6c\u5230 Saladict \u6253\u5f00\u3002\",\n+ \"zh_TW\": \"\u9ed1\u540d\u55ae\u5339\u914d\u7684 PDF \u9023\u7d50\u5c07\u4e0d\u6703\u8df3\u8f49\u5230 Saladict \u958b\u555f\u3002\"\n+ },\n+ \"opt_pdf_sniff\": {\n+ \"en\": \"Enable PDF Sniffer\",\n+ \"zh_CN\": \"\u9ed8\u8ba4\u7528\u672c\u6269\u5c55\u6d4f\u89c8 PDF\",\n+ \"zh_TW\": \"\u4f7f\u7528\u672c\u61c9\u7528\u7a0b\u5f0f\u700f\u89bd PDF\"\n+ },\n+ \"opt_pdf_sniff_help\": {\n+ \"en\": \"If turned on\uff0c PDF links will be automatically captured.\",\n+ \"zh_CN\": \"\u5f00\u542f\u540e\u6240\u6709 PDF \u94fe\u63a5\u5c06\u81ea\u52a8\u8df3\u8f6c\u5230\u672c\u6269\u5c55\u6253\u5f00\uff08\u5305\u62ec\u672c\u5730\uff0c\u5982\u679c\u5728\u6269\u5c55\u7ba1\u7406\u9875\u9762\u52fe\u9009\u4e86\u5141\u8bb8\uff09\u3002\",\n+ \"zh_TW\": \"\u958b\u555f\u5f8c\u6240\u6709 PDF \u9023\u7d50\u5c07\u81ea\u52d5\u8df3\u8f49\u5230\u672c\u64f4\u5145\u5957\u4ef6\u958b\u555f\uff08\u5305\u62ec\u672c\u5730\uff0c\u5982\u679c\u5728\u64f4\u5145\u5957\u4ef6\u7ba1\u7406\u9801\u9762\u52fe\u9078\u4e86\u5141\u8a31\uff09\u3002\"\n+ },\n \"opt_profile_change\": {\n \"en\": \"This option may change base on \\\"Profile\\\".\",\n \"zh_CN\": \"\u6b64\u9009\u9879\u4f1a\u56e0\u300c\u60c5\u666f\u6a21\u5f0f\u300d\u800c\u6539\u53d8\u3002\",\n@@ -329,6 +349,16 @@\n \"zh_CN\": \"\u8f93\u5165\u65f6\u663e\u793a\u5019\u9009\",\n \"zh_TW\": \"\u8f38\u5165\u6642\u986f\u793a\u5019\u9078\"\n },\n+ \"opt_sel_blackwhitelist\": {\n+ \"en\": \"Selection Black/White List\",\n+ \"zh_CN\": \"\u5212\u8bcd\u9ed1\u767d\u540d\u5355\",\n+ \"zh_TW\": \"\u9078\u8a5e\u9ed1\u767d\u540d\u55ae\"\n+ },\n+ \"opt_sel_blackwhitelist_help\": {\n+ \"en\": \"Saladict will not react to selection in blacklisted pages.\",\n+ \"zh_CN\": \"\u9ed1\u540d\u5355\u5339\u914d\u7684\u9875\u9762 Saladict \u5c06\u4e0d\u4f1a\u54cd\u5e94\u9f20\u6807\u5212\u8bcd\u3002\",\n+ \"zh_TW\": \"\u9ed1\u540d\u55ae\u5339\u914d\u7684\u9801\u9762 Saladict \u5c07\u4e0d\u6703\u97ff\u61c9\u6ed1\u9f20\u5283\u8a5e\u3002\"\n+ },\n \"opt_sel_lang\": {\n \"en\": \"Selection Languages\",\n \"zh_CN\": \"\u5212\u8bcd\u8bed\u8a00\",\ndiff --git a/src/options/components/options/BlackWhiteList/index.tsx b/src/options/components/options/BlackWhiteList/index.tsx\nnew file mode 100644\nindex 0000000..52708dd\n--- /dev/null\n+++ b/src/options/components/options/BlackWhiteList/index.tsx\n@@ -0,0 +1,69 @@\n+import React from 'react'\n+import { Props } from '../typings'\n+import { formItemLayout } from '../helpers'\n+import MatchPatternModal from '../../MatchPatternModal'\n+\n+import { FormComponentProps } from 'antd/lib/form'\n+import { Form, Button } from 'antd'\n+\n+export type BlackWhiteListProps = Props & FormComponentProps\n+\n+interface BlackWhiteListState {\n+ editingArea: '' | 'pdfWhitelist' | 'pdfBlacklist' | 'whitelist' | 'blacklist'\n+}\n+\n+export class BlackWhiteList extends React.Component<BlackWhiteListProps, BlackWhiteListState> {\n+ constructor (props: BlackWhiteListProps) {\n+ super(props)\n+ this.state = {\n+ editingArea: ''\n+ }\n+ }\n+\n+ closeModal = () => {\n+ this.setState({ editingArea: '' })\n+ }\n+\n+ render () {\n+ const { t, config } = this.props\n+\n+ return (\n+ <Form>\n+ <Form.Item\n+ {...formItemLayout}\n+ label={t('opt_sel_blackwhitelist')}\n+ help={t('opt_sel_blackwhitelist_help')}\n+ >\n+ <Button\n+ style={{ marginRight: 10 }}\n+ onClick={() => this.setState({ editingArea: 'blacklist' })}\n+ >{t('common:blacklist')}</Button>\n+ <Button\n+ onClick={() => this.setState({ editingArea: 'whitelist' })}\n+ >{t('common:whitelist')}</Button>\n+ </Form.Item>\n+ <Form.Item\n+ {...formItemLayout}\n+ label={`PDF ${t('nav_BlackWhiteList')}`}\n+ help={t('opt_pdf_blackwhitelist_help')}\n+ >\n+ <Button\n+ style={{ marginRight: 10 }}\n+ onClick={() => this.setState({ editingArea: 'pdfBlacklist' })}\n+ >PDF {t('common:blacklist')}</Button>\n+ <Button\n+ onClick={() => this.setState({ editingArea: 'pdfWhitelist' })}\n+ >PDF {t('common:whitelist')}</Button>\n+ </Form.Item>\n+ <MatchPatternModal\n+ t={t}\n+ config={config}\n+ area={this.state.editingArea}\n+ onClose={this.closeModal}\n+ />\n+ </Form>\n+ )\n+ }\n+}\n+\n+export default BlackWhiteList\ndiff --git a/src/options/components/options/PDF/index.tsx b/src/options/components/options/PDF/index.tsx\nnew file mode 100644\nindex 0000000..3e7772d\n--- /dev/null\n+++ b/src/options/components/options/PDF/index.tsx\n@@ -0,0 +1,72 @@\n+import React from 'react'\n+import { Props } from '../typings'\n+import { updateConfigOrProfile, formItemLayout } from '../helpers'\n+import MatchPatternModal from '../../MatchPatternModal'\n+\n+import { FormComponentProps } from 'antd/lib/form'\n+import { Form, Switch, Button } from 'antd'\n+\n+export type PDFProps = Props & FormComponentProps\n+\n+interface PDFState {\n+ editingArea: '' | 'pdfWhitelist' | 'pdfBlacklist'\n+}\n+\n+export class PDF extends React.Component<PDFProps, PDFState> {\n+ constructor (props: PDFProps) {\n+ super(props)\n+\n+ this.state = {\n+ editingArea: ''\n+ }\n+ }\n+\n+ closeModal = () => {\n+ this.setState({ editingArea: '' })\n+ }\n+\n+ render () {\n+ const { t, config } = this.props\n+ const { getFieldDecorator } = this.props.form\n+\n+ return (\n+ <Form>\n+ <Form.Item\n+ {...formItemLayout}\n+ label={t('opt_pdf_sniff')}\n+ help={t('opt_pdf_sniff_help')}\n+ >{\n+ getFieldDecorator('config#pdfSniff', {\n+ initialValue: config.pdfSniff,\n+ valuePropName: 'checked',\n+ })(\n+ <Switch />\n+ )\n+ }</Form.Item>\n+ <Form.Item\n+ {...formItemLayout}\n+ label={t('nav_BlackWhiteList')}\n+ help={t('opt_pdf_blackwhitelist_help')}\n+ >\n+ <Button\n+ style={{ marginRight: 10 }}\n+ onClick={() => this.setState({ editingArea: 'pdfBlacklist' })}\n+ >PDF {t('common:blacklist')}</Button>\n+ <Button\n+ onClick={() => this.setState({ editingArea: 'pdfWhitelist' })}\n+ >PDF {t('common:whitelist')}</Button>\n+ </Form.Item>\n+ <MatchPatternModal\n+ t={t}\n+ config={config}\n+ area={this.state.editingArea}\n+ onClose={this.closeModal}\n+ />\n+ </Form>\n+ )\n+ }\n+}\n+\n+export default Form.create<PDFProps>({\n+ onValuesChange: updateConfigOrProfile\n+})(PDF)\n", "diff --git a/src/__test__/m.spec.ts b/src/__test__/m.spec.ts\nindex 0f9cb63..ff5e5f0 100644\n--- a/src/__test__/m.spec.ts\n+++ b/src/__test__/m.spec.ts\n@@ -1,4 +1,4 @@\n-import { className, m, ns, style } from '../m';\n+import { className, m, ns, svg, style } from '../m';\n import { VNode, VProps } from '../structs';\n \n const h = (tag: string, props?: VProps, ...children: VNode[]) =>\n@@ -173,6 +173,28 @@ describe('.m', () => {\n });\n });\n \n+ it('should attach ns to props using svg helper', () => {\n+ const vnode = {\n+ tag: 'svg',\n+ children: [\n+ 'foo',\n+ {\n+ tag: 'div',\n+ },\n+ ],\n+ };\n+ expect(svg(vnode)).toEqual({\n+ tag: 'svg',\n+ props: { ns: 'http://www.w3.org/2000/svg' },\n+ children: [\n+ 'foo',\n+ {\n+ tag: 'div',\n+ },\n+ ],\n+ });\n+ });\n+\n it('should move key to distinct property', () => {\n expect(h('div', { key: 'foo' }, 'foo', h('div'))).toEqual({\n tag: 'div',\n", "diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml\nindex 3830f4c..3b14ee5 100644\n--- a/.github/workflows/deploy.yaml\n+++ b/.github/workflows/deploy.yaml\n@@ -67,7 +67,7 @@ jobs:\n run: aws s3 cp .next/static s3://cdn.rs.school/_next/static/ --recursive --cache-control \"public,max-age=15552000,immutable\"\n \n - name: Build container\n- run: docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/rolling-scopes/rsschool-app-client:master .\n+ run: docker buildx build --platform linux/arm64 -t ghcr.io/rolling-scopes/rsschool-app-client:master .\n \n - name: Login to GitHub Container Registry\n uses: docker/login-action@v1\n@@ -117,7 +117,7 @@ jobs:\n run: npm run build\n \n - name: Build container\n- run: docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/rolling-scopes/rsschool-app-server:master .\n+ run: docker buildx build --platform linux/arm64 -t ghcr.io/rolling-scopes/rsschool-app-server:master .\n \n - name: Login to GitHub Container Registry\n uses: docker/login-action@v1\n@@ -167,7 +167,7 @@ jobs:\n run: npm run build\n \n - name: Build container\n- run: docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/rolling-scopes/rsschool-app-nestjs:master .\n+ run: docker buildx build --platform linux/arm64 -t ghcr.io/rolling-scopes/rsschool-app-nestjs:master .\n \n - name: Login to GitHub Container Registry\n uses: docker/login-action@v1\n"]
| 3 |
["9b1c0fc20b614513384a1e562317dbf076eb8ef0", "4aa3e4c438742ef0fe694ffaf6a181874366d777", "7785be09053049b30cf41b420c59f051cd0129fc"]
|
["feat", "test", "ci"]
|
set Opensearch version to 2.5.0
We use Opensearch 2.5.0 in our dependencies. This is tied to the
Opensearch versions of other component of the platform.
This Docker compose file is only used for local testing. Let's make sure
we test on the actual version we support.,Template using kube api version
Signed-off-by: rjshrjndrn <[email protected]>,reintroduce timeout for assertion
The timeout had been removed by a previous commit. Without the timeout the test might be flaky.
Also removed obsolete code
|
["diff --git a/exporters/opensearch-exporter/docker-compose.yml b/exporters/opensearch-exporter/docker-compose.yml\nindex 8fe84b3..647afa1 100644\n--- a/exporters/opensearch-exporter/docker-compose.yml\n+++ b/exporters/opensearch-exporter/docker-compose.yml\n@@ -2,7 +2,7 @@ version: '3'\n \n services:\n opensearch:\n- image: opensearchproject/opensearch:2.6.0\n+ image: opensearchproject/opensearch:2.5.0\n ports:\n - \"9200:9200\"\n - \"9600:9600\"\n@@ -14,7 +14,7 @@ services:\n - opensearch-net\n \n opensearch-dashboards:\n- image: opensearchproject/opensearch-dashboards:2.6.0\n+ image: opensearchproject/opensearch-dashboards:2.5.0\n ports:\n - \"5601:5601\"\n expose:\n", "diff --git a/.github/workflows/api-ee.yaml b/.github/workflows/api-ee.yaml\nindex c014f34..2a12e0d 100644\n--- a/.github/workflows/api-ee.yaml\n+++ b/.github/workflows/api-ee.yaml\n@@ -8,7 +8,7 @@ on:\n default: 'false'\n push:\n branches:\n- - dev\n+ - test_ci\n paths:\n - ee/api/**\n - api/**\n@@ -112,7 +112,8 @@ jobs:\n # Deploy command\n kubectl config set-context --namespace=app --current\n kubectl config get-contexts\n- helm template openreplay -n app openreplay -f vars.yaml -f /tmp/image_override.yaml --set ingress-nginx.enabled=false --set skipMigration=true --no-hooks | kubectl apply -f -\n+ k_version=$(kubectl version --short 2>/dev/null | awk '/Server/{print $NF}')\n+ helm template openreplay -n app openreplay -f vars.yaml -f /tmp/image_override.yaml --set ingress-nginx.enabled=false --set skipMigration=true --no-hooks --kube-version=$k_version | kubectl apply -f -\n env:\n DOCKER_REPO: ${{ secrets.EE_REGISTRY_URL }}\n # We're not passing -ee flag, because helm will add that.\n", "diff --git a/engine/src/test/java/io/camunda/zeebe/engine/processing/streamprocessor/StreamProcessorReplayModeTest.java b/engine/src/test/java/io/camunda/zeebe/engine/processing/streamprocessor/StreamProcessorReplayModeTest.java\nindex d0ee4f3..c2ab83c 100644\n--- a/engine/src/test/java/io/camunda/zeebe/engine/processing/streamprocessor/StreamProcessorReplayModeTest.java\n+++ b/engine/src/test/java/io/camunda/zeebe/engine/processing/streamprocessor/StreamProcessorReplayModeTest.java\n@@ -13,6 +13,7 @@ import static io.camunda.zeebe.protocol.record.intent.ProcessInstanceIntent.ACTI\n import static io.camunda.zeebe.protocol.record.intent.ProcessInstanceIntent.ELEMENT_ACTIVATING;\n import static java.util.function.Predicate.isEqual;\n import static org.assertj.core.api.Assertions.assertThat;\n+import static org.awaitility.Awaitility.await;\n import static org.mockito.ArgumentMatchers.any;\n import static org.mockito.ArgumentMatchers.anyLong;\n import static org.mockito.ArgumentMatchers.eq;\n@@ -30,7 +31,6 @@ import io.camunda.zeebe.protocol.record.intent.ProcessInstanceIntent;\n import io.camunda.zeebe.streamprocessor.StreamProcessor;\n import io.camunda.zeebe.streamprocessor.StreamProcessor.Phase;\n import io.camunda.zeebe.streamprocessor.StreamProcessorMode;\n-import org.awaitility.Awaitility;\n import org.junit.Rule;\n import org.junit.Test;\n import org.mockito.InOrder;\n@@ -71,7 +71,7 @@ public final class StreamProcessorReplayModeTest {\n // when\n startStreamProcessor(replayUntilEnd);\n \n- Awaitility.await()\n+ await()\n .untilAsserted(\n () -> assertThat(getCurrentPhase(replayUntilEnd)).isEqualTo(Phase.PROCESSING));\n \n@@ -163,7 +163,7 @@ public final class StreamProcessorReplayModeTest {\n command().processInstance(ACTIVATE_ELEMENT, RECORD),\n event().processInstance(ELEMENT_ACTIVATING, RECORD).causedBy(0));\n \n- Awaitility.await(\"should have replayed first events\")\n+ await(\"should have replayed first events\")\n .until(replayContinuously::getLastSuccessfulProcessedRecordPosition, (pos) -> pos > 0);\n \n // when\n@@ -210,7 +210,7 @@ public final class StreamProcessorReplayModeTest {\n command().processInstance(ACTIVATE_ELEMENT, RECORD),\n event().processInstance(ELEMENT_ACTIVATING, RECORD).causedBy(0));\n \n- Awaitility.await(\"should have replayed first events\")\n+ await(\"should have replayed first events\")\n .until(replayContinuously::getLastSuccessfulProcessedRecordPosition, (pos) -> pos > 0);\n streamProcessor.pauseProcessing().join();\n replayContinuously.writeBatch(\n@@ -244,7 +244,7 @@ public final class StreamProcessorReplayModeTest {\n // then\n verify(eventApplier, TIMEOUT).applyState(anyLong(), eq(ELEMENT_ACTIVATING), any());\n \n- Awaitility.await()\n+ await()\n .untilAsserted(\n () -> {\n final var lastProcessedPosition = getLastProcessedPosition(replayContinuously);\n@@ -273,8 +273,7 @@ public final class StreamProcessorReplayModeTest {\n \n verify(eventApplier, TIMEOUT).applyState(anyLong(), eq(ELEMENT_ACTIVATING), any());\n \n- Awaitility.await()\n- .until(() -> getLastProcessedPosition(replayContinuously), isEqual(commandPosition));\n+ await().until(() -> getLastProcessedPosition(replayContinuously), isEqual(commandPosition));\n \n // then\n assertThat(replayContinuously.getLastSuccessfulProcessedRecordPosition())\n@@ -285,7 +284,6 @@ public final class StreamProcessorReplayModeTest {\n @Test\n public void shouldNotSetLastProcessedPositionIfLessThanSnapshotPosition() {\n // given\n- final var commandPositionBeforeSnapshot = 1L;\n final var snapshotPosition = 2L;\n \n startStreamProcessor(replayContinuously);\n@@ -298,23 +296,20 @@ public final class StreamProcessorReplayModeTest {\n // when\n startStreamProcessor(replayContinuously);\n \n- Awaitility.await()\n+ await()\n .untilAsserted(\n () -> assertThat(getCurrentPhase(replayContinuously)).isEqualTo(Phase.REPLAY));\n \n- final var eventPosition =\n- replayContinuously.writeEvent(\n- ELEMENT_ACTIVATING,\n- RECORD,\n- writer -> writer.sourceRecordPosition(commandPositionBeforeSnapshot));\n-\n // then\n final var lastProcessedPositionState = replayContinuously.getLastProcessedPositionState();\n \n- assertThat(lastProcessedPositionState.getLastSuccessfulProcessedRecordPosition())\n- .describedAs(\n- \"Expected that the last processed position is not less than the snapshot position\")\n- .isEqualTo(snapshotPosition);\n+ await()\n+ .untilAsserted(\n+ () ->\n+ assertThat(lastProcessedPositionState.getLastSuccessfulProcessedRecordPosition())\n+ .describedAs(\n+ \"Expected that the last processed position is not less than the snapshot position\")\n+ .isEqualTo(snapshotPosition));\n }\n \n private StreamProcessor startStreamProcessor(final StreamProcessorRule streamProcessorRule) {\n"]
| 3 |
["b7beb4d8cf19bbb7b72997a8276300a786e4fb5e", "c3531347fe5a4cc82d426db195026a5bdad15e7a", "0d23f1b3ed22e615b9611bb4eae01d2241e64dff"]
|
["build", "ci", "refactor"]
|
run nix macos jobs on macos-13 to try and avoid SIP,fixed tick interval,add LICENSE
|
["diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml\nnew file mode 100644\nindex 0000000..5be7d17\n--- /dev/null\n+++ b/.github/actionlint.yaml\n@@ -0,0 +1,7 @@\n+self-hosted-runner:\n+ # Labels of self-hosted runner in array of strings.\n+ labels: [macos-13]\n+# Configuration variables in array of strings defined in your repository or\n+# organization. `null` means disabling configuration variables check.\n+# Empty array means no configuration variable is allowed.\n+config-variables: null\ndiff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml\nindex e37346c..dce77e1 100644\n--- a/.github/workflows/nix.yml\n+++ b/.github/workflows/nix.yml\n@@ -37,7 +37,7 @@ jobs:\n - \"3.10\"\n - \"3.11\"\n include:\n- - os: macos-latest\n+ - os: macos-13\n python-version: \"3.10\"\n steps:\n - name: checkout\ndiff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex 005a850..8db22e2 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -3,7 +3,7 @@ ci:\n autofix_prs: false\n autoupdate_commit_msg: \"chore(deps): pre-commit.ci autoupdate\"\n skip:\n- - actionlint\n+ - actionlint-system\n - deadnix\n - just\n - nixpkgs-fmt\n@@ -17,9 +17,9 @@ default_stages:\n - commit\n repos:\n - repo: https://github.com/rhysd/actionlint\n- rev: v1.6.24\n+ rev: v1.6.25\n hooks:\n- - id: actionlint\n+ - id: actionlint-system\n - repo: https://github.com/psf/black\n rev: 23.3.0\n hooks:\n@@ -30,7 +30,7 @@ repos:\n - id: nbstripout\n exclude: .+/rendered/.+\n - repo: https://github.com/codespell-project/codespell\n- rev: v2.2.4\n+ rev: v2.2.5\n hooks:\n - id: codespell\n additional_dependencies:\n", "diff --git a/backend/services/integrations/main.go b/backend/services/integrations/main.go\nindex 4a5e764..35c3ff2 100644\n--- a/backend/services/integrations/main.go\n+++ b/backend/services/integrations/main.go\n@@ -54,7 +54,7 @@ func main() {\n \tsigchan := make(chan os.Signal, 1)\n \tsignal.Notify(sigchan, syscall.SIGINT, syscall.SIGTERM)\n \n-\ttick := time.Tick(intervals.INTEGRATIONS_REQUEST_INTERVAL)\n+\ttick := time.Tick(intervals.INTEGRATIONS_REQUEST_INTERVAL * time.Millisecond)\n \n \tlog.Printf(\"Integration service started\\n\")\n \tmanager.RequestAll()\n@@ -66,7 +66,7 @@ func main() {\n \t\t\tpg.Close()\n \t\t\tos.Exit(0)\n \t\tcase <-tick:\n-\t\t\t// log.Printf(\"Requesting all...\\n\")\n+\t\t\tlog.Printf(\"Requesting all...\\n\")\n \t\t\tmanager.RequestAll()\n \t\tcase event := <-manager.Events:\n \t\t\t// log.Printf(\"New integration event: %v\\n\", *event.RawErrorEvent)\n", "diff --git a/LICENSE b/LICENSE\nnew file mode 100644\nindex 0000000..005581d\n--- /dev/null\n+++ b/LICENSE\n@@ -0,0 +1,21 @@\n+MIT License\n+\n+Copyright (c) Hassan El Mghari\n+\n+Permission is hereby granted, free of charge, to any person obtaining a copy\n+of this software and associated documentation files (the \"Software\"), to deal\n+in the Software without restriction, including without limitation the rights\n+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+copies of the Software, and to permit persons to whom the Software is\n+furnished to do so, subject to the following conditions:\n+\n+The above copyright notice and this permission notice shall be included in all\n+copies or substantial portions of the Software.\n+\n+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n+SOFTWARE.\n"]
| 3 |
["54cb6d4643b4a072ff997592a7fa14a69a6c068d", "7dc3b70fe40fc7de255a28bb3098bcb8c0d35365", "096145f0d32a6b351b1db413b04a685952f04fb3"]
|
["ci", "fix", "docs"]
|
Added tooltip for Data sources table buttons only on small screen,template properties,support react@17 in peer deps
resolves #1478
|
["diff --git a/packages/nc-gui/components/dashboard/settings/DataSources.vue b/packages/nc-gui/components/dashboard/settings/DataSources.vue\nindex 78caa98..0ed5df9 100644\n--- a/packages/nc-gui/components/dashboard/settings/DataSources.vue\n+++ b/packages/nc-gui/components/dashboard/settings/DataSources.vue\n@@ -351,59 +351,78 @@ const isEditBaseModalOpen = computed({\n \n <div class=\"ds-table-col ds-table-actions\">\n <div class=\"flex items-center gap-2\">\n- <NcButton\n- v-if=\"!sources[0].is_meta && !sources[0].is_local\"\n- class=\"nc-action-btn cursor-pointer outline-0\"\n- type=\"text\"\n- size=\"small\"\n- @click=\"baseAction(sources[0].id, DataSourcesSubTab.Metadata)\"\n- >\n- <div class=\"flex items-center gap-2 text-gray-600\">\n- <GeneralIcon icon=\"sync\" class=\"group-hover:text-accent\" />\n- <div class=\"nc-action-btn-label\">\n- {{ $t('tooltip.metaSync') }}\n+ <NcTooltip v-if=\"!sources[0].is_meta && !sources[0].is_local\" overlay-class-name=\"!xl:hidden\">\n+ <template #title>\n+ {{ $t('tooltip.metaSync') }}\n+ </template>\n+ <NcButton\n+ class=\"nc-action-btn cursor-pointer outline-0\"\n+ type=\"text\"\n+ size=\"small\"\n+ @click=\"baseAction(sources[0].id, DataSourcesSubTab.Metadata)\"\n+ >\n+ <div class=\"flex items-center gap-2 text-gray-600\">\n+ <GeneralIcon icon=\"sync\" class=\"group-hover:text-accent\" />\n+ <div class=\"nc-action-btn-label\">\n+ {{ $t('tooltip.metaSync') }}\n+ </div>\n </div>\n- </div>\n- </NcButton>\n- <NcButton\n- size=\"small\"\n- class=\"nc-action-btn cursor-pointer outline-0\"\n- type=\"text\"\n- @click=\"baseAction(sources[0].id, DataSourcesSubTab.ERD)\"\n- >\n- <div class=\"flex items-center gap-2 text-gray-600\">\n- <GeneralIcon icon=\"erd\" class=\"group-hover:text-accent\" />\n- <div class=\"nc-action-btn-label\">\n- {{ $t('title.relations') }}\n+ </NcButton>\n+ </NcTooltip>\n+ <NcTooltip overlay-class-name=\"!xl:hidden\">\n+ <template #title>\n+ {{ $t('title.relations') }}\n+ </template>\n+ <NcButton\n+ size=\"small\"\n+ class=\"nc-action-btn cursor-pointer outline-0\"\n+ type=\"text\"\n+ @click=\"baseAction(sources[0].id, DataSourcesSubTab.ERD)\"\n+ >\n+ <div class=\"flex items-center gap-2 text-gray-600\">\n+ <GeneralIcon icon=\"erd\" class=\"group-hover:text-accent\" />\n+ <div class=\"nc-action-btn-label\">\n+ {{ $t('title.relations') }}\n+ </div>\n </div>\n- </div>\n- </NcButton>\n- <NcButton\n- size=\"small\"\n- class=\"nc-action-btn cursor-pointer outline-0\"\n- type=\"text\"\n- @click=\"baseAction(sources[0].id, DataSourcesSubTab.UIAcl)\"\n- >\n- <div class=\"flex items-center gap-2 text-gray-600\">\n- <GeneralIcon icon=\"acl\" class=\"group-hover:text-accent\" />\n- <div class=\"nc-action-btn-label\">\n- {{ $t('labels.uiAcl') }}\n+ </NcButton>\n+ </NcTooltip>\n+ <NcTooltip overlay-class-name=\"!xl:hidden\">\n+ <template #title>\n+ {{ $t('labels.uiAcl') }}\n+ </template>\n+ <NcButton\n+ size=\"small\"\n+ class=\"nc-action-btn cursor-pointer outline-0\"\n+ type=\"text\"\n+ @click=\"baseAction(sources[0].id, DataSourcesSubTab.UIAcl)\"\n+ >\n+ <div class=\"flex items-center gap-2 text-gray-600\">\n+ <GeneralIcon icon=\"acl\" class=\"group-hover:text-accent\" />\n+ <div class=\"nc-action-btn-label\">\n+ {{ $t('labels.uiAcl') }}\n+ </div>\n </div>\n- </div>\n- </NcButton>\n- <NcButton\n- size=\"small\"\n- class=\"nc-action-btn cursor-pointer outline-0\"\n- type=\"text\"\n- @click=\"baseAction(sources[0].id, DataSourcesSubTab.Audit)\"\n- >\n- <div class=\"flex items-center gap-2 text-gray-600\">\n- <GeneralIcon icon=\"book\" class=\"group-hover:text-accent\" />\n- <div class=\"nc-action-btn-label\">\n- {{ $t('title.audit') }}\n+ </NcButton>\n+ </NcTooltip>\n+ <NcTooltip overlay-class-name=\"!xl:hidden\">\n+ <template #title>\n+ {{ $t('title.audit') }}\n+ </template>\n+ <NcButton\n+ size=\"small\"\n+ class=\"nc-action-btn cursor-pointer outline-0\"\n+ type=\"text\"\n+ @click=\"baseAction(sources[0].id, DataSourcesSubTab.Audit)\"\n+ >\n+ <div class=\"flex items-center gap-2 text-gray-600\">\n+ <GeneralIcon icon=\"book\" class=\"group-hover:text-accent\" />\n+ <div class=\"nc-action-btn-label\">\n+ {{ $t('title.audit') }}\n+ </div>\n </div>\n- </div>\n- </NcButton>\n+ </NcButton>\n+ </NcTooltip>\n </div>\n </div>\n <div class=\"ds-table-col ds-table-crud\">\n@@ -450,67 +469,92 @@ const isEditBaseModalOpen = computed({\n \n <div class=\"ds-table-col ds-table-actions\">\n <div class=\"flex items-center gap-2\">\n- <NcButton\n- size=\"small\"\n- class=\"nc-action-btn cursor-pointer outline-0\"\n- type=\"text\"\n- @click=\"baseAction(source.id, DataSourcesSubTab.ERD)\"\n- >\n- <div class=\"flex items-center gap-2 text-gray-600\">\n- <GeneralIcon icon=\"erd\" class=\"group-hover:text-accent\" />\n- <div class=\"nc-action-btn-label\">\n- {{ $t('title.relations') }}\n+ <NcTooltip overlay-class-name=\"!xl:hidden\">\n+ <template #title>\n+ {{ $t('title.relations') }}\n+ </template>\n+ <NcButton\n+ size=\"small\"\n+ class=\"nc-action-btn cursor-pointer outline-0\"\n+ type=\"text\"\n+ @click=\"baseAction(source.id, DataSourcesSubTab.ERD)\"\n+ >\n+ <div class=\"flex items-center gap-2 text-gray-600\">\n+ <GeneralIcon icon=\"erd\" class=\"group-hover:text-accent\" />\n+ <div class=\"nc-action-btn-label\">\n+ {{ $t('title.relations') }}\n+ </div>\n </div>\n- </div>\n- </NcButton>\n+ </NcButton>\n+ </NcTooltip>\n+ <NcTooltip overlay-class-name=\"!xl:hidden\">\n+ <template #title>\n+ {{ $t('labels.uiAcl') }}\n+ </template>\n+ <NcButton\n+ size=\"small\"\n+ type=\"text\"\n+ class=\"nc-action-btn cursor-pointer outline-0\"\n+ @click=\"baseAction(source.id, DataSourcesSubTab.UIAcl)\"\n+ >\n+ <div class=\"flex items-center gap-2 text-gray-600\">\n+ <GeneralIcon icon=\"acl\" class=\"group-hover:text-accent\" />\n+ <div class=\"nc-action-btn-label\">\n+ {{ $t('labels.uiAcl') }}\n+ </div>\n+ </div>\n+ </NcButton>\n+ </NcTooltip>\n+ <NcTooltip overlay-class-name=\"!xl:hidden\">\n+ <template #title>\n+ {{ $t('tooltip.metaSync') }}\n+ </template>\n+ <NcButton\n+ v-if=\"!source.is_meta && !source.is_local\"\n+ size=\"small\"\n+ type=\"text\"\n+ class=\"nc-action-btn cursor-pointer outline-0\"\n+ @click=\"baseAction(source.id, DataSourcesSubTab.Metadata)\"\n+ >\n+ <div class=\"flex items-center gap-2 text-gray-600\">\n+ <GeneralIcon icon=\"sync\" class=\"group-hover:text-accent\" />\n+ <div class=\"nc-action-btn-label\">\n+ {{ $t('tooltip.metaSync') }}\n+ </div>\n+ </div>\n+ </NcButton>\n+ </NcTooltip>\n+ </div>\n+ </div>\n+ <div class=\"ds-table-col ds-table-crud justify-end gap-x-1\">\n+ <NcTooltip>\n+ <template #title>\n+ {{ $t('general.edit') }}\n+ </template>\n <NcButton\n+ v-if=\"!source.is_meta && !source.is_local\"\n size=\"small\"\n+ class=\"nc-action-btn cursor-pointer outline-0 !w-8 !px-1 !rounded-lg mt-0.5\"\n type=\"text\"\n- class=\"nc-action-btn cursor-pointer outline-0\"\n- @click=\"baseAction(source.id, DataSourcesSubTab.UIAcl)\"\n+ @click=\"baseAction(source.id, DataSourcesSubTab.Edit)\"\n >\n- <div class=\"flex items-center gap-2 text-gray-600\">\n- <GeneralIcon icon=\"acl\" class=\"group-hover:text-accent\" />\n- <div class=\"nc-action-btn-label\">\n- {{ $t('labels.uiAcl') }}\n- </div>\n- </div>\n+ <GeneralIcon icon=\"edit\" class=\"text-gray-600 -mt-0.5\" />\n </NcButton>\n+ </NcTooltip>\n+ <NcTooltip>\n+ <template #title>\n+ {{ $t('general.delete') }}\n+ </template>\n <NcButton\n v-if=\"!source.is_meta && !source.is_local\"\n size=\"small\"\n+ class=\"nc-action-btn cursor-pointer outline-0 !w-8 !px-1 !rounded-lg mt-0.5\"\n type=\"text\"\n- class=\"nc-action-btn cursor-pointer outline-0\"\n- @click=\"baseAction(source.id, DataSourcesSubTab.Metadata)\"\n+ @click=\"openDeleteBase(source)\"\n >\n- <div class=\"flex items-center gap-2 text-gray-600\">\n- <GeneralIcon icon=\"sync\" class=\"group-hover:text-accent\" />\n- <div class=\"nc-action-btn-label\">\n- {{ $t('tooltip.metaSync') }}\n- </div>\n- </div>\n+ <GeneralIcon icon=\"delete\" class=\"text-red-500 -mt-0.5\" />\n </NcButton>\n- </div>\n- </div>\n- <div class=\"ds-table-col ds-table-crud justify-end gap-x-1\">\n- <NcButton\n- v-if=\"!source.is_meta && !source.is_local\"\n- size=\"small\"\n- class=\"nc-action-btn cursor-pointer outline-0 !w-8 !px-1 !rounded-lg mt-0.5\"\n- type=\"text\"\n- @click=\"baseAction(source.id, DataSourcesSubTab.Edit)\"\n- >\n- <GeneralIcon icon=\"edit\" class=\"text-gray-600 -mt-0.5\" />\n- </NcButton>\n- <NcButton\n- v-if=\"!source.is_meta && !source.is_local\"\n- size=\"small\"\n- class=\"nc-action-btn cursor-pointer outline-0 !w-8 !px-1 !rounded-lg mt-0.5\"\n- type=\"text\"\n- @click=\"openDeleteBase(source)\"\n- >\n- <GeneralIcon icon=\"delete\" class=\"text-red-500 -mt-0.5\" />\n- </NcButton>\n+ </NcTooltip>\n </div>\n </div>\n </template>\ndiff --git a/packages/nc-gui/components/nc/Tooltip.vue b/packages/nc-gui/components/nc/Tooltip.vue\nindex 0810b8b..97b159e 100644\n--- a/packages/nc-gui/components/nc/Tooltip.vue\n+++ b/packages/nc-gui/components/nc/Tooltip.vue\n@@ -12,6 +12,7 @@ interface Props {\n disabled?: boolean\n placement?: TooltipPlacement | undefined\n hideOnClick?: boolean\n+ overlayClassName?: string\n }\n \n const props = defineProps<Props>()\n@@ -36,6 +37,8 @@ const attrs = useAttrs()\n \n const isKeyPressed = ref(false)\n \n+const overlayClassName = computed(() => props.overlayClassName)\n+\n onKeyStroke(\n (e) => e.key === modifierKey.value,\n (e) => {\n@@ -100,7 +103,7 @@ const onClick = () => {\n <template>\n <a-tooltip\n v-model:visible=\"showTooltip\"\n- :overlay-class-name=\"`nc-tooltip ${showTooltip ? 'visible' : 'hidden'}`\"\n+ :overlay-class-name=\"`nc-tooltip ${showTooltip ? 'visible' : 'hidden'} ${overlayClassName}`\"\n :overlay-style=\"tooltipStyle\"\n arrow-point-at-center\n :trigger=\"[]\"\n", "diff --git a/docs/docs/segment-angular.md b/docs/docs/segment-angular.md\nindex b7ff7d8..c307239 100644\n--- a/docs/docs/segment-angular.md\n+++ b/docs/docs/segment-angular.md\n@@ -29,3 +29,17 @@ Display the currently active Angular CLI version.\n - display_mode: `string` - determines when the segment is displayed\n - `always`: the segment is always displayed\n - `files`: the segment is only displayed when `angular.json` file is present (default)\n+- template: `string` - A go [text/template][go-text-template] template extended with [sprig][sprig] utilizing the\n+properties below. Defaults to `{{ .Full }}`\n+\n+## Template Properties\n+\n+- `.Full`: `string` - the full version\n+- `.Major`: `string` - is the major version\n+- `.Minor`: `string` - is the minor version\n+- `.Patch`: `string` - is the patch version\n+- `.Prerelease`: `string` - is the prerelease version\n+- `.BuildMetadata`: `string` - is the build metadata\n+\n+[go-text-template]: https://golang.org/pkg/text/template/\n+[sprig]: https://masterminds.github.io/sprig/\ndiff --git a/docs/docs/segment-azfunc.md b/docs/docs/segment-azfunc.md\nindex 6b4368a..984c0fb 100644\n--- a/docs/docs/segment-azfunc.md\n+++ b/docs/docs/segment-azfunc.md\n@@ -33,3 +33,17 @@ Display the currently active Azure functions CLI version.\n - display_mode: `string` - determines when the segment is displayed\n - `always`: the segment is always displayed\n - `files`: the segment is only displayed when a `host.json` or `local.settings.json` files is present (default)\n+- template: `string` - A go [text/template][go-text-template] template extended with [sprig][sprig] utilizing the\n+properties below. Defaults to `{{ .Full }}`\n+\n+## Template Properties\n+\n+- `.Full`: `string` - the full version\n+- `.Major`: `string` - is the major version\n+- `.Minor`: `string` - is the minor version\n+- `.Patch`: `string` - is the patch version\n+- `.Prerelease`: `string` - is the prerelease version\n+- `.BuildMetadata`: `string` - is the build metadata\n+\n+[go-text-template]: https://golang.org/pkg/text/template/\n+[sprig]: https://masterminds.github.io/sprig/\ndiff --git a/docs/docs/segment-crystal.md b/docs/docs/segment-crystal.md\nindex 9cf8ead..8f995bc 100644\n--- a/docs/docs/segment-crystal.md\n+++ b/docs/docs/segment-crystal.md\n@@ -32,3 +32,17 @@ Display the currently active crystal version.\n - display_mode: `string` - determines when the segment is displayed\n - `always`: the segment is always displayed\n - `files`: the segment is only displayed when `*.cr` or `shard.yml` files are present (default)\n+- template: `string` - A go [text/template][go-text-template] template extended with [sprig][sprig] utilizing the\n+ properties below. Defaults to `{{ .Full }}`\n+\n+## Template Properties\n+\n+- `.Full`: `string` - the full version\n+- `.Major`: `string` - is the major version\n+- `.Minor`: `string` - is the minor version\n+- `.Patch`: `string` - is the patch version\n+- `.Prerelease`: `string` - is the prerelease version\n+- `.BuildMetadata`: `string` - is the build metadata\n+\n+[go-text-template]: https://golang.org/pkg/text/template/\n+[sprig]: https://masterminds.github.io/sprig/\ndiff --git a/docs/docs/segment-dart.md b/docs/docs/segment-dart.md\nindex ddfe247..9eb1d0e 100644\n--- a/docs/docs/segment-dart.md\n+++ b/docs/docs/segment-dart.md\n@@ -33,3 +33,17 @@ Display the currently active dart version.\n - `always`: the segment is always displayed\n - `files`: the segment is only displayed when `*.dart`, `pubspec.yaml`, `pubspec.yml`, `pubspec.lock` files or the `.dart_tool`\n folder are present (default)\n+- template: `string` - A go [text/template][go-text-template] template extended with [sprig][sprig] utilizing the\n+properties below. Defaults to `{{ .Full }}`\n+\n+## Template Properties\n+\n+- `.Full`: `string` - the full version\n+- `.Major`: `string` - is the major version\n+- `.Minor`: `string` - is the minor version\n+- `.Patch`: `string` - is the patch version\n+- `.Prerelease`: `string` - is the prerelease version\n+- `.BuildMetadata`: `string` - is the build metadata\n+\n+[go-text-template]: https://golang.org/pkg/text/template/\n+[sprig]: https://masterminds.github.io/sprig/\ndiff --git a/docs/docs/segment-dotnet.md b/docs/docs/segment-dotnet.md\nindex a8300c1..83bb0c2 100644\n--- a/docs/docs/segment-dotnet.md\n+++ b/docs/docs/segment-dotnet.md\n@@ -37,12 +37,13 @@ Display the currently active .NET SDK version.\n - unsupported_version_icon: `string` - text/icon that is displayed when the active .NET SDK version (e.g., one specified\n by `global.json`) is not installed/supported - defaults to `\\uf071` (X in a rectangle box)\n - template: `string` - A go [text/template][go-text-template] template extended with [sprig][sprig] utilizing the\n-properties below. Defaults does nothing(backward compatibility).\n+properties below. Defaults to `{{ .Full }}`\n - version_url_template: `string` - A go [text/template][go-text-template] template extended\n with [sprig][sprig] utilizing the properties below. Defaults does nothing(backward compatibility).\n \n ## Template Properties\n \n+- `.Full`: `string` - the full version\n - `.Major`: `string` - is the major version\n - `.Minor`: `string` - is the minor version\n - `.Patch`: `string` - is the patch version\ndiff --git a/docs/docs/segment-golang.md b/docs/docs/segment-golang.md\nindex 10321d3..7790269 100644\n--- a/docs/docs/segment-golang.md\n+++ b/docs/docs/segment-golang.md\n@@ -32,3 +32,14 @@ Display the currently active golang version.\n - display_mode: `string` - determines when the segment is displayed\n - `always`: the segment is always displayed\n - `files`: the segment is only displayed when `*.go` or `go.mod` files are present (default)\n+- template: `string` - A go [text/template][go-text-template] template extended with [sprig][sprig] utilizing the\n+properties below. Defaults to `{{ .Full }}`\n+\n+## Template Properties\n+\n+- `.Full`: `string` - the full version\n+- `.Major`: `string` - is the major version\n+- `.Minor`: `string` - is the minor version\n+- `.Patch`: `string` - is the patch version\n+- `.Prerelease`: `string` - is the prerelease version\n+- `.BuildMetadata`: `string` - is the build metadata\ndiff --git a/docs/docs/segment-java.md b/docs/docs/segment-java.md\nindex f4cc85d..c13c3e0 100644\n--- a/docs/docs/segment-java.md\n+++ b/docs/docs/segment-java.md\n@@ -45,3 +45,14 @@ Display the currently active java version.\n - `*.jar`\n - `*.clj`\n - `*.cljc`\n+- template: `string` - A go [text/template][go-text-template] template extended with [sprig][sprig] utilizing the\n+properties below. Defaults to `{{ .Full }}`\n+\n+## Template Properties\n+\n+- `.Full`: `string` - the full version\n+- `.Major`: `string` - is the major version\n+- `.Minor`: `string` - is the minor version\n+- `.Patch`: `string` - is the patch version\n+- `.Prerelease`: `string` - is the prerelease version\n+- `.BuildMetadata`: `string` - is the build metadata\ndiff --git a/docs/docs/segment-julia.md b/docs/docs/segment-julia.md\nindex 4b75608..3a4a0ec 100644\n--- a/docs/docs/segment-julia.md\n+++ b/docs/docs/segment-julia.md\n@@ -32,3 +32,17 @@ Display the currently active julia version.\n - display_mode: `string` - determines when the segment is displayed\n - `always`: the segment is always displayed\n - `files`: the segment is only displayed when `*.jl` files are present (default)\n+- template: `string` - A go [text/template][go-text-template] template extended with [sprig][sprig] utilizing the\n+properties below. Defaults to `{{ .Full }}`\n+\n+## Template Properties\n+\n+- `.Full`: `string` - the full version\n+- `.Major`: `string` - is the major version\n+- `.Minor`: `string` - is the minor version\n+- `.Patch`: `string` - is the patch version\n+- `.Prerelease`: `string` - is the prerelease version\n+- `.BuildMetadata`: `string` - is the build metadata\n+\n+[go-text-template]: https://golang.org/pkg/text/template/\n+[sprig]: https://masterminds.github.io/sprig/\ndiff --git a/docs/docs/segment-node.md b/docs/docs/segment-node.md\nindex 04d5963..ced7d23 100644\n--- a/docs/docs/segment-node.md\n+++ b/docs/docs/segment-node.md\n@@ -40,3 +40,17 @@ segment's background or foreground color\n - display_package_manager: `boolean` - show whether the current project uses Yarn or NPM - defaults to `false`\n - yarn_icon: `string` - the icon/text to display when using Yarn - defaults to ` \\uF61A`\n - npm_icon: `string` - the icon/text to display when using NPM - defaults to ` \\uE71E`\n+- template: `string` - A go [text/template][go-text-template] template extended with [sprig][sprig] utilizing the\n+properties below. Defaults to `{{ .Full }}`\n+\n+## Template Properties\n+\n+- `.Full`: `string` - the full version\n+- `.Major`: `string` - is the major version\n+- `.Minor`: `string` - is the minor version\n+- `.Patch`: `string` - is the patch version\n+- `.Prerelease`: `string` - is the prerelease version\n+- `.BuildMetadata`: `string` - is the build metadata\n+\n+[go-text-template]: https://golang.org/pkg/text/template/\n+[sprig]: https://masterminds.github.io/sprig/\ndiff --git a/docs/docs/segment-php.md b/docs/docs/segment-php.md\nindex a7b05aa..47b8ea4 100644\n--- a/docs/docs/segment-php.md\n+++ b/docs/docs/segment-php.md\n@@ -34,3 +34,17 @@ Display the currently active php version.\n - `always`: the segment is always displayed\n - `files`: the segment is only displayed when `*.php, composer.json, composer.lock, .php-version` files are present (default)\n - enable_hyperlink: `bool` - display an hyperlink to the php release notes - defaults to `false`\n+- template: `string` - A go [text/template][go-text-template] template extended with [sprig][sprig] utilizing the\n+properties below. Defaults to `{{ .Full }}`\n+\n+## Template Properties\n+\n+- `.Full`: `string` - the full version\n+- `.Major`: `string` - is the major version\n+- `.Minor`: `string` - is the minor version\n+- `.Patch`: `string` - is the patch version\n+- `.Prerelease`: `string` - is the prerelease version\n+- `.BuildMetadata`: `string` - is the build metadata\n+\n+[go-text-template]: https://golang.org/pkg/text/template/\n+[sprig]: https://masterminds.github.io/sprig/\ndiff --git a/docs/docs/segment-python.md b/docs/docs/segment-python.md\nindex 80fa718..13bd1f8 100644\n--- a/docs/docs/segment-python.md\n+++ b/docs/docs/segment-python.md\n@@ -39,3 +39,17 @@ or not - defaults to `true`\n files are present (default)\n - `environment`: the segment is only displayed when a virtual env is present\n - `context`: the segment is only displayed when either `environment` or `files` is active\n+- template: `string` - A go [text/template][go-text-template] template extended with [sprig][sprig] utilizing the\n+properties below. Defaults to `{{ .Full }}`\n+\n+## Template Properties\n+\n+- `.Full`: `string` - the full version\n+- `.Major`: `string` - is the major version\n+- `.Minor`: `string` - is the minor version\n+- `.Patch`: `string` - is the patch version\n+- `.Prerelease`: `string` - is the prerelease version\n+- `.BuildMetadata`: `string` - is the build metadata\n+\n+[go-text-template]: https://golang.org/pkg/text/template/\n+[sprig]: https://masterminds.github.io/sprig/\ndiff --git a/docs/docs/segment-ruby.md b/docs/docs/segment-ruby.md\nindex e64fcf7..5d812f6 100644\n--- a/docs/docs/segment-ruby.md\n+++ b/docs/docs/segment-ruby.md\n@@ -32,3 +32,17 @@ Display the currently active ruby version.\n - display_mode: `string` - determines when the segment is displayed\n - `always`: the segment is always displayed\n - `files`: the segment is only displayed when `*.rb`, `Gemfile` or `Rakefile` files are present (default)\n+- template: `string` - A go [text/template][go-text-template] template extended with [sprig][sprig] utilizing the\n+properties below. Defaults to `{{ .Full }}`\n+\n+## Template Properties\n+\n+- `.Full`: `string` - the full version\n+- `.Major`: `string` - is the major version\n+- `.Minor`: `string` - is the minor version\n+- `.Patch`: `string` - is the patch version\n+- `.Prerelease`: `string` - is the prerelease version\n+- `.BuildMetadata`: `string` - is the build metadata\n+\n+[go-text-template]: https://golang.org/pkg/text/template/\n+[sprig]: https://masterminds.github.io/sprig/\ndiff --git a/docs/docs/segment-rust.md b/docs/docs/segment-rust.md\nindex 30c222d..c0f2a43 100644\n--- a/docs/docs/segment-rust.md\n+++ b/docs/docs/segment-rust.md\n@@ -32,3 +32,17 @@ Display the currently active rust version.\n - display_mode: `string` - determines when the segment is displayed\n - `always`: the segment is always displayed\n - `files`: the segment is only displayed when `*.rs`, `Cargo.toml` or `Cargo.lock` files are present (default)\n+- template: `string` - A go [text/template][go-text-template] template extended with [sprig][sprig] utilizing the\n+properties below. Defaults to `{{ .Full }}`\n+\n+## Template Properties\n+\n+- `.Full`: `string` - the full version\n+- `.Major`: `string` - is the major version\n+- `.Minor`: `string` - is the minor version\n+- `.Patch`: `string` - is the patch version\n+- `.Prerelease`: `string` - is the prerelease version\n+- `.BuildMetadata`: `string` - is the build metadata\n+\n+[go-text-template]: https://golang.org/pkg/text/template/\n+[sprig]: https://masterminds.github.io/sprig/\ndiff --git a/src/segment_language.go b/src/segment_language.go\nindex d9ced7b..2cfffa8 100644\n--- a/src/segment_language.go\n+++ b/src/segment_language.go\n@@ -97,7 +97,7 @@ func (l *language) string() string {\n \t\treturn \"\"\n \t}\n \n-\tsegmentTemplate := l.props.getString(SegmentTemplate, \"{{.Full}}\")\n+\tsegmentTemplate := l.props.getString(SegmentTemplate, \"{{ .Full }}\")\n \ttemplate := &textTemplate{\n \t\tTemplate: segmentTemplate,\n \t\tContext: l.version,\n", "diff --git a/packages/animated/package.json b/packages/animated/package.json\nindex 2249a2f..e35a1fd 100644\n--- a/packages/animated/package.json\n+++ b/packages/animated/package.json\n@@ -33,6 +33,6 @@\n \"react-layout-effect\": \"^1.0.1\"\n },\n \"peerDependencies\": {\n- \"react\": \">=16.8\"\n+ \"react\": \"^16.8.0 || ^17.0.0\"\n }\n }\ndiff --git a/packages/core/package.json b/packages/core/package.json\nindex 584bbc2..c934253 100644\n--- a/packages/core/package.json\n+++ b/packages/core/package.json\n@@ -36,7 +36,7 @@\n \"react-layout-effect\": \"^1.0.1\"\n },\n \"peerDependencies\": {\n- \"react\": \">=16.8\"\n+ \"react\": \"^16.8.0 || ^17.0.0\"\n },\n \"devDependencies\": {\n \"rafz\": \"^0.1.13\"\ndiff --git a/packages/parallax/package.json b/packages/parallax/package.json\nindex 49f8391..5a181fe 100644\n--- a/packages/parallax/package.json\n+++ b/packages/parallax/package.json\n@@ -31,6 +31,6 @@\n \"@react-spring/web\": \"~9.2.0-beta.0\"\n },\n \"peerDependencies\": {\n- \"react\": \">=16.8\"\n+ \"react\": \"^16.8.0 || ^17.0.0\"\n }\n }\ndiff --git a/packages/shared/package.json b/packages/shared/package.json\nindex 67d286c..12f7db3 100644\n--- a/packages/shared/package.json\n+++ b/packages/shared/package.json\n@@ -33,6 +33,6 @@\n \"rafz\": \"^0.1.13\"\n },\n \"peerDependencies\": {\n- \"react\": \">=16.8\"\n+ \"react\": \"^16.8.0 || ^17.0.0\"\n }\n }\ndiff --git a/targets/konva/package.json b/targets/konva/package.json\nindex 17675ac..271d58c 100644\n--- a/targets/konva/package.json\n+++ b/targets/konva/package.json\n@@ -34,7 +34,7 @@\n },\n \"peerDependencies\": {\n \"konva\": \">=2.6\",\n- \"react\": \">=16.8\",\n+ \"react\": \"^16.8.0 || ^17.0.0\",\n \"react-konva\": \">=16.8\"\n },\n \"devDependencies\": {\ndiff --git a/targets/native/package.json b/targets/native/package.json\nindex e97aa97..802a66c 100644\n--- a/targets/native/package.json\n+++ b/targets/native/package.json\n@@ -33,7 +33,7 @@\n \"@react-spring/types\": \"~9.2.0-beta.0\"\n },\n \"peerDependencies\": {\n- \"react\": \">=16.8\",\n+ \"react\": \"^16.8.0 || ^17.0.0\",\n \"react-native\": \">=0.58\"\n },\n \"devDependencies\": {\ndiff --git a/targets/web/package.json b/targets/web/package.json\nindex d74c25c..f7ac000 100644\n--- a/targets/web/package.json\n+++ b/targets/web/package.json\n@@ -33,7 +33,7 @@\n \"@react-spring/types\": \"~9.2.0-beta.0\"\n },\n \"peerDependencies\": {\n- \"react\": \">=16.8\",\n+ \"react\": \"^16.8.0 || ^17.0.0\",\n \"react-dom\": \">=16.8\"\n }\n }\ndiff --git a/targets/zdog/package.json b/targets/zdog/package.json\nindex aa57890..f65945a 100644\n--- a/targets/zdog/package.json\n+++ b/targets/zdog/package.json\n@@ -33,7 +33,7 @@\n \"@react-spring/types\": \"~9.2.0-beta.0\"\n },\n \"peerDependencies\": {\n- \"react\": \">=16.8\",\n+ \"react\": \"^16.8.0 || ^17.0.0\",\n \"react-dom\": \">=16.8\",\n \"react-zdog\": \">=1.0\",\n \"zdog\": \">=1.0\"\n"]
| 3 |
["a75538817c20fc4132718fd7b586bf835a5795e3", "3a4e21c36d76b4bea8dbb365d3c3bd005a7f3f8f", "27169897c0e58bc4fbca724f290ad54fa39abec7"]
|
["feat", "docs", "build"]
|
101: fix import key cmd
Signed-off-by: Sam Alba <[email protected]>,use lambda to define backend operations,render-svg
|
["diff --git a/docs/learn/101-use.md b/docs/learn/101-use.md\nindex 283c1c1..2ec10f9 100644\n--- a/docs/learn/101-use.md\n+++ b/docs/learn/101-use.md\n@@ -41,8 +41,7 @@ cd ./examples/todoapp\n The example app contains encrypted secrets and other pre-configured inputs, here is how to decrypt them:\n \n ```sh\n-curl -sfL https://releases.dagger.io/examples/key.txt >> ~/.config/dagger/keys.txt\n-dagger input list\n+dagger input list || curl -sfL https://releases.dagger.io/examples/key.txt >> ~/.config/dagger/keys.txt\n ```\n \n **Step 4**: Deploy!\n", "diff --git a/ibis/backends/duckdb/registry.py b/ibis/backends/duckdb/registry.py\nindex 20ffd6f..3f56f2a 100644\n--- a/ibis/backends/duckdb/registry.py\n+++ b/ibis/backends/duckdb/registry.py\n@@ -107,28 +107,13 @@ def _literal(_, op):\n return sa.cast(sa.literal(value), sqla_type)\n \n \n-def _array_column(t, op):\n- (arg,) = op.args\n- sqla_type = to_sqla_type(op.output_dtype)\n- return sa.cast(sa.func.list_value(*map(t.translate, arg)), sqla_type)\n-\n-\n def _neg_idx_to_pos(array, idx):\n if_ = getattr(sa.func, \"if\")\n arg_length = sa.func.array_length(array)\n return if_(idx < 0, arg_length + sa.func.greatest(idx, -arg_length), idx)\n \n \n-def _struct_field(t, op):\n- return sa.func.struct_extract(\n- t.translate(op.arg),\n- sa.text(repr(op.field)),\n- type_=to_sqla_type(op.output_dtype),\n- )\n-\n-\n-def _regex_extract(t, op):\n- string, pattern, index = map(t.translate, op.args)\n+def _regex_extract(string, pattern, index):\n result = sa.case(\n [\n (\n@@ -149,8 +134,7 @@ def _regex_extract(t, op):\n return result\n \n \n-def _json_get_item(t, op):\n- left, path = map(t.translate, op.args)\n+def _json_get_item(left, path):\n # Workaround for https://github.com/duckdb/duckdb/issues/5063\n # In some situations duckdb silently does the wrong thing if\n # the path is parametrized.\n@@ -197,7 +181,12 @@ def _struct_column(t, op):\n \n operation_registry.update(\n {\n- ops.ArrayColumn: _array_column,\n+ ops.ArrayColumn: (\n+ lambda t, op: sa.cast(\n+ sa.func.list_value(*map(t.translate, op.cols)),\n+ to_sqla_type(op.output_dtype),\n+ )\n+ ),\n ops.ArrayConcat: fixed_arity(sa.func.array_concat, 2),\n ops.ArrayRepeat: fixed_arity(\n lambda arg, times: sa.func.flatten(\n@@ -222,7 +211,13 @@ operation_registry.update(\n # TODO: map operations, but DuckDB's maps are multimaps\n ops.Modulus: fixed_arity(operator.mod, 2),\n ops.Round: _round,\n- ops.StructField: _struct_field,\n+ ops.StructField: (\n+ lambda t, op: sa.func.struct_extract(\n+ t.translate(op.arg),\n+ sa.text(repr(op.field)),\n+ type_=to_sqla_type(op.output_dtype),\n+ )\n+ ),\n ops.TableColumn: _table_column,\n ops.TimestampDiff: fixed_arity(sa.func.age, 2),\n ops.TimestampFromUNIX: _timestamp_from_unix,\n@@ -232,7 +227,7 @@ operation_registry.update(\n lambda *_: sa.cast(sa.func.now(), sa.TIMESTAMP),\n 0,\n ),\n- ops.RegexExtract: _regex_extract,\n+ ops.RegexExtract: fixed_arity(_regex_extract, 3),\n ops.RegexReplace: fixed_arity(\n lambda *args: sa.func.regexp_replace(*args, \"g\"), 3\n ),\n@@ -255,7 +250,7 @@ operation_registry.update(\n ops.ArgMin: reduction(sa.func.min_by),\n ops.ArgMax: reduction(sa.func.max_by),\n ops.BitwiseXor: fixed_arity(sa.func.xor, 2),\n- ops.JSONGetItem: _json_get_item,\n+ ops.JSONGetItem: fixed_arity(_json_get_item, 2),\n ops.RowID: lambda *_: sa.literal_column('rowid'),\n ops.StringToTimestamp: fixed_arity(sa.func.strptime, 2),\n }\n", "diff --git a/package.json b/package.json\nindex 3f8e5fa..cc4e398 100644\n--- a/package.json\n+++ b/package.json\n@@ -42,6 +42,7 @@\n \"rollup\": \"^2.34.2\",\n \"rollup-plugin-copy\": \"^3.3.0\",\n \"rollup-plugin-dts\": \"^2.0.0\",\n+ \"rollup-plugin-terser\": \"^7.0.2\",\n \"rollup-plugin-typescript2\": \"^0.29.0\",\n \"ts-jest\": \"^26.4.4\",\n \"tsup\": \"^3.10.1\",\ndiff --git a/packages/renderer-svg/package.json b/packages/renderer-svg/package.json\nindex fa9c049..6a0654c 100644\n--- a/packages/renderer-svg/package.json\n+++ b/packages/renderer-svg/package.json\n@@ -1,16 +1,27 @@\n {\n- \"name\": \"shiki-renderer-svg\",\n+ \"name\": \"@antfu/shiki-renderer-svg\",\n \"version\": \"0.2.0\",\n \"description\": \"SVG renderer for shiki\",\n \"author\": \"Pine Wu <[email protected]>\",\n \"homepage\": \"https://github.com/octref/shiki/tree/master/packages/renderer-svg\",\n \"license\": \"MIT\",\n- \"main\": \"dist/index.js\",\n- \"types\": \"dist/index.d.ts\",\n \"repository\": {\n \"type\": \"git\",\n \"url\": \"git+https://github.com/shikijs/shiki.git\"\n },\n+ \"main\": \"dist/index.js\",\n+ \"module\": \"dist/index.mjs\",\n+ \"types\": \"dist/index.d.ts\",\n+ \"unpkg\": \"dist/index.iife.min.js\",\n+ \"jsdelivr\": \"dist/index.iife.min.js\",\n+ \"files\": [\n+ \"dist\"\n+ ],\n+ \"scripts\": {\n+ \"prepublishOnly\": \"npm run build\",\n+ \"build\": \"rollup -c\",\n+ \"watch\": \"rollup -c -w\"\n+ },\n \"dependencies\": {\n \"puppeteer\": \"^5.2.1\"\n },\ndiff --git a/packages/renderer-svg/rollup.config.js b/packages/renderer-svg/rollup.config.js\nnew file mode 100644\nindex 0000000..d4e45ce\n--- /dev/null\n+++ b/packages/renderer-svg/rollup.config.js\n@@ -0,0 +1,67 @@\n+import { nodeResolve } from '@rollup/plugin-node-resolve'\n+import commonjs from '@rollup/plugin-commonjs'\n+import dts from 'rollup-plugin-dts'\n+import typescript from 'rollup-plugin-typescript2'\n+import replace from '@rollup/plugin-replace'\n+import { terser } from 'rollup-plugin-terser'\n+\n+const external = ['shiki', 'puppeteer']\n+\n+export default [\n+ {\n+ input: 'src/index.ts',\n+ external,\n+ output: [\n+ {\n+ file: 'dist/index.js',\n+ format: 'cjs'\n+ },\n+ {\n+ file: 'dist/index.mjs',\n+ format: 'esm'\n+ }\n+ ],\n+ plugins: [\n+ replace({\n+ __BROWSER__: JSON.stringify(false)\n+ }),\n+ typescript(),\n+ nodeResolve(),\n+ commonjs()\n+ ]\n+ },\n+ {\n+ input: 'src/index.ts',\n+ output: [\n+ {\n+ file: 'dist/index.iife.js',\n+ format: 'iife',\n+ name: 'ShikiRenderSVG'\n+ },\n+ {\n+ file: 'dist/index.iife.min.js',\n+ format: 'iife',\n+ name: 'ShikiRenderSVG',\n+ plugins: [terser()]\n+ }\n+ ],\n+ plugins: [\n+ replace({\n+ __BROWSER__: JSON.stringify(true)\n+ }),\n+ typescript(),\n+ nodeResolve(),\n+ commonjs()\n+ ]\n+ },\n+ {\n+ input: 'src/index.ts',\n+ output: [\n+ {\n+ file: 'dist/index.d.ts',\n+ format: 'es'\n+ }\n+ ],\n+ plugins: [dts()]\n+ }\n+]\ndiff --git a/packages/renderer-svg/src/global.d.ts b/packages/renderer-svg/src/global.d.ts\nnew file mode 100644\nindex 0000000..08c128f\n--- /dev/null\n+++ b/packages/renderer-svg/src/global.d.ts\n@@ -0,0 +1 @@\n+declare var __BROWSER__: boolean\ndiff --git a/packages/renderer-svg/src/index.ts b/packages/renderer-svg/src/index.ts\nindex ae77136..8f92312 100644\n--- a/packages/renderer-svg/src/index.ts\n+++ b/packages/renderer-svg/src/index.ts\n@@ -1,4 +1,4 @@\n-import { IThemedToken } from 'shiki'\n+import type { IThemedToken } from 'shiki'\n import { measureMonospaceTypeface } from './measureMonospaceTypeface'\n \n interface SVGRendererOptions {\ndiff --git a/packages/renderer-svg/src/measureMonospaceTypeface.ts b/packages/renderer-svg/src/measureMonospaceTypeface.ts\nindex e28a1ff..6ab834d 100644\n--- a/packages/renderer-svg/src/measureMonospaceTypeface.ts\n+++ b/packages/renderer-svg/src/measureMonospaceTypeface.ts\n@@ -1,58 +1,61 @@\n-import puppeteer from 'puppeteer'\n+function measureFont(fontName: string, fontSize: number) {\n+ /**\n+ * Measure `M` for width\n+ */\n+ var c = document.createElement('canvas')\n+ var ctx = c.getContext('2d')!\n+ ctx.font = `${fontSize}px \"${fontName}\"`\n \n-export async function measureMonospaceTypeface(\n- fontName: string,\n- fontSize: number\n-): Promise<{ width: number; height: number }> {\n- const browser = await puppeteer.launch({ headless: true })\n- const page = await browser.newPage()\n- const measurement = await page.evaluate(measureFont, fontName, fontSize)\n- await browser.close()\n- return measurement\n+ const capMMeasurement = ctx.measureText('M')\n \n- function measureFont(fontName: string, fontSize: number) {\n- /**\n- * Measure `M` for width\n- */\n- var c = document.createElement('canvas')\n- var ctx = c.getContext('2d')!\n- ctx.font = `${fontSize}px \"${fontName}\"`\n-\n- const capMMeasurement = ctx.measureText('M')\n+ /**\n+ * Measure A-Z, a-z for height\n+ * A - 65\n+ * Z - 90\n+ * a - 97\n+ * z - 122\n+ */\n+ const characters = []\n+ for (let i = 65; i <= 90; i++) {\n+ characters.push(String.fromCharCode(i))\n+ }\n+ for (let i = 97; i <= 122; i++) {\n+ characters.push(String.fromCharCode(i))\n+ }\n \n- /**\n- * Measure A-Z, a-z for height\n- * A - 65\n- * Z - 90\n- * a - 97\n- * z - 122\n- */\n- const characters = []\n- for (let i = 65; i <= 90; i++) {\n- characters.push(String.fromCharCode(i))\n+ let highC, lowC\n+ let highestAscent = 0\n+ let lowestDescent = 0\n+ characters.forEach(c => {\n+ const m = ctx.measureText(c)\n+ if (m.actualBoundingBoxAscent > highestAscent) {\n+ highestAscent = m.actualBoundingBoxAscent\n+ highC = c\n }\n- for (let i = 97; i <= 122; i++) {\n- characters.push(String.fromCharCode(i))\n+ if (m.actualBoundingBoxDescent > lowestDescent) {\n+ lowestDescent = m.actualBoundingBoxDescent\n+ lowC = c\n }\n+ })\n \n- let highC, lowC\n- let highestAscent = 0\n- let lowestDescent = 0\n- characters.forEach(c => {\n- const m = ctx.measureText(c)\n- if (m.actualBoundingBoxAscent > highestAscent) {\n- highestAscent = m.actualBoundingBoxAscent\n- highC = c\n- }\n- if (m.actualBoundingBoxDescent > lowestDescent) {\n- lowestDescent = m.actualBoundingBoxDescent\n- lowC = c\n- }\n- })\n+ return {\n+ width: capMMeasurement.width,\n+ height: highestAscent + lowestDescent\n+ }\n+}\n \n- return {\n- width: capMMeasurement.width,\n- height: highestAscent + lowestDescent\n- }\n+export async function measureMonospaceTypeface(\n+ fontName: string,\n+ fontSize: number\n+): Promise<{ width: number; height: number }> {\n+ if (__BROWSER__) {\n+ return measureFont(fontName, fontSize)\n+ } else {\n+ const puppeteer = await import('puppeteer')\n+ const browser = await puppeteer.launch({ headless: true })\n+ const page = await browser.newPage()\n+ const measurement = await page.evaluate(measureFont, fontName, fontSize)\n+ await browser.close()\n+ return measurement\n }\n }\ndiff --git a/packages/renderer-svg/tsconfig.json b/packages/renderer-svg/tsconfig.json\nindex 3613212..bc50ce3 100644\n--- a/packages/renderer-svg/tsconfig.json\n+++ b/packages/renderer-svg/tsconfig.json\n@@ -1,9 +1,10 @@\n {\n- \"extends\": \"../../tsconfig.json\",\n \"compilerOptions\": {\n- \"composite\": true,\n- \"rootDir\": \"src\",\n- \"outDir\": \"dist\",\n- \"lib\": [\"dom\"]\n+ \"module\": \"esnext\",\n+ \"target\": \"es2017\",\n+ \"esModuleInterop\": true,\n+ \"moduleResolution\": \"node\",\n+ \"lib\": [\"esnext\", \"DOM\"],\n+ \"sourceMap\": true\n }\n }\ndiff --git a/packages/shiki/rollup.config.js b/packages/shiki/rollup.config.js\nindex b8ba9e3..9078ea2 100644\n--- a/packages/shiki/rollup.config.js\n+++ b/packages/shiki/rollup.config.js\n@@ -4,6 +4,7 @@ import dts from 'rollup-plugin-dts'\n import typescript from 'rollup-plugin-typescript2'\n import copy from 'rollup-plugin-copy'\n import replace from '@rollup/plugin-replace'\n+import { terser } from 'rollup-plugin-terser'\n import { version } from './package.json'\n \n const external = ['onigasm', 'vscode-textmate']\n@@ -22,7 +23,14 @@ export default [\n format: 'esm'\n }\n ],\n- plugins: [typescript(), nodeResolve(), commonjs()]\n+ plugins: [\n+ replace({\n+ __BROWSER__: JSON.stringify(false)\n+ }),\n+ typescript(),\n+ nodeResolve(),\n+ commonjs()\n+ ]\n },\n {\n input: 'src/index.ts',\n@@ -58,7 +66,15 @@ export default [\n ]\n }\n ],\n- plugins: [typescript(), nodeResolve(), commonjs()]\n+ plugins: [\n+ replace({\n+ __BROWSER__: JSON.stringify(true)\n+ }),\n+ typescript(),\n+ nodeResolve(),\n+ commonjs(),\n+ terser()\n+ ]\n },\n {\n input: 'src/index.ts',\ndiff --git a/packages/shiki/src/global.d.ts b/packages/shiki/src/global.d.ts\nnew file mode 100644\nindex 0000000..08c128f\n--- /dev/null\n+++ b/packages/shiki/src/global.d.ts\n@@ -0,0 +1 @@\n+declare var __BROWSER__: boolean\ndiff --git a/packages/shiki/src/loader.ts b/packages/shiki/src/loader.ts\nindex 934cfbd..d9c3128 100644\n--- a/packages/shiki/src/loader.ts\n+++ b/packages/shiki/src/loader.ts\n@@ -5,11 +5,16 @@ import type { ILanguageRegistration, IShikiTheme } from './types'\n export const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined'\n \n let CDN_ROOT = '__CDN_ROOT__'\n+let ONIGASM_WASM = ''\n \n export function setCDN(root: string) {\n CDN_ROOT = root\n }\n \n+export function setOnigasmWASM(path: string) {\n+ ONIGASM_WASM = path\n+}\n+\n let _onigasmPromise: Promise<IOnigLib> = null\n \n export async function getOnigasm(): Promise<IOnigLib> {\n@@ -17,7 +22,7 @@ export async function getOnigasm(): Promise<IOnigLib> {\n let loader: Promise<any>\n \n if (isBrowser) {\n- loader = Onigasm.loadWASM(_resolvePath('onigasm.wasm', 'dist/'))\n+ loader = Onigasm.loadWASM(ONIGASM_WASM || _resolvePath('onigasm.wasm', 'dist/'))\n } else {\n const path = require('path')\n const onigasmPath = path.join(require.resolve('onigasm'), '../onigasm.wasm')\ndiff --git a/yarn.lock b/yarn.lock\nindex c143969..dfd7540 100644\n--- a/yarn.lock\n+++ b/yarn.lock\n@@ -2487,6 +2487,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:\n dependencies:\n delayed-stream \"~1.0.0\"\n \n+commander@^2.20.0, commander@~2.20.3:\n+ version \"2.20.3\"\n+ resolved \"https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33\"\n+ integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==\n+\n commander@^4.0.0:\n version \"4.1.1\"\n resolved \"https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068\"\n@@ -2497,11 +2502,6 @@ commander@^6.2.0:\n resolved \"https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75\"\n integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==\n \n-commander@~2.20.3:\n- version \"2.20.3\"\n- resolved \"https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33\"\n- integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==\n-\n commondir@^1.0.1:\n version \"1.0.1\"\n resolved \"https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b\"\n@@ -4799,7 +4799,7 @@ jest-watcher@^26.6.2:\n jest-util \"^26.6.2\"\n string-length \"^4.0.1\"\n \n-jest-worker@^26.6.2:\n+jest-worker@^26.2.1, jest-worker@^26.6.2:\n version \"26.6.2\"\n resolved \"https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed\"\n integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==\n@@ -6444,6 +6444,13 @@ quick-lru@^4.0.1:\n resolved \"https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f\"\n integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==\n \n+randombytes@^2.1.0:\n+ version \"2.1.0\"\n+ resolved \"https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a\"\n+ integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==\n+ dependencies:\n+ safe-buffer \"^5.1.0\"\n+\n react-is@^17.0.1:\n version \"17.0.1\"\n resolved \"https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339\"\n@@ -6812,6 +6819,16 @@ rollup-plugin-dts@^2.0.0:\n optionalDependencies:\n \"@babel/code-frame\" \"^7.10.4\"\n \n+rollup-plugin-terser@^7.0.2:\n+ version \"7.0.2\"\n+ resolved \"https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d\"\n+ integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==\n+ dependencies:\n+ \"@babel/code-frame\" \"^7.10.4\"\n+ jest-worker \"^26.2.1\"\n+ serialize-javascript \"^4.0.0\"\n+ terser \"^5.0.0\"\n+\n rollup-plugin-typescript2@^0.29.0:\n version \"0.29.0\"\n resolved \"https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.29.0.tgz#b7ad83f5241dbc5bdf1e98d9c3fca005ffe39e1a\"\n@@ -6873,7 +6890,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, \n resolved \"https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d\"\n integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==\n \n-safe-buffer@^5.2.0, safe-buffer@~5.2.0:\n+safe-buffer@^5.1.0, safe-buffer@^5.2.0, safe-buffer@~5.2.0:\n version \"5.2.1\"\n resolved \"https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6\"\n integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==\n@@ -6937,6 +6954,13 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:\n resolved \"https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d\"\n integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==\n \n+serialize-javascript@^4.0.0:\n+ version \"4.0.0\"\n+ resolved \"https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa\"\n+ integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==\n+ dependencies:\n+ randombytes \"^2.1.0\"\n+\n set-blocking@^2.0.0, set-blocking@~2.0.0:\n version \"2.0.0\"\n resolved \"https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7\"\n@@ -7140,7 +7164,7 @@ source-map-resolve@^0.5.0:\n source-map-url \"^0.4.0\"\n urix \"^0.1.0\"\n \n-source-map-support@^0.5.6:\n+source-map-support@^0.5.6, source-map-support@~0.5.19:\n version \"0.5.19\"\n resolved \"https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61\"\n integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==\n@@ -7163,7 +7187,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:\n resolved \"https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263\"\n integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==\n \n-source-map@^0.7.3:\n+source-map@^0.7.3, source-map@~0.7.2:\n version \"0.7.3\"\n resolved \"https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383\"\n integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==\n@@ -7552,6 +7576,15 @@ terminal-link@^2.0.0:\n ansi-escapes \"^4.2.1\"\n supports-hyperlinks \"^2.0.0\"\n \n+terser@^5.0.0:\n+ version \"5.5.1\"\n+ resolved \"https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289\"\n+ integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==\n+ dependencies:\n+ commander \"^2.20.0\"\n+ source-map \"~0.7.2\"\n+ source-map-support \"~0.5.19\"\n+\n test-exclude@^6.0.0:\n version \"6.0.0\"\n resolved \"https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e\"\n"]
| 3 |
["2b01808ec86fe9d8b4a93141a1b7f95e11fd6010", "5d14de6722eb34c6604a124f6f11cb711f16bd44", "ace6b981c8098a68092d4a10e75daae7b8bfee9b"]
|
["docs", "refactor", "feat"]
|
add unit test for query API,Remove hasmany and belongsto from context menu
Signed-off-by: Pranav C <[email protected]>,temporary do no run "verify-ffmpeg.py" on Mac CI (#14986)
|
["diff --git a/gateway/src/test/java/io/camunda/zeebe/gateway/api/util/StubbedBrokerClient.java b/gateway/src/test/java/io/camunda/zeebe/gateway/api/util/StubbedBrokerClient.java\nindex 2d2d084..38261ad 100644\n--- a/gateway/src/test/java/io/camunda/zeebe/gateway/api/util/StubbedBrokerClient.java\n+++ b/gateway/src/test/java/io/camunda/zeebe/gateway/api/util/StubbedBrokerClient.java\n@@ -25,6 +25,7 @@ import java.util.HashMap;\n import java.util.List;\n import java.util.Map;\n import java.util.concurrent.CompletableFuture;\n+import java.util.concurrent.TimeUnit;\n import java.util.function.Consumer;\n \n public final class StubbedBrokerClient implements BrokerClient {\n@@ -67,7 +68,15 @@ public final class StubbedBrokerClient implements BrokerClient {\n @Override\n public <T> CompletableFuture<BrokerResponse<T>> sendRequestWithRetry(\n final BrokerRequest<T> request, final Duration requestTimeout) {\n- throw new UnsupportedOperationException(\"not implemented\");\n+ final CompletableFuture<BrokerResponse<T>> result = new CompletableFuture<>();\n+\n+ sendRequestWithRetry(\n+ request,\n+ (key, response) ->\n+ result.complete(new BrokerResponse<>(response, Protocol.decodePartitionId(key), key)),\n+ result::completeExceptionally);\n+\n+ return result.orTimeout(requestTimeout.toNanos(), TimeUnit.NANOSECONDS);\n }\n \n @Override\ndiff --git a/gateway/src/test/java/io/camunda/zeebe/gateway/query/QueryApiTest.java b/gateway/src/test/java/io/camunda/zeebe/gateway/query/QueryApiTest.java\nnew file mode 100644\nindex 0000000..ec9ec80\n--- /dev/null\n+++ b/gateway/src/test/java/io/camunda/zeebe/gateway/query/QueryApiTest.java\n@@ -0,0 +1,91 @@\n+/*\n+ * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH under\n+ * one or more contributor license agreements. See the NOTICE file distributed\n+ * with this work for additional information regarding copyright ownership.\n+ * Licensed under the Zeebe Community License 1.1. You may not use this file\n+ * except in compliance with the Zeebe Community License 1.1.\n+ */\n+package io.camunda.zeebe.gateway.query;\n+\n+import static org.assertj.core.api.Assertions.assertThat;\n+\n+import io.camunda.zeebe.gateway.api.util.GatewayTest;\n+import io.camunda.zeebe.gateway.cmd.BrokerErrorException;\n+import io.camunda.zeebe.gateway.impl.broker.response.BrokerError;\n+import io.camunda.zeebe.gateway.impl.broker.response.BrokerErrorResponse;\n+import io.camunda.zeebe.gateway.impl.broker.response.BrokerResponse;\n+import io.camunda.zeebe.gateway.query.impl.QueryApiImpl;\n+import io.camunda.zeebe.protocol.Protocol;\n+import io.camunda.zeebe.protocol.record.ErrorCode;\n+import java.time.Duration;\n+import java.util.concurrent.CompletionStage;\n+import java.util.concurrent.ExecutionException;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.junit.runners.Parameterized;\n+import org.junit.runners.Parameterized.Parameter;\n+import org.junit.runners.Parameterized.Parameters;\n+\n+@RunWith(Parameterized.class)\n+public final class QueryApiTest extends GatewayTest {\n+ @Parameter(0)\n+ public String name;\n+\n+ @Parameter(1)\n+ public Querier querier;\n+\n+ @Parameters(name = \"{index}: {0}\")\n+ public static Object[][] queries() {\n+ return new Object[][] {\n+ new Object[] {\"getBpmnProcessIdForProcess\", (Querier) QueryApi::getBpmnProcessIdFromProcess},\n+ new Object[] {\n+ \"getBpmnProcessIdForProcessInstance\",\n+ (Querier) QueryApi::getBpmnProcessIdFromProcessInstance\n+ },\n+ new Object[] {\"getBpmnProcessIdForProcessJob\", (Querier) QueryApi::getBpmnProcessIdFromJob},\n+ };\n+ }\n+\n+ @Test\n+ public void shouldGetBpmnProcessId() {\n+ // given\n+ final var key = Protocol.encodePartitionId(1, 1);\n+ final var api = new QueryApiImpl(brokerClient);\n+ final var timeout = Duration.ofSeconds(5);\n+ final var stub = new QueryStub(new BrokerResponse<>(\"myProcess\", 1, 1));\n+ stub.registerWith(brokerClient);\n+\n+ // when\n+ final var result = querier.query(api, key, timeout);\n+\n+ // then\n+ assertThat(result).succeedsWithin(timeout).isEqualTo(\"myProcess\");\n+ }\n+\n+ @Test\n+ public void shouldCompleteExceptionallyOnError() {\n+ // given\n+ final var key = Protocol.encodePartitionId(1, 1);\n+ final var api = new QueryApiImpl(brokerClient);\n+ final var timeout = Duration.ofSeconds(5);\n+ final var stub =\n+ new QueryStub(\n+ new BrokerErrorResponse<>(\n+ new BrokerError(ErrorCode.PARTITION_LEADER_MISMATCH, \"Leader mismatch\")));\n+ stub.registerWith(brokerClient);\n+\n+ // when\n+ final var result = querier.query(api, key, timeout);\n+\n+ // then\n+ assertThat(result)\n+ .failsWithin(timeout)\n+ .withThrowableOfType(ExecutionException.class)\n+ .havingRootCause()\n+ .isInstanceOf(BrokerErrorException.class);\n+ }\n+\n+ private interface Querier {\n+ CompletionStage<String> query(final QueryApi api, final long key, final Duration timeout);\n+ }\n+}\ndiff --git a/gateway/src/test/java/io/camunda/zeebe/gateway/query/QueryStub.java b/gateway/src/test/java/io/camunda/zeebe/gateway/query/QueryStub.java\nnew file mode 100644\nindex 0000000..2f8334e\n--- /dev/null\n+++ b/gateway/src/test/java/io/camunda/zeebe/gateway/query/QueryStub.java\n@@ -0,0 +1,31 @@\n+/*\n+ * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH under\n+ * one or more contributor license agreements. See the NOTICE file distributed\n+ * with this work for additional information regarding copyright ownership.\n+ * Licensed under the Zeebe Community License 1.1. You may not use this file\n+ * except in compliance with the Zeebe Community License 1.1.\n+ */\n+package io.camunda.zeebe.gateway.query;\n+\n+import io.camunda.zeebe.gateway.api.util.StubbedBrokerClient;\n+import io.camunda.zeebe.gateway.api.util.StubbedBrokerClient.RequestStub;\n+import io.camunda.zeebe.gateway.impl.broker.response.BrokerResponse;\n+import io.camunda.zeebe.gateway.query.impl.BrokerExecuteQuery;\n+\n+final class QueryStub implements RequestStub<BrokerExecuteQuery, BrokerResponse<String>> {\n+ private final BrokerResponse<String> response;\n+\n+ public QueryStub(final BrokerResponse<String> response) {\n+ this.response = response;\n+ }\n+\n+ @Override\n+ public void registerWith(final StubbedBrokerClient gateway) {\n+ gateway.registerHandler(BrokerExecuteQuery.class, this);\n+ }\n+\n+ @Override\n+ public BrokerResponse<String> handle(final BrokerExecuteQuery request) throws Exception {\n+ return response;\n+ }\n+}\n", "diff --git a/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue b/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue\nindex 5bc6f67..aaa297c 100644\n--- a/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue\n+++ b/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue\n@@ -261,37 +261,7 @@\n :size=\"size\"\n @input=\"loadTableData\"\n />\n- <!-- <v-pagination\n- v-if=\"count !== Infinity\"\n- style=\"max-width: 100%\"\n- v-model=\"page\"\n- :length=\"Math.ceil(count / size)\"\n- :total-visible=\"8\"\n- @input=\"loadTableData\"\n- color=\"primary lighten-2\"\n- ></v-pagination>\n- <div v-else class=\"mx-auto d-flex align-center mt-n1 \" style=\"max-width:250px\">\n- <span class=\"caption\" style=\"white-space: nowrap\"> Change page:</span>\n- <v-text-field\n- class=\"ml-1 caption\"\n- :full-width=\"false\"\n- outlined\n- dense\n- hide-details\n- v-model=\"page\"\n- @keydown.enter=\"loadTableData\"\n- type=\"number\"\n- >\n- <template #append>\n- <x-icon tooltip=\"Change page\" small icon.class=\"mt-1\" @click=\"loadTableData\">mdi-keyboard-return\n- </x-icon>\n- </template>\n- </v-text-field>\n- </div>-->\n </template>\n- <!-- <div v-else class=\"d-flex justify-center py-4\">-->\n- <!-- <v-alert type=\"info\" dense class=\"ma-1 flex-shrink-1\">Table is empty</v-alert>-->\n- <!-- </div>-->\n </div>\n \n <spreadsheet-nav-drawer\n@@ -414,9 +384,9 @@\n <span class=\"caption\">Delete Selected Rows</span>\n </v-list-item>\n </template>\n- <template v-if=\"meta.hasMany && meta.hasMany.length\">\n+ <!-- <template v-if=\"meta.hasMany && meta.hasMany.length\">\n <v-divider v-if=\"isEditable && !isLocked\" />\n- <span class=\"ml-3 grey--text \" style=\"font-size: 9px\">Has Many</span>\n+ <span class=\"ml-3 grey--text \" style=\"font-size: 9px\">Has Many</span>\n \n <v-list-item v-for=\"(hm,i) in meta.hasMany\" :key=\"i\" @click=\"addNewRelationTabCtxMenu(hm,'hm')\">\n <span class=\"caption text-capitalize\">{{ hm._tn }}</span>\n@@ -425,12 +395,12 @@\n \n <template v-if=\"meta.belongsTo && meta.belongsTo.length\">\n <v-divider />\n- <span class=\"ml-3 grey--text \" style=\"font-size: 9px\">Belongs To</span>\n+ <span class=\"ml-3 grey--text \" style=\"font-size: 9px\">Belongs To</span>\n \n <v-list-item v-for=\"(bt,i) in belongsTo\" :key=\"i\" @click=\"addNewRelationTabCtxMenu(bt,'bt')\">\n <span class=\"caption text-capitalize\">{{ bt._rtn }}</span>\n </v-list-item>\n- </template>\n+ </template>-->\n </v-list>\n </v-menu>\n <v-dialog\n", "diff --git a/vsts.yml b/vsts.yml\nindex 6cb0eb3..a058238 100644\n--- a/vsts.yml\n+++ b/vsts.yml\n@@ -86,13 +86,13 @@ jobs:\n killall Electron\n fi\n displayName: Make sure Electron isn't running from previous tests\n-\n- - bash: |\n- cd src\n- python electron/script/verify-ffmpeg.py --source-root \"$PWD\" --build-dir out/Default --ffmpeg-path out/ffmpeg\n- displayName: Verify non proprietary ffmpeg\n- condition: and(succeeded(), eq(variables['RUN_TESTS'], '1'))\n- timeoutInMinutes: 5\n+# FIXME(alexeykuzmin)\n+# - bash: |\n+# cd src\n+# python electron/script/verify-ffmpeg.py --source-root \"$PWD\" --build-dir out/Default --ffmpeg-path out/ffmpeg\n+# displayName: Verify non proprietary ffmpeg\n+# condition: and(succeeded(), eq(variables['RUN_TESTS'], '1'))\n+# timeoutInMinutes: 5\n \n - bash: |\n cd src\n"]
| 3 |
["bed86aeae8dad2dd6371635cd24bf8ef3db80361", "7dbbb64c45506ef634180638db800b6d9535523d", "9187415f5ee35d2e88dd834e413fc16bf19c5db1"]
|
["test", "refactor", "ci"]
|
use new, public `quay.io/influxdb/iox` image,updated to lerna v6,add ability to get all encoded values
|
["diff --git a/.circleci/config.yml b/.circleci/config.yml\nindex 3ae6728..a5f2d2f 100644\n--- a/.circleci/config.yml\n+++ b/.circleci/config.yml\n@@ -12,7 +12,7 @@\n # The CI for every PR and merge to main runs tests, fmt, lints and compiles debug binaries\n #\n # On main if all these checks pass it will then additionally compile in \"release\" mode and\n-# publish a docker image to quay.io/influxdb/fusion:$COMMIT_SHA\n+# publish a docker image to quay.io/influxdb/iox:$COMMIT_SHA\n #\n # Manual CI Image:\n #\n@@ -317,11 +317,11 @@ jobs:\n #\n # Uses the latest ci_image (influxdb/rust below) to build a release binary and\n # copies it to a minimal container image based upon `rust:slim-buster`. This\n- # minimal image is then pushed to `quay.io/influxdb/fusion:${BRANCH}` with '/'\n+ # minimal image is then pushed to `quay.io/influxdb/iox:${BRANCH}` with '/'\n # repaced by '.' - as an example:\n #\n # git branch: dom/my-awesome-feature/perf\n- # container: quay.io/influxdb/fusion:dom.my-awesome-feature.perf\n+ # container: quay.io/influxdb/iox:dom.my-awesome-feature.perf\n #\n # Subsequent CI runs will overwrite the tag if you push more changes, so watch\n # out for parallel CI runs!\n@@ -365,7 +365,7 @@ jobs:\n sudo apt-get update\n sudo apt-get install -y docker.io\n - run: |\n- echo \"$QUAY_PASS\" | docker login quay.io --username $QUAY_USER --password-stdin\n+ echo \"$QUAY_INFLUXDB_IOX_PASS\" | docker login quay.io --username $QUAY_INFLUXDB_IOX_USER --password-stdin\n - run:\n # Docker has functionality to support per-Dockerfile .dockerignore\n # This was added in https://github.com/moby/buildkit/pull/901\n@@ -379,8 +379,8 @@ jobs:\n echo sha256sum after build is\n sha256sum target/release/influxdb_iox\n COMMIT_SHA=$(git rev-parse --short HEAD)\n- docker build -t quay.io/influxdb/fusion:$COMMIT_SHA -f docker/Dockerfile.iox .\n- docker push quay.io/influxdb/fusion:$COMMIT_SHA\n+ docker build -t quay.io/influxdb/iox:$COMMIT_SHA -f docker/Dockerfile.iox .\n+ docker push quay.io/influxdb/iox:$COMMIT_SHA\n echo \"export COMMIT_SHA=${COMMIT_SHA}\" >> $BASH_ENV\n - run:\n name: Deploy tags\n", "diff --git a/lerna.json b/lerna.json\nindex 29cb6ed..4488fb6 100644\n--- a/lerna.json\n+++ b/lerna.json\n@@ -25,7 +25,6 @@\n \"npmClient\": \"pnpm\",\n \"useWorkspaces\": true,\n \"conventionalCommits\": true,\n- \"useNx\": true,\n \"command\": {\n \"version\": {\n \"message\": \"chore(release): published new version\"\ndiff --git a/nx.json b/nx.json\nindex 00997ba..b3f2627 100644\n--- a/nx.json\n+++ b/nx.json\n@@ -33,32 +33,6 @@\n }\n }\n },\n- \"targetDependencies\": {\n- \"build\": [\n- {\n- \"target\": \"build\",\n- \"projects\": \"dependencies\"\n- }\n- ],\n- \"build:ci\": [\n- {\n- \"target\": \"build:ci\",\n- \"projects\": \"dependencies\"\n- }\n- ],\n- \"prepare\": [\n- {\n- \"target\": \"prepare\",\n- \"projects\": \"dependencies\"\n- }\n- ],\n- \"package\": [\n- {\n- \"target\": \"package\",\n- \"projects\": \"dependencies\"\n- }\n- ]\n- },\n \"affected\": {\n \"defaultBase\": \"main\"\n },\n@@ -66,5 +40,28 @@\n \"@nrwl/js\": {\n \"analyzeSourceFiles\": false\n }\n+ },\n+ \"$schema\": \"./node_modules/nx/schemas/nx-schema.json\",\n+ \"targetDefaults\": {\n+ \"build\": {\n+ \"dependsOn\": [\n+ \"^build\"\n+ ]\n+ },\n+ \"build:ci\": {\n+ \"dependsOn\": [\n+ \"^build:ci\"\n+ ]\n+ },\n+ \"prepare\": {\n+ \"dependsOn\": [\n+ \"^prepare\"\n+ ]\n+ },\n+ \"package\": {\n+ \"dependsOn\": [\n+ \"^package\"\n+ ]\n+ }\n }\n }\n", "diff --git a/delorean_mem_qe/src/column.rs b/delorean_mem_qe/src/column.rs\nindex bc89cb2..b3df18e 100644\n--- a/delorean_mem_qe/src/column.rs\n+++ b/delorean_mem_qe/src/column.rs\n@@ -537,6 +537,22 @@ impl Column {\n }\n }\n \n+ /// Materialise all of the encoded values.\n+ pub fn all_encoded_values(&self) -> Vector {\n+ match self {\n+ Column::String(c) => {\n+ let now = std::time::Instant::now();\n+ let v = c.all_encoded_values();\n+ log::debug!(\"time getting all encoded values {:?}\", now.elapsed());\n+\n+ log::debug!(\"dictionary {:?}\", c.data.dictionary());\n+ Vector::Integer(v)\n+ }\n+ Column::Float(c) => Vector::Float(c.all_encoded_values()),\n+ Column::Integer(c) => Vector::Integer(c.all_encoded_values()),\n+ }\n+ }\n+\n /// Given an encoded value for a row, materialise and return the decoded\n /// version.\n ///\n@@ -986,6 +1002,10 @@ impl String {\n self.data.encoded_values(row_ids)\n }\n \n+ pub fn all_encoded_values(&self) -> Vec<i64> {\n+ self.data.all_encoded_values()\n+ }\n+\n /// Return the decoded value for an encoded ID.\n ///\n /// Panics if there is no decoded value for the provided id\n@@ -1037,6 +1057,10 @@ impl Float {\n self.data.encoded_values(row_ids)\n }\n \n+ pub fn all_encoded_values(&self) -> Vec<f64> {\n+ self.data.all_encoded_values()\n+ }\n+\n pub fn scan_from(&self, row_id: usize) -> &[f64] {\n self.data.scan_from(row_id)\n }\n@@ -1106,6 +1130,10 @@ impl Integer {\n self.data.encoded_values(row_ids)\n }\n \n+ pub fn all_encoded_values(&self) -> Vec<i64> {\n+ self.data.all_encoded_values()\n+ }\n+\n pub fn scan_from(&self, row_id: usize) -> &[i64] {\n self.data.scan_from(row_id)\n }\ndiff --git a/delorean_mem_qe/src/encoding.rs b/delorean_mem_qe/src/encoding.rs\nindex d6a865a..4b057cf 100644\n--- a/delorean_mem_qe/src/encoding.rs\n+++ b/delorean_mem_qe/src/encoding.rs\n@@ -68,6 +68,12 @@ where\n self.values(row_ids)\n }\n \n+ /// Return all encoded values. For this encoding this is just the decoded\n+ /// values\n+ pub fn all_encoded_values(&self) -> Vec<T> {\n+ self.values.clone()\n+ }\n+\n // TODO(edd): fix this when added NULL support\n pub fn scan_from_until_some(&self, _row_id: usize) -> Option<T> {\n unreachable!(\"to remove\");\n@@ -485,6 +491,26 @@ impl DictionaryRLE {\n out\n }\n \n+ // values materialises a vector of references to all logical values in the\n+ // encoding.\n+ pub fn all_values(&mut self) -> Vec<Option<&String>> {\n+ let mut out: Vec<Option<&String>> = Vec::with_capacity(self.total as usize);\n+\n+ // build reverse mapping.\n+ let mut idx_value = BTreeMap::new();\n+ for (k, v) in &self.entry_index {\n+ idx_value.insert(v, k);\n+ }\n+ assert_eq!(idx_value.len(), self.entry_index.len());\n+\n+ for (idx, rl) in &self.run_lengths {\n+ // TODO(edd): fix unwrap - we know that the value exists in map...\n+ let v = idx_value.get(&idx).unwrap().as_ref();\n+ out.extend(iter::repeat(v).take(*rl as usize));\n+ }\n+ out\n+ }\n+\n /// Return the decoded value for an encoded ID.\n ///\n /// Panics if there is no decoded value for the provided id\n@@ -528,22 +554,13 @@ impl DictionaryRLE {\n out\n }\n \n- // values materialises a vector of references to all logical values in the\n- // encoding.\n- pub fn all_values(&mut self) -> Vec<Option<&String>> {\n- let mut out: Vec<Option<&String>> = Vec::with_capacity(self.total as usize);\n-\n- // build reverse mapping.\n- let mut idx_value = BTreeMap::new();\n- for (k, v) in &self.entry_index {\n- idx_value.insert(v, k);\n- }\n- assert_eq!(idx_value.len(), self.entry_index.len());\n+ // all_encoded_values materialises a vector of all encoded values for the\n+ // column.\n+ pub fn all_encoded_values(&self) -> Vec<i64> {\n+ let mut out: Vec<i64> = Vec::with_capacity(self.total as usize);\n \n for (idx, rl) in &self.run_lengths {\n- // TODO(edd): fix unwrap - we know that the value exists in map...\n- let v = idx_value.get(&idx).unwrap().as_ref();\n- out.extend(iter::repeat(v).take(*rl as usize));\n+ out.extend(iter::repeat(*idx as i64).take(*rl as usize));\n }\n out\n }\ndiff --git a/delorean_mem_qe/src/segment.rs b/delorean_mem_qe/src/segment.rs\nindex c058df0..f8c5005 100644\n--- a/delorean_mem_qe/src/segment.rs\n+++ b/delorean_mem_qe/src/segment.rs\n@@ -228,7 +228,7 @@ impl Segment {\n group_columns: &[String],\n aggregates: &[(String, AggregateType)],\n window: i64,\n- ) -> BTreeMap<Vec<String>, Vec<(String, Option<column::Aggregate>)>> {\n+ ) -> BTreeMap<Vec<i64>, Vec<(&String, &AggregateType, Option<column::Aggregate>)>> {\n // Build a hash table - essentially, scan columns for matching row ids,\n // emitting the encoded value for each column and track those value\n // combinations in a hashmap with running aggregates.\n@@ -242,6 +242,10 @@ impl Segment {\n assert_ne!(group_columns[group_columns.len() - 1], \"time\");\n }\n \n+ // TODO(edd): Perf - if there is no predicate and we want entire segment\n+ // then it will be a lot faster to not build filtered_row_ids and just\n+ // get all encoded values for each grouping column...\n+\n // filter on predicates and time\n let filtered_row_ids: croaring::Bitmap;\n if let Some(row_ids) = self.filter_by_predicates_eq(time_range, predicates) {\n@@ -263,7 +267,12 @@ impl Segment {\n let mut group_column_encoded_values = Vec::with_capacity(group_columns.len());\n for group_column in group_columns {\n if let Some(column) = self.column(&group_column) {\n- let encoded_values = column.encoded_values(&filtered_row_ids_vec);\n+ let encoded_values = if filtered_row_ids_vec.len() == self.meta.rows {\n+ column.all_encoded_values()\n+ } else {\n+ column.encoded_values(&filtered_row_ids_vec)\n+ };\n+\n assert_eq!(\n filtered_row_ids.cardinality() as usize,\n encoded_values.len()\n@@ -325,10 +334,10 @@ impl Segment {\n .collect::<Vec<_>>();\n \n // hashMap is about 20% faster than BTreeMap in this case\n- let mut hash_table: HashMap<\n+ let mut hash_table: BTreeMap<\n Vec<i64>,\n Vec<(&String, &AggregateType, Option<column::Aggregate>)>,\n- > = HashMap::new();\n+ > = BTreeMap::new();\n \n let mut aggregate_row: Vec<(&str, Option<column::Scalar>)> =\n std::iter::repeat_with(|| (\"\", None))\n@@ -406,8 +415,10 @@ impl Segment {\n }\n processed_rows += 1;\n }\n+ // println!(\"groups: {:?}\", hash_table.len());\n log::debug!(\"({:?} rows processed) {:?}\", processed_rows, hash_table);\n BTreeMap::new()\n+ // hash_table\n }\n \n pub fn aggregate_by_group_using_sort(\n@@ -451,7 +462,11 @@ impl Segment {\n let mut group_column_encoded_values = Vec::with_capacity(group_columns.len());\n for group_column in group_columns {\n if let Some(column) = self.column(&group_column) {\n- let encoded_values = column.encoded_values(&filtered_row_ids_vec);\n+ let encoded_values = if filtered_row_ids_vec.len() == self.meta.rows {\n+ column.all_encoded_values()\n+ } else {\n+ column.encoded_values(&filtered_row_ids_vec)\n+ };\n assert_eq!(\n filtered_row_ids.cardinality() as usize,\n encoded_values.len()\n@@ -557,6 +572,10 @@ impl Segment {\n assert_ne!(group_columns[group_columns.len() - 1], \"time\");\n }\n \n+ // TODO(edd): Perf - if there is no predicate and we want entire segment\n+ // then it will be a lot faster to not build filtered_row_ids and just\n+ // get all encoded values for each grouping column...\n+\n // filter on predicates and time\n let filtered_row_ids: croaring::Bitmap;\n if let Some(row_ids) = self.filter_by_predicates_eq(time_range, predicates) {\n@@ -577,7 +596,11 @@ impl Segment {\n let mut group_column_encoded_values = Vec::with_capacity(group_columns.len());\n for group_column in group_columns {\n if let Some(column) = self.column(&group_column) {\n- let encoded_values = column.encoded_values(&filtered_row_ids_vec);\n+ let encoded_values = if filtered_row_ids_vec.len() == self.meta.rows {\n+ column.all_encoded_values()\n+ } else {\n+ column.encoded_values(&filtered_row_ids_vec)\n+ };\n assert_eq!(\n filtered_row_ids.cardinality() as usize,\n encoded_values.len()\n@@ -709,6 +732,7 @@ impl Segment {\n aggregates: group_key_aggregates,\n });\n \n+ // println!(\"groups: {:?}\", results.len());\n log::debug!(\"({:?} rows processed) {:?}\", processed_rows, results);\n // results\n vec![]\n"]
| 3 |
["f751bb5426b87f82096d620f1cd6203badf45d58", "aa30370b796c1f46cc60aa56b2918c3d27c0cf88", "cad5e45208346528ad02cd04dcac863f90faa037"]
|
["ci", "build", "feat"]
|
do not query all networks,update get-started,Fix Cube Store build on Windows
|
["diff --git a/src/environment/windows_win32.go b/src/environment/windows_win32.go\nindex be0c7b5..b90e0ff 100644\n--- a/src/environment/windows_win32.go\n+++ b/src/environment/windows_win32.go\n@@ -203,7 +203,6 @@ func (env *ShellEnvironment) getConnections() []*Connection {\n \tvar pIFTable2 *MIN_IF_TABLE2\n \t_, _, _ = hGetIfTable2.Call(uintptr(unsafe.Pointer(&pIFTable2)))\n \n-\tSSIDs, _ := env.getAllWifiSSID()\n \tnetworks := make([]*Connection, 0)\n \n \tfor i := 0; i < int(pIFTable2.NumEntries); i++ {\n@@ -220,11 +219,13 @@ func (env *ShellEnvironment) getConnections() []*Connection {\n \t\t}\n \n \t\tvar connectionType ConnectionType\n+\t\tvar ssid string\n \t\tswitch networkInterface.Type {\n \t\tcase 6:\n \t\t\tconnectionType = ETHERNET\n \t\tcase 71:\n \t\t\tconnectionType = WIFI\n+\t\t\tssid = env.getWiFiSSID(networkInterface.InterfaceGUID)\n \t\tcase 237, 234, 244:\n \t\t\tconnectionType = CELLULAR\n \t\t}\n@@ -243,10 +244,7 @@ func (env *ShellEnvironment) getConnections() []*Connection {\n \t\t\tName: description, // we want a relatable name, alias isn't that\n \t\t\tTransmitRate: networkInterface.TransmitLinkSpeed,\n \t\t\tReceiveRate: networkInterface.ReceiveLinkSpeed,\n-\t\t}\n-\n-\t\tif SSID, OK := SSIDs[network.Name]; OK {\n-\t\t\tnetwork.SSID = SSID\n+\t\t\tSSID: ssid,\n \t\t}\n \n \t\tnetworks = append(networks, network)\n@@ -322,13 +320,21 @@ type MIB_IF_ROW2 struct { //nolint: revive\n \tOutQLen uint64\n }\n \n-func (env *ShellEnvironment) getAllWifiSSID() (map[string]string, error) {\n+var (\n+\twlanapi = syscall.NewLazyDLL(\"wlanapi.dll\")\n+\thWlanOpenHandle = wlanapi.NewProc(\"WlanOpenHandle\")\n+\thWlanCloseHandle = wlanapi.NewProc(\"WlanCloseHandle\")\n+\thWlanQueryInterface = wlanapi.NewProc(\"WlanQueryInterface\")\n+)\n+\n+func (env *ShellEnvironment) getWiFiSSID(guid windows.GUID) string {\n+\t// Query wifi connection state\n \tvar pdwNegotiatedVersion uint32\n \tvar phClientHandle uint32\n \te, _, err := hWlanOpenHandle.Call(uintptr(uint32(2)), uintptr(unsafe.Pointer(nil)), uintptr(unsafe.Pointer(&pdwNegotiatedVersion)), uintptr(unsafe.Pointer(&phClientHandle)))\n \tif e != 0 {\n \t\tenv.Log(Error, \"getAllWifiSSID\", err.Error())\n-\t\treturn nil, err\n+\t\treturn \"\"\n \t}\n \n \t// defer closing handle\n@@ -336,42 +342,11 @@ func (env *ShellEnvironment) getAllWifiSSID() (map[string]string, error) {\n \t\t_, _, _ = hWlanCloseHandle.Call(uintptr(phClientHandle), uintptr(unsafe.Pointer(nil)))\n \t}()\n \n-\tssid := make(map[string]string)\n-\t// list interfaces\n-\tvar interfaceList *WLAN_INTERFACE_INFO_LIST\n-\te, _, err = hWlanEnumInterfaces.Call(uintptr(phClientHandle), uintptr(unsafe.Pointer(nil)), uintptr(unsafe.Pointer(&interfaceList)))\n-\tif e != 0 {\n-\t\tenv.Log(Error, \"getAllWifiSSID\", err.Error())\n-\t\treturn nil, err\n-\t}\n-\n-\t// use first interface that is connected\n-\tnumberOfInterfaces := int(interfaceList.dwNumberOfItems)\n-\tinfoSize := unsafe.Sizeof(interfaceList.InterfaceInfo[0])\n-\tfor i := 0; i < numberOfInterfaces; i++ {\n-\t\tnetwork := (*WLAN_INTERFACE_INFO)(unsafe.Pointer(uintptr(unsafe.Pointer(&interfaceList.InterfaceInfo[0])) + uintptr(i)*infoSize))\n-\t\tif network.isState == 1 {\n-\t\t\twifiInterface := strings.TrimRight(string(utf16.Decode(network.strInterfaceDescription[:])), \"\\x00\")\n-\t\t\tssid[wifiInterface] = env.getWiFiSSID(network, phClientHandle)\n-\t\t}\n-\t}\n-\treturn ssid, nil\n-}\n-\n-var (\n-\twlanapi = syscall.NewLazyDLL(\"wlanapi.dll\")\n-\thWlanOpenHandle = wlanapi.NewProc(\"WlanOpenHandle\")\n-\thWlanCloseHandle = wlanapi.NewProc(\"WlanCloseHandle\")\n-\thWlanEnumInterfaces = wlanapi.NewProc(\"WlanEnumInterfaces\")\n-\thWlanQueryInterface = wlanapi.NewProc(\"WlanQueryInterface\")\n-)\n-\n-func (env *ShellEnvironment) getWiFiSSID(network *WLAN_INTERFACE_INFO, clientHandle uint32) string {\n-\t// Query wifi connection state\n \tvar dataSize uint16\n \tvar wlanAttr *WLAN_CONNECTION_ATTRIBUTES\n-\te, _, _ := hWlanQueryInterface.Call(uintptr(clientHandle),\n-\t\tuintptr(unsafe.Pointer(&network.InterfaceGuid)),\n+\n+\te, _, _ = hWlanQueryInterface.Call(uintptr(phClientHandle),\n+\t\tuintptr(unsafe.Pointer(&guid)),\n \t\tuintptr(7), // wlan_intf_opcode_current_connection\n \t\tuintptr(unsafe.Pointer(nil)),\n \t\tuintptr(unsafe.Pointer(&dataSize)),\n@@ -389,18 +364,6 @@ func (env *ShellEnvironment) getWiFiSSID(network *WLAN_INTERFACE_INFO, clientHan\n \treturn string(ssid.ucSSID[0:ssid.uSSIDLength])\n }\n \n-type WLAN_INTERFACE_INFO_LIST struct { //nolint: revive\n-\tdwNumberOfItems uint32\n-\tdwIndex uint32 //nolint: unused\n-\tInterfaceInfo [256]WLAN_INTERFACE_INFO\n-}\n-\n-type WLAN_INTERFACE_INFO struct { //nolint: revive\n-\tInterfaceGuid syscall.GUID //nolint: revive\n-\tstrInterfaceDescription [256]uint16\n-\tisState uint32\n-}\n-\n type WLAN_CONNECTION_ATTRIBUTES struct { //nolint: revive\n \tisState uint32 //nolint: unused\n \twlanConnectionMode uint32 //nolint: unused\n", "diff --git a/docs/src/go-client/get-started.md b/docs/src/go-client/get-started.md\nindex 4f4405f..a792e0e 100755\n--- a/docs/src/go-client/get-started.md\n+++ b/docs/src/go-client/get-started.md\n@@ -199,14 +199,12 @@ workflowKey:1 bpmnProcessId:\"order-process\" version:1 workflowInstanceKey:6\n \n You did it! You want to see how the workflow instance is executed?\n \n-Start the Zeebe Monitor using `java -jar zeebe-simple-monitor.jar`.\n+Start the Zeebe Monitor using `java -jar zeebe-simple-monitor-app-*.jar`.\n \n Open a web browser and go to <http://localhost:8080/>.\n \n-Connect to the broker and switch to the workflow instances view.\n-Here, you see the current state of the workflow instance which includes active jobs, completed activities, the payload and open incidents.\n-\n-\n+Here, you see the current state of the workflow instance.\n+\n \n \n ## Work on a task\n@@ -322,7 +320,7 @@ it encounters a problem while processing the job.\n \n When you have a look at the Zeebe Monitor, then you can see that the workflow instance moved from the first service task to the next one:\n \n-\n+\n \n When you run the above example you should see similar output:\n \ndiff --git a/docs/src/go-client/java-get-started-monitor-1.gif b/docs/src/go-client/java-get-started-monitor-1.gif\nnew file mode 100644\nindex 0000000..b86803a\nBinary files /dev/null and b/docs/src/go-client/java-get-started-monitor-1.gif differ\ndiff --git a/docs/src/go-client/java-get-started-monitor-2.gif b/docs/src/go-client/java-get-started-monitor-2.gif\nnew file mode 100644\nindex 0000000..8f0f2a4\nBinary files /dev/null and b/docs/src/go-client/java-get-started-monitor-2.gif differ\ndiff --git a/docs/src/go-client/zeebe-monitor-1.png b/docs/src/go-client/zeebe-monitor-1.png\ndeleted file mode 100644\nindex 0075f3d..0000000\nBinary files a/docs/src/go-client/zeebe-monitor-1.png and /dev/null differ\ndiff --git a/docs/src/go-client/zeebe-monitor-2.png b/docs/src/go-client/zeebe-monitor-2.png\ndeleted file mode 100644\nindex 6687bb0..0000000\nBinary files a/docs/src/go-client/zeebe-monitor-2.png and /dev/null differ\ndiff --git a/docs/src/go-client/zeebe-monitor-3.png b/docs/src/go-client/zeebe-monitor-3.png\ndeleted file mode 100644\nindex bc15659..0000000\nBinary files a/docs/src/go-client/zeebe-monitor-3.png and /dev/null differ\ndiff --git a/docs/src/introduction/quickstart.md b/docs/src/introduction/quickstart.md\nindex 70abacf..68be28b 100644\n--- a/docs/src/introduction/quickstart.md\n+++ b/docs/src/introduction/quickstart.md\n@@ -215,7 +215,7 @@ and completed by a [job worker](/basics/job-workers.html). A job worker is a\n long living process which repeatedly tries to activate jobs for a given job\n type and completes them after executing its business logic. The `zbctl` also\n provides a command to spawn simple job workers using an external command or\n-script. The job worker will receive for every job the payload as JSON object on\n+script. The job worker will receive for every job the workflow instance variables as JSON object on\n `stdin` and has to return its result also as JSON object on `stdout` if it\n handled the job successfully.\n \ndiff --git a/docs/src/java-client/get-started.md b/docs/src/java-client/get-started.md\nindex 54d2208..afc1fd4 100755\n--- a/docs/src/java-client/get-started.md\n+++ b/docs/src/java-client/get-started.md\n@@ -21,9 +21,9 @@ You will be guided through the following steps:\n * [Zeebe Modeler](https://github.com/zeebe-io/zeebe-modeler/releases)\n * [Zeebe Monitor](https://github.com/zeebe-io/zeebe-simple-monitor/releases)\n \n-Before you begin to setup your project please start the broker, i.e. by running the start up script \n-`bin/broker` or `bin/broker.bat` in the distribution. Per default the broker is binding to the \n-address `localhost:26500`, which is used as contact point in this guide. In case your broker is \n+Before you begin to setup your project please start the broker, i.e. by running the start up script\n+`bin/broker` or `bin/broker.bat` in the distribution. Per default the broker is binding to the\n+address `localhost:26500`, which is used as contact point in this guide. In case your broker is\n available under another address please adjust the broker contact point when building the client.\n \n ## Set up a project\n@@ -182,14 +182,12 @@ Workflow instance created. Key: 6\n \n You did it! You want to see how the workflow instance is executed?\n \n-Start the Zeebe Monitor using `java -jar zeebe-simple-monitor.jar`.\n+Start the Zeebe Monitor using `java -jar zeebe-simple-monitor-app-*.jar`.\n \n Open a web browser and go to <http://localhost:8080/>.\n \n-Connect to the broker and switch to the workflow instances view.\n-Here, you see the current state of the workflow instance which includes active jobs, completed activities, the payload and open incidents.\n-\n-\n+Here, you see the current state of the workflow instance.\n+\n \n ## Work on a job\n \n@@ -205,12 +203,9 @@ Insert a few service tasks between the start and the end event.\n You need to set the type of each task, which identifies the nature of the work to be performed.\n Set the type of the first task to 'payment-service'.\n \n-Optionally, you can define parameters of the task by adding headers.\n-Add the header `method = VISA` to the first task.\n-\n Save the BPMN diagram and switch back to the main class.\n \n-Add the following lines to create a [job worker][] for the first jobs type:\n+Add the following lines to create a job worker for the first jobs type:\n \n ```java\n package io.zeebe;\n@@ -227,10 +222,7 @@ public class Application\n .jobType(\"payment-service\")\n .handler((jobClient, job) ->\n {\n- final Map<String, Object> headers = job.getCustomHeaders();\n- final String method = (String) headers.get(\"method\");\n-\n- System.out.println(\"Collect money using payment method: \" + method);\n+ System.out.println(\"Collect money\");\n \n // ...\n \n@@ -252,40 +244,29 @@ public class Application\n Run the program and verify that the job is processed. You should see the output:\n \n ```\n-Collect money using payment method: VISA\n+Collect money\n ```\n \n When you have a look at the Zeebe Monitor, then you can see that the workflow instance moved from the first service task to the next one:\n \n-\n+\n \n ## Work with data\n \n-Usually, a workflow is more than just tasks, there is also data flow.\n-The tasks need data as input and in order to produce data.\n+Usually, a workflow is more than just tasks, there is also a data flow. The worker gets the data from the workflow instance to do its work and send the result back to the workflow instance.\n \n-In Zeebe, the data is represented as a JSON document.\n-When you create a workflow instance, then you can pass the data as payload.\n-Within the workflow, you can use input and output mappings on tasks to control the data flow.\n+In Zeebe, the data is stored as key-value-pairs in form of variables. Variables can be set when the workflow instance is created. Within the workflow, variables can be read and modified by workers.\n \n-In our example, we want to create a workflow instance with the following data:\n+In our example, we want to create a workflow instance with the following variables:\n \n ```json\n-{\n- \"orderId\": 31243,\n- \"orderItems\": [435, 182, 376]\n-}\n+\"orderId\": 31243\n+\"orderItems\": [435, 182, 376]\n ```\n \n-The first task should take `orderId` as input and return `totalPrice` as result.\n-\n-Open the BPMN diagram and switch to the input-output-mappings of the first task.\n-Add the input mapping `$.orderId : $.orderId` and the output mapping `$.totalPrice : $.totalPrice`.\n+The first task should read `orderId` as input and return `totalPrice` as result.\n \n-Save the BPMN diagram and go back to the main class.\n-\n-Modify the create command and pass the data as variables.\n-Also, modify the job worker to read the jobs payload and complete the job with payload.\n+Modify the workflow instance create command and pass the data as variables. Also, modify the job worker to read the job variables and complete the job with a result.\n \n ```java\n package io.zeebe;\n@@ -313,23 +294,22 @@ public class Application\n .jobType(\"payment-service\")\n .handler((jobClient, job) ->\n {\n- final Map<String, Object> headers = job.getCustomHeaders();\n- final String method = (String) headers.get(\"method\");\n-\n- final Map<String, Object> payload = job.getPayloadAsMap();\n+ final Map<String, Object> variables = job.getVariablesAsMap();\n \n- System.out.println(\"Process order: \" + payload.get(\"orderId\"));\n- System.out.println(\"Collect money using payment method: \" + method);\n+ System.out.println(\"Process order: \" + variables.get(\"orderId\"));\n+ System.out.println(\"Collect money\");\n \n // ...\n \n- payload.put(\"totalPrice\", 46.50);\n+ final Map<String, Object> result = new HashMap<>();\n+ result.put(\"totalPrice\", 46.50);\n \n jobClient.newCompleteCommand(job.getKey())\n- .payload(payload)\n+ .variables(result)\n .send()\n .join();\n })\n+ .fetchVariables(\"orderId\")\n .open();\n \n // ...\n@@ -337,16 +317,16 @@ public class Application\n }\n ```\n \n-Run the program and verify that the payload is mapped into the job. You should see the output:\n+Run the program and verify that the variable is read. You should see the output:\n \n ```\n-Process order: {\"orderId\":31243}\n-Collect money using payment method: VISA\n+Process order: 31243\n+Collect money\n ```\n \n-When we have a look at the Zeebe Monitor, then we can see how the payload is modified after the activity:\n+When we have a look at the Zeebe Monitor, then we can see that the variable `totalPrice` is set:\n \n-\n+\n \n ## What's next?\n \ndiff --git a/docs/src/java-client/java-get-started-monitor-1.gif b/docs/src/java-client/java-get-started-monitor-1.gif\nnew file mode 100644\nindex 0000000..b86803a\nBinary files /dev/null and b/docs/src/java-client/java-get-started-monitor-1.gif differ\ndiff --git a/docs/src/java-client/java-get-started-monitor-2.gif b/docs/src/java-client/java-get-started-monitor-2.gif\nnew file mode 100644\nindex 0000000..8f0f2a4\nBinary files /dev/null and b/docs/src/java-client/java-get-started-monitor-2.gif differ\ndiff --git a/docs/src/java-client/java-get-started-monitor-3.gif b/docs/src/java-client/java-get-started-monitor-3.gif\nnew file mode 100644\nindex 0000000..1f6cb56\nBinary files /dev/null and b/docs/src/java-client/java-get-started-monitor-3.gif differ\ndiff --git a/docs/src/java-client/zeebe-monitor-1.png b/docs/src/java-client/zeebe-monitor-1.png\ndeleted file mode 100644\nindex 0075f3d..0000000\nBinary files a/docs/src/java-client/zeebe-monitor-1.png and /dev/null differ\ndiff --git a/docs/src/java-client/zeebe-monitor-2.png b/docs/src/java-client/zeebe-monitor-2.png\ndeleted file mode 100644\nindex 6687bb0..0000000\nBinary files a/docs/src/java-client/zeebe-monitor-2.png and /dev/null differ\ndiff --git a/docs/src/java-client/zeebe-monitor-3.png b/docs/src/java-client/zeebe-monitor-3.png\ndeleted file mode 100644\nindex bc15659..0000000\nBinary files a/docs/src/java-client/zeebe-monitor-3.png and /dev/null differ\n", "diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml\nindex a986501..db33097 100644\n--- a/.github/workflows/publish.yml\n+++ b/.github/workflows/publish.yml\n@@ -409,7 +409,7 @@ jobs:\n run: vcpkg integrate install; vcpkg install openssl:x64-windows\n - name: Instal LLVM for Windows\n if: ${{ startsWith(matrix.os, 'windows') }}\n- run: choco install -y llvm --version 9.0.1\n+ run: choco install -y --force llvm --version 9.0.1\n - name: Set Env Variables for Windows\n uses: allenevans/[email protected]\n if: ${{ startsWith(matrix.os, 'windows') }}\ndiff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml\nindex d45cdf9..8d87ed6 100644\n--- a/.github/workflows/rust.yml\n+++ b/.github/workflows/rust.yml\n@@ -158,7 +158,7 @@ jobs:\n run: vcpkg integrate install; vcpkg install openssl:x64-windows\n - name: Instal LLVM for Windows\n if: ${{ startsWith(matrix.os, 'windows') }}\n- run: choco install -y llvm --version 9.0.1\n+ run: choco install -y --force llvm --version 9.0.1\n - name: Set Env Variables for Windows\n uses: allenevans/[email protected]\n if: ${{ startsWith(matrix.os, 'windows') }}\n"]
| 3 |
["8a9a022baa15befc325f87892c6bdae25b35bc33", "cf6d526123abab2689b24a06aaf03d8e4d6ddff4", "e34bb04baac7574e67bc566d13dea72092e0cfa3"]
|
["refactor", "docs", "ci"]
|
remove members that are left from ClusterTopology when last change is applied
When the change is applied, the member is marked as LEFT. It is removed from the
ClusterTopology when all changes in the ClusterChangePlan is completed.,create dashboards from imported templates,add getting started gitlab ci configuration
Signed-off-by: Adrien Brault <[email protected]>
|
["diff --git a/topology/src/main/java/io/camunda/zeebe/topology/state/ClusterTopology.java b/topology/src/main/java/io/camunda/zeebe/topology/state/ClusterTopology.java\nindex e5a111d..8ccd410 100644\n--- a/topology/src/main/java/io/camunda/zeebe/topology/state/ClusterTopology.java\n+++ b/topology/src/main/java/io/camunda/zeebe/topology/state/ClusterTopology.java\n@@ -171,7 +171,31 @@ public record ClusterTopology(\n }\n \n private ClusterTopology advance() {\n- return new ClusterTopology(version, members, changes.advance());\n+ final ClusterTopology result = new ClusterTopology(version, members, changes.advance());\n+ if (!result.hasPendingChanges()) {\n+ // The last change has been applied. Clean up the members that are marked as LEFT in the\n+ // topology. This operation will be executed in the member that executes the last operation.\n+ // This is ok because it is guaranteed that no other concurrent modification will be applied\n+ // to the topology. This is because all the operations are applied sequentially, and no\n+ // topology update will be done without adding a ClusterChangePlan.\n+ return result.gc();\n+ }\n+ return result;\n+ }\n+\n+ private ClusterTopology gc() {\n+ if (hasPendingChanges()) {\n+ throw new IllegalStateException(\n+ \"Expected to remove members that are left from the topology, but there are pending changes \"\n+ + changes);\n+ }\n+ // remove members that are marked as LEFT\n+ final var currentMembers =\n+ members().entrySet().stream()\n+ .filter(entry -> entry.getValue().state() != State.LEFT)\n+ .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));\n+ // Increment the version so that other members can merge by overwriting their local topology.\n+ return new ClusterTopology(version + 1, currentMembers, changes);\n }\n \n public boolean hasMember(final MemberId memberId) {\n", "diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 590f5ea..bd74e95 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -1,6 +1,7 @@\n ## v2.0.0-alpha.6 [unreleased]\n \n ### Features\n+1. [12496](https://github.com/influxdata/influxdb/pull/12496): Add ability to import a dashboard\n \n ### Bug Fixes\n \ndiff --git a/ui/src/dashboards/actions/v2/index.ts b/ui/src/dashboards/actions/v2/index.ts\nindex ad0d13d..35babc7 100644\n--- a/ui/src/dashboards/actions/v2/index.ts\n+++ b/ui/src/dashboards/actions/v2/index.ts\n@@ -16,6 +16,7 @@ import {\n removeDashboardLabels as removeDashboardLabelsAJAX,\n updateView as updateViewAJAX,\n } from 'src/dashboards/apis/v2'\n+import {client} from 'src/utils/api'\n \n // Actions\n import {notify} from 'src/shared/actions/notifications'\n@@ -25,6 +26,10 @@ import {\n DeleteTimeRangeAction,\n } from 'src/dashboards/actions/v2/ranges'\n import {setView, SetViewAction} from 'src/dashboards/actions/v2/views'\n+import {\n+ importDashboardSucceeded,\n+ importDashboardFailed,\n+} from 'src/shared/copy/notifications'\n \n // Utils\n import {\n@@ -38,7 +43,7 @@ import * as copy from 'src/shared/copy/notifications'\n // Types\n import {RemoteDataState} from 'src/types'\n import {PublishNotificationAction} from 'src/types/actions/notifications'\n-import {CreateCell} from '@influxdata/influx'\n+import {CreateCell, IDashboardTemplate} from '@influxdata/influx'\n import {Dashboard, NewView, Cell} from 'src/types/v2'\n import {ILabel} from '@influxdata/influx'\n \n@@ -201,6 +206,19 @@ export const getDashboardsAsync = () => async (\n }\n }\n \n+export const createDashboardFromTemplate = (\n+ template: IDashboardTemplate,\n+ orgID: string\n+) => async dispatch => {\n+ try {\n+ await client.dashboards.createFromTemplate(template, orgID)\n+\n+ dispatch(notify(importDashboardSucceeded()))\n+ } catch (error) {\n+ dispatch(notify(importDashboardFailed(error)))\n+ }\n+}\n+\n export const importDashboardAsync = (dashboard: Dashboard) => async (\n dispatch: Dispatch<Action>\n ): Promise<void> => {\ndiff --git a/ui/src/dashboards/components/ImportDashboardOverlay.tsx b/ui/src/dashboards/components/ImportDashboardOverlay.tsx\nindex 37ef80b..84216c3 100644\n--- a/ui/src/dashboards/components/ImportDashboardOverlay.tsx\n+++ b/ui/src/dashboards/components/ImportDashboardOverlay.tsx\n@@ -1,70 +1,80 @@\n+// Libraries\n import React, {PureComponent} from 'react'\n import _ from 'lodash'\n+import {connect} from 'react-redux'\n \n-import Container from 'src/clockface/components/overlays/OverlayContainer'\n-import Heading from 'src/clockface/components/overlays/OverlayHeading'\n-import Body from 'src/clockface/components/overlays/OverlayBody'\n-import DragAndDrop from 'src/shared/components/DragAndDrop'\n+// Constants\n import {dashboardImportFailed} from 'src/shared/copy/notifications'\n \n-import {Dashboard} from 'src/types/v2'\n-import {Notification} from 'src/types/notifications'\n+// Actions\n+import {notify as notifyAction} from 'src/shared/actions/notifications'\n+import {getDashboardsAsync} from 'src/dashboards/actions/v2'\n \n-interface Props {\n+// Types\n+import ImportOverlay from 'src/shared/components/ImportOverlay'\n+import {createDashboardFromTemplate as createDashboardFromTemplateAction} from 'src/dashboards/actions/v2'\n+\n+interface OwnProps {\n onDismissOverlay: () => void\n- onImportDashboard: (dashboard: Dashboard) => void\n- notify: (message: Notification) => void\n+ orgID: string\n+ isVisible: boolean\n+}\n+interface DispatchProps {\n+ notify: typeof notifyAction\n+ createDashboardFromTemplate: typeof createDashboardFromTemplateAction\n+ populateDashboards: typeof getDashboardsAsync\n }\n+\n+type Props = OwnProps & DispatchProps\n+\n class ImportDashboardOverlay extends PureComponent<Props> {\n constructor(props: Props) {\n super(props)\n }\n \n public render() {\n- const {onDismissOverlay} = this.props\n+ const {isVisible, onDismissOverlay} = this.props\n \n return (\n- <Container maxWidth={800}>\n- <Heading title=\"Import Dashboard\" onDismiss={onDismissOverlay} />\n- <Body>\n- <DragAndDrop\n- submitText=\"Upload Dashboard\"\n- fileTypesToAccept={this.validFileExtension}\n- handleSubmit={this.handleUploadDashboard}\n- />\n- </Body>\n- </Container>\n+ <ImportOverlay\n+ isVisible={isVisible}\n+ onDismissOverlay={onDismissOverlay}\n+ resourceName=\"Dashboard\"\n+ onSubmit={this.handleUploadDashboard}\n+ />\n )\n }\n \n- private get validFileExtension(): string {\n- return '.json'\n- }\n-\n- private handleUploadDashboard = (\n- uploadContent: string,\n- fileName: string\n- ): void => {\n- const {notify, onImportDashboard, onDismissOverlay} = this.props\n- const fileExtensionRegex = new RegExp(`${this.validFileExtension}$`)\n- if (!fileName.match(fileExtensionRegex)) {\n- notify(dashboardImportFailed('Please import a JSON file'))\n- return\n- }\n+ private handleUploadDashboard = async (\n+ uploadContent: string\n+ ): Promise<void> => {\n+ const {\n+ notify,\n+ createDashboardFromTemplate,\n+ onDismissOverlay,\n+ populateDashboards,\n+ orgID,\n+ } = this.props\n \n try {\n- const {dashboard} = JSON.parse(uploadContent)\n+ const template = JSON.parse(uploadContent)\n \n- if (!_.isEmpty(dashboard)) {\n- onImportDashboard(dashboard)\n- onDismissOverlay()\n- } else {\n- notify(dashboardImportFailed('No dashboard found in file'))\n- }\n+ await createDashboardFromTemplate(template, orgID)\n+ await populateDashboards()\n+\n+ onDismissOverlay()\n } catch (error) {\n notify(dashboardImportFailed(error))\n }\n }\n }\n+const mdtp: DispatchProps = {\n+ notify: notifyAction,\n+ createDashboardFromTemplate: createDashboardFromTemplateAction,\n+ populateDashboards: getDashboardsAsync,\n+}\n \n-export default ImportDashboardOverlay\n+export default connect<{}, DispatchProps, OwnProps>(\n+ null,\n+ mdtp\n+)(ImportDashboardOverlay)\ndiff --git a/ui/src/dashboards/components/dashboard_index/DashboardsIndex.tsx b/ui/src/dashboards/components/dashboard_index/DashboardsIndex.tsx\nindex d6b299f..1ff7f47 100644\n--- a/ui/src/dashboards/components/dashboard_index/DashboardsIndex.tsx\n+++ b/ui/src/dashboards/components/dashboard_index/DashboardsIndex.tsx\n@@ -2,15 +2,15 @@\n import React, {PureComponent} from 'react'\n import {InjectedRouter} from 'react-router'\n import {connect} from 'react-redux'\n-import {isEmpty} from 'lodash'\n+import {get} from 'lodash'\n \n // Components\n import DashboardsIndexContents from 'src/dashboards/components/dashboard_index/DashboardsIndexContents'\n import {Page} from 'src/pageLayout'\n import SearchWidget from 'src/shared/components/search_widget/SearchWidget'\n import AddResourceDropdown from 'src/shared/components/AddResourceDropdown'\n-import ImportOverlay from 'src/shared/components/ImportOverlay'\n import ExportOverlay from 'src/shared/components/ExportOverlay'\n+import ImportDashboardOverlay from 'src/dashboards/components/ImportDashboardOverlay'\n \n // APIs\n import {createDashboard, cloneDashboard} from 'src/dashboards/apis/v2/'\n@@ -32,10 +32,7 @@ import {DEFAULT_DASHBOARD_NAME} from 'src/dashboards/constants/index'\n import {\n dashboardSetDefaultFailed,\n dashboardCreateFailed,\n- dashboardImported,\n- dashboardImportFailed,\n } from 'src/shared/copy/notifications'\n-import {cantImportInvalidResource} from 'src/shared/copy/v2/notifications'\n \n // Types\n import {Notification} from 'src/types/notifications'\n@@ -197,24 +194,6 @@ class DashboardIndex extends PureComponent<Props, State> {\n this.props.handleDeleteDashboard(dashboard)\n }\n \n- private handleImportDashboard = async (\n- importString: string\n- ): Promise<void> => {\n- const {notify} = this.props\n- try {\n- const resource = JSON.parse(importString)\n-\n- if (isEmpty(resource)) {\n- notify(cantImportInvalidResource('Dashboard'))\n- return\n- }\n- this.handleToggleImportOverlay()\n- notify(dashboardImported())\n- } catch (error) {\n- notify(dashboardImportFailed(error))\n- }\n- }\n-\n private handleFilterDashboards = (searchTerm: string): void => {\n this.setState({searchTerm})\n }\n@@ -229,13 +208,13 @@ class DashboardIndex extends PureComponent<Props, State> {\n \n private get importOverlay(): JSX.Element {\n const {isImportingDashboard} = this.state\n+ const {orgs} = this.props\n \n return (\n- <ImportOverlay\n- isVisible={isImportingDashboard}\n- resourceName=\"Dashboard\"\n+ <ImportDashboardOverlay\n onDismissOverlay={this.handleToggleImportOverlay}\n- onSubmit={this.handleImportDashboard}\n+ orgID={get(orgs, '0.id', '')}\n+ isVisible={isImportingDashboard}\n />\n )\n }\ndiff --git a/ui/src/organizations/components/Dashboards.tsx b/ui/src/organizations/components/Dashboards.tsx\nindex 08c8402..90c2514 100644\n--- a/ui/src/organizations/components/Dashboards.tsx\n+++ b/ui/src/organizations/components/Dashboards.tsx\n@@ -6,13 +6,10 @@ import _ from 'lodash'\n \n // Components\n import DashboardsIndexContents from 'src/dashboards/components/dashboard_index/DashboardsIndexContents'\n-import {OverlayTechnology, Input, Tabs} from 'src/clockface'\n+import {Input, Tabs} from 'src/clockface'\n import {Button, ComponentColor, IconFont} from '@influxdata/clockface'\n import ImportDashboardOverlay from 'src/dashboards/components/ImportDashboardOverlay'\n \n-// Utils\n-import {getDeep} from 'src/utils/wrappers'\n-\n // APIs\n import {createDashboard, cloneDashboard} from 'src/dashboards/apis/v2/'\n \n@@ -39,7 +36,7 @@ import {DEFAULT_DASHBOARD_NAME} from 'src/dashboards/constants/index'\n \n // Types\n import {Notification} from 'src/types/notifications'\n-import {Links, Cell, Dashboard, AppState, Organization} from 'src/types/v2'\n+import {Links, Dashboard, AppState, Organization} from 'src/types/v2'\n \n // Decorators\n import {ErrorHandling} from 'src/shared/decorators/errors'\n@@ -205,46 +202,20 @@ class Dashboards extends PureComponent<Props, State> {\n this.props.handleDeleteDashboard(dashboard)\n }\n \n- private handleImportDashboard = async (\n- dashboard: Dashboard\n- ): Promise<void> => {\n- const defaultCell = {\n- x: 0,\n- y: 0,\n- w: 4,\n- h: 4,\n- }\n-\n- const name = _.get(dashboard, 'name', DEFAULT_DASHBOARD_NAME)\n- const cellsWithDefaultsApplied = getDeep<Cell[]>(\n- dashboard,\n- 'cells',\n- []\n- ).map(c => ({...defaultCell, ...c}))\n-\n- await this.props.handleImportDashboard({\n- ...dashboard,\n- name,\n- cells: cellsWithDefaultsApplied,\n- })\n- }\n-\n private handleToggleOverlay = (): void => {\n this.setState({isImportingDashboard: !this.state.isImportingDashboard})\n }\n \n private get renderImportOverlay(): JSX.Element {\n- const {notify} = this.props\n const {isImportingDashboard} = this.state\n+ const {orgs} = this.props\n \n return (\n- <OverlayTechnology visible={isImportingDashboard}>\n- <ImportDashboardOverlay\n- onDismissOverlay={this.handleToggleOverlay}\n- onImportDashboard={this.handleImportDashboard}\n- notify={notify}\n- />\n- </OverlayTechnology>\n+ <ImportDashboardOverlay\n+ onDismissOverlay={this.handleToggleOverlay}\n+ orgID={_.get(orgs, '0.id', '')}\n+ isVisible={isImportingDashboard}\n+ />\n )\n }\n }\ndiff --git a/ui/src/shared/components/ImportOverlay.tsx b/ui/src/shared/components/ImportOverlay.tsx\nindex 10f1d50..476fa70 100644\n--- a/ui/src/shared/components/ImportOverlay.tsx\n+++ b/ui/src/shared/components/ImportOverlay.tsx\n@@ -10,6 +10,7 @@ import {\n OverlayHeading,\n OverlayFooter,\n Radio,\n+ ComponentStatus,\n } from 'src/clockface'\n import {Button, ComponentColor} from '@influxdata/clockface'\n \n@@ -93,6 +94,7 @@ export default class ImportOverlay extends PureComponent<Props, State> {\n submitText=\"Upload\"\n handleSubmit={this.handleSetImportContent}\n submitOnDrop={true}\n+ submitOnUpload={true}\n onCancel={this.clearImportContent}\n />\n )\n@@ -110,18 +112,21 @@ export default class ImportOverlay extends PureComponent<Props, State> {\n private get submitButton(): JSX.Element {\n const {resourceName} = this.props\n const {selectedImportOption, importContent} = this.state\n- if (\n+ const isEnabled =\n selectedImportOption === ImportOption.Paste ||\n (selectedImportOption === ImportOption.Upload && importContent)\n- ) {\n- return (\n- <Button\n- text={`Import JSON as ${resourceName}`}\n- onClick={this.submit}\n- color={ComponentColor.Primary}\n- />\n- )\n- }\n+ const status = isEnabled\n+ ? ComponentStatus.Default\n+ : ComponentStatus.Disabled\n+\n+ return (\n+ <Button\n+ text={`Import JSON as ${resourceName}`}\n+ onClick={this.submit}\n+ color={ComponentColor.Primary}\n+ status={status}\n+ />\n+ )\n }\n \n private submit = () => {\ndiff --git a/ui/src/shared/copy/notifications.ts b/ui/src/shared/copy/notifications.ts\nindex 4492078..86700e2 100644\n--- a/ui/src/shared/copy/notifications.ts\n+++ b/ui/src/shared/copy/notifications.ts\n@@ -799,9 +799,18 @@ export const importTaskSucceeded = (): Notification => ({\n })\n \n export const importTaskFailed = (error: string): Notification => ({\n- ...defaultSuccessNotification,\n+ ...defaultErrorNotification,\n message: `Failed to import task: ${error}`,\n })\n+export const importDashboardSucceeded = (): Notification => ({\n+ ...defaultSuccessNotification,\n+ message: `Successfully imported dashboard.`,\n+})\n+\n+export const importDashboardFailed = (error: string): Notification => ({\n+ ...defaultErrorNotification,\n+ message: `Failed to import dashboard: ${error}`,\n+})\n \n // Labels\n export const getLabelsFailed = (): Notification => ({\n", "diff --git a/docs/getting-started/1201-ci-environment.md b/docs/getting-started/1201-ci-environment.md\nindex 6c72b15..2313e30 100644\n--- a/docs/getting-started/1201-ci-environment.md\n+++ b/docs/getting-started/1201-ci-environment.md\n@@ -46,7 +46,60 @@ If you would like us to document CircleCI next, vote for it here: [dagger#1677](\n \n <TabItem value=\"gitlab\">\n \n-If you would like us to document GitLab next, vote for it here: [dagger#1677](https://github.com/dagger/dagger/discussions/1677)\n+```yaml\n+.docker:\n+ image: docker:${DOCKER_VERSION}-git\n+ services:\n+ - docker:${DOCKER_VERSION}-dind\n+ variables:\n+ # See https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#docker-in-docker-with-tls-enabled-in-the-docker-executor\n+ DOCKER_HOST: tcp://docker:2376\n+\n+ DOCKER_TLS_VERIFY: '1'\n+ DOCKER_TLS_CERTDIR: '/certs'\n+ DOCKER_CERT_PATH: '/certs/client'\n+\n+ # Faster than the default, apparently\n+ DOCKER_DRIVER: overlay2\n+\n+ DOCKER_VERSION: '20.10'\n+\n+.dagger:\n+ extends: [.docker]\n+ variables:\n+ DAGGER_VERSION: 0.2.4\n+ DAGGER_LOG_FORMAT: plain\n+ DAGGER_CACHE_PATH: .dagger-cache\n+\n+ ARGS: ''\n+ cache:\n+ key: dagger-${CI_JOB_NAME}\n+ paths:\n+ - ${DAGGER_CACHE_PATH}\n+ before_script:\n+ - apk add --no-cache curl\n+ - |\n+ # install dagger\n+ cd /usr/local\n+ curl -L https://dl.dagger.io/dagger/install.sh | sh\n+ cd -\n+\n+ dagger version\n+ script:\n+ - dagger project update\n+ - |\n+ dagger \\\n+ do \\\n+ --cache-from type=local,src=${DAGGER_CACHE_PATH} \\\n+ --cache-to type=local,mode=max,dest=${DAGGER_CACHE_PATH} \\\n+ ${ARGS}\n+\n+build:\n+ extends: [.dagger]\n+ variables:\n+ ARGS: build\n+\n+```\n \n </TabItem>\n \n"]
| 3 |
["4bfbf60653068ef17df98c021134692bd6d02939", "9114362b39f5194209cd0b330af7076333f3db77", "12257ce53f94dc902df4ba087de90f52d2840ad4"]
|
["refactor", "feat", "docs"]
|
README,only restart if pages directory itself is changed
resolves #429,rebuild when environment variables change (#11471)
|
["diff --git a/README.md b/README.md\nindex 11a24b3..56e8d2a 100644\n--- a/README.md\n+++ b/README.md\n@@ -16,7 +16,9 @@ oclif: create your own CLI\n \n # Description\n \n-This is a framework for building CLIs in Node.js. This framework was built out of the [Heroku CLI](https://cli.heroku.com) but generalized to build any custom CLI. It's designed both for simple CLIs that can be just a single file with a few flag options, or for very complex CLIs that have many commands (like git or heroku). Most CLI tools in Node are simple flag parsers but oclif is much more than that\u2014though without the overhead of making simple CLIs quick to write with minimal boilerplate.\n+This is a framework for building CLIs in Node.js. This framework was built out of the [Heroku CLI](https://cli.heroku.com) but generalized to build any custom CLI. It's designed both for simple CLIs that can be just a single file with a few flag options, or for very complex CLIs that have many commands (like git or heroku).\n+\n+Most CLI tools for Node are simple flag parsers but oclif is much more than that\u2014though without the overhead of making simple CLIs quick to write with minimal boilerplate.\n \n # Features\n \n", "diff --git a/packages/cli/src/commands/dev.ts b/packages/cli/src/commands/dev.ts\nindex 35d859e..d6d91ed 100644\n--- a/packages/cli/src/commands/dev.ts\n+++ b/packages/cli/src/commands/dev.ts\n@@ -1,4 +1,4 @@\n-import { resolve } from 'upath'\n+import { resolve, relative } from 'upath'\n import chokidar from 'chokidar'\n import debounce from 'debounce-promise'\n import type { Nuxt } from '@nuxt/kit'\n@@ -27,9 +27,9 @@ export default defineNuxtCommand({\n const { loadNuxt, buildNuxt } = requireModule('@nuxt/kit', rootDir) as typeof import('@nuxt/kit')\n \n let currentNuxt: Nuxt\n- const load = async (isRestart: boolean) => {\n+ const load = async (isRestart: boolean, reason?: string) => {\n try {\n- const message = `${isRestart ? 'Restarting' : 'Starting'} nuxt...`\n+ const message = `${reason ? reason + '. ' : ''}${isRestart ? 'Restarting' : 'Starting'} nuxt...`\n server.setApp(createLoadingHandler(message))\n if (isRestart) {\n console.log(message)\n@@ -59,12 +59,8 @@ export default defineNuxtCommand({\n const dLoad = debounce(load, 250)\n const watcher = chokidar.watch([rootDir], { ignoreInitial: true, depth: 1 })\n watcher.on('all', (_event, file) => {\n- // Ignore any changes to files within the Nuxt build directory\n- if (file.includes(currentNuxt.options.buildDir)) {\n- return\n- }\n- if (file.includes('nuxt.config') || file.includes('modules') || file.includes('pages')) {\n- dLoad(true)\n+ if (file.match(/nuxt\\.config\\.(js|ts|mjs|cjs)$|pages$/)) {\n+ dLoad(true, `${relative(rootDir, file)} updated`)\n }\n })\n \n", "diff --git a/cli/build.rs b/cli/build.rs\nindex 548fbb5..d7bed21 100644\n--- a/cli/build.rs\n+++ b/cli/build.rs\n@@ -269,8 +269,17 @@ fn main() {\n // To debug snapshot issues uncomment:\n // op_fetch_asset::trace_serializer();\n \n- println!(\"cargo:rustc-env=TS_VERSION={}\", ts_version());\n+ if let Ok(c) = env::var(\"DENO_CANARY\") {\n+ println!(\"cargo:rustc-env=DENO_CANARY={}\", c);\n+ }\n+ println!(\"cargo:rerun-if-env-changed=DENO_CANARY\");\n+\n println!(\"cargo:rustc-env=GIT_COMMIT_HASH={}\", git_commit_hash());\n+ println!(\"cargo:rerun-if-env-changed=GIT_COMMIT_HASH\");\n+\n+ println!(\"cargo:rustc-env=TS_VERSION={}\", ts_version());\n+ println!(\"cargo:rerun-if-env-changed=TS_VERSION\");\n+\n println!(\n \"cargo:rustc-env=DENO_CONSOLE_LIB_PATH={}\",\n deno_console::get_declaration().display()\n@@ -322,9 +331,6 @@ fn main() {\n \n println!(\"cargo:rustc-env=TARGET={}\", env::var(\"TARGET\").unwrap());\n println!(\"cargo:rustc-env=PROFILE={}\", env::var(\"PROFILE\").unwrap());\n- if let Ok(c) = env::var(\"DENO_CANARY\") {\n- println!(\"cargo:rustc-env=DENO_CANARY={}\", c);\n- }\n \n let c = PathBuf::from(env::var_os(\"CARGO_MANIFEST_DIR\").unwrap());\n let o = PathBuf::from(env::var_os(\"OUT_DIR\").unwrap());\n"]
| 3 |
["363f84c7da411468b4103da8e0b39ca48cfd8327", "cbce777addb3dd118232a9f28db9d425d4c937b2", "63546c15bfb1284ac6d956eee274e6d7cf263a8f"]
|
["docs", "fix", "build"]
|
Publish crates,improve test stability
* improve test stability by waiting until the message subscription is opened. Message subscriptions are opened outside of the context of the stream processor. Sometimes this may take a while.
* enable running the tests repeatably by fixing the engine rule,fix cypress on windows
|
["diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 7b98b44..f17ad6f 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -7,6 +7,9 @@\n \n - **(css/parser)** Fix parsing of at rules (#3328) ([506a310](https://github.com/swc-project/swc/commit/506a31078aaebf50129658f096bbd5929995205f))\n \n+\n+- **(es/compat)** Fix regression of `destructuring` (#3326) ([6d1ad36](https://github.com/swc-project/swc/commit/6d1ad368aca53ee64a63ae565cd015909f2f4458))\n+\n ### Performance\n \n \ndiff --git a/Cargo.lock b/Cargo.lock\nindex 3c6598b..4baa252 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -2652,7 +2652,7 @@ dependencies = [\n \n [[package]]\n name = \"swc\"\n-version = \"0.116.15\"\n+version = \"0.116.16\"\n dependencies = [\n \"ahash\",\n \"anyhow\",\n@@ -3097,7 +3097,7 @@ dependencies = [\n \n [[package]]\n name = \"swc_ecma_transforms\"\n-version = \"0.113.3\"\n+version = \"0.113.4\"\n dependencies = [\n \"pretty_assertions 0.7.2\",\n \"sourcemap\",\n@@ -3157,7 +3157,7 @@ dependencies = [\n \n [[package]]\n name = \"swc_ecma_transforms_compat\"\n-version = \"0.68.2\"\n+version = \"0.68.3\"\n dependencies = [\n \"ahash\",\n \"arrayvec 0.7.2\",\n@@ -3366,7 +3366,7 @@ dependencies = [\n \n [[package]]\n name = \"swc_ecmascript\"\n-version = \"0.110.14\"\n+version = \"0.110.15\"\n dependencies = [\n \"swc_ecma_ast\",\n \"swc_ecma_codegen\",\ndiff --git a/crates/swc/Cargo.toml b/crates/swc/Cargo.toml\nindex 756cfc8..2f02d22 100644\n--- a/crates/swc/Cargo.toml\n+++ b/crates/swc/Cargo.toml\n@@ -9,7 +9,7 @@ include = [\"Cargo.toml\", \"src/**/*.rs\"]\n license = \"Apache-2.0\"\n name = \"swc\"\n repository = \"https://github.com/swc-project/swc.git\"\n-version = \"0.116.15\"\n+version = \"0.116.16\"\n \n [lib]\n name = \"swc\"\n@@ -55,7 +55,7 @@ swc_ecma_loader = {version = \"0.27.0\", path = \"../swc_ecma_loader\", features = [\n swc_ecma_minifier = {version = \"0.70.9\", path = \"../swc_ecma_minifier\"}\n swc_ecma_parser = {version = \"0.87.0\", path = \"../swc_ecma_parser\"}\n swc_ecma_preset_env = {version = \"0.86.1\", path = \"../swc_ecma_preset_env\"}\n-swc_ecma_transforms = {version = \"0.113.3\", path = \"../swc_ecma_transforms\", features = [\n+swc_ecma_transforms = {version = \"0.113.4\", path = \"../swc_ecma_transforms\", features = [\n \"compat\",\n \"module\",\n \"optimization\",\n@@ -64,11 +64,11 @@ swc_ecma_transforms = {version = \"0.113.3\", path = \"../swc_ecma_transforms\", fea\n \"typescript\",\n ]}\n swc_ecma_transforms_base = {version = \"0.57.1\", path = \"../swc_ecma_transforms_base\"}\n-swc_ecma_transforms_compat = {version = \"0.68.2\", path = \"../swc_ecma_transforms_compat\"}\n+swc_ecma_transforms_compat = {version = \"0.68.3\", path = \"../swc_ecma_transforms_compat\"}\n swc_ecma_transforms_optimization = {version = \"0.83.0\", path = \"../swc_ecma_transforms_optimization\"}\n swc_ecma_utils = {version = \"0.64.0\", path = \"../swc_ecma_utils\"}\n swc_ecma_visit = {version = \"0.51.1\", path = \"../swc_ecma_visit\"}\n-swc_ecmascript = {version = \"0.110.14\", path = \"../swc_ecmascript\"}\n+swc_ecmascript = {version = \"0.110.15\", path = \"../swc_ecmascript\"}\n swc_node_comments = {version = \"0.4.0\", path = \"../swc_node_comments\"}\n swc_plugin_runner = {version = \"0.30.0\", path = \"../swc_plugin_runner\", optional = true}\n swc_visit = {version = \"0.3.0\", path = \"../swc_visit\"}\ndiff --git a/crates/swc_ecma_transforms/Cargo.toml b/crates/swc_ecma_transforms/Cargo.toml\nindex 1604f4e..a0aafae 100644\n--- a/crates/swc_ecma_transforms/Cargo.toml\n+++ b/crates/swc_ecma_transforms/Cargo.toml\n@@ -6,7 +6,7 @@ edition = \"2021\"\n license = \"Apache-2.0\"\n name = \"swc_ecma_transforms\"\n repository = \"https://github.com/swc-project/swc.git\"\n-version = \"0.113.3\"\n+version = \"0.113.4\"\n \n [package.metadata.docs.rs]\n all-features = true\n@@ -28,7 +28,7 @@ swc_common = {version = \"0.17.0\", path = \"../swc_common\"}\n swc_ecma_ast = {version = \"0.65.0\", path = \"../swc_ecma_ast\"}\n swc_ecma_parser = {version = \"0.87.0\", path = \"../swc_ecma_parser\"}\n swc_ecma_transforms_base = {version = \"0.57.1\", path = \"../swc_ecma_transforms_base\"}\n-swc_ecma_transforms_compat = {version = \"0.68.2\", path = \"../swc_ecma_transforms_compat\", optional = true}\n+swc_ecma_transforms_compat = {version = \"0.68.3\", path = \"../swc_ecma_transforms_compat\", optional = true}\n swc_ecma_transforms_module = {version = \"0.74.0\", path = \"../swc_ecma_transforms_module\", optional = true}\n swc_ecma_transforms_optimization = {version = \"0.83.0\", path = \"../swc_ecma_transforms_optimization\", optional = true}\n swc_ecma_transforms_proposal = {version = \"0.74.0\", path = \"../swc_ecma_transforms_proposal\", optional = true}\ndiff --git a/crates/swc_ecma_transforms_compat/Cargo.toml b/crates/swc_ecma_transforms_compat/Cargo.toml\nindex 0ea6609..58374e3 100644\n--- a/crates/swc_ecma_transforms_compat/Cargo.toml\n+++ b/crates/swc_ecma_transforms_compat/Cargo.toml\n@@ -6,7 +6,7 @@ edition = \"2021\"\n license = \"Apache-2.0\"\n name = \"swc_ecma_transforms_compat\"\n repository = \"https://github.com/swc-project/swc.git\"\n-version = \"0.68.2\"\n+version = \"0.68.3\"\n # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html\n \n [features]\ndiff --git a/crates/swc_ecmascript/Cargo.toml b/crates/swc_ecmascript/Cargo.toml\nindex 63680a0..775208a 100644\n--- a/crates/swc_ecmascript/Cargo.toml\n+++ b/crates/swc_ecmascript/Cargo.toml\n@@ -6,7 +6,7 @@ edition = \"2021\"\n license = \"Apache-2.0\"\n name = \"swc_ecmascript\"\n repository = \"https://github.com/swc-project/swc.git\"\n-version = \"0.110.14\"\n+version = \"0.110.15\"\n \n [package.metadata.docs.rs]\n all-features = true\n@@ -39,7 +39,7 @@ swc_ecma_dep_graph = {version = \"0.58.0\", path = \"../swc_ecma_dep_graph\", option\n swc_ecma_minifier = {version = \"0.70.9\", path = \"../swc_ecma_minifier\", optional = true}\n swc_ecma_parser = {version = \"0.87.0\", path = \"../swc_ecma_parser\", optional = true, default-features = false}\n swc_ecma_preset_env = {version = \"0.86.1\", path = \"../swc_ecma_preset_env\", optional = true}\n-swc_ecma_transforms = {version = \"0.113.3\", path = \"../swc_ecma_transforms\", optional = true}\n+swc_ecma_transforms = {version = \"0.113.4\", path = \"../swc_ecma_transforms\", optional = true}\n swc_ecma_utils = {version = \"0.64.0\", path = \"../swc_ecma_utils\", optional = true}\n swc_ecma_visit = {version = \"0.51.1\", path = \"../swc_ecma_visit\", optional = true}\n \n", "diff --git a/engine/src/test/java/io/zeebe/engine/processing/bpmn/subprocess/InterruptingEventSubprocessTest.java b/engine/src/test/java/io/zeebe/engine/processing/bpmn/subprocess/InterruptingEventSubprocessTest.java\nindex 0c539b9..ffaead1 100644\n--- a/engine/src/test/java/io/zeebe/engine/processing/bpmn/subprocess/InterruptingEventSubprocessTest.java\n+++ b/engine/src/test/java/io/zeebe/engine/processing/bpmn/subprocess/InterruptingEventSubprocessTest.java\n@@ -334,22 +334,31 @@ public class InterruptingEventSubprocessTest {\n \"timer-event-subprocess\",\n s -> s.startEvent(\"other-timer\").timerWithDuration(\"P1D\").endEvent());\n \n- final long wfInstanceKey = createInstanceAndTriggerEvent(workflow(eventSubprocess));\n+ final long wfInstanceKey = createInstanceAndWaitForTask(workflow(eventSubprocess));\n+\n+ RecordingExporter.messageSubscriptionRecords(MessageSubscriptionIntent.OPENED)\n+ .withWorkflowInstanceKey(wfInstanceKey)\n+ .withMessageName(\"other-message\")\n+ .await();\n+\n+ triggerEventSubprocess.accept(wfInstanceKey);\n \n // then\n assertThat(\n- RecordingExporter.messageSubscriptionRecords()\n+ RecordingExporter.records()\n+ .limitToWorkflowInstance(wfInstanceKey)\n+ .messageSubscriptionRecords()\n .withWorkflowInstanceKey(wfInstanceKey)\n- .withMessageName(\"other-message\")\n- .limit(4))\n+ .withMessageName(\"other-message\"))\n .extracting(Record::getIntent)\n .contains(MessageSubscriptionIntent.CLOSED);\n \n assertThat(\n- RecordingExporter.timerRecords()\n+ RecordingExporter.records()\n+ .limitToWorkflowInstance(wfInstanceKey)\n+ .timerRecords()\n .withWorkflowInstanceKey(wfInstanceKey)\n- .withHandlerNodeId(\"other-timer\")\n- .limit(4))\n+ .withHandlerNodeId(\"other-timer\"))\n .extracting(Record::getIntent)\n .contains(TimerIntent.CANCELED);\n }\ndiff --git a/engine/src/test/java/io/zeebe/engine/util/EngineRule.java b/engine/src/test/java/io/zeebe/engine/util/EngineRule.java\nindex 8576be5..50040f4 100644\n--- a/engine/src/test/java/io/zeebe/engine/util/EngineRule.java\n+++ b/engine/src/test/java/io/zeebe/engine/util/EngineRule.java\n@@ -71,7 +71,7 @@ public final class EngineRule extends ExternalResource {\n \n private static final int PARTITION_ID = Protocol.DEPLOYMENT_PARTITION;\n private static final RecordingExporter RECORDING_EXPORTER = new RecordingExporter();\n- private StreamProcessorRule environmentRule;\n+ private final StreamProcessorRule environmentRule;\n private final RecordingExporterTestWatcher recordingExporterTestWatcher =\n new RecordingExporterTestWatcher();\n private final int partitionCount;\n@@ -80,7 +80,7 @@ public final class EngineRule extends ExternalResource {\n \n private final Int2ObjectHashMap<SubscriptionCommandMessageHandler> subscriptionHandlers =\n new Int2ObjectHashMap<>();\n- private final ExecutorService subscriptionHandlerExecutor = Executors.newSingleThreadExecutor();\n+ private ExecutorService subscriptionHandlerExecutor;\n \n private EngineRule(final int partitionCount) {\n this(partitionCount, false);\n@@ -115,6 +115,8 @@ public final class EngineRule extends ExternalResource {\n \n @Override\n protected void before() {\n+ subscriptionHandlerExecutor = Executors.newSingleThreadExecutor();\n+\n if (!explicitStart) {\n startProcessors();\n }\n@@ -123,7 +125,6 @@ public final class EngineRule extends ExternalResource {\n @Override\n protected void after() {\n subscriptionHandlerExecutor.shutdown();\n- environmentRule = null;\n subscriptionHandlers.clear();\n }\n \ndiff --git a/engine/src/test/java/io/zeebe/engine/util/StreamProcessorRule.java b/engine/src/test/java/io/zeebe/engine/util/StreamProcessorRule.java\nindex 0f3da21..af6c50e 100755\n--- a/engine/src/test/java/io/zeebe/engine/util/StreamProcessorRule.java\n+++ b/engine/src/test/java/io/zeebe/engine/util/StreamProcessorRule.java\n@@ -248,6 +248,7 @@ public final class StreamProcessorRule implements TestRule {\n @Override\n protected void after() {\n streams = null;\n+ streamProcessingComposite = null;\n }\n }\n \ndiff --git a/test-util/src/main/java/io/zeebe/test/util/record/RecordStream.java b/test-util/src/main/java/io/zeebe/test/util/record/RecordStream.java\nindex 293df93..a3ede18 100644\n--- a/test-util/src/main/java/io/zeebe/test/util/record/RecordStream.java\n+++ b/test-util/src/main/java/io/zeebe/test/util/record/RecordStream.java\n@@ -81,4 +81,9 @@ public final class RecordStream extends ExporterRecordStream<RecordValue, Record\n return new IncidentRecordStream(\n filter(r -> r.getValueType() == ValueType.INCIDENT).map(Record.class::cast));\n }\n+\n+ public MessageSubscriptionRecordStream messageSubscriptionRecords() {\n+ return new MessageSubscriptionRecordStream(\n+ filter(r -> r.getValueType() == ValueType.MESSAGE_SUBSCRIPTION).map(Record.class::cast));\n+ }\n }\n", "diff --git a/packages/cypress/src/builders/cypress/cypress.impl.spec.ts b/packages/cypress/src/builders/cypress/cypress.impl.spec.ts\nindex 22851fb..c9296fe 100644\n--- a/packages/cypress/src/builders/cypress/cypress.impl.spec.ts\n+++ b/packages/cypress/src/builders/cypress/cypress.impl.spec.ts\n@@ -77,7 +77,7 @@ describe('Cypress builder', () => {\n await run.result;\n await run.stop();\n expect(fork).toHaveBeenCalledWith(\n- '/root/node_modules/.bin/tsc',\n+ '/root/node_modules/typescript/bin/tsc',\n ['-p', '/root/apps/my-app-e2e/tsconfig.json'],\n { stdio: [0, 1, 2, 'ipc'] }\n );\ndiff --git a/packages/cypress/src/builders/cypress/cypress.impl.ts b/packages/cypress/src/builders/cypress/cypress.impl.ts\nindex 9d9ded3..d3917c2 100644\n--- a/packages/cypress/src/builders/cypress/cypress.impl.ts\n+++ b/packages/cypress/src/builders/cypress/cypress.impl.ts\n@@ -115,7 +115,7 @@ function compileTypescriptFiles(\n let args = ['-p', path.join(context.workspaceRoot, tsConfigPath)];\n const tscPath = path.join(\n context.workspaceRoot,\n- '/node_modules/.bin/tsc'\n+ '/node_modules/typescript/bin/tsc'\n );\n if (isWatching) {\n args.push('--watch');\n"]
| 3 |
["af53b9487f74ff28438928903fb1f2db93fe4fa8", "00be00f2dd0ba7e4bfa4f5dfb74135761f5f86ec", "eebee9ab0bb6d4255ad0402d8422364e96bfef61"]
|
["build", "test", "fix"]
|
cue linter: include all CUE files
Signed-off-by: Andrea Luzzardi <[email protected]>,render-svg,move group logical op outside
Signed-off-by: Pranav C <[email protected]>
|
["diff --git a/ci/cue/lint.cue b/ci/cue/lint.cue\nindex cdda698..6aac265 100644\n--- a/ci/cue/lint.cue\n+++ b/ci/cue/lint.cue\n@@ -39,7 +39,7 @@ import (\n \t\t\t// CACHE: copy only *.cue files\n \t\t\tdocker.#Copy & {\n \t\t\t\tcontents: source\n-\t\t\t\tinclude: [\"*.cue\"]\n+\t\t\t\tinclude: [\"*.cue\", \"**/*.cue\"]\n \t\t\t\tdest: \"/cue\"\n \t\t\t},\n \n", "diff --git a/package.json b/package.json\nindex 3f8e5fa..cc4e398 100644\n--- a/package.json\n+++ b/package.json\n@@ -42,6 +42,7 @@\n \"rollup\": \"^2.34.2\",\n \"rollup-plugin-copy\": \"^3.3.0\",\n \"rollup-plugin-dts\": \"^2.0.0\",\n+ \"rollup-plugin-terser\": \"^7.0.2\",\n \"rollup-plugin-typescript2\": \"^0.29.0\",\n \"ts-jest\": \"^26.4.4\",\n \"tsup\": \"^3.10.1\",\ndiff --git a/packages/renderer-svg/package.json b/packages/renderer-svg/package.json\nindex fa9c049..6a0654c 100644\n--- a/packages/renderer-svg/package.json\n+++ b/packages/renderer-svg/package.json\n@@ -1,16 +1,27 @@\n {\n- \"name\": \"shiki-renderer-svg\",\n+ \"name\": \"@antfu/shiki-renderer-svg\",\n \"version\": \"0.2.0\",\n \"description\": \"SVG renderer for shiki\",\n \"author\": \"Pine Wu <[email protected]>\",\n \"homepage\": \"https://github.com/octref/shiki/tree/master/packages/renderer-svg\",\n \"license\": \"MIT\",\n- \"main\": \"dist/index.js\",\n- \"types\": \"dist/index.d.ts\",\n \"repository\": {\n \"type\": \"git\",\n \"url\": \"git+https://github.com/shikijs/shiki.git\"\n },\n+ \"main\": \"dist/index.js\",\n+ \"module\": \"dist/index.mjs\",\n+ \"types\": \"dist/index.d.ts\",\n+ \"unpkg\": \"dist/index.iife.min.js\",\n+ \"jsdelivr\": \"dist/index.iife.min.js\",\n+ \"files\": [\n+ \"dist\"\n+ ],\n+ \"scripts\": {\n+ \"prepublishOnly\": \"npm run build\",\n+ \"build\": \"rollup -c\",\n+ \"watch\": \"rollup -c -w\"\n+ },\n \"dependencies\": {\n \"puppeteer\": \"^5.2.1\"\n },\ndiff --git a/packages/renderer-svg/rollup.config.js b/packages/renderer-svg/rollup.config.js\nnew file mode 100644\nindex 0000000..d4e45ce\n--- /dev/null\n+++ b/packages/renderer-svg/rollup.config.js\n@@ -0,0 +1,67 @@\n+import { nodeResolve } from '@rollup/plugin-node-resolve'\n+import commonjs from '@rollup/plugin-commonjs'\n+import dts from 'rollup-plugin-dts'\n+import typescript from 'rollup-plugin-typescript2'\n+import replace from '@rollup/plugin-replace'\n+import { terser } from 'rollup-plugin-terser'\n+\n+const external = ['shiki', 'puppeteer']\n+\n+export default [\n+ {\n+ input: 'src/index.ts',\n+ external,\n+ output: [\n+ {\n+ file: 'dist/index.js',\n+ format: 'cjs'\n+ },\n+ {\n+ file: 'dist/index.mjs',\n+ format: 'esm'\n+ }\n+ ],\n+ plugins: [\n+ replace({\n+ __BROWSER__: JSON.stringify(false)\n+ }),\n+ typescript(),\n+ nodeResolve(),\n+ commonjs()\n+ ]\n+ },\n+ {\n+ input: 'src/index.ts',\n+ output: [\n+ {\n+ file: 'dist/index.iife.js',\n+ format: 'iife',\n+ name: 'ShikiRenderSVG'\n+ },\n+ {\n+ file: 'dist/index.iife.min.js',\n+ format: 'iife',\n+ name: 'ShikiRenderSVG',\n+ plugins: [terser()]\n+ }\n+ ],\n+ plugins: [\n+ replace({\n+ __BROWSER__: JSON.stringify(true)\n+ }),\n+ typescript(),\n+ nodeResolve(),\n+ commonjs()\n+ ]\n+ },\n+ {\n+ input: 'src/index.ts',\n+ output: [\n+ {\n+ file: 'dist/index.d.ts',\n+ format: 'es'\n+ }\n+ ],\n+ plugins: [dts()]\n+ }\n+]\ndiff --git a/packages/renderer-svg/src/global.d.ts b/packages/renderer-svg/src/global.d.ts\nnew file mode 100644\nindex 0000000..08c128f\n--- /dev/null\n+++ b/packages/renderer-svg/src/global.d.ts\n@@ -0,0 +1 @@\n+declare var __BROWSER__: boolean\ndiff --git a/packages/renderer-svg/src/index.ts b/packages/renderer-svg/src/index.ts\nindex ae77136..8f92312 100644\n--- a/packages/renderer-svg/src/index.ts\n+++ b/packages/renderer-svg/src/index.ts\n@@ -1,4 +1,4 @@\n-import { IThemedToken } from 'shiki'\n+import type { IThemedToken } from 'shiki'\n import { measureMonospaceTypeface } from './measureMonospaceTypeface'\n \n interface SVGRendererOptions {\ndiff --git a/packages/renderer-svg/src/measureMonospaceTypeface.ts b/packages/renderer-svg/src/measureMonospaceTypeface.ts\nindex e28a1ff..6ab834d 100644\n--- a/packages/renderer-svg/src/measureMonospaceTypeface.ts\n+++ b/packages/renderer-svg/src/measureMonospaceTypeface.ts\n@@ -1,58 +1,61 @@\n-import puppeteer from 'puppeteer'\n+function measureFont(fontName: string, fontSize: number) {\n+ /**\n+ * Measure `M` for width\n+ */\n+ var c = document.createElement('canvas')\n+ var ctx = c.getContext('2d')!\n+ ctx.font = `${fontSize}px \"${fontName}\"`\n \n-export async function measureMonospaceTypeface(\n- fontName: string,\n- fontSize: number\n-): Promise<{ width: number; height: number }> {\n- const browser = await puppeteer.launch({ headless: true })\n- const page = await browser.newPage()\n- const measurement = await page.evaluate(measureFont, fontName, fontSize)\n- await browser.close()\n- return measurement\n+ const capMMeasurement = ctx.measureText('M')\n \n- function measureFont(fontName: string, fontSize: number) {\n- /**\n- * Measure `M` for width\n- */\n- var c = document.createElement('canvas')\n- var ctx = c.getContext('2d')!\n- ctx.font = `${fontSize}px \"${fontName}\"`\n-\n- const capMMeasurement = ctx.measureText('M')\n+ /**\n+ * Measure A-Z, a-z for height\n+ * A - 65\n+ * Z - 90\n+ * a - 97\n+ * z - 122\n+ */\n+ const characters = []\n+ for (let i = 65; i <= 90; i++) {\n+ characters.push(String.fromCharCode(i))\n+ }\n+ for (let i = 97; i <= 122; i++) {\n+ characters.push(String.fromCharCode(i))\n+ }\n \n- /**\n- * Measure A-Z, a-z for height\n- * A - 65\n- * Z - 90\n- * a - 97\n- * z - 122\n- */\n- const characters = []\n- for (let i = 65; i <= 90; i++) {\n- characters.push(String.fromCharCode(i))\n+ let highC, lowC\n+ let highestAscent = 0\n+ let lowestDescent = 0\n+ characters.forEach(c => {\n+ const m = ctx.measureText(c)\n+ if (m.actualBoundingBoxAscent > highestAscent) {\n+ highestAscent = m.actualBoundingBoxAscent\n+ highC = c\n }\n- for (let i = 97; i <= 122; i++) {\n- characters.push(String.fromCharCode(i))\n+ if (m.actualBoundingBoxDescent > lowestDescent) {\n+ lowestDescent = m.actualBoundingBoxDescent\n+ lowC = c\n }\n+ })\n \n- let highC, lowC\n- let highestAscent = 0\n- let lowestDescent = 0\n- characters.forEach(c => {\n- const m = ctx.measureText(c)\n- if (m.actualBoundingBoxAscent > highestAscent) {\n- highestAscent = m.actualBoundingBoxAscent\n- highC = c\n- }\n- if (m.actualBoundingBoxDescent > lowestDescent) {\n- lowestDescent = m.actualBoundingBoxDescent\n- lowC = c\n- }\n- })\n+ return {\n+ width: capMMeasurement.width,\n+ height: highestAscent + lowestDescent\n+ }\n+}\n \n- return {\n- width: capMMeasurement.width,\n- height: highestAscent + lowestDescent\n- }\n+export async function measureMonospaceTypeface(\n+ fontName: string,\n+ fontSize: number\n+): Promise<{ width: number; height: number }> {\n+ if (__BROWSER__) {\n+ return measureFont(fontName, fontSize)\n+ } else {\n+ const puppeteer = await import('puppeteer')\n+ const browser = await puppeteer.launch({ headless: true })\n+ const page = await browser.newPage()\n+ const measurement = await page.evaluate(measureFont, fontName, fontSize)\n+ await browser.close()\n+ return measurement\n }\n }\ndiff --git a/packages/renderer-svg/tsconfig.json b/packages/renderer-svg/tsconfig.json\nindex 3613212..bc50ce3 100644\n--- a/packages/renderer-svg/tsconfig.json\n+++ b/packages/renderer-svg/tsconfig.json\n@@ -1,9 +1,10 @@\n {\n- \"extends\": \"../../tsconfig.json\",\n \"compilerOptions\": {\n- \"composite\": true,\n- \"rootDir\": \"src\",\n- \"outDir\": \"dist\",\n- \"lib\": [\"dom\"]\n+ \"module\": \"esnext\",\n+ \"target\": \"es2017\",\n+ \"esModuleInterop\": true,\n+ \"moduleResolution\": \"node\",\n+ \"lib\": [\"esnext\", \"DOM\"],\n+ \"sourceMap\": true\n }\n }\ndiff --git a/packages/shiki/rollup.config.js b/packages/shiki/rollup.config.js\nindex b8ba9e3..9078ea2 100644\n--- a/packages/shiki/rollup.config.js\n+++ b/packages/shiki/rollup.config.js\n@@ -4,6 +4,7 @@ import dts from 'rollup-plugin-dts'\n import typescript from 'rollup-plugin-typescript2'\n import copy from 'rollup-plugin-copy'\n import replace from '@rollup/plugin-replace'\n+import { terser } from 'rollup-plugin-terser'\n import { version } from './package.json'\n \n const external = ['onigasm', 'vscode-textmate']\n@@ -22,7 +23,14 @@ export default [\n format: 'esm'\n }\n ],\n- plugins: [typescript(), nodeResolve(), commonjs()]\n+ plugins: [\n+ replace({\n+ __BROWSER__: JSON.stringify(false)\n+ }),\n+ typescript(),\n+ nodeResolve(),\n+ commonjs()\n+ ]\n },\n {\n input: 'src/index.ts',\n@@ -58,7 +66,15 @@ export default [\n ]\n }\n ],\n- plugins: [typescript(), nodeResolve(), commonjs()]\n+ plugins: [\n+ replace({\n+ __BROWSER__: JSON.stringify(true)\n+ }),\n+ typescript(),\n+ nodeResolve(),\n+ commonjs(),\n+ terser()\n+ ]\n },\n {\n input: 'src/index.ts',\ndiff --git a/packages/shiki/src/global.d.ts b/packages/shiki/src/global.d.ts\nnew file mode 100644\nindex 0000000..08c128f\n--- /dev/null\n+++ b/packages/shiki/src/global.d.ts\n@@ -0,0 +1 @@\n+declare var __BROWSER__: boolean\ndiff --git a/packages/shiki/src/loader.ts b/packages/shiki/src/loader.ts\nindex 934cfbd..d9c3128 100644\n--- a/packages/shiki/src/loader.ts\n+++ b/packages/shiki/src/loader.ts\n@@ -5,11 +5,16 @@ import type { ILanguageRegistration, IShikiTheme } from './types'\n export const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined'\n \n let CDN_ROOT = '__CDN_ROOT__'\n+let ONIGASM_WASM = ''\n \n export function setCDN(root: string) {\n CDN_ROOT = root\n }\n \n+export function setOnigasmWASM(path: string) {\n+ ONIGASM_WASM = path\n+}\n+\n let _onigasmPromise: Promise<IOnigLib> = null\n \n export async function getOnigasm(): Promise<IOnigLib> {\n@@ -17,7 +22,7 @@ export async function getOnigasm(): Promise<IOnigLib> {\n let loader: Promise<any>\n \n if (isBrowser) {\n- loader = Onigasm.loadWASM(_resolvePath('onigasm.wasm', 'dist/'))\n+ loader = Onigasm.loadWASM(ONIGASM_WASM || _resolvePath('onigasm.wasm', 'dist/'))\n } else {\n const path = require('path')\n const onigasmPath = path.join(require.resolve('onigasm'), '../onigasm.wasm')\ndiff --git a/yarn.lock b/yarn.lock\nindex c143969..dfd7540 100644\n--- a/yarn.lock\n+++ b/yarn.lock\n@@ -2487,6 +2487,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:\n dependencies:\n delayed-stream \"~1.0.0\"\n \n+commander@^2.20.0, commander@~2.20.3:\n+ version \"2.20.3\"\n+ resolved \"https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33\"\n+ integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==\n+\n commander@^4.0.0:\n version \"4.1.1\"\n resolved \"https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068\"\n@@ -2497,11 +2502,6 @@ commander@^6.2.0:\n resolved \"https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75\"\n integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==\n \n-commander@~2.20.3:\n- version \"2.20.3\"\n- resolved \"https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33\"\n- integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==\n-\n commondir@^1.0.1:\n version \"1.0.1\"\n resolved \"https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b\"\n@@ -4799,7 +4799,7 @@ jest-watcher@^26.6.2:\n jest-util \"^26.6.2\"\n string-length \"^4.0.1\"\n \n-jest-worker@^26.6.2:\n+jest-worker@^26.2.1, jest-worker@^26.6.2:\n version \"26.6.2\"\n resolved \"https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed\"\n integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==\n@@ -6444,6 +6444,13 @@ quick-lru@^4.0.1:\n resolved \"https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f\"\n integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==\n \n+randombytes@^2.1.0:\n+ version \"2.1.0\"\n+ resolved \"https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a\"\n+ integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==\n+ dependencies:\n+ safe-buffer \"^5.1.0\"\n+\n react-is@^17.0.1:\n version \"17.0.1\"\n resolved \"https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339\"\n@@ -6812,6 +6819,16 @@ rollup-plugin-dts@^2.0.0:\n optionalDependencies:\n \"@babel/code-frame\" \"^7.10.4\"\n \n+rollup-plugin-terser@^7.0.2:\n+ version \"7.0.2\"\n+ resolved \"https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d\"\n+ integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==\n+ dependencies:\n+ \"@babel/code-frame\" \"^7.10.4\"\n+ jest-worker \"^26.2.1\"\n+ serialize-javascript \"^4.0.0\"\n+ terser \"^5.0.0\"\n+\n rollup-plugin-typescript2@^0.29.0:\n version \"0.29.0\"\n resolved \"https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.29.0.tgz#b7ad83f5241dbc5bdf1e98d9c3fca005ffe39e1a\"\n@@ -6873,7 +6890,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, \n resolved \"https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d\"\n integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==\n \n-safe-buffer@^5.2.0, safe-buffer@~5.2.0:\n+safe-buffer@^5.1.0, safe-buffer@^5.2.0, safe-buffer@~5.2.0:\n version \"5.2.1\"\n resolved \"https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6\"\n integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==\n@@ -6937,6 +6954,13 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:\n resolved \"https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d\"\n integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==\n \n+serialize-javascript@^4.0.0:\n+ version \"4.0.0\"\n+ resolved \"https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa\"\n+ integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==\n+ dependencies:\n+ randombytes \"^2.1.0\"\n+\n set-blocking@^2.0.0, set-blocking@~2.0.0:\n version \"2.0.0\"\n resolved \"https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7\"\n@@ -7140,7 +7164,7 @@ source-map-resolve@^0.5.0:\n source-map-url \"^0.4.0\"\n urix \"^0.1.0\"\n \n-source-map-support@^0.5.6:\n+source-map-support@^0.5.6, source-map-support@~0.5.19:\n version \"0.5.19\"\n resolved \"https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61\"\n integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==\n@@ -7163,7 +7187,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:\n resolved \"https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263\"\n integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==\n \n-source-map@^0.7.3:\n+source-map@^0.7.3, source-map@~0.7.2:\n version \"0.7.3\"\n resolved \"https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383\"\n integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==\n@@ -7552,6 +7576,15 @@ terminal-link@^2.0.0:\n ansi-escapes \"^4.2.1\"\n supports-hyperlinks \"^2.0.0\"\n \n+terser@^5.0.0:\n+ version \"5.5.1\"\n+ resolved \"https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289\"\n+ integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==\n+ dependencies:\n+ commander \"^2.20.0\"\n+ source-map \"~0.7.2\"\n+ source-map-support \"~0.5.19\"\n+\n test-exclude@^6.0.0:\n version \"6.0.0\"\n resolved \"https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e\"\n", "diff --git a/packages/nc-gui/components/project/spreadsheet/components/ColumnFilter.vue b/packages/nc-gui/components/project/spreadsheet/components/ColumnFilter.vue\nindex 5138589..f756981 100644\n--- a/packages/nc-gui/components/project/spreadsheet/components/ColumnFilter.vue\n+++ b/packages/nc-gui/components/project/spreadsheet/components/ColumnFilter.vue\n@@ -2,40 +2,46 @@\n <div\n class=\"backgroundColor pa-2 menu-filter-dropdown\"\n :class=\"{ nested }\"\n- :style=\"{ width: nested ? '100%' : '530px' }\"\n+ :style=\"{ width: nested ? '100%' : '630px' }\"\n >\n <div class=\"grid\" @click.stop>\n <template v-for=\"(filter, i) in filters\" dense>\n <template v-if=\"filter.status !== 'delete'\">\n- <div v-if=\"filter.is_group\" :key=\"i\" style=\"grid-column: span 5; padding: 6px\" class=\"elevation-4\">\n- <div class=\"d-flex\" style=\"gap: 6px; padding: 0 6px\">\n- <v-icon\n- v-if=\"!filter.readOnly\"\n- small\n- class=\"nc-filter-item-remove-btn\"\n- @click.stop=\"deleteFilter(filter, i)\"\n- >\n- mdi-close-box\n- </v-icon>\n- <span v-if=\"!i\" class=\"caption d-flex align-center\">{{ $t('labels.where') }}</span>\n- <v-select\n- v-else\n- v-model=\"filter.logical_op\"\n- class=\"flex-shrink-1 flex-grow-0 elevation-0 caption\"\n- :items=\"['and', 'or']\"\n- solo\n- flat\n- dense\n- hide-details\n- placeholder=\"Group op\"\n- @click.stop\n- @change=\"saveOrUpdate(filter, i)\"\n- >\n- <template #item=\"{ item }\">\n- <span class=\"caption font-weight-regular\">{{ item }}</span>\n- </template>\n- </v-select>\n- </div>\n+ <template v-if=\"filter.is_group\">\n+ <v-icon\n+ v-if=\"!filter.readOnly\"\n+ small\n+ class=\"nc-filter-item-remove-btn\"\n+ @click.stop=\"deleteFilter(filter, i)\"\n+ :key=\"i + '_1'\"\n+ >\n+ mdi-close-box\n+ </v-icon>\n+ <span v-else :key=\"i + '_1'\" />\n+\n+ <span :key=\"i + '_2'\" v-if=\"!i\" class=\"caption d-flex align-center\">{{ $t('labels.where') }}</span>\n+ <v-select\n+ v-else\n+ :key=\"i + '_2'\"\n+ v-model=\"filter.logical_op\"\n+ class=\"flex-shrink-1 flex-grow-0 elevation-0 caption\"\n+ :items=\"['and', 'or']\"\n+ solo\n+ flat\n+ dense\n+ hide-details\n+ placeholder=\"Group op\"\n+ @click.stop\n+ @change=\"saveOrUpdate(filter, i)\"\n+ >\n+ <template #item=\"{ item }\">\n+ <span class=\"caption font-weight-regular\">{{ item }}</span>\n+ </template>\n+ </v-select>\n+ <span :key=\"i + '_3'\" style=\"grid-column: span 3\"></span>\n+ </template>\n+\n+ <div v-if=\"filter.is_group\" :key=\"i + '_4'\" style=\"grid-column: span 5; padding: 6px\" class=\"elevation-4\">\n <column-filter\n v-if=\"filter.id || shared\"\n ref=\"nestedFilter\"\n@@ -54,19 +60,19 @@\n <template v-else>\n <v-icon\n v-if=\"!filter.readOnly\"\n- :key=\"i + '_1'\"\n+ :key=\"i + '_5'\"\n small\n class=\"nc-filter-item-remove-btn\"\n @click.stop=\"deleteFilter(filter, i)\"\n >\n mdi-close-box\n </v-icon>\n- <span v-else :key=\"i + '_1'\" />\n- <span v-if=\"!i\" :key=\"i + '_2'\" class=\"caption d-flex align-center\">{{ $t('labels.where') }}</span>\n+ <span v-else :key=\"i + '_5'\" />\n+ <span v-if=\"!i\" :key=\"i + '_6'\" class=\"caption d-flex align-center\">{{ $t('labels.where') }}</span>\n \n <v-select\n v-else\n- :key=\"i + '_2'\"\n+ :key=\"i + '_6'\"\n v-model=\"filter.logical_op\"\n class=\"flex-shrink-1 flex-grow-0 elevation-0 caption\"\n :items=\"['and', 'or']\"\n@@ -84,7 +90,7 @@\n </v-select>\n \n <field-list-auto-complete-dropdown\n- :key=\"i + '_3'\"\n+ :key=\"i + '_7'\"\n v-model=\"filter.fk_column_id\"\n class=\"caption nc-filter-field-select\"\n :columns=\"columns\"\n@@ -94,7 +100,7 @@\n />\n \n <v-select\n- :key=\"i + '_4'\"\n+ :key=\"i + '_8'\"\n v-model=\"filter.comparison_op\"\n class=\"flex-shrink-1 flex-grow-0 caption nc-filter-operation-select\"\n :items=\"filterComparisonOp(filter)\"\n@@ -114,11 +120,11 @@\n <span class=\"caption font-weight-regular\">{{ item.text }}</span>\n </template>\n </v-select>\n- <span v-else :key=\"i + '_4'\"></span>\n+ <span v-else :key=\"i + '_8'\"></span>\n <span v-if=\"['null', 'notnull', 'empty', 'notempty'].includes(filter.comparison_op)\" :key=\"i + '_5'\" />\n <v-checkbox\n v-else-if=\"types[filter.field] === 'boolean'\"\n- :key=\"i + '_5'\"\n+ :key=\"i + '_9'\"\n v-model=\"filter.value\"\n dense\n :disabled=\"filter.readOnly\"\n@@ -126,7 +132,7 @@\n />\n <v-text-field\n v-else-if=\"filter && filter.fk_column_id\"\n- :key=\"i + '_5'\"\n+ :key=\"i + '_9'\"\n v-model=\"filter.value\"\n solo\n flat\n@@ -137,7 +143,7 @@\n @click.stop\n @input=\"saveOrUpdate(filter, i)\"\n />\n- <span v-else :key=\"i + '_5'\"></span>\n+ <span v-else :key=\"i + '_9'\"></span>\n </template>\n </template>\n </template>\n@@ -411,6 +417,7 @@ export default {\n parentId: this.parentId,\n is_group: true,\n status: 'update',\n+ logical_op: 'and',\n });\n this.filters = this.filters.slice();\n const index = this.filters.length - 1;\n@@ -478,4 +485,8 @@ export default {\n column-gap: 6px;\n row-gap: 6px;\n }\n+\n+.nc-filter-value-select {\n+ min-width: 100px;\n+}\n </style>\n"]
| 3 |
["4c44543a3d9eea37e90a2316717feb01c0e0d83a", "ace6b981c8098a68092d4a10e75daae7b8bfee9b", "4f86f2570b274c45605cc59d9adb38f7ed30cd17"]
|
["ci", "feat", "refactor"]
|
ignore all markdown files for backend and main test suites,Fix readme
Signed-off-by: Ben Johnson <[email protected]>,remove members that are left from ClusterTopology when last change is applied
When the change is applied, the member is marked as LEFT. It is removed from the
ClusterTopology when all changes in the ClusterChangePlan is completed.
|
["diff --git a/.github/workflows/ibis-backends-skip-helper.yml b/.github/workflows/ibis-backends-skip-helper.yml\nindex efd0953..058f8b6 100644\n--- a/.github/workflows/ibis-backends-skip-helper.yml\n+++ b/.github/workflows/ibis-backends-skip-helper.yml\n@@ -7,6 +7,7 @@ on:\n paths:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\n@@ -14,6 +15,7 @@ on:\n paths:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\ndiff --git a/.github/workflows/ibis-backends.yml b/.github/workflows/ibis-backends.yml\nindex d18e62d..144562c 100644\n--- a/.github/workflows/ibis-backends.yml\n+++ b/.github/workflows/ibis-backends.yml\n@@ -3,18 +3,20 @@ name: Backends\n \n on:\n push:\n- # Skip the backend suite if all changes are in the docs directory\n+ # Skip the backend suite if all changes are docs\n paths-ignore:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\n pull_request:\n- # Skip the backend suite if all changes are in the docs directory\n+ # Skip the backend suite if all changes are docs\n paths-ignore:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\ndiff --git a/.github/workflows/ibis-main-skip-helper.yml b/.github/workflows/ibis-main-skip-helper.yml\nindex f6086e1..7d79af7 100644\n--- a/.github/workflows/ibis-main-skip-helper.yml\n+++ b/.github/workflows/ibis-main-skip-helper.yml\n@@ -7,6 +7,7 @@ on:\n paths:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\n@@ -14,6 +15,7 @@ on:\n paths:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\ndiff --git a/.github/workflows/ibis-main.yml b/.github/workflows/ibis-main.yml\nindex d5b0735..3d22bff 100644\n--- a/.github/workflows/ibis-main.yml\n+++ b/.github/workflows/ibis-main.yml\n@@ -7,6 +7,7 @@ on:\n paths-ignore:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\n@@ -15,6 +16,7 @@ on:\n paths-ignore:\n - \"docs/**\"\n - \"mkdocs.yml\"\n+ - \"**/*.md\"\n branches:\n - master\n - \"*.x.x\"\n", "diff --git a/README.md b/README.md\nindex 587d655..da746bb 100644\n--- a/README.md\n+++ b/README.md\n@@ -38,15 +38,20 @@ simple and unified.\n * [**Installation**][docs.installation] - [containers][docs.containers], [operating systems][docs.operating_systems], [package managers][docs.package_managers], [from archives][docs.from-archives], [from source][docs.from-source]\n * [**Configuration**][docs.configuration]\n * [**Deployment**][docs.deployment] - [topologies][docs.topologies], [roles][docs.roles]\n+* [**Guides**][docs.guides] - [getting started][docs.guides.getting_started]\n \n-#### [Components](https://vector.dev/components)\n+#### Reference\n \n-* [**Sources**][docs.sources] - \n-* [**Transforms**][docs.transforms]\n-* [**Sinks**][docs.sinks]\n+* [**Sources**][docs.sources] - [docker][docs.sources.docker], [file][docs.sources.file], [journald][docs.sources.journald], [kafka][docs.sources.kafka]\n+* [**Transforms**][docs.transforms] - [json_parser][docs.transforms.json_parser], [log_to_metric][docs.transforms.log_to_metric], [lua][docs.transforms.lua], [regex_parser][docs.transforms.regex_parser]\n+* [**Sinks**][docs.sinks] - [aws_cloudwatch_logs][docs.sinks.aws_cloudwatch_logs], [aws_cloudwatch_metrics][docs.sinks.aws_cloudwatch_metrics], [aws_kinesis_streams][docs.sinks.aws_kinesis_streams], [aws_s3][docs.sinks.aws_s3], [clickhouse][docs.sinks.clickhouse], [elasticsearch][docs.sinks.elasticsearch], and [15 more][docs.sinks]\n \n-* [**Administration**][docs.administration] - [process management][docs.process-management], [monitoring][docs.monitoring], [updating][docs.updating], [validating][docs.validating]\n-* [**Guides**][docs.guides]\n+#### Administration\n+\n+* [**Process management**][docs.process-management]\n+* [**Monitoring**][docs.monitoring]\n+* [**Updating**][docs.updating]\n+* [**Validating**][docs.validating]\n \n #### Resources\n \n@@ -105,88 +110,6 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.vector.dev | sh\n \n Or view [platform specific installation instructions][docs.installation].\n \n-\n-## Sources\n-\n-| Name | Description |\n-|:------|:------------|\n-| [**`docker`**][docs.sources.docker] | Ingests data through the docker engine daemon and outputs [`log`][docs.data-model#log] events. |\n-| [**`file`**][docs.sources.file] | Ingests data through one or more local files and outputs [`log`][docs.data-model#log] events. |\n-| [**`journald`**][docs.sources.journald] | Ingests data through log records from journald and outputs [`log`][docs.data-model#log] events. |\n-| [**`kafka`**][docs.sources.kafka] | Ingests data through Kafka 0.9 or later and outputs [`log`][docs.data-model#log] events. |\n-| [**`statsd`**][docs.sources.statsd] | Ingests data through the StatsD UDP protocol and outputs [`metric`][docs.data-model#metric] events. |\n-| [**`stdin`**][docs.sources.stdin] | Ingests data through standard input (STDIN) and outputs [`log`][docs.data-model#log] events. |\n-| [**`syslog`**][docs.sources.syslog] | Ingests data through the Syslog 5424 protocol and outputs [`log`][docs.data-model#log] events. |\n-| [**`tcp`**][docs.sources.tcp] | Ingests data through the TCP protocol and outputs [`log`][docs.data-model#log] events. |\n-| [**`udp`**][docs.sources.udp] | Ingests data through the UDP protocol and outputs [`log`][docs.data-model#log] events. |\n-| [**`vector`**][docs.sources.vector] | Ingests data through another upstream [`vector` sink][docs.sinks.vector] and outputs [`log`][docs.data-model#log] and [`metric`][docs.data-model#metric] events. |\n-\n-[+ request a new source][urls.new_source]\n-\n-\n-## Transforms\n-\n-| Name | Description |\n-|:------|:------------|\n-| [**`add_fields`**][docs.transforms.add_fields] | Accepts [`log`][docs.data-model#log] events and allows you to add one or more log fields. |\n-| [**`add_tags`**][docs.transforms.add_tags] | Accepts [`metric`][docs.data-model#metric] events and allows you to add one or more metric tags. |\n-| [**`coercer`**][docs.transforms.coercer] | Accepts [`log`][docs.data-model#log] events and allows you to coerce log fields into fixed types. |\n-| [**`field_filter`**][docs.transforms.field_filter] | Accepts [`log`][docs.data-model#log] and [`metric`][docs.data-model#metric] events and allows you to filter events by a log field's value. |\n-| [**`grok_parser`**][docs.transforms.grok_parser] | Accepts [`log`][docs.data-model#log] events and allows you to parse a log field value with [Grok][urls.grok]. |\n-| [**`json_parser`**][docs.transforms.json_parser] | Accepts [`log`][docs.data-model#log] events and allows you to parse a log field value as JSON. |\n-| [**`log_to_metric`**][docs.transforms.log_to_metric] | Accepts [`log`][docs.data-model#log] events and allows you to convert logs into one or more metrics. |\n-| [**`lua`**][docs.transforms.lua] | Accepts [`log`][docs.data-model#log] events and allows you to transform events with a full embedded [Lua][urls.lua] engine. |\n-| [**`regex_parser`**][docs.transforms.regex_parser] | Accepts [`log`][docs.data-model#log] events and allows you to parse a log field's value with a [Regular Expression][urls.regex]. |\n-| [**`remove_fields`**][docs.transforms.remove_fields] | Accepts [`log`][docs.data-model#log] events and allows you to remove one or more log fields. |\n-| [**`remove_tags`**][docs.transforms.remove_tags] | Accepts [`metric`][docs.data-model#metric] events and allows you to remove one or more metric tags. |\n-| [**`sampler`**][docs.transforms.sampler] | Accepts [`log`][docs.data-model#log] events and allows you to sample events with a configurable rate. |\n-| [**`split`**][docs.transforms.split] | Accepts [`log`][docs.data-model#log] events and allows you to split a field's value on a given separator and zip the tokens into ordered field names. |\n-| [**`tokenizer`**][docs.transforms.tokenizer] | Accepts [`log`][docs.data-model#log] events and allows you to tokenize a field's value by splitting on white space, ignoring special wrapping characters, and zip the tokens into ordered field names. |\n-\n-[+ request a new transform][urls.new_transform]\n-\n-\n-## Sinks\n-\n-| Name | Description |\n-|:------|:------------|\n-| [**`aws_cloudwatch_logs`**][docs.sinks.aws_cloudwatch_logs] | [Batches](#buffers-and-batches) [`log`][docs.data-model#log] events to [AWS CloudWatch Logs][urls.aws_cw_logs] via the [`PutLogEvents` API endpoint](https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutLogEvents.html). |\n-| [**`aws_cloudwatch_metrics`**][docs.sinks.aws_cloudwatch_metrics] | [Streams](#streaming) [`metric`][docs.data-model#metric] events to [AWS CloudWatch Metrics][urls.aws_cw_metrics] via the [`PutMetricData` API endpoint](https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_PutMetricData.html). |\n-| [**`aws_kinesis_streams`**][docs.sinks.aws_kinesis_streams] | [Batches](#buffers-and-batches) [`log`][docs.data-model#log] events to [AWS Kinesis Data Stream][urls.aws_kinesis_data_streams] via the [`PutRecords` API endpoint](https://docs.aws.amazon.com/kinesis/latest/APIReference/API_PutRecords.html). |\n-| [**`aws_s3`**][docs.sinks.aws_s3] | [Batches](#buffers-and-batches) [`log`][docs.data-model#log] events to [AWS S3][urls.aws_s3] via the [`PutObject` API endpoint](https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUT.html). |\n-| [**`blackhole`**][docs.sinks.blackhole] | [Streams](#streaming) [`log`][docs.data-model#log] and [`metric`][docs.data-model#metric] events to a blackhole that simply discards data, designed for testing and benchmarking purposes. |\n-| [**`clickhouse`**][docs.sinks.clickhouse] | [Batches](#buffers-and-batches) [`log`][docs.data-model#log] events to [Clickhouse][urls.clickhouse] via the [`HTTP` Interface][urls.clickhouse_http]. |\n-| [**`console`**][docs.sinks.console] | [Streams](#streaming) [`log`][docs.data-model#log] and [`metric`][docs.data-model#metric] events to [standard output streams][urls.standard_streams], such as `STDOUT` and `STDERR`. |\n-| [**`datadog_metrics`**][docs.sinks.datadog_metrics] | [Batches](#buffers-and-batches) [`metric`][docs.data-model#metric] events to [Datadog][urls.datadog] metrics service using [HTTP API](https://docs.datadoghq.com/api/?lang=bash#metrics). |\n-| [**`elasticsearch`**][docs.sinks.elasticsearch] | [Batches](#buffers-and-batches) [`log`][docs.data-model#log] events to [Elasticsearch][urls.elasticsearch] via the [`_bulk` API endpoint](https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html). |\n-| [**`file`**][docs.sinks.file] | [Streams](#streaming) [`log`][docs.data-model#log] events to a file. |\n-| [**`http`**][docs.sinks.http] | [Batches](#buffers-and-batches) [`log`][docs.data-model#log] events to a generic HTTP endpoint. |\n-| [**`kafka`**][docs.sinks.kafka] | [Streams](#streaming) [`log`][docs.data-model#log] events to [Apache Kafka][urls.kafka] via the [Kafka protocol][urls.kafka_protocol]. |\n-| [**`prometheus`**][docs.sinks.prometheus] | [Exposes](#exposing-and-scraping) [`metric`][docs.data-model#metric] events to [Prometheus][urls.prometheus] metrics service. |\n-| [**`splunk_hec`**][docs.sinks.splunk_hec] | [Batches](#buffers-and-batches) [`log`][docs.data-model#log] events to a [Splunk HTTP Event Collector][urls.splunk_hec]. |\n-| [**`statsd`**][docs.sinks.statsd] | [Streams](#streaming) [`metric`][docs.data-model#metric] events to [StatsD][urls.statsd] metrics service. |\n-| [**`tcp`**][docs.sinks.tcp] | [Streams](#streaming) [`log`][docs.data-model#log] events to a TCP connection. |\n-| [**`vector`**][docs.sinks.vector] | [Streams](#streaming) [`log`][docs.data-model#log] events to another downstream [`vector` source][docs.sources.vector]. |\n-\n-[+ request a new sink][urls.new_sink]\n-\n-\n-## License\n-\n-Copyright 2019, Vector Authors. All rights reserved.\n-\n-Licensed under the Apache License, Version 2.0 (the \"License\"); you may not\n-use these files except in compliance with the License. You may obtain a copy\n-of the License at\n-\n-http://www.apache.org/licenses/LICENSE-2.0\n-\n-Unless required by applicable law or agreed to in writing, software\n-distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT\n-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\n-License for the specific language governing permissions and limitations under\n-the License.\n-\n ---\n \n <p align=\"center\">\n@@ -200,8 +123,6 @@ the License.\n [docs.configuration]: https://vector.dev/docs/setup/configuration\n [docs.containers]: https://vector.dev/docs/setup/installation/containers\n [docs.correctness]: https://vector.dev/docs/about/correctness\n-[docs.data-model#log]: https://vector.dev/docs/about/data-model#log\n-[docs.data-model#metric]: https://vector.dev/docs/about/data-model#metric\n [docs.data-model.log]: https://vector.dev/docs/about/data-model/log\n [docs.data-model.metric]: https://vector.dev/docs/about/data-model/metric\n [docs.data_model]: https://vector.dev/docs/about/data-model\n@@ -209,6 +130,7 @@ the License.\n [docs.from-archives]: https://vector.dev/docs/setup/installation/manual/from-archives\n [docs.from-source]: https://vector.dev/docs/setup/installation/manual/from-source\n [docs.guarantees]: https://vector.dev/docs/about/guarantees\n+[docs.guides.getting_started]: https://vector.dev/docs/setup/guides/getting-started\n [docs.guides]: https://vector.dev/docs/setup/guides\n [docs.installation]: https://vector.dev/docs/setup/installation\n [docs.monitoring]: https://vector.dev/docs/administration/monitoring\n@@ -224,72 +146,25 @@ the License.\n [docs.sinks.aws_cloudwatch_metrics]: https://vector.dev/docs/reference/sinks/aws_cloudwatch_metrics\n [docs.sinks.aws_kinesis_streams]: https://vector.dev/docs/reference/sinks/aws_kinesis_streams\n [docs.sinks.aws_s3]: https://vector.dev/docs/reference/sinks/aws_s3\n-[docs.sinks.blackhole]: https://vector.dev/docs/reference/sinks/blackhole\n [docs.sinks.clickhouse]: https://vector.dev/docs/reference/sinks/clickhouse\n-[docs.sinks.console]: https://vector.dev/docs/reference/sinks/console\n-[docs.sinks.datadog_metrics]: https://vector.dev/docs/reference/sinks/datadog_metrics\n [docs.sinks.elasticsearch]: https://vector.dev/docs/reference/sinks/elasticsearch\n-[docs.sinks.file]: https://vector.dev/docs/reference/sinks/file\n-[docs.sinks.http]: https://vector.dev/docs/reference/sinks/http\n-[docs.sinks.kafka]: https://vector.dev/docs/reference/sinks/kafka\n-[docs.sinks.prometheus]: https://vector.dev/docs/reference/sinks/prometheus\n-[docs.sinks.splunk_hec]: https://vector.dev/docs/reference/sinks/splunk_hec\n-[docs.sinks.statsd]: https://vector.dev/docs/reference/sinks/statsd\n-[docs.sinks.tcp]: https://vector.dev/docs/reference/sinks/tcp\n-[docs.sinks.vector]: https://vector.dev/docs/reference/sinks/vector\n [docs.sinks]: https://vector.dev/docs/reference/sinks\n [docs.sources.docker]: https://vector.dev/docs/reference/sources/docker\n [docs.sources.file]: https://vector.dev/docs/reference/sources/file\n [docs.sources.journald]: https://vector.dev/docs/reference/sources/journald\n [docs.sources.kafka]: https://vector.dev/docs/reference/sources/kafka\n-[docs.sources.statsd]: https://vector.dev/docs/reference/sources/statsd\n-[docs.sources.stdin]: https://vector.dev/docs/reference/sources/stdin\n-[docs.sources.syslog]: https://vector.dev/docs/reference/sources/syslog\n-[docs.sources.tcp]: https://vector.dev/docs/reference/sources/tcp\n-[docs.sources.udp]: https://vector.dev/docs/reference/sources/udp\n-[docs.sources.vector]: https://vector.dev/docs/reference/sources/vector\n [docs.sources]: https://vector.dev/docs/reference/sources\n [docs.topologies]: https://vector.dev/docs/setup/deployment/topologies\n-[docs.transforms.add_fields]: https://vector.dev/docs/reference/transforms/add_fields\n-[docs.transforms.add_tags]: https://vector.dev/docs/reference/transforms/add_tags\n-[docs.transforms.coercer]: https://vector.dev/docs/reference/transforms/coercer\n-[docs.transforms.field_filter]: https://vector.dev/docs/reference/transforms/field_filter\n-[docs.transforms.grok_parser]: https://vector.dev/docs/reference/transforms/grok_parser\n [docs.transforms.json_parser]: https://vector.dev/docs/reference/transforms/json_parser\n [docs.transforms.log_to_metric]: https://vector.dev/docs/reference/transforms/log_to_metric\n [docs.transforms.lua]: https://vector.dev/docs/reference/transforms/lua\n [docs.transforms.regex_parser]: https://vector.dev/docs/reference/transforms/regex_parser\n-[docs.transforms.remove_fields]: https://vector.dev/docs/reference/transforms/remove_fields\n-[docs.transforms.remove_tags]: https://vector.dev/docs/reference/transforms/remove_tags\n-[docs.transforms.sampler]: https://vector.dev/docs/reference/transforms/sampler\n-[docs.transforms.split]: https://vector.dev/docs/reference/transforms/split\n-[docs.transforms.tokenizer]: https://vector.dev/docs/reference/transforms/tokenizer\n [docs.transforms]: https://vector.dev/docs/reference/transforms\n [docs.updating]: https://vector.dev/docs/administration/updating\n [docs.use_cases]: https://vector.dev/docs/use_cases\n [docs.validating]: https://vector.dev/docs/administration/validating\n-[urls.aws_cw_logs]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/WhatIsCloudWatchLogs.html\n-[urls.aws_cw_metrics]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/working_with_metrics.html\n-[urls.aws_kinesis_data_streams]: https://aws.amazon.com/kinesis/data-streams/\n-[urls.aws_s3]: https://aws.amazon.com/s3/\n-[urls.clickhouse]: https://clickhouse.yandex/\n-[urls.clickhouse_http]: https://clickhouse.yandex/docs/en/interfaces/http/\n-[urls.datadog]: https://www.datadoghq.com\n-[urls.elasticsearch]: https://www.elastic.co/products/elasticsearch\n-[urls.grok]: http://grokdebug.herokuapp.com/\n-[urls.kafka]: https://kafka.apache.org/\n-[urls.kafka_protocol]: https://kafka.apache.org/protocol\n-[urls.lua]: https://www.lua.org/\n [urls.mailing_list]: https://vector.dev/mailing_list/\n-[urls.new_sink]: https://github.com/timberio/vector/issues/new?labels=Type%3A+New+Feature\n-[urls.new_source]: https://github.com/timberio/vector/issues/new?labels=Type%3A+New+Feature\n-[urls.new_transform]: https://github.com/timberio/vector/issues/new?labels=Type%3A+New+Feature\n-[urls.prometheus]: https://prometheus.io/\n-[urls.regex]: https://en.wikipedia.org/wiki/Regular_expression\n [urls.rust]: https://www.rust-lang.org/\n-[urls.splunk_hec]: http://dev.splunk.com/view/event-collector/SP-CAAAE6M\n-[urls.standard_streams]: https://en.wikipedia.org/wiki/Standard_streams\n-[urls.statsd]: https://github.com/statsd/statsd\n [urls.test_harness]: https://github.com/timberio/vector-test-harness/\n [urls.v0.5.0]: https://github.com/timberio/vector/releases/tag/v0.5.0\n [urls.vector_changelog]: https://github.com/timberio/vector/blob/master/CHANGELOG.md\ndiff --git a/README.md.erb b/README.md.erb\nindex 3b14aa0..cc241eb 100644\n--- a/README.md.erb\n+++ b/README.md.erb\n@@ -38,15 +38,20 @@ simple and unified.\n * [**Installation**][docs.installation] - [containers][docs.containers], [operating systems][docs.operating_systems], [package managers][docs.package_managers], [from archives][docs.from-archives], [from source][docs.from-source]\n * [**Configuration**][docs.configuration]\n * [**Deployment**][docs.deployment] - [topologies][docs.topologies], [roles][docs.roles]\n+* [**Guides**][docs.guides] - [getting started][docs.guides.getting_started]\n \n-#### [Components](https://vector.dev/components)\n+#### Reference\n \n-* [**Sources**][docs.sources] - \n-* [**Transforms**][docs.transforms]\n-* [**Sinks**][docs.sinks]\n+* [**Sources**][docs.sources] - <%= common_component_links(:source) %>\n+* [**Transforms**][docs.transforms] - <%= common_component_links(:transform) %>\n+* [**Sinks**][docs.sinks] - <%= common_component_links(:sink) %>\n \n-* [**Administration**][docs.administration] - [process management][docs.process-management], [monitoring][docs.monitoring], [updating][docs.updating], [validating][docs.validating]\n-* [**Guides**][docs.guides]\n+#### Administration\n+\n+* [**Process management**][docs.process-management]\n+* [**Monitoring**][docs.monitoring]\n+* [**Updating**][docs.updating]\n+* [**Validating**][docs.validating]\n \n #### Resources\n \n@@ -105,44 +110,6 @@ Run the following in your terminal, then follow the on-screen instructions.\n \n Or view [platform specific installation instructions][docs.installation].\n \n-\n-## Sources\n-\n-<%= components_table(metadata.sources.to_h.values.sort) %>\n-\n-[+ request a new source][urls.new_source]\n-\n-\n-## Transforms\n-\n-<%= components_table(metadata.transforms.to_h.values.sort) %>\n-\n-[+ request a new transform][urls.new_transform]\n-\n-\n-## Sinks\n-\n-<%= components_table(metadata.sinks.to_h.values.sort) %>\n-\n-[+ request a new sink][urls.new_sink]\n-\n-\n-## License\n-\n-Copyright <%= Time.now.year %>, Vector Authors. All rights reserved.\n-\n-Licensed under the Apache License, Version 2.0 (the \"License\"); you may not\n-use these files except in compliance with the License. You may obtain a copy\n-of the License at\n-\n-http://www.apache.org/licenses/LICENSE-2.0\n-\n-Unless required by applicable law or agreed to in writing, software\n-distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT\n-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\n-License for the specific language governing permissions and limitations under\n-the License.\n-\n ---\n \n <p align=\"center\">\ndiff --git a/scripts/generate/templates.rb b/scripts/generate/templates.rb\nindex e5e7ce7..c793ae0 100644\n--- a/scripts/generate/templates.rb\n+++ b/scripts/generate/templates.rb\n@@ -89,6 +89,23 @@ class Templates\n render(\"#{partials_path}/_commit_type_toc_item.md\", binding).gsub(/,$/, \"\")\n end\n \n+ def common_component_links(type, limit = 5)\n+ common = metadata.send(\"#{type.to_s.pluralize}_list\").select(&:common?)\n+\n+ links =\n+ common[0..limit].collect do |component|\n+ \"[#{component.name}][docs.#{type.to_s.pluralize}.#{component.name}]\"\n+ end\n+\n+ num_leftover = common.size - links.size\n+\n+ if num_leftover > 0\n+ links << \"and [15 more][docs.#{type.to_s.pluralize}]\"\n+ end\n+\n+ links.join(\", \")\n+ end\n+\n def component_config_example(component)\n render(\"#{partials_path}/_component_config_example.md\", binding).strip\n end\ndiff --git a/scripts/util/metadata/component.rb b/scripts/util/metadata/component.rb\nindex 0873b2e..4dc5650 100644\n--- a/scripts/util/metadata/component.rb\n+++ b/scripts/util/metadata/component.rb\n@@ -9,6 +9,7 @@ class Component\n include Comparable\n \n attr_reader :beta,\n+ :common,\n :function_category,\n :id,\n :name,\n@@ -18,6 +19,7 @@ class Component\n \n def initialize(hash)\n @beta = hash[\"beta\"] == true\n+ @common = hash[\"common\"] == true\n @function_category = hash.fetch(\"function_category\")\n @name = hash.fetch(\"name\")\n @type ||= self.class.name.downcase\n@@ -71,6 +73,10 @@ class Component\n beta == true\n end\n \n+ def common?\n+ common == true\n+ end\n+\n def context_options\n options_list.select(&:context?)\n end\ndiff --git a/website/src/components/VectorComponents/index.js b/website/src/components/VectorComponents/index.js\nindex b6c5c13..d3c9adf 100644\n--- a/website/src/components/VectorComponents/index.js\n+++ b/website/src/components/VectorComponents/index.js\n@@ -154,7 +154,7 @@ function VectorComponents(props) {\n //\n \n const [onlyAtLeastOnce, setOnlyAtLeastOnce] = useState(queryObj['at-least-once'] == 'true');\n- const [onlyFunctions, setOnlyFunctions] = useState(new Set(queryObj['providers']));\n+ const [onlyFunctions, setOnlyFunctions] = useState(new Set(queryObj['functions']));\n const [onlyLog, setOnlyLog] = useState(queryObj['log'] == 'true');\n const [onlyMetric, setOnlyMetric] = useState(queryObj['metric'] == 'true');\n const [onlyProductionReady, setOnlyProductionReady] = useState(queryObj['prod-ready'] == 'true');\n", "diff --git a/topology/src/main/java/io/camunda/zeebe/topology/state/ClusterTopology.java b/topology/src/main/java/io/camunda/zeebe/topology/state/ClusterTopology.java\nindex e5a111d..8ccd410 100644\n--- a/topology/src/main/java/io/camunda/zeebe/topology/state/ClusterTopology.java\n+++ b/topology/src/main/java/io/camunda/zeebe/topology/state/ClusterTopology.java\n@@ -171,7 +171,31 @@ public record ClusterTopology(\n }\n \n private ClusterTopology advance() {\n- return new ClusterTopology(version, members, changes.advance());\n+ final ClusterTopology result = new ClusterTopology(version, members, changes.advance());\n+ if (!result.hasPendingChanges()) {\n+ // The last change has been applied. Clean up the members that are marked as LEFT in the\n+ // topology. This operation will be executed in the member that executes the last operation.\n+ // This is ok because it is guaranteed that no other concurrent modification will be applied\n+ // to the topology. This is because all the operations are applied sequentially, and no\n+ // topology update will be done without adding a ClusterChangePlan.\n+ return result.gc();\n+ }\n+ return result;\n+ }\n+\n+ private ClusterTopology gc() {\n+ if (hasPendingChanges()) {\n+ throw new IllegalStateException(\n+ \"Expected to remove members that are left from the topology, but there are pending changes \"\n+ + changes);\n+ }\n+ // remove members that are marked as LEFT\n+ final var currentMembers =\n+ members().entrySet().stream()\n+ .filter(entry -> entry.getValue().state() != State.LEFT)\n+ .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));\n+ // Increment the version so that other members can merge by overwriting their local topology.\n+ return new ClusterTopology(version + 1, currentMembers, changes);\n }\n \n public boolean hasMember(final MemberId memberId) {\n"]
| 3 |
["370830b8c9f971fa537f42308ab5e3ff356919f8", "662c5d1346ea2b01c0bc3c11c648cbdf92035fe2", "4bfbf60653068ef17df98c021134692bd6d02939"]
|
["ci", "docs", "refactor"]
|
add user role enum
Signed-off-by: Braks <[email protected]>,simplify loadFiles code,fixa few issues
|
["diff --git a/packages/nc-gui-v2/lib/enums.ts b/packages/nc-gui-v2/lib/enums.ts\nindex e87b69a..c6751a3 100644\n--- a/packages/nc-gui-v2/lib/enums.ts\n+++ b/packages/nc-gui-v2/lib/enums.ts\n@@ -1,3 +1,9 @@\n+export enum Role {\n+ Super = 'super',\n+ Admin = 'admin',\n+ User = 'user',\n+}\n+\n export enum Language {\n de = 'Deutsch',\n en = 'English',\ndiff --git a/packages/nc-gui-v2/lib/types.ts b/packages/nc-gui-v2/lib/types.ts\nindex bf152c4..dd8a1ce 100644\n--- a/packages/nc-gui-v2/lib/types.ts\n+++ b/packages/nc-gui-v2/lib/types.ts\n@@ -1,11 +1,12 @@\n import type { ComputedRef, ToRefs } from 'vue'\n+import type { Role } from '~/lib/enums'\n \n export interface User {\n id: string\n email: string\n firstname: string | null\n lastname: string | null\n- roles: string[]\n+ roles: (Role | string)[]\n }\n \n export interface State {\n", "diff --git a/frontend/app/player/web/network/loadFiles.ts b/frontend/app/player/web/network/loadFiles.ts\nindex ec174fc..d164333 100644\n--- a/frontend/app/player/web/network/loadFiles.ts\n+++ b/frontend/app/player/web/network/loadFiles.ts\n@@ -1,43 +1,33 @@\n import APIClient from 'App/api_client';\n \n-const NO_NTH_FILE = \"nnf\"\n-const NO_UNPROCESSED_FILES = \"nuf\"\n+const NO_FILE_OK = \"No-file-but-this-is-ok\"\n+const NO_BACKUP_FILE = \"No-efs-file\"\n \n export const loadFiles = (\n urls: string[],\n onData: (data: Uint8Array) => void,\n ): Promise<void> => {\n- const firstFileURL = urls[0]\n- urls = urls.slice(1)\n- if (!firstFileURL) {\n+ if (!urls.length) {\n return Promise.reject(\"No urls provided\")\n }\n- return window.fetch(firstFileURL)\n- .then(r => {\n- return processAPIStreamResponse(r, true)\n- })\n- .then(onData)\n- .then(() =>\n- urls.reduce((p, url) =>\n- p.then(() =>\n- window.fetch(url)\n- .then(r => {\n- return processAPIStreamResponse(r, false)\n- })\n- .then(onData)\n- ),\n- Promise.resolve(),\n- )\n+ return urls.reduce((p, url, index) =>\n+ p.then(() =>\n+ window.fetch(url)\n+ .then(r => {\n+ return processAPIStreamResponse(r, index===0)\n+ })\n+ .then(onData)\n+ ),\n+ Promise.resolve(),\n )\n .catch(e => {\n- if (e === NO_NTH_FILE) {\n+ if (e === NO_FILE_OK) {\n return\n }\n throw e\n })\n }\n \n-\n export async function requestEFSDom(sessionId: string) {\n return await requestEFSMobFile(sessionId + \"/dom.mob\")\n }\n@@ -50,21 +40,18 @@ async function requestEFSMobFile(filename: string) {\n const api = new APIClient()\n const res = await api.fetch('/unprocessed/' + filename)\n if (res.status >= 400) {\n- throw NO_UNPROCESSED_FILES\n+ throw NO_BACKUP_FILE\n }\n return await processAPIStreamResponse(res, false)\n }\n \n-const processAPIStreamResponse = (response: Response, isFirstFile: boolean) => {\n+const processAPIStreamResponse = (response: Response, canBeMissed: boolean) => {\n return new Promise<ArrayBuffer>((res, rej) => {\n- if (response.status === 404 && !isFirstFile) {\n- return rej(NO_NTH_FILE)\n+ if (response.status === 404 && canBeMissed) {\n+ return rej(NO_FILE_OK)\n }\n if (response.status >= 400) {\n- return rej(\n- isFirstFile ? `no start file. status code ${ response.status }`\n- : `Bad endfile status code ${response.status}`\n- )\n+ return rej(`Bad file status code ${response.status}. Url: ${response.url}`)\n }\n res(response.arrayBuffer())\n }).then(buffer => new Uint8Array(buffer))\n", "diff --git a/README.md b/README.md\nindex d944d22..5099f03 100644\n--- a/README.md\n+++ b/README.md\n@@ -10,9 +10,8 @@ React state management with a minimal API. Made with :heart: and ES6 Proxies.\n \n <!-- toc -->\n \n-* [Motivation](#motivation)\n+* [Introduction](#introduction)\n * [Installation](#installation)\n- + [Setting up a quick project](#setting-up-a-quick-project)\n * [Usage](#usage)\n + [Creating stores](#creating-stores)\n + [Creating reactive views](#creating-reactive-views)\n@@ -35,12 +34,14 @@ React state management with a minimal API. Made with :heart: and ES6 Proxies.\n Easy State consists of two wrapper functions only. `store` creates state stores and `view` creates reactive components, which re-render whenever state stores are mutated. The rest is just plain JavaScript.\n \n ```js\n-import React, from 'react'\n+import React from 'react'\n import { store, view } from 'react-easy-state'\n \n+// stores are normal objects\n const clock = store({ time: new Date() })\n setInterval(() => clock.time = new Date(), 1000)\n \n+// reactive components re-render on store mutations\n function ClockComp () {\n return <div>{clock.time}</div>\n }\n"]
| 3 |
["176a959eb80d17f9abc5c6b5354e6097be95b42d", "983fef55ef08ca2ca25349bb2d5bdff10ecf89f4", "b8a664c1b10f4e30a3e221a14211a3cdaf90b7f4"]
|
["feat", "refactor", "docs"]
|
replace api call which requires auth token in public page
re #4694
Signed-off-by: Pranav C <[email protected]>,treeview width fix
Signed-off-by: Raju Udava <[email protected]>,explain `ChunkOrder` query test scenario
|
["diff --git a/packages/nc-gui/composables/useSharedView.ts b/packages/nc-gui/composables/useSharedView.ts\nindex cb0c5ea..f67a6c9 100644\n--- a/packages/nc-gui/composables/useSharedView.ts\n+++ b/packages/nc-gui/composables/useSharedView.ts\n@@ -17,7 +17,7 @@ export function useSharedView() {\n \n const { appInfo } = $(useGlobal())\n \n- const { loadProject } = useProject()\n+ const { project } = useProject()\n \n const appInfoDefaultLimit = appInfo.defaultLimit || 25\n \n@@ -76,7 +76,16 @@ export function useSharedView() {\n \n await setMeta(viewMeta.model)\n \n- await loadProject(true, viewMeta.project_id)\n+ // if project is not defined then set it with an object containing base\n+ if (!project.value?.bases)\n+ project.value = {\n+ bases: [\n+ {\n+ id: viewMeta.base_id,\n+ type: viewMeta.client,\n+ },\n+ ],\n+ }\n \n const relatedMetas = { ...viewMeta.relatedMetas }\n Object.keys(relatedMetas).forEach((key) => setMeta(relatedMetas[key]))\n", "diff --git a/tests/playwright/pages/Dashboard/TreeView.ts b/tests/playwright/pages/Dashboard/TreeView.ts\nindex 9cc622b..75c02c0 100644\n--- a/tests/playwright/pages/Dashboard/TreeView.ts\n+++ b/tests/playwright/pages/Dashboard/TreeView.ts\n@@ -23,10 +23,24 @@ export class TreeViewPage extends BasePage {\n }\n \n async verifyVisibility({ isVisible }: { isVisible: boolean }) {\n- if (isVisible) {\n- await expect(this.get()).toBeVisible();\n+ await this.rootPage.waitForTimeout(1000);\n+\n+ const domElement = await this.get();\n+ // get width of treeview dom element\n+ const width = (await domElement.boundingBox()).width;\n+\n+ // if (isVisible) {\n+ // await expect(this.get()).toBeVisible();\n+ // } else {\n+ // await expect(this.get()).not.toBeVisible();\n+ // }\n+\n+ // border for treeview is 1px\n+ // if not-visible, width should be < 5;\n+ if (!isVisible) {\n+ expect(width).toBeLessThan(5);\n } else {\n- await expect(this.get()).not.toBeVisible();\n+ expect(width).toBeGreaterThan(5);\n }\n }\n \n", "diff --git a/query_tests/src/scenarios.rs b/query_tests/src/scenarios.rs\nindex f0e352b..86df0e9 100644\n--- a/query_tests/src/scenarios.rs\n+++ b/query_tests/src/scenarios.rs\n@@ -1170,6 +1170,21 @@ impl DbSetup for ChunkOrder {\n .clear_lifecycle_action()\n .unwrap();\n \n+ // Now we have the the following chunks (same partition and table):\n+ //\n+ // | ID | order | tag: region | field: user | time |\n+ // | -- | ----- | ----------- | ----------- | ---- |\n+ // | 1 | 1 | \"west\" | 2 | 100 |\n+ // | 2 | 0 | \"west\" | 1 | 100 |\n+ //\n+ // The result after deduplication should be:\n+ //\n+ // | tag: region | field: user | time |\n+ // | ----------- | ----------- | ---- |\n+ // | \"west\" | 2 | 100 |\n+ //\n+ // So the query engine must use `order` as a primary key to sort chunks, NOT `id`.\n+\n let scenario = DbScenario {\n scenario_name: \"chunks where chunk ID alone cannot be used for ordering\".into(),\n db,\n"]
| 3 |
["4986a5892fb00bd5a6b2065ad8cfefbc36052dd7", "efeb30f26252ef4791ef2a02d83827b7f0c45462", "9a60af7fa3b480e2e04bacd646112cad9aaab6d7"]
|
["fix", "test", "docs"]
|
run nix macos jobs on macos-13 to try and avoid SIP,101: fix import key cmd
Signed-off-by: Sam Alba <[email protected]>,release for ppc64
closes #3703
Signed-off-by: Carlos A Becker <[email protected]>
|
["diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml\nnew file mode 100644\nindex 0000000..5be7d17\n--- /dev/null\n+++ b/.github/actionlint.yaml\n@@ -0,0 +1,7 @@\n+self-hosted-runner:\n+ # Labels of self-hosted runner in array of strings.\n+ labels: [macos-13]\n+# Configuration variables in array of strings defined in your repository or\n+# organization. `null` means disabling configuration variables check.\n+# Empty array means no configuration variable is allowed.\n+config-variables: null\ndiff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml\nindex e37346c..dce77e1 100644\n--- a/.github/workflows/nix.yml\n+++ b/.github/workflows/nix.yml\n@@ -37,7 +37,7 @@ jobs:\n - \"3.10\"\n - \"3.11\"\n include:\n- - os: macos-latest\n+ - os: macos-13\n python-version: \"3.10\"\n steps:\n - name: checkout\ndiff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex 005a850..8db22e2 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -3,7 +3,7 @@ ci:\n autofix_prs: false\n autoupdate_commit_msg: \"chore(deps): pre-commit.ci autoupdate\"\n skip:\n- - actionlint\n+ - actionlint-system\n - deadnix\n - just\n - nixpkgs-fmt\n@@ -17,9 +17,9 @@ default_stages:\n - commit\n repos:\n - repo: https://github.com/rhysd/actionlint\n- rev: v1.6.24\n+ rev: v1.6.25\n hooks:\n- - id: actionlint\n+ - id: actionlint-system\n - repo: https://github.com/psf/black\n rev: 23.3.0\n hooks:\n@@ -30,7 +30,7 @@ repos:\n - id: nbstripout\n exclude: .+/rendered/.+\n - repo: https://github.com/codespell-project/codespell\n- rev: v2.2.4\n+ rev: v2.2.5\n hooks:\n - id: codespell\n additional_dependencies:\n", "diff --git a/docs/learn/101-use.md b/docs/learn/101-use.md\nindex 283c1c1..2ec10f9 100644\n--- a/docs/learn/101-use.md\n+++ b/docs/learn/101-use.md\n@@ -41,8 +41,7 @@ cd ./examples/todoapp\n The example app contains encrypted secrets and other pre-configured inputs, here is how to decrypt them:\n \n ```sh\n-curl -sfL https://releases.dagger.io/examples/key.txt >> ~/.config/dagger/keys.txt\n-dagger input list\n+dagger input list || curl -sfL https://releases.dagger.io/examples/key.txt >> ~/.config/dagger/keys.txt\n ```\n \n **Step 4**: Deploy!\n", "diff --git a/.goreleaser.yaml b/.goreleaser.yaml\nindex 46901cb..7d4d355 100644\n--- a/.goreleaser.yaml\n+++ b/.goreleaser.yaml\n@@ -25,6 +25,7 @@ builds:\n - amd64\n - arm\n - arm64\n+ - ppc64\n goarm:\n - \"7\"\n mod_timestamp: '{{ .CommitTimestamp }}'\n"]
| 3 |
["54cb6d4643b4a072ff997592a7fa14a69a6c068d", "2b01808ec86fe9d8b4a93141a1b7f95e11fd6010", "e27e3a6478d59eb0f93af0a51a9c474bad6f8350"]
|
["ci", "docs", "build"]
|
fix sonar integration,avoid cancelling jobs,update README.md about the NPM package
|
["diff --git a/.ci/scripts/distribution/analyse-java.sh b/.ci/scripts/distribution/analyse-java.sh\nindex a0122f7..0e965df 100755\n--- a/.ci/scripts/distribution/analyse-java.sh\n+++ b/.ci/scripts/distribution/analyse-java.sh\n@@ -23,12 +23,12 @@ else\n fi\n \n if [ \"${GIT_BRANCH}\" == \"master\" ] || [ \"${GIT_BRANCH}\" == \"develop\" ]; then\n- TARGET_BRANCH=\"master\"\n+ TARGET_BRANCH=\"${GIT_BRANCH}\"\n else\n TARGET_BRANCH=\"develop\"\n+ PROPERTIES+=(\"-Dsonar.branch.target=${TARGET_BRANCH}\")\n fi\n \n- PROPERTIES+=(\"-Dsonar.branch.target=${TARGET_BRANCH}\")\n git fetch --no-tags \"${GIT_URL}\" \"+refs/heads/${TARGET_BRANCH}:refs/remotes/origin/${TARGET_BRANCH}\"\n fi\n \ndiff --git a/parent/pom.xml b/parent/pom.xml\nindex f4c3160..d34b41f 100644\n--- a/parent/pom.xml\n+++ b/parent/pom.xml\n@@ -1570,7 +1570,7 @@\n <!-- sonarscanner integration -->\n <!-- sonar.login token must be passed at runtime to avoid sharing token -->\n <sonar.host.url>https://sonarcloud.io</sonar.host.url>\n- <sonar.organization>zeebe-io</sonar.organization>\n+ <sonar.organization>camunda-cloud</sonar.organization>\n <sonar.login>${env.SONARCLOUD_TOKEN}</sonar.login>\n <sonar.links.issue>${project.scm.url}/issues</sonar.links.issue>\n <sonar.cpd.exclusions>\n", "diff --git a/.github/workflows/ibis-backends-cloud.yml b/.github/workflows/ibis-backends-cloud.yml\nindex 321708e..b990984 100644\n--- a/.github/workflows/ibis-backends-cloud.yml\n+++ b/.github/workflows/ibis-backends-cloud.yml\n@@ -29,7 +29,9 @@ jobs:\n name: ${{ matrix.backend.title }} python-${{ matrix.python-version }}\n # only a single bigquery or snowflake run at a time, otherwise test data is\n # clobbered by concurrent runs\n- concurrency: ${{ matrix.backend.name }}\n+ concurrency:\n+ group: ${{ matrix.backend.name }}\n+ cancel-in-progress: false\n runs-on: ubuntu-latest\n strategy:\n fail-fast: false\n", "diff --git a/README.md b/README.md\nindex 9faf168..bbb5b5c 100644\n--- a/README.md\n+++ b/README.md\n@@ -126,23 +126,24 @@ pacman -S git-cliff\n \n ### From NPM\n \n-[git-cliff](https://www.npmjs.com/package/git-cliff) can be installed from NPM:\n+\n+You can install and run [git-cliff](https://www.npmjs.com/package/git-cliff) with a single command:\n \n ```sh\n-yarn add -D git-cliff\n+npx git-cliff@latest\n ```\n \n-or:\n+Also, if you want to add `git-cliff` to your project:\n \n ```sh\n+# with yarn\n+yarn add -D git-cliff\n+\n+# with npm\n npm install git-cliff --save-dev\n ```\n \n-You can also use `git-cliff` directly with `npx`:\n-\n-```sh\n-npx git-cliff\n-```\n+Afterwards, you can run `git-cliff` via `npm exec git-cliff` or `npx git-cliff@latest`.\n \n ### From MacPorts\n \n"]
| 3 |
["6cbbd98dfe6c768dbe49f8d6d2448856a9a86089", "19514bc68624a964c63fc217f163f7b11f3dfe82", "e0177c25e13812306aab0b0991562d58b6d14767"]
|
["build", "ci", "docs"]
|
Port shard precreation service from InfluxDB 1.x
Provides new configuration parameters:
```
--storage-shard-precreator-advance-period
--storage-shard-precreator-check-interval
```
Closes #19520,remove broken link
Fixes #1785,remove duplicated variables
|
["diff --git a/cmd/influxd/launcher/launcher.go b/cmd/influxd/launcher/launcher.go\nindex e3548ef..5559e94 100644\n--- a/cmd/influxd/launcher/launcher.go\n+++ b/cmd/influxd/launcher/launcher.go\n@@ -440,6 +440,16 @@ func launcherOpts(l *Launcher) []cli.Opt {\n \t\t\tFlag: \"storage-retention-check-interval\",\n \t\t\tDesc: \"The interval of time when retention policy enforcement checks run.\",\n \t\t},\n+\t\t{\n+\t\t\tDestP: &l.StorageConfig.PrecreatorConfig.CheckInterval,\n+\t\t\tFlag: \"storage-shard-precreator-check-interval\",\n+\t\t\tDesc: \"The interval of time when the check to pre-create new shards runs.\",\n+\t\t},\n+\t\t{\n+\t\t\tDestP: &l.StorageConfig.PrecreatorConfig.AdvancePeriod,\n+\t\t\tFlag: \"storage-shard-precreator-advance-period\",\n+\t\t\tDesc: \"The default period ahead of the endtime of a shard group that its successor group is created.\",\n+\t\t},\n \n \t\t// InfluxQL Coordinator Config\n \t\t{\ndiff --git a/storage/config.go b/storage/config.go\nindex ef953a2..d8e24db 100644\n--- a/storage/config.go\n+++ b/storage/config.go\n@@ -2,6 +2,7 @@ package storage\n \n import (\n \t\"github.com/influxdata/influxdb/v2/tsdb\"\n+\t\"github.com/influxdata/influxdb/v2/v1/services/precreator\"\n \t\"github.com/influxdata/influxdb/v2/v1/services/retention\"\n )\n \n@@ -10,6 +11,7 @@ type Config struct {\n \tData tsdb.Config\n \n \tRetentionService retention.Config\n+\tPrecreatorConfig precreator.Config\n }\n \n // NewConfig initialises a new config for an Engine.\n@@ -17,5 +19,6 @@ func NewConfig() Config {\n \treturn Config{\n \t\tData: tsdb.NewConfig(),\n \t\tRetentionService: retention.NewConfig(),\n+\t\tPrecreatorConfig: precreator.NewConfig(),\n \t}\n }\ndiff --git a/storage/engine.go b/storage/engine.go\nindex 8518f48..ae37fdd 100644\n--- a/storage/engine.go\n+++ b/storage/engine.go\n@@ -19,6 +19,7 @@ import (\n \t_ \"github.com/influxdata/influxdb/v2/tsdb/index/tsi1\"\n \t\"github.com/influxdata/influxdb/v2/v1/coordinator\"\n \t\"github.com/influxdata/influxdb/v2/v1/services/meta\"\n+\t\"github.com/influxdata/influxdb/v2/v1/services/precreator\"\n \t\"github.com/influxdata/influxdb/v2/v1/services/retention\"\n \t\"github.com/influxdata/influxql\"\n \t\"github.com/pkg/errors\"\n@@ -42,7 +43,8 @@ type Engine struct {\n \t\tWritePoints(database, retentionPolicy string, consistencyLevel models.ConsistencyLevel, user meta.User, points []models.Point) error\n \t}\n \n-\tretentionService *retention.Service\n+\tretentionService *retention.Service\n+\tprecreatorService *precreator.Service\n \n \tdefaultMetricLabels prometheus.Labels\n \n@@ -66,6 +68,7 @@ type MetaClient interface {\n \tDatabase(name string) (di *meta.DatabaseInfo)\n \tDatabases() []meta.DatabaseInfo\n \tDeleteShardGroup(database, policy string, id uint64) error\n+\tPrecreateShardGroups(now, cutoff time.Time) error\n \tPruneShardGroups() error\n \tRetentionPolicy(database, policy string) (*meta.RetentionPolicyInfo, error)\n \tShardGroupsByTimeRange(database, policy string, min, max time.Time) (a []meta.ShardGroupInfo, err error)\n@@ -115,6 +118,9 @@ func NewEngine(path string, c Config, options ...Option) *Engine {\n \te.retentionService.TSDBStore = e.tsdbStore\n \te.retentionService.MetaClient = e.metaClient\n \n+\te.precreatorService = precreator.NewService(c.PrecreatorConfig)\n+\te.precreatorService.MetaClient = e.metaClient\n+\n \treturn e\n }\n \n@@ -132,6 +138,10 @@ func (e *Engine) WithLogger(log *zap.Logger) {\n \tif e.retentionService != nil {\n \t\te.retentionService.WithLogger(log)\n \t}\n+\n+\tif e.precreatorService != nil {\n+\t\te.precreatorService.WithLogger(log)\n+\t}\n }\n \n // PrometheusCollectors returns all the prometheus collectors associated with\n@@ -161,6 +171,10 @@ func (e *Engine) Open(ctx context.Context) (err error) {\n \t\treturn err\n \t}\n \n+\tif err := e.precreatorService.Open(ctx); err != nil {\n+\t\treturn err\n+\t}\n+\n \te.closing = make(chan struct{})\n \n \treturn nil\n@@ -194,6 +208,10 @@ func (e *Engine) Close() error {\n \n \tvar retErr *multierror.Error\n \n+\tif err := e.precreatorService.Close(); err != nil {\n+\t\tretErr = multierror.Append(retErr, fmt.Errorf(\"error closing shard precreator service: %w\", err))\n+\t}\n+\n \tif err := e.retentionService.Close(); err != nil {\n \t\tretErr = multierror.Append(retErr, fmt.Errorf(\"error closing retention service: %w\", err))\n \t}\ndiff --git a/v1/services/precreator/README.md b/v1/services/precreator/README.md\nnew file mode 100644\nindex 0000000..8830b73\n--- /dev/null\n+++ b/v1/services/precreator/README.md\n@@ -0,0 +1,13 @@\n+Shard Precreation\n+============\n+\n+During normal operation when InfluxDB receives time-series data, it writes the data to files known as _shards_. Each shard only contains data for a specific range of time. Therefore, before data can be accepted by the system, the shards must exist and InfluxDB always checks that the required shards exist for every incoming data point. If the required shards do not exist, InfluxDB will create those shards. Because this requires a cluster to reach consensus, the process is not instantaneous and can temporarily impact write-throughput.\n+\n+Since almost all time-series data is written sequentially in time, the system has an excellent idea of the timestamps of future data. Shard precreation takes advantage of this fact by creating required shards ahead of time, thereby ensuring the required shards exist by the time new time-series data actually arrives. Write-throughput is therefore not affected when data is first received for a range of time that would normally trigger shard creation.\n+\n+Note that the shard-existence check must remain in place in the code, even with shard precreation. This is because while most data is written sequentially in time, this is not always the case. Data may be written with timestamps in the past, or farther in the future than shard precreation handles.\n+\n+## Configuration\n+Shard precreation can be disabled if necessary, though this is not recommended. If it is disabled, then shards will be only be created when explicitly needed.\n+\n+The interval between runs of the shard precreation service, as well as the time-in-advance the shards are created, are also configurable. The defaults should work for most deployments.\ndiff --git a/v1/services/precreator/config.go b/v1/services/precreator/config.go\nnew file mode 100644\nindex 0000000..5e994e6\n--- /dev/null\n+++ b/v1/services/precreator/config.go\n@@ -0,0 +1,65 @@\n+package precreator\n+\n+import (\n+\t\"errors\"\n+\t\"time\"\n+\n+\t\"github.com/influxdata/influxdb/v2/toml\"\n+\t\"github.com/influxdata/influxdb/v2/v1/monitor/diagnostics\"\n+)\n+\n+const (\n+\t// DefaultCheckInterval is the shard precreation check time if none is specified.\n+\tDefaultCheckInterval = 10 * time.Minute\n+\n+\t// DefaultAdvancePeriod is the default period ahead of the endtime of a shard group\n+\t// that its successor group is created.\n+\tDefaultAdvancePeriod = 30 * time.Minute\n+)\n+\n+// Config represents the configuration for shard precreation.\n+type Config struct {\n+\tEnabled bool `toml:\"enabled\"`\n+\tCheckInterval toml.Duration `toml:\"check-interval\"`\n+\tAdvancePeriod toml.Duration `toml:\"advance-period\"`\n+}\n+\n+// NewConfig returns a new Config with defaults.\n+func NewConfig() Config {\n+\treturn Config{\n+\t\tEnabled: true,\n+\t\tCheckInterval: toml.Duration(DefaultCheckInterval),\n+\t\tAdvancePeriod: toml.Duration(DefaultAdvancePeriod),\n+\t}\n+}\n+\n+// Validate returns an error if the Config is invalid.\n+func (c Config) Validate() error {\n+\tif !c.Enabled {\n+\t\treturn nil\n+\t}\n+\n+\tif c.CheckInterval <= 0 {\n+\t\treturn errors.New(\"check-interval must be positive\")\n+\t}\n+\tif c.AdvancePeriod <= 0 {\n+\t\treturn errors.New(\"advance-period must be positive\")\n+\t}\n+\n+\treturn nil\n+}\n+\n+// Diagnostics returns a diagnostics representation of a subset of the Config.\n+func (c Config) Diagnostics() (*diagnostics.Diagnostics, error) {\n+\tif !c.Enabled {\n+\t\treturn diagnostics.RowFromMap(map[string]interface{}{\n+\t\t\t\"enabled\": false,\n+\t\t}), nil\n+\t}\n+\n+\treturn diagnostics.RowFromMap(map[string]interface{}{\n+\t\t\"enabled\": true,\n+\t\t\"check-interval\": c.CheckInterval,\n+\t\t\"advance-period\": c.AdvancePeriod,\n+\t}), nil\n+}\ndiff --git a/v1/services/precreator/config_test.go b/v1/services/precreator/config_test.go\nnew file mode 100644\nindex 0000000..2686001\n--- /dev/null\n+++ b/v1/services/precreator/config_test.go\n@@ -0,0 +1,67 @@\n+package precreator_test\n+\n+import (\n+\t\"testing\"\n+\t\"time\"\n+\n+\t\"github.com/BurntSushi/toml\"\n+\t\"github.com/influxdata/influxdb/v2/v1/services/precreator\"\n+)\n+\n+func TestConfig_Parse(t *testing.T) {\n+\t// Parse configuration.\n+\tvar c precreator.Config\n+\tif _, err := toml.Decode(`\n+enabled = true\n+check-interval = \"2m\"\n+advance-period = \"10m\"\n+`, &c); err != nil {\n+\n+\t\tt.Fatal(err)\n+\t}\n+\n+\t// Validate configuration.\n+\tif !c.Enabled {\n+\t\tt.Fatalf(\"unexpected enabled state: %v\", c.Enabled)\n+\t} else if time.Duration(c.CheckInterval) != 2*time.Minute {\n+\t\tt.Fatalf(\"unexpected check interval: %s\", c.CheckInterval)\n+\t} else if time.Duration(c.AdvancePeriod) != 10*time.Minute {\n+\t\tt.Fatalf(\"unexpected advance period: %s\", c.AdvancePeriod)\n+\t}\n+}\n+\n+func TestConfig_Validate(t *testing.T) {\n+\tc := precreator.NewConfig()\n+\tif err := c.Validate(); err != nil {\n+\t\tt.Fatalf(\"unexpected validation fail from NewConfig: %s\", err)\n+\t}\n+\n+\tc = precreator.NewConfig()\n+\tc.CheckInterval = 0\n+\tif err := c.Validate(); err == nil {\n+\t\tt.Fatal(\"expected error for check-interval = 0, got nil\")\n+\t}\n+\n+\tc = precreator.NewConfig()\n+\tc.CheckInterval *= -1\n+\tif err := c.Validate(); err == nil {\n+\t\tt.Fatal(\"expected error for negative check-interval, got nil\")\n+\t}\n+\n+\tc = precreator.NewConfig()\n+\tc.AdvancePeriod = 0\n+\tif err := c.Validate(); err == nil {\n+\t\tt.Fatal(\"expected error for advance-period = 0, got nil\")\n+\t}\n+\n+\tc = precreator.NewConfig()\n+\tc.AdvancePeriod *= -1\n+\tif err := c.Validate(); err == nil {\n+\t\tt.Fatal(\"expected error for negative advance-period, got nil\")\n+\t}\n+\n+\tc.Enabled = false\n+\tif err := c.Validate(); err != nil {\n+\t\tt.Fatalf(\"unexpected validation fail from disabled config: %s\", err)\n+\t}\n+}\ndiff --git a/v1/services/precreator/service.go b/v1/services/precreator/service.go\nnew file mode 100644\nindex 0000000..28e8f16\n--- /dev/null\n+++ b/v1/services/precreator/service.go\n@@ -0,0 +1,93 @@\n+// Package precreator provides the shard precreation service.\n+package precreator // import \"github.com/influxdata/influxdb/v2/v1/services/precreator\"\n+\n+import (\n+\t\"context\"\n+\t\"sync\"\n+\t\"time\"\n+\n+\t\"github.com/influxdata/influxdb/v2/logger\"\n+\t\"go.uber.org/zap\"\n+)\n+\n+// Service manages the shard precreation service.\n+type Service struct {\n+\tcheckInterval time.Duration\n+\tadvancePeriod time.Duration\n+\n+\tLogger *zap.Logger\n+\n+\tcancel context.CancelFunc\n+\twg sync.WaitGroup\n+\n+\tMetaClient interface {\n+\t\tPrecreateShardGroups(now, cutoff time.Time) error\n+\t}\n+}\n+\n+// NewService returns an instance of the precreation service.\n+func NewService(c Config) *Service {\n+\treturn &Service{\n+\t\tcheckInterval: time.Duration(c.CheckInterval),\n+\t\tadvancePeriod: time.Duration(c.AdvancePeriod),\n+\t\tLogger: zap.NewNop(),\n+\t}\n+}\n+\n+// WithLogger sets the logger for the service.\n+func (s *Service) WithLogger(log *zap.Logger) {\n+\ts.Logger = log.With(zap.String(\"service\", \"shard-precreation\"))\n+}\n+\n+// Open starts the precreation service.\n+func (s *Service) Open(ctx context.Context) error {\n+\tif s.cancel != nil {\n+\t\treturn nil\n+\t}\n+\n+\ts.Logger.Info(\"Starting precreation service\",\n+\t\tlogger.DurationLiteral(\"check_interval\", s.checkInterval),\n+\t\tlogger.DurationLiteral(\"advance_period\", s.advancePeriod))\n+\n+\tctx, s.cancel = context.WithCancel(ctx)\n+\n+\ts.wg.Add(1)\n+\tgo s.runPrecreation(ctx)\n+\treturn nil\n+}\n+\n+// Close stops the precreation service.\n+func (s *Service) Close() error {\n+\tif s.cancel == nil {\n+\t\treturn nil\n+\t}\n+\n+\ts.cancel()\n+\ts.wg.Wait()\n+\ts.cancel = nil\n+\n+\treturn nil\n+}\n+\n+// runPrecreation continually checks if resources need precreation.\n+func (s *Service) runPrecreation(ctx context.Context) {\n+\tdefer s.wg.Done()\n+\n+\tfor {\n+\t\tselect {\n+\t\tcase <-time.After(s.checkInterval):\n+\t\t\tif err := s.precreate(time.Now().UTC()); err != nil {\n+\t\t\t\ts.Logger.Info(\"Failed to precreate shards\", zap.Error(err))\n+\t\t\t}\n+\t\tcase <-ctx.Done():\n+\t\t\ts.Logger.Info(\"Terminating precreation service\")\n+\t\t\treturn\n+\t\t}\n+\t}\n+}\n+\n+// precreate performs actual resource precreation.\n+func (s *Service) precreate(now time.Time) error {\n+\tcutoff := now.Add(s.advancePeriod).UTC()\n+\treturn s.MetaClient.PrecreateShardGroups(now, cutoff)\n+}\ndiff --git a/v1/services/precreator/service_test.go b/v1/services/precreator/service_test.go\nnew file mode 100644\nindex 0000000..20289b7\n--- /dev/null\n+++ b/v1/services/precreator/service_test.go\n@@ -0,0 +1,56 @@\n+package precreator_test\n+\n+import (\n+\t\"context\"\n+\t\"os\"\n+\t\"testing\"\n+\t\"time\"\n+\n+\t\"github.com/influxdata/influxdb/v2/logger\"\n+\t\"github.com/influxdata/influxdb/v2/toml\"\n+\t\"github.com/influxdata/influxdb/v2/v1/internal\"\n+\t\"github.com/influxdata/influxdb/v2/v1/services/precreator\"\n+)\n+\n+func TestShardPrecreation(t *testing.T) {\n+\tdone := make(chan struct{})\n+\tprecreate := false\n+\n+\tvar mc internal.MetaClientMock\n+\tmc.PrecreateShardGroupsFn = func(now, cutoff time.Time) error {\n+\t\tif !precreate {\n+\t\t\tclose(done)\n+\t\t\tprecreate = true\n+\t\t}\n+\t\treturn nil\n+\t}\n+\n+\ts := NewTestService()\n+\ts.MetaClient = &mc\n+\n+\tif err := s.Open(context.Background()); err != nil {\n+\t\tt.Fatalf(\"unexpected open error: %s\", err)\n+\t}\n+\tdefer s.Close() // double close should not cause a panic\n+\n+\ttimer := time.NewTimer(100 * time.Millisecond)\n+\tselect {\n+\tcase <-done:\n+\t\ttimer.Stop()\n+\tcase <-timer.C:\n+\t\tt.Errorf(\"timeout exceeded while waiting for precreate\")\n+\t}\n+\n+\tif err := s.Close(); err != nil {\n+\t\tt.Fatalf(\"unexpected close error: %s\", err)\n+\t}\n+}\n+\n+func NewTestService() *precreator.Service {\n+\tconfig := precreator.NewConfig()\n+\tconfig.CheckInterval = toml.Duration(10 * time.Millisecond)\n+\n+\ts := precreator.NewService(config)\n+\ts.WithLogger(logger.New(os.Stderr))\n+\treturn s\n+}\n", "diff --git a/docs/content/Caching/Caching.md b/docs/content/Caching/Caching.md\nindex d873a52..9706dda 100644\n--- a/docs/content/Caching/Caching.md\n+++ b/docs/content/Caching/Caching.md\n@@ -135,8 +135,9 @@ If nothing is found in the cache, the query is executed in the database and the \n is returned as well as updating the cache.\n \n If an existing value is present in the cache and the `refreshKey` value for\n-the query hasn't changed, the cached value will be returned. Otherwise, a\n-[query renewal](#in-memory-cache-force-query-renewal) will be performed.\n+the query hasn't changed, the cached value will be returned. Otherwise, a SQL query will be executed either against the pre-aggregations storage or the source database to populate the cache with the results and return them.\n+\n+\n \n ### Refresh Keys\n \n", "diff --git a/packages/core/src/components/item/item.ios.scss b/packages/core/src/components/item/item.ios.scss\nindex 4de5455..6c4d11a 100644\n--- a/packages/core/src/components/item/item.ios.scss\n+++ b/packages/core/src/components/item/item.ios.scss\n@@ -47,15 +47,6 @@ $item-ios-detail-push-color: $list-ios-border-color !default;\n /// @prop - Icon for the detail arrow\n $item-ios-detail-push-svg: \"<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 20'><path d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z' fill='#{$item-ios-detail-push-color}'/></svg>\" !default;\n \n-/// @prop - Background for the divider\n-$item-ios-divider-background: #f7f7f7 !default;\n-\n-/// @prop - Color for the divider\n-$item-ios-divider-color: #222 !default;\n-\n-/// @prop - Padding for the divider\n-$item-ios-divider-padding: 5px 15px !default;\n-\n \n // iOS Item\n // --------------------------------------------------\ndiff --git a/packages/core/src/components/item/item.md.scss b/packages/core/src/components/item/item.md.scss\nindex 1dd1800..3dadbc0 100644\n--- a/packages/core/src/components/item/item.md.scss\n+++ b/packages/core/src/components/item/item.md.scss\n@@ -35,21 +35,6 @@ $item-md-detail-push-color: $list-md-border-color !default;\n /// @prop - Icon for the detail arrow\n $item-md-detail-push-svg: \"<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 20'><path d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z' fill='#{$item-md-detail-push-color}'/></svg>\" !default;\n \n-/// @prop - Color for the divider\n-$item-md-divider-color: #858585 !default;\n-\n-/// @prop - Background for the divider\n-$item-md-divider-background: #fff !default;\n-\n-/// @prop - Font size for the divider\n-$item-md-divider-font-size: $item-md-body-text-font-size !default;\n-\n-/// @prop - Border bottom for the divider\n-$item-md-divider-border-bottom: 1px solid $list-md-border-color !default;\n-\n-/// @prop - Padding for the divider\n-$item-md-divider-padding: 5px 15px !default;\n-\n \n .item-md {\n @include padding-horizontal($item-md-padding-start, 0);\ndiff --git a/packages/core/src/components/item/item.wp.scss b/packages/core/src/components/item/item.wp.scss\nindex 2c4aae6..07b9266 100644\n--- a/packages/core/src/components/item/item.wp.scss\n+++ b/packages/core/src/components/item/item.wp.scss\n@@ -41,21 +41,6 @@ $item-wp-detail-push-color: $input-wp-border-color !default;\n /// @prop - Icon for the detail arrow\n $item-wp-detail-push-svg: \"<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 20'><path d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z' fill='#{$item-wp-detail-push-color}'/></svg>\" !default;\n \n-/// @prop - Color for the divider\n-$item-wp-divider-color: $list-wp-text-color !default;\n-\n-/// @prop - Background for the divider\n-$item-wp-divider-background: #fff !default;\n-\n-/// @prop - Bodrer bottom for the divider\n-$item-wp-divider-border-bottom: 1px solid $list-wp-border-color !default;\n-\n-/// @prop - Font size for the divider\n-$item-wp-divider-font-size: 2rem !default;\n-\n-/// @prop - Padding for the divider\n-$item-wp-divider-padding: 5px 15px !default;\n-\n \n .item-wp {\n @include padding-horizontal($item-wp-padding-start, 0);\n"]
| 3 |
["6f0cf049caa1a7982669ee685e86621452686551", "c351088bce98594c740a39546ce3655c91554a5d", "cd7e8c3d3549ea05115b3f02586eeba894d86906"]
|
["feat", "docs", "refactor"]
|
support document.html,use connect instead of begin to avoid nesting transactions,remove unnecessary import
|
["diff --git a/packages/nuxt3/src/builder/builder.ts b/packages/nuxt3/src/builder/builder.ts\nindex a24bd88..ecc22ef 100644\n--- a/packages/nuxt3/src/builder/builder.ts\n+++ b/packages/nuxt3/src/builder/builder.ts\n@@ -3,6 +3,7 @@ import fsExtra from 'fs-extra'\n import { debounce } from 'lodash'\n import { BundleBuilder } from 'src/webpack'\n import { Nuxt } from '../core'\n+import { DeterminedGlobals, determineGlobals } from '../utils'\n import {\n templateData,\n compileTemplates,\n@@ -15,12 +16,14 @@ import Ignore from './ignore'\n \n export class Builder {\n nuxt: Nuxt\n+ globals: DeterminedGlobals\n ignore: Ignore\n- app: NuxtApp\n templates: NuxtTemplate[]\n+ app: NuxtApp\n \n constructor (nuxt) {\n this.nuxt = nuxt\n+ this.globals = determineGlobals(nuxt.options.globalName, nuxt.options.globals)\n this.ignore = new Ignore({\n rootDir: nuxt.options.srcDir,\n ignoreArray: nuxt.options.ignore.concat(\n@@ -32,6 +35,10 @@ export class Builder {\n build () {\n return build(this)\n }\n+\n+ close () {\n+ // TODO: close watchers\n+ }\n }\n \n // Extends VueRouter\ndiff --git a/packages/nuxt3/src/builder/template.ts b/packages/nuxt3/src/builder/template.ts\nindex 63a9115..fe09f16 100644\n--- a/packages/nuxt3/src/builder/template.ts\n+++ b/packages/nuxt3/src/builder/template.ts\n@@ -11,6 +11,7 @@ export interface NuxtTemplate {\n \n export function templateData (builder) {\n return {\n+ globals: builder.globals,\n app: builder.app\n }\n }\ndiff --git a/packages/nuxt3/src/builder/watch.ts b/packages/nuxt3/src/builder/watch.ts\nindex b4d1415..d148fec 100644\n--- a/packages/nuxt3/src/builder/watch.ts\n+++ b/packages/nuxt3/src/builder/watch.ts\n@@ -38,7 +38,8 @@ export function createWatcher (\n return {\n watchAll,\n watch,\n- debug\n+ debug,\n+ close: () => watcher.close()\n }\n }\n \ndiff --git a/packages/nuxt3/src/config/options.ts b/packages/nuxt3/src/config/options.ts\nindex 5aac8ac..6e7f93c 100644\n--- a/packages/nuxt3/src/config/options.ts\n+++ b/packages/nuxt3/src/config/options.ts\n@@ -12,7 +12,7 @@ import { DefaultConfiguration, defaultNuxtConfigFile, getDefaultNuxtConfig } fro\n import { deleteProp, mergeConfigs, setProp, overrideProp, Optional } from './transformers'\n \n interface InputConfiguration {\n- appTemplatePath?: string\n+ documentPath?: string\n layoutTransition?: string | DefaultConfiguration['layoutTransition']\n loading?: true | false | DefaultConfiguration['loading']\n manifest?: {\n@@ -197,13 +197,16 @@ function normalizeConfig (_options: CliConfiguration) {\n .concat(options.extensions))\n \n // If app.html is defined, set the template path to the user template\n- if (options.appTemplatePath === undefined) {\n- options.appTemplatePath = path.resolve(options.buildDir, 'views/app.template.html')\n- if (fs.existsSync(path.join(options.srcDir, 'app.html'))) {\n- options.appTemplatePath = path.join(options.srcDir, 'app.html')\n+ if (options.documentPath === undefined) {\n+ options.documentPath = path.resolve(options.buildDir, 'views/document.template.html')\n+ const userDocumentPath = path.join(options.srcDir, 'document.html')\n+ if (fs.existsSync(userDocumentPath)) {\n+ options.documentPath = userDocumentPath\n+ } else {\n+ options.watch.push(userDocumentPath)\n }\n } else {\n- options.appTemplatePath = path.resolve(options.srcDir, options.appTemplatePath)\n+ options.documentPath = path.resolve(options.srcDir, options.documentPath)\n }\n \n overrideProp(options.build, 'publicPath', options.build.publicPath.replace(/([^/])$/, '$1/'))\ndiff --git a/packages/nuxt3/src/vue-renderer/renderers/ssr.ts b/packages/nuxt3/src/vue-renderer/renderers/ssr.ts\nindex 3e3ce2d..482bd6b 100644\n--- a/packages/nuxt3/src/vue-renderer/renderers/ssr.ts\n+++ b/packages/nuxt3/src/vue-renderer/renderers/ssr.ts\n@@ -96,6 +96,9 @@ export default class SSRRenderer extends BaseRenderer {\n // Call Vue renderer renderToString\n let APP = await this.vueRenderer.renderToString(renderContext)\n \n+ // Wrap with Nuxt id\n+ APP = `<div id=\"${this.serverContext.globals.id}\">${APP}</div>`\n+\n // Call render:done in app\n await renderContext.nuxt.hooks.callHook('vue-renderer:done')\n \ndiff --git a/packages/nuxt3/src/webpack/configs/client.ts b/packages/nuxt3/src/webpack/configs/client.ts\nindex a257948..4fb35e0 100644\n--- a/packages/nuxt3/src/webpack/configs/client.ts\n+++ b/packages/nuxt3/src/webpack/configs/client.ts\n@@ -94,7 +94,7 @@ function clientHTML (ctx: WebpackConfigContext) {\n config.plugins.push(\n new HTMLPlugin({\n filename: '../server/index.ssr.html',\n- template: options.appTemplatePath,\n+ template: options.documentPath,\n minify: options.build.html.minify as any,\n inject: false // Resources will be injected using bundleRenderer\n })\n@@ -104,7 +104,7 @@ function clientHTML (ctx: WebpackConfigContext) {\n config.plugins.push(\n new HTMLPlugin({\n filename: '../server/index.spa.html',\n- template: options.appTemplatePath,\n+ template: options.documentPath,\n minify: options.build.html.minify as any,\n inject: true\n })\n", "diff --git a/ibis/backends/duckdb/__init__.py b/ibis/backends/duckdb/__init__.py\nindex 2006f59..bb2028e 100644\n--- a/ibis/backends/duckdb/__init__.py\n+++ b/ibis/backends/duckdb/__init__.py\n@@ -1180,7 +1180,7 @@ WHERE catalog_name = :database\"\"\"\n def _register_udfs(self, expr: ir.Expr) -> None:\n import ibis.expr.operations as ops\n \n- with self.begin() as con:\n+ with self.con.connect() as con:\n for udf_node in expr.op().find(ops.ScalarUDF):\n compile_func = getattr(\n self, f\"_compile_{udf_node.__input_type__.name.lower()}_udf\"\n", "diff --git a/transport/src/main/java/io/camunda/zeebe/transport/stream/impl/LogicalId.java b/transport/src/main/java/io/camunda/zeebe/transport/stream/impl/LogicalId.java\nindex 14c6f30..ebaef60 100644\n--- a/transport/src/main/java/io/camunda/zeebe/transport/stream/impl/LogicalId.java\n+++ b/transport/src/main/java/io/camunda/zeebe/transport/stream/impl/LogicalId.java\n@@ -8,7 +8,6 @@\n package io.camunda.zeebe.transport.stream.impl;\n \n import io.camunda.zeebe.util.buffer.BufferUtil;\n-import org.agrona.BitUtil;\n import org.agrona.concurrent.UnsafeBuffer;\n \n /**\n"]
| 3 |
["09476134eeeb12c025618919ab9a795a680a9b30", "6889543bec720e7e7da66535e1012cb66edfe081", "84529bcb10c6fe02e2c0079d069ab6c6ac7683d6"]
|
["feat", "fix", "refactor"]
|
Publish crates,remove unnecessary lines from verify-wal test,lint source on ci
|
["diff --git a/CHANGELOG.md b/CHANGELOG.md\nindex 7b98b44..f17ad6f 100644\n--- a/CHANGELOG.md\n+++ b/CHANGELOG.md\n@@ -7,6 +7,9 @@\n \n - **(css/parser)** Fix parsing of at rules (#3328) ([506a310](https://github.com/swc-project/swc/commit/506a31078aaebf50129658f096bbd5929995205f))\n \n+\n+- **(es/compat)** Fix regression of `destructuring` (#3326) ([6d1ad36](https://github.com/swc-project/swc/commit/6d1ad368aca53ee64a63ae565cd015909f2f4458))\n+\n ### Performance\n \n \ndiff --git a/Cargo.lock b/Cargo.lock\nindex 3c6598b..4baa252 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -2652,7 +2652,7 @@ dependencies = [\n \n [[package]]\n name = \"swc\"\n-version = \"0.116.15\"\n+version = \"0.116.16\"\n dependencies = [\n \"ahash\",\n \"anyhow\",\n@@ -3097,7 +3097,7 @@ dependencies = [\n \n [[package]]\n name = \"swc_ecma_transforms\"\n-version = \"0.113.3\"\n+version = \"0.113.4\"\n dependencies = [\n \"pretty_assertions 0.7.2\",\n \"sourcemap\",\n@@ -3157,7 +3157,7 @@ dependencies = [\n \n [[package]]\n name = \"swc_ecma_transforms_compat\"\n-version = \"0.68.2\"\n+version = \"0.68.3\"\n dependencies = [\n \"ahash\",\n \"arrayvec 0.7.2\",\n@@ -3366,7 +3366,7 @@ dependencies = [\n \n [[package]]\n name = \"swc_ecmascript\"\n-version = \"0.110.14\"\n+version = \"0.110.15\"\n dependencies = [\n \"swc_ecma_ast\",\n \"swc_ecma_codegen\",\ndiff --git a/crates/swc/Cargo.toml b/crates/swc/Cargo.toml\nindex 756cfc8..2f02d22 100644\n--- a/crates/swc/Cargo.toml\n+++ b/crates/swc/Cargo.toml\n@@ -9,7 +9,7 @@ include = [\"Cargo.toml\", \"src/**/*.rs\"]\n license = \"Apache-2.0\"\n name = \"swc\"\n repository = \"https://github.com/swc-project/swc.git\"\n-version = \"0.116.15\"\n+version = \"0.116.16\"\n \n [lib]\n name = \"swc\"\n@@ -55,7 +55,7 @@ swc_ecma_loader = {version = \"0.27.0\", path = \"../swc_ecma_loader\", features = [\n swc_ecma_minifier = {version = \"0.70.9\", path = \"../swc_ecma_minifier\"}\n swc_ecma_parser = {version = \"0.87.0\", path = \"../swc_ecma_parser\"}\n swc_ecma_preset_env = {version = \"0.86.1\", path = \"../swc_ecma_preset_env\"}\n-swc_ecma_transforms = {version = \"0.113.3\", path = \"../swc_ecma_transforms\", features = [\n+swc_ecma_transforms = {version = \"0.113.4\", path = \"../swc_ecma_transforms\", features = [\n \"compat\",\n \"module\",\n \"optimization\",\n@@ -64,11 +64,11 @@ swc_ecma_transforms = {version = \"0.113.3\", path = \"../swc_ecma_transforms\", fea\n \"typescript\",\n ]}\n swc_ecma_transforms_base = {version = \"0.57.1\", path = \"../swc_ecma_transforms_base\"}\n-swc_ecma_transforms_compat = {version = \"0.68.2\", path = \"../swc_ecma_transforms_compat\"}\n+swc_ecma_transforms_compat = {version = \"0.68.3\", path = \"../swc_ecma_transforms_compat\"}\n swc_ecma_transforms_optimization = {version = \"0.83.0\", path = \"../swc_ecma_transforms_optimization\"}\n swc_ecma_utils = {version = \"0.64.0\", path = \"../swc_ecma_utils\"}\n swc_ecma_visit = {version = \"0.51.1\", path = \"../swc_ecma_visit\"}\n-swc_ecmascript = {version = \"0.110.14\", path = \"../swc_ecmascript\"}\n+swc_ecmascript = {version = \"0.110.15\", path = \"../swc_ecmascript\"}\n swc_node_comments = {version = \"0.4.0\", path = \"../swc_node_comments\"}\n swc_plugin_runner = {version = \"0.30.0\", path = \"../swc_plugin_runner\", optional = true}\n swc_visit = {version = \"0.3.0\", path = \"../swc_visit\"}\ndiff --git a/crates/swc_ecma_transforms/Cargo.toml b/crates/swc_ecma_transforms/Cargo.toml\nindex 1604f4e..a0aafae 100644\n--- a/crates/swc_ecma_transforms/Cargo.toml\n+++ b/crates/swc_ecma_transforms/Cargo.toml\n@@ -6,7 +6,7 @@ edition = \"2021\"\n license = \"Apache-2.0\"\n name = \"swc_ecma_transforms\"\n repository = \"https://github.com/swc-project/swc.git\"\n-version = \"0.113.3\"\n+version = \"0.113.4\"\n \n [package.metadata.docs.rs]\n all-features = true\n@@ -28,7 +28,7 @@ swc_common = {version = \"0.17.0\", path = \"../swc_common\"}\n swc_ecma_ast = {version = \"0.65.0\", path = \"../swc_ecma_ast\"}\n swc_ecma_parser = {version = \"0.87.0\", path = \"../swc_ecma_parser\"}\n swc_ecma_transforms_base = {version = \"0.57.1\", path = \"../swc_ecma_transforms_base\"}\n-swc_ecma_transforms_compat = {version = \"0.68.2\", path = \"../swc_ecma_transforms_compat\", optional = true}\n+swc_ecma_transforms_compat = {version = \"0.68.3\", path = \"../swc_ecma_transforms_compat\", optional = true}\n swc_ecma_transforms_module = {version = \"0.74.0\", path = \"../swc_ecma_transforms_module\", optional = true}\n swc_ecma_transforms_optimization = {version = \"0.83.0\", path = \"../swc_ecma_transforms_optimization\", optional = true}\n swc_ecma_transforms_proposal = {version = \"0.74.0\", path = \"../swc_ecma_transforms_proposal\", optional = true}\ndiff --git a/crates/swc_ecma_transforms_compat/Cargo.toml b/crates/swc_ecma_transforms_compat/Cargo.toml\nindex 0ea6609..58374e3 100644\n--- a/crates/swc_ecma_transforms_compat/Cargo.toml\n+++ b/crates/swc_ecma_transforms_compat/Cargo.toml\n@@ -6,7 +6,7 @@ edition = \"2021\"\n license = \"Apache-2.0\"\n name = \"swc_ecma_transforms_compat\"\n repository = \"https://github.com/swc-project/swc.git\"\n-version = \"0.68.2\"\n+version = \"0.68.3\"\n # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html\n \n [features]\ndiff --git a/crates/swc_ecmascript/Cargo.toml b/crates/swc_ecmascript/Cargo.toml\nindex 63680a0..775208a 100644\n--- a/crates/swc_ecmascript/Cargo.toml\n+++ b/crates/swc_ecmascript/Cargo.toml\n@@ -6,7 +6,7 @@ edition = \"2021\"\n license = \"Apache-2.0\"\n name = \"swc_ecmascript\"\n repository = \"https://github.com/swc-project/swc.git\"\n-version = \"0.110.14\"\n+version = \"0.110.15\"\n \n [package.metadata.docs.rs]\n all-features = true\n@@ -39,7 +39,7 @@ swc_ecma_dep_graph = {version = \"0.58.0\", path = \"../swc_ecma_dep_graph\", option\n swc_ecma_minifier = {version = \"0.70.9\", path = \"../swc_ecma_minifier\", optional = true}\n swc_ecma_parser = {version = \"0.87.0\", path = \"../swc_ecma_parser\", optional = true, default-features = false}\n swc_ecma_preset_env = {version = \"0.86.1\", path = \"../swc_ecma_preset_env\", optional = true}\n-swc_ecma_transforms = {version = \"0.113.3\", path = \"../swc_ecma_transforms\", optional = true}\n+swc_ecma_transforms = {version = \"0.113.4\", path = \"../swc_ecma_transforms\", optional = true}\n swc_ecma_utils = {version = \"0.64.0\", path = \"../swc_ecma_utils\", optional = true}\n swc_ecma_visit = {version = \"0.51.1\", path = \"../swc_ecma_visit\", optional = true}\n \n", "diff --git a/storage/wal/verifier_test.go b/storage/wal/verifier_test.go\nindex 61e1536..a44755f 100644\n--- a/storage/wal/verifier_test.go\n+++ b/storage/wal/verifier_test.go\n@@ -138,22 +138,13 @@ func writeCorruptEntries(file *os.File, t *testing.T, n int) {\n \t\t}\n \t}\n \n-\n \t// Write some random bytes to the file to simulate corruption.\n \tif _, err := file.Write(corruption); err != nil {\n \t\tfatal(t, \"corrupt WAL segment\", err)\n \t}\n-\tcorrupt := []byte{1, 255, 0, 3, 45, 26, 110}\n-\n-\twrote, err := file.Write(corrupt)\n-\tif err != nil {\n-\t\tt.Fatal(err)\n-\t} else if wrote != len(corrupt) {\n-\t\tt.Fatal(\"Error writing corrupt data to file\")\n-\t}\n \n \tif err := file.Close(); err != nil {\n-\t\tt.Fatalf(\"Error: filed to close file: %v\\n\", err)\n+\t\tt.Fatalf(\"Error: failed to close file: %v\\n\", err)\n \t}\n }\n \n", "diff --git a/.travis.yml b/.travis.yml\nindex d56185e..96510cb 100644\n--- a/.travis.yml\n+++ b/.travis.yml\n@@ -2,5 +2,6 @@ language: node_js\n node_js:\n - 'stable'\n script:\n+ - yarn lint\n - yarn build\n - yarn test\n"]
| 3 |
["af53b9487f74ff28438928903fb1f2db93fe4fa8", "fba4326c72fc22d81aba6976a9fef1e4b6154fd9", "2ac99c0a66a1adc18ee4ef660608f814823dd198"]
|
["build", "refactor", "ci"]
|
convert to record,add classname and style props for Playground,getBorderSize() missing "width"
The correct property name to use is "borderWidth", not just "border".
"border" works in Chrome but was breaking in Firefox.
Also had to change .ui-grid-header's box-sizing to content-box so IE11
would include the border in height calcs. AND finally IE11 was returning
fractional heights so Grid parseInt()s the returned values.
|
["diff --git a/broker/src/test/java/io/camunda/zeebe/broker/exporter/stream/ExporterDirectorDistributionTest.java b/broker/src/test/java/io/camunda/zeebe/broker/exporter/stream/ExporterDirectorDistributionTest.java\nindex cc998c6..65c8550 100755\n--- a/broker/src/test/java/io/camunda/zeebe/broker/exporter/stream/ExporterDirectorDistributionTest.java\n+++ b/broker/src/test/java/io/camunda/zeebe/broker/exporter/stream/ExporterDirectorDistributionTest.java\n@@ -167,13 +167,8 @@ public final class ExporterDirectorDistributionTest {\n * <p>This makes sure that even if we miss one export position event, we distribute the event\n * later again, which makes tests less flaky.\n */\n- private static final class ClockShifter implements ConditionEvaluationListener<Void> {\n-\n- private final ControlledActorClock clock;\n-\n- public ClockShifter(final ControlledActorClock clock) {\n- this.clock = clock;\n- }\n+ private record ClockShifter(ControlledActorClock clock)\n+ implements ConditionEvaluationListener<Void> {\n \n @Override\n public void conditionEvaluated(final EvaluatedCondition<Void> condition) {\n", "diff --git a/packages/docz-theme-default/src/components/ui/Render.tsx b/packages/docz-theme-default/src/components/ui/Render.tsx\nindex 197359b..943f9ab 100644\n--- a/packages/docz-theme-default/src/components/ui/Render.tsx\n+++ b/packages/docz-theme-default/src/components/ui/Render.tsx\n@@ -24,9 +24,16 @@ const Code = styled('div')`\n }\n `\n \n-export const Render: RenderComponent = ({ component, code }) => (\n+export const Render: RenderComponent = ({\n+ component,\n+ code,\n+ className,\n+ style,\n+}) => (\n <Fragment>\n- <Playground>{component}</Playground>\n+ <Playground className={className} style={style}>\n+ {component}\n+ </Playground>\n <Code>{code}</Code>\n </Fragment>\n )\ndiff --git a/packages/docz/src/components/DocPreview.tsx b/packages/docz/src/components/DocPreview.tsx\nindex ca2d88f..ee8f7c0 100644\n--- a/packages/docz/src/components/DocPreview.tsx\n+++ b/packages/docz/src/components/DocPreview.tsx\n@@ -16,6 +16,8 @@ const DefaultLoading: SFC = () => null\n export type RenderComponent = ComponentType<{\n component: JSX.Element\n code: any\n+ className?: string\n+ style?: any\n }>\n \n export const DefaultRender: RenderComponent = ({ component, code }) => (\ndiff --git a/packages/docz/src/components/Playground.tsx b/packages/docz/src/components/Playground.tsx\nindex d6ff5a3..418c82e 100644\n--- a/packages/docz/src/components/Playground.tsx\n+++ b/packages/docz/src/components/Playground.tsx\n@@ -9,15 +9,21 @@ export interface PlaygroundProps {\n __code: (components: ComponentsMap) => any\n children: any\n components: ComponentsMap\n+ className?: string\n+ style?: any\n }\n \n const BasePlayground: SFC<PlaygroundProps> = ({\n components,\n children,\n __code,\n+ className,\n+ style,\n }) => {\n return components && components.render ? (\n <components.render\n+ className={className}\n+ style={style}\n component={isFn(children) ? children() : children}\n code={__code(components)}\n />\n", "diff --git a/src/js/core/factories/Grid.js b/src/js/core/factories/Grid.js\nindex dcf10af..2be7842 100644\n--- a/src/js/core/factories/Grid.js\n+++ b/src/js/core/factories/Grid.js\n@@ -1525,7 +1525,7 @@ angular.module('ui.grid')\n var oldHeaderHeight = container.headerHeight;\n var headerHeight = gridUtil.outerElementHeight(container.header);\n \n- container.headerHeight = headerHeight;\n+ container.headerHeight = parseInt(headerHeight, 10);\n \n if (oldHeaderHeight !== headerHeight) {\n rebuildStyles = true;\n@@ -1534,7 +1534,9 @@ angular.module('ui.grid')\n // Get the \"inner\" header height, that is the height minus the top and bottom borders, if present. We'll use it to make sure all the headers have a consistent height\n var topBorder = gridUtil.getBorderSize(container.header, 'top');\n var bottomBorder = gridUtil.getBorderSize(container.header, 'bottom');\n- var innerHeaderHeight = headerHeight - topBorder - bottomBorder;\n+ var innerHeaderHeight = parseInt(headerHeight - topBorder - bottomBorder, 10);\n+\n+ innerHeaderHeight = innerHeaderHeight < 0 ? 0 : innerHeaderHeight;\n \n container.innerHeaderHeight = innerHeaderHeight;\n \ndiff --git a/src/js/core/services/ui-grid-util.js b/src/js/core/services/ui-grid-util.js\nindex 2c32cbe..cc7c36c 100644\n--- a/src/js/core/services/ui-grid-util.js\n+++ b/src/js/core/services/ui-grid-util.js\n@@ -757,6 +757,8 @@ module.service('gridUtil', ['$log', '$window', '$document', '$http', '$templateC\n borderType = 'border';\n }\n \n+ borderType += 'Width';\n+\n var val = parseInt(styles[borderType], 10);\n \n if (isNaN(val)) {\ndiff --git a/src/less/header.less b/src/less/header.less\nindex 5468a43..de8ff0b 100644\n--- a/src/less/header.less\n+++ b/src/less/header.less\n@@ -7,6 +7,7 @@\n \n .ui-grid-header {\n border-bottom: 1px solid @borderColor;\n+ box-sizing: content-box;;\n }\n \n .ui-grid-top-panel {\n"]
| 3 |
["3346331a963766c8193170fb130adad2e658ada2", "1b64ed30a2e3c41abf3976efee4c7463044b2ef1", "174f25214caa10ec643db6c81aaa0f3511bf78f4"]
|
["refactor", "feat", "fix"]
|
do not check mkdocs for older versions used in deployments,path correction
Signed-off-by: Pranav C <[email protected]>,add documentation to use react-native-paper with CRA (#874)
|
["diff --git a/.github/workflows/ibis-docs-lint.yml b/.github/workflows/ibis-docs-lint.yml\nindex 57d94a4..04de03b 100644\n--- a/.github/workflows/ibis-docs-lint.yml\n+++ b/.github/workflows/ibis-docs-lint.yml\n@@ -206,7 +206,7 @@ jobs:\n - name: build and push dev docs\n run: |\n nix develop --ignore-environment -c \\\n- mkdocs gh-deploy --message 'docs: ibis@${{ github.sha }}'\n+ mkdocs gh-deploy --message 'docs: ibis@${{ github.sha }}' --ignore-version\n \n simulate_release:\n runs-on: ubuntu-latest\n", "diff --git a/packages/nocodb-nest/src/modules/test/TestResetService/resetMetaSakilaSqliteProject.ts b/packages/nocodb-nest/src/modules/test/TestResetService/resetMetaSakilaSqliteProject.ts\nindex 3afce9b..8425b00 100644\n--- a/packages/nocodb-nest/src/modules/test/TestResetService/resetMetaSakilaSqliteProject.ts\n+++ b/packages/nocodb-nest/src/modules/test/TestResetService/resetMetaSakilaSqliteProject.ts\n@@ -1,11 +1,9 @@\n import { promises as fs } from 'fs';\n import axios from 'axios';\n+import path from 'path'\n \n const sqliteFilePath = (parallelId: string) => {\n- const rootDir = __dirname.replace(\n- '/src/modules/test/TestResetService',\n- '',\n- );\n+ const rootDir = process.cwd()\n \n return `${rootDir}/test_sakila_${parallelId}.db`;\n };\n@@ -78,10 +76,10 @@ const deleteSqliteFileIfExists = async (parallelId: string) => {\n };\n \n const seedSakilaSqliteFile = async (parallelId: string) => {\n- const testsDir = __dirname.replace(\n- '/src/modules/test/TestResetService',\n- '/tests',\n- );\n+ const testsDir = path.join(\n+ process.cwd(),\n+ 'tests'\n+ );;\n \n await fs.copyFile(\n `${testsDir}/sqlite-sakila-db/sakila.db`,\ndiff --git a/packages/nocodb-nest/src/modules/test/TestResetService/resetMysqlSakilaProject.ts b/packages/nocodb-nest/src/modules/test/TestResetService/resetMysqlSakilaProject.ts\nindex 6bcd3f1..e4ed112 100644\n--- a/packages/nocodb-nest/src/modules/test/TestResetService/resetMysqlSakilaProject.ts\n+++ b/packages/nocodb-nest/src/modules/test/TestResetService/resetMysqlSakilaProject.ts\n@@ -1,4 +1,5 @@\n import { promises as fs } from 'fs';\n+import path from 'path';\n import axios from 'axios';\n import { knex } from 'knex';\n import Audit from '../../../models/Audit';\n@@ -85,10 +86,7 @@ const resetSakilaMysql = async (\n parallelId: string,\n isEmptyProject: boolean,\n ) => {\n- const testsDir = __dirname.replace(\n- '/src/modules/test/TestResetService',\n- '/tests',\n- );\n+ const testsDir = path.join(process.cwd(), '/tests');\n \n try {\n await knex.raw(`DROP DATABASE test_sakila_${parallelId}`);\ndiff --git a/packages/nocodb-nest/src/modules/test/TestResetService/resetPgSakilaProject.ts b/packages/nocodb-nest/src/modules/test/TestResetService/resetPgSakilaProject.ts\nindex 1a042c3..73923ef 100644\n--- a/packages/nocodb-nest/src/modules/test/TestResetService/resetPgSakilaProject.ts\n+++ b/packages/nocodb-nest/src/modules/test/TestResetService/resetPgSakilaProject.ts\n@@ -1,6 +1,7 @@\n import { promises as fs } from 'fs';\n import axios from 'axios';\n import { knex } from 'knex';\n+import path from 'path'\n import Audit from '../../../models/Audit';\n import type Project from '../../../models/Project';\n \n@@ -78,8 +79,8 @@ const isSakilaPgToBeReset = async (parallelId: string, project?: Project) => {\n };\n \n const resetSakilaPg = async (parallelId: string, isEmptyProject: boolean) => {\n- const testsDir = __dirname.replace(\n- '/src/modules/test/TestResetService',\n+ const testsDir = path.join(\n+ process.cwd(),\n '/tests',\n );\n \n", "diff --git a/docs/pages/4.react-native-web.md b/docs/pages/4.react-native-web.md\nindex 69e4e52..8d6ae2a 100644\n--- a/docs/pages/4.react-native-web.md\n+++ b/docs/pages/4.react-native-web.md\n@@ -16,6 +16,63 @@ To install `react-native-web`, run:\n yarn add react-native-web react-dom react-art\n ```\n \n+### Using CRA ([Create React App](https://github.com/facebook/create-react-app))\n+\n+Install [`react-app-rewired`](https://github.com/timarney/react-app-rewired) to override `webpack` configuration:\n+\n+```sh\n+yarn add --dev react-app-rewired\n+```\n+\n+[Configure `babel-loader`](#2-configure-babel-loader) using a new file called `config-overrides.js`:\n+\n+```js\n+module.exports = function override(config, env) {\n+ config.module.rules.push({\n+ test: /\\.js$/,\n+ exclude: /node_modules[/\\\\](?!react-native-paper|react-native-vector-icons|react-native-safe-area-view)/,\n+ use: {\n+ loader: \"babel-loader\",\n+ options: {\n+ // Disable reading babel configuration\n+ babelrc: false,\n+ configFile: false,\n+\n+ // The configration for compilation\n+ presets: [\n+ [\"@babel/preset-env\", { useBuiltIns: \"usage\" }],\n+ \"@babel/preset-react\",\n+ \"@babel/preset-flow\"\n+ ],\n+ plugins: [\n+ \"@babel/plugin-proposal-class-properties\",\n+ \"@babel/plugin-proposal-object-rest-spread\"\n+ ]\n+ }\n+ }\n+ });\n+\n+ return config;\n+};\n+```\n+\n+Change your script in `package.json`:\n+\n+```diff\n+/* package.json */\n+\n+ \"scripts\": {\n+- \"start\": \"react-scripts start\",\n++ \"start\": \"react-app-rewired start\",\n+- \"build\": \"react-scripts build\",\n++ \"build\": \"react-app-rewired build\",\n+- \"test\": \"react-scripts test --env=jsdom\",\n++ \"test\": \"react-app-rewired test --env=jsdom\"\n+}\n+```\n+\n+### Custom webpack setup\n+\n To install `webpack`, run:\n \n ```sh\n"]
| 3 |
["21228c55b7045d9b2225f65e6231184ff332b071", "974e033a3ca7484290a04201ee33856a25da0942", "ee7cc5d5a940fba774e715b1f029c6361110b108"]
|
["ci", "fix", "docs"]
|
init environ cache,bundle and tree shake assets with webpack,apply element migrated events
This is a very straightforward event applier. All it needs to do is
update the persisted data for the element instance using the data in the
event.
|
["diff --git a/src/environment.go b/src/environment.go\nindex ae5e26a..0c961c5 100644\n--- a/src/environment.go\n+++ b/src/environment.go\n@@ -229,6 +229,7 @@ func (env *environment) environ() map[string]string {\n \tif env.environCache != nil {\n \t\treturn env.environCache\n \t}\n+\tenv.environCache = make(map[string]string)\n \tconst separator = \"=\"\n \tvalues := os.Environ()\n \tfor value := range values {\n", "diff --git a/package.json b/package.json\nindex c8051d2..b0a97fb 100644\n--- a/package.json\n+++ b/package.json\n@@ -60,6 +60,7 @@\n \"babel-cli\": \"^6.16.0\",\n \"babel-core\": \"^6.16.0\",\n \"babel-eslint\": \"^7.0.0\",\n+ \"babel-loader\": \"^6.2.5\",\n \"babel-plugin-transform-class-properties\": \"^6.10.2\",\n \"babel-plugin-transform-flow-strip-types\": \"^6.14.0\",\n \"babel-preset-es2015-node6\": \"^0.3.0\",\n@@ -82,6 +83,7 @@\n \"eslint-plugin-react\": \"^6.3.0\",\n \"flow-bin\": \"^0.33.0\",\n \"jsdom\": \"^9.4.2\",\n+ \"json-loader\": \"^0.5.4\",\n \"jsx-chai\": \"^4.0.0\",\n \"mocha\": \"^3.0.2\",\n \"mock-require\": \"^1.3.0\",\n@@ -91,6 +93,8 @@\n \"rimraf\": \"^2.5.2\",\n \"sinon\": \"^1.17.6\",\n \"sinon-chai\": \"^2.8.0\",\n- \"watch\": \"^1.0.0\"\n+ \"source-map-support\": \"^0.4.3\",\n+ \"watch\": \"^1.0.0\",\n+ \"webpack\": \"^1.13.2\"\n }\n }\ndiff --git a/webpack.config.js b/webpack.config.js\nnew file mode 100644\nindex 0000000..0ca6da1\n--- /dev/null\n+++ b/webpack.config.js\n@@ -0,0 +1,44 @@\n+const webpack = require('webpack');\n+const path = require('path');\n+const fs = require('fs');\n+\n+const nodeModules = {\n+ zmq: 'commonjs zmq',\n+ jmp: 'commonjs jmp',\n+ github: 'commonjs github',\n+};\n+\n+module.exports = {\n+ entry: './src/notebook/index.js',\n+ target: 'electron-renderer',\n+ output: {\n+ path: path.join(__dirname, 'app', 'build'),\n+ filename: 'webpacked-notebook.js'\n+ },\n+ module: {\n+ loaders: [\n+ { test: /\\.js$/, exclude: /node_modules/, loaders: ['babel'] },\n+ { test: /\\.json$/, loader: 'json-loader' },\n+ ]\n+ },\n+ resolve: {\n+ extensions: ['', '.js', '.jsx'],\n+ root: path.join(__dirname, 'app'),\n+ // Webpack 1\n+ modulesDirectories: [\n+ path.resolve(__dirname, 'app', 'node_modules'),\n+ path.resolve(__dirname, 'node_modules'),\n+ ],\n+ // Webpack 2\n+ modules: [\n+ path.resolve(__dirname, 'app', 'node_modules'),\n+ ],\n+ },\n+ externals: nodeModules,\n+ plugins: [\n+ new webpack.IgnorePlugin(/\\.(css|less)$/),\n+ new webpack.BannerPlugin('require(\"source-map-support\").install();',\n+ { raw: true, entryOnly: false })\n+ ],\n+ devtool: 'sourcemap'\n+};\n", "diff --git a/engine/src/main/java/io/camunda/zeebe/engine/state/appliers/EventAppliers.java b/engine/src/main/java/io/camunda/zeebe/engine/state/appliers/EventAppliers.java\nindex da05e13..9231df3 100644\n--- a/engine/src/main/java/io/camunda/zeebe/engine/state/appliers/EventAppliers.java\n+++ b/engine/src/main/java/io/camunda/zeebe/engine/state/appliers/EventAppliers.java\n@@ -154,6 +154,9 @@ public final class EventAppliers implements EventApplier {\n register(\n ProcessInstanceIntent.SEQUENCE_FLOW_TAKEN,\n new ProcessInstanceSequenceFlowTakenApplier(elementInstanceState, processState));\n+ register(\n+ ProcessInstanceIntent.ELEMENT_MIGRATED,\n+ new ProcessInstanceElementMigratedApplier(elementInstanceState));\n }\n \n private void registerProcessInstanceCreationAppliers(final MutableProcessingState state) {\ndiff --git a/engine/src/main/java/io/camunda/zeebe/engine/state/appliers/ProcessInstanceElementMigratedApplier.java b/engine/src/main/java/io/camunda/zeebe/engine/state/appliers/ProcessInstanceElementMigratedApplier.java\nindex e5a0f3a..d38358f 100644\n--- a/engine/src/main/java/io/camunda/zeebe/engine/state/appliers/ProcessInstanceElementMigratedApplier.java\n+++ b/engine/src/main/java/io/camunda/zeebe/engine/state/appliers/ProcessInstanceElementMigratedApplier.java\n@@ -24,5 +24,16 @@ final class ProcessInstanceElementMigratedApplier\n }\n \n @Override\n- public void applyState(final long elementInstanceKey, final ProcessInstanceRecord value) {}\n+ public void applyState(final long elementInstanceKey, final ProcessInstanceRecord value) {\n+ elementInstanceState.updateInstance(\n+ elementInstanceKey,\n+ elementInstance ->\n+ elementInstance\n+ .getValue()\n+ .setProcessDefinitionKey(value.getProcessDefinitionKey())\n+ .setBpmnProcessId(value.getBpmnProcessId())\n+ .setVersion(value.getVersion())\n+ .setElementId(value.getElementId())\n+ .setFlowScopeKey(value.getFlowScopeKey()));\n+ }\n }\n"]
| 3 |
["dc50bd35462a49058c91a939fc8830ae7a9eb692", "4ab28fc2e63e975a0c77e18ae644f34fa5f8771a", "39d5d1cfe8d2210305df2c8fab4a4ae430732cf7"]
|
["fix", "build", "feat"]
|
new ShowDebug parameter
calculate each segment timing
new parameter to show/hide segment debug information
set-poshprompt updated with the new showDebug parameter
Force disabled segment to be visible for debug purpose,add react ecosystem,remove broken link
Fixes #1785
|
["diff --git a/engine.go b/engine.go\nindex 6cc1ff3..4617ceb 100644\n--- a/engine.go\n+++ b/engine.go\n@@ -67,6 +67,9 @@ func (e *engine) renderText(text string) {\n \tprefix := e.activeSegment.getValue(Prefix, \" \")\n \tpostfix := e.activeSegment.getValue(Postfix, \" \")\n \te.renderer.write(e.activeSegment.Background, e.activeSegment.Foreground, fmt.Sprintf(\"%s%s%s\", prefix, text, postfix))\n+\tif *e.env.getArgs().Debug {\n+\t\te.renderer.write(e.activeSegment.Background, e.activeSegment.Foreground, fmt.Sprintf(\"(%s:%s)\", e.activeSegment.Type, e.activeSegment.timing))\n+\t}\n }\n \n func (e *engine) renderSegmentText(text string) {\n@@ -107,13 +110,11 @@ func (e *engine) setStringValues(segments []*Segment) {\n \twg.Add(len(segments))\n \tdefer wg.Wait()\n \tcwd := e.env.getcwd()\n+\tdebug := *e.env.getArgs().Debug\n \tfor _, segment := range segments {\n \t\tgo func(s *Segment) {\n \t\t\tdefer wg.Done()\n-\t\t\terr := s.mapSegmentWithWriter(e.env)\n-\t\t\tif err == nil && !s.hasValue(IgnoreFolders, cwd) && s.enabled() {\n-\t\t\t\ts.stringValue = s.string()\n-\t\t\t}\n+\t\t\ts.setStringValue(e.env, cwd, debug)\n \t\t}(segment)\n \t}\n }\ndiff --git a/main.go b/main.go\nindex 56ae8a5..d67a640 100644\n--- a/main.go\n+++ b/main.go\n@@ -14,6 +14,7 @@ type args struct {\n \tConfig *string\n \tShell *string\n \tPWD *string\n+\tDebug *bool\n }\n \n func main() {\n@@ -42,6 +43,10 @@ func main() {\n \t\t\t\"pwd\",\n \t\t\t\"\",\n \t\t\t\"the path you are working in\"),\n+\t\tDebug: flag.Bool(\n+\t\t\t\"debug\",\n+\t\t\tfalse,\n+\t\t\t\"Print debug information\"),\n \t}\n \tflag.Parse()\n \tenv := &environment{\ndiff --git a/packages/powershell/oh-my-posh/oh-my-posh.psm1 b/packages/powershell/oh-my-posh/oh-my-posh.psm1\nindex 9234fc6..1450eb3 100644\n--- a/packages/powershell/oh-my-posh/oh-my-posh.psm1\n+++ b/packages/powershell/oh-my-posh/oh-my-posh.psm1\n@@ -5,6 +5,7 @@\n \n $global:PoshSettings = New-Object -TypeName PSObject -Property @{\n Theme = \"$PSScriptRoot\\themes\\jandedobbeleer.json\";\n+ ShowDebug = $false\n }\n \n function Get-PoshCommand {\n@@ -36,9 +37,14 @@ function Set-PoshPrompt {\n param(\n [Parameter(Mandatory = $false)]\n [string]\n- $Theme\n+ $Theme,\n+ [Parameter(Mandatory = $false)]\n+ [bool]\n+ $ShowDebug = $false\n )\n \n+ $global:PoshSettings.ShowDebug = $ShowDebug\n+\n if (Test-Path \"$PSScriptRoot/themes/$Theme.json\") {\n $global:PoshSettings.Theme = \"$PSScriptRoot/themes/$Theme.json\"\n }\n@@ -68,8 +74,9 @@ function Set-PoshPrompt {\n $startInfo = New-Object System.Diagnostics.ProcessStartInfo\n $startInfo.FileName = Get-PoshCommand\n $config = $global:PoshSettings.Theme\n+ $showDebug = $global:PoshSettings.ShowDebug\n $cleanPWD = $PWD.ProviderPath.TrimEnd(\"\\\")\n- $startInfo.Arguments = \"-config=\"\"$config\"\" -error=$errorCode -pwd=\"\"$cleanPWD\"\"\"\n+ $startInfo.Arguments = \"-debug=\"\"$showDebug\"\" -config=\"\"$config\"\" -error=$errorCode -pwd=\"\"$cleanPWD\"\"\"\n $startInfo.Environment[\"TERM\"] = \"xterm-256color\"\n $startInfo.CreateNoWindow = $true\n $startInfo.StandardOutputEncoding = [System.Text.Encoding]::UTF8\ndiff --git a/segment.go b/segment.go\nindex 27dd416..4015dac 100644\n--- a/segment.go\n+++ b/segment.go\n@@ -1,6 +1,9 @@\n package main\n \n-import \"errors\"\n+import (\n+\t\"errors\"\n+\t\"time\"\n+)\n \n // Segment represent a single segment and it's configuration\n type Segment struct {\n@@ -17,6 +20,7 @@ type Segment struct {\n \twriter SegmentWriter\n \tstringValue string\n \tactive bool\n+\ttiming time.Duration\n }\n \n // SegmentWriter is the interface used to define what and if to write to the prompt\n@@ -149,3 +153,26 @@ func (segment *Segment) mapSegmentWithWriter(env environmentInfo) error {\n \t}\n \treturn errors.New(\"unable to map writer\")\n }\n+\n+func (segment *Segment) setStringValue(env environmentInfo, cwd string, debug bool) {\n+\terr := segment.mapSegmentWithWriter(env)\n+\tif err != nil || segment.hasValue(IgnoreFolders, cwd) {\n+\t\treturn\n+\t}\n+\t// add timing only in debug\n+\tif debug {\n+\t\tstart := time.Now()\n+\t\tdefer (func() {\n+\t\t\t// force segment rendering to display the time it took\n+\t\t\t// to check if the segment is enabled or not\n+\t\t\t// depending on the segement, calling enabled()\n+\t\t\t// can be time consuming\n+\t\t\tsegment.active = true\n+\t\t\telapsed := time.Since(start)\n+\t\t\tsegment.timing = elapsed\n+\t\t})()\n+\t}\n+\tif segment.enabled() {\n+\t\tsegment.stringValue = segment.string()\n+\t}\n+}\n", "diff --git a/package.json b/package.json\nindex 1ba8c4f..d1de9a0 100644\n--- a/package.json\n+++ b/package.json\n@@ -36,14 +36,19 @@\n \"@types/node\": \"^9.3.0\",\n \"@types/react\": \"^16.0.34\",\n \"@types/react-dom\": \"^16.0.3\",\n+ \"@types/react-motion\": \"^0.0.25\",\n \"bootstrap-sass\": \"^3.3.7\",\n \"highcharts\": \"^6.0.4\",\n \"html2canvas\": \"^1.0.0-alpha.9\",\n+ \"immer\": \"^1.2.1\",\n \"lodash\": \"^4.17.4\",\n \"moment\": \"^2.20.1\",\n \"normalize.css\": \"^8.0.0\",\n- \"react\": \"^16.2.0\",\n- \"react-dom\": \"^16.2.0\",\n+ \"react\": \"^16.3.1\",\n+ \"react-dom\": \"^16.3.1\",\n+ \"react-motion\": \"^0.5.2\",\n+ \"react-redux\": \"^5.0.7\",\n+ \"redux\": \"^3.7.2\",\n \"rxjs\": \"^5.5.6\",\n \"vue\": \"^2.5.13\",\n \"vue-plugin-webextension-i18n\": \"^0.1.0\",\ndiff --git a/yarn.lock b/yarn.lock\nindex c8898d8..5d0fc9f 100644\n--- a/yarn.lock\n+++ b/yarn.lock\n@@ -187,6 +187,12 @@\n \"@types/node\" \"*\"\n \"@types/react\" \"*\"\n \n+\"@types/react-motion@^0.0.25\":\n+ version \"0.0.25\"\n+ resolved \"https://registry.npmjs.org/@types/react-motion/-/react-motion-0.0.25.tgz#2445745ee8e8e6149faa47a36ff6b0d4c21dbf94\"\n+ dependencies:\n+ \"@types/react\" \"*\"\n+\n \"@types/react@*\", \"@types/react@^16.0.34\":\n version \"16.0.40\"\n resolved \"https://registry.npmjs.org/@types/react/-/react-16.0.40.tgz#caabc2296886f40b67f6fc80f0f3464476461df9\"\n@@ -3837,6 +3843,10 @@ [email protected]:\n version \"4.2.1\"\n resolved \"https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb\"\n \n+hoist-non-react-statics@^2.5.0:\n+ version \"2.5.0\"\n+ resolved \"https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40\"\n+\n home-or-tmp@^2.0.0:\n version \"2.0.0\"\n resolved \"https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8\"\n@@ -4004,6 +4014,10 @@ ignore@^3.3.5:\n version \"3.3.7\"\n resolved \"https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021\"\n \n+immer@^1.2.1:\n+ version \"1.2.1\"\n+ resolved \"https://registry.npmjs.org/immer/-/immer-1.2.1.tgz#96e2ae29cdfc428f28120b832701931b92fa597c\"\n+\n import-local@^1.0.0:\n version \"1.0.0\"\n resolved \"https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc\"\n@@ -4104,7 +4118,7 @@ interpret@^1.0.0:\n version \"1.1.0\"\n resolved \"https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614\"\n \n-invariant@^2.2.2:\n+invariant@^2.0.0, invariant@^2.2.2:\n version \"2.2.4\"\n resolved \"https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6\"\n dependencies:\n@@ -5040,6 +5054,10 @@ locate-path@^2.0.0:\n p-locate \"^2.0.0\"\n path-exists \"^3.0.0\"\n \n+lodash-es@^4.17.5, lodash-es@^4.2.1:\n+ version \"4.17.8\"\n+ resolved \"https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.8.tgz#6fa8c8c5d337481df0bdf1c0d899d42473121e45\"\n+\n lodash._reinterpolate@~3.0.0:\n version \"3.0.0\"\n resolved \"https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d\"\n@@ -5149,7 +5167,7 @@ [email protected]:\n version \"4.17.2\"\n resolved \"https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42\"\n \[email protected], lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.16.3, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.4:\[email protected], lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.16.3, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.4:\n version \"4.17.5\"\n resolved \"https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511\"\n \n@@ -6467,7 +6485,7 @@ promise@^7.1.1:\n dependencies:\n asap \"~2.0.3\"\n \n-prop-types@^15.6.0:\n+prop-types@^15.5.8, prop-types@^15.6.0:\n version \"15.6.1\"\n resolved \"https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca\"\n dependencies:\n@@ -6574,7 +6592,7 @@ quick-lru@^1.0.0:\n version \"1.1.0\"\n resolved \"https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8\"\n \[email protected]:\[email protected], raf@^3.1.0:\n version \"3.4.0\"\n resolved \"https://registry.npmjs.org/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575\"\n dependencies:\n@@ -6645,9 +6663,9 @@ react-dev-utils@^5.0.0:\n strip-ansi \"3.0.1\"\n text-table \"0.2.0\"\n \n-react-dom@^16.2.0:\n- version \"16.2.0\"\n- resolved \"https://registry.npmjs.org/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044\"\n+react-dom@^16.3.1:\n+ version \"16.3.1\"\n+ resolved \"https://registry.npmjs.org/react-dom/-/react-dom-16.3.1.tgz#6a3c90a4fb62f915bdbcf6204422d93a7d4ca573\"\n dependencies:\n fbjs \"^0.8.16\"\n loose-envify \"^1.1.0\"\n@@ -6658,9 +6676,28 @@ react-error-overlay@^4.0.0:\n version \"4.0.0\"\n resolved \"https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-4.0.0.tgz#d198408a85b4070937a98667f500c832f86bd5d4\"\n \n-react@^16.2.0:\n- version \"16.2.0\"\n- resolved \"https://registry.npmjs.org/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba\"\n+react-motion@^0.5.2:\n+ version \"0.5.2\"\n+ resolved \"https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz#0dd3a69e411316567927917c6626551ba0607316\"\n+ dependencies:\n+ performance-now \"^0.2.0\"\n+ prop-types \"^15.5.8\"\n+ raf \"^3.1.0\"\n+\n+react-redux@^5.0.7:\n+ version \"5.0.7\"\n+ resolved \"https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8\"\n+ dependencies:\n+ hoist-non-react-statics \"^2.5.0\"\n+ invariant \"^2.0.0\"\n+ lodash \"^4.17.5\"\n+ lodash-es \"^4.17.5\"\n+ loose-envify \"^1.1.0\"\n+ prop-types \"^15.6.0\"\n+\n+react@^16.3.1:\n+ version \"16.3.1\"\n+ resolved \"https://registry.npmjs.org/react/-/react-16.3.1.tgz#4a2da433d471251c69b6033ada30e2ed1202cfd8\"\n dependencies:\n fbjs \"^0.8.16\"\n loose-envify \"^1.1.0\"\n@@ -6788,6 +6825,15 @@ reduce-function-call@^1.0.1:\n dependencies:\n balanced-match \"^0.4.2\"\n \n+redux@^3.7.2:\n+ version \"3.7.2\"\n+ resolved \"https://registry.npmjs.org/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b\"\n+ dependencies:\n+ lodash \"^4.2.1\"\n+ lodash-es \"^4.2.1\"\n+ loose-envify \"^1.1.0\"\n+ symbol-observable \"^1.0.3\"\n+\n regenerate@^1.2.1:\n version \"1.3.3\"\n resolved \"https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f\"\n@@ -7811,6 +7857,10 @@ [email protected]:\n version \"1.0.1\"\n resolved \"https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4\"\n \n+symbol-observable@^1.0.3:\n+ version \"1.2.0\"\n+ resolved \"https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804\"\n+\n symbol-tree@^3.2.2:\n version \"3.2.2\"\n resolved \"https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6\"\n", "diff --git a/docs/content/Caching/Caching.md b/docs/content/Caching/Caching.md\nindex d873a52..9706dda 100644\n--- a/docs/content/Caching/Caching.md\n+++ b/docs/content/Caching/Caching.md\n@@ -135,8 +135,9 @@ If nothing is found in the cache, the query is executed in the database and the \n is returned as well as updating the cache.\n \n If an existing value is present in the cache and the `refreshKey` value for\n-the query hasn't changed, the cached value will be returned. Otherwise, a\n-[query renewal](#in-memory-cache-force-query-renewal) will be performed.\n+the query hasn't changed, the cached value will be returned. Otherwise, a SQL query will be executed either against the pre-aggregations storage or the source database to populate the cache with the results and return them.\n+\n+\n \n ### Refresh Keys\n \n"]
| 3 |
["bea32587586ca08f390c901a95e9b9c25263f4df", "7e04a5e829d7416e312ac342a00a11787745753b", "c351088bce98594c740a39546ce3655c91554a5d"]
|
["feat", "build", "docs"]
|
fix error spacing,update basic test with colors,update dependencies
|
["diff --git a/cmd/infracost/main.go b/cmd/infracost/main.go\nindex 425aef1..fcc9eb5 100644\n--- a/cmd/infracost/main.go\n+++ b/cmd/infracost/main.go\n@@ -149,7 +149,7 @@ Example:\n \t\t\t}\n \n \t\t\tif appErr.Error() != \"\" {\n-\t\t\t\tfmt.Fprintf(os.Stderr, \"\\n%s\\n\", color.HiRedString(appErr.Error()))\n+\t\t\t\tfmt.Fprintf(os.Stderr, \"%s\\n\", color.HiRedString(appErr.Error()))\n \t\t\t}\n \t\t}\n \n", "diff --git a/core/src/components/label/test/basic/index.html b/core/src/components/label/test/basic/index.html\nindex d0b566c..377e58c 100644\n--- a/core/src/components/label/test/basic/index.html\n+++ b/core/src/components/label/test/basic/index.html\n@@ -19,12 +19,32 @@\n </ion-header>\n \n <ion-content>\n+ <div padding>\n+ <ion-label>Default</ion-label>\n+\n+ <ion-label color=\"secondary\">Secondary</ion-label>\n+\n+ <ion-label color=\"tertiary\">Tertiary</ion-label>\n+\n+ <ion-label color=\"danger\">Danger</ion-label>\n+\n+ <ion-label class=\"custom\">Custom</ion-label>\n+ </div>\n+\n <ion-list>\n <ion-item>\n <ion-label>Default</ion-label>\n <ion-input></ion-input>\n </ion-item>\n <ion-item>\n+ <ion-label color=\"tertiary\">Tertiary</ion-label>\n+ <ion-input></ion-input>\n+ </ion-item>\n+ <ion-item>\n+ <ion-label class=\"custom\">Custom</ion-label>\n+ <ion-input></ion-input>\n+ </ion-item>\n+ <ion-item>\n <ion-label text-wrap>Wrap label this label just goes on and on and on</ion-label>\n <ion-input></ion-input>\n </ion-item>\n@@ -42,6 +62,12 @@\n </ion-item>\n </ion-list>\n </ion-content>\n+\n+ <style>\n+ .custom {\n+ color: lightblue;\n+ }\n+ </style>\n </ion-app>\n </body>\n \n", "diff --git a/example/exp.json b/example/exp.json\nindex ea820f9..b838093 100644\n--- a/example/exp.json\n+++ b/example/exp.json\n@@ -1,8 +1,8 @@\n {\n- \"name\": \"react-native-paper-example\",\n+ \"name\": \"React Native Paper Example\",\n \"description\": \"Example for React Native Paper\",\n \"slug\": \"react-native-paper-example\",\n- \"sdkVersion\": \"10.0.0\",\n+ \"sdkVersion\": \"11.0.0\",\n \"version\": \"1.0.0\",\n \"orientation\": \"portrait\",\n \"primaryColor\": \"#cccccc\",\ndiff --git a/example/package.json b/example/package.json\nindex c4d049a..7e2baeb 100644\n--- a/example/package.json\n+++ b/example/package.json\n@@ -6,10 +6,10 @@\n \"private\": true,\n \"main\": \"main.js\",\n \"dependencies\": {\n- \"@exponent/ex-navigation\": \"^1.7.0\",\n- \"exponent\": \"^10.0.4\",\n+ \"@exponent/ex-navigation\": \"^2.0.0\",\n+ \"exponent\": \"^11.0.2\",\n \"react\": \"~15.3.2\",\n- \"react-native\": \"github:exponentjs/react-native#sdk-10.1.2\",\n+ \"react-native\": \"github:exponentjs/react-native#sdk-11.0.3\",\n \"react-native-paper\": \"file:../\",\n \"react-native-vector-icons\": \"git+https://github.com/exponentjs/react-native-vector-icons.git\"\n }\ndiff --git a/package.json b/package.json\nindex 65afbbc..326ab48 100644\n--- a/package.json\n+++ b/package.json\n@@ -27,17 +27,17 @@\n \"react-native-vector-icons\": \"*\"\n },\n \"devDependencies\": {\n- \"babel-eslint\": \"^7.0.0\",\n- \"eslint\": \"^3.8.1\",\n+ \"babel-eslint\": \"^7.1.0\",\n+ \"eslint\": \"^3.9.1\",\n \"eslint-plugin-babel\": \"^3.3.0\",\n- \"eslint-plugin-import\": \"^2.0.1\",\n- \"eslint-plugin-react\": \"^6.4.1\",\n+ \"eslint-plugin-import\": \"^2.2.0\",\n+ \"eslint-plugin-react\": \"^6.6.0\",\n \"eslint-plugin-react-native\": \"^2.0.0\",\n \"flow-bin\": \"^0.32.0\",\n \"react\": \"latest\",\n \"react-native\": \"latest\"\n },\n \"dependencies\": {\n- \"color\": \"^0.11.3\"\n+ \"color\": \"^0.11.4\"\n }\n }\n"]
| 3 |
["c623b3622058b913290120b06ccdc779a4e4413d", "c3b5dc77ff3d89d389f6f3a868b17d0a8ca63074", "ecc481f9f501aa34b41e06e7bbdde6e79f8ca1bb"]
|
["fix", "test", "build"]
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.