Skip to content

Commit d0b10bc

Browse files
authored
Merge pull request #6762 from BacLuc/fix-print
Fix broken print on devel
2 parents 6f8107d + d83f667 commit d0b10bc

File tree

85 files changed

+108
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+108
-95
lines changed

common/helpers/dayjs/__tests__/parseTime.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { describe, beforeEach, expect, it } from 'vitest'
22
import { default as dayjs, dayjsLocaleMap } from '../../dayjs'
33
import parseTime from '../parseTime'
4-
import { padStart, range } from 'lodash'
4+
import { padStart, range } from 'lodash-es'
55
import { HTML5_FMT } from '../../dateFormat'
66

77
describe('parseTime', () => {

common/helpers/materialListsSorted.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import sortBy from 'lodash/sortBy.js'
1+
import sortBy from 'lodash-es/sortBy.js'
22

33
export default function (materialLists) {
44
return sortBy(

common/helpers/picasso.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import minBy from 'lodash/minBy.js'
2-
import maxBy from 'lodash/maxBy.js'
3-
import sortBy from 'lodash/sortBy.js'
4-
import keyBy from 'lodash/keyBy.js'
1+
import minBy from 'lodash-es/minBy.js'
2+
import maxBy from 'lodash-es/maxBy.js'
3+
import sortBy from 'lodash-es/sortBy.js'
4+
import keyBy from 'lodash-es/keyBy.js'
55
import dayjs from './dayjs.js'
66
import { arrange } from './scheduleEntryLayout.js'
77

frontend/package-lock.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"inter-ui": "3.19.3",
6565
"js-cookie": "3.0.5",
6666
"linkify-it": "5.0.0",
67-
"lodash": "4.17.21",
67+
"lodash-es": "4.17.21",
6868
"runes": "0.4.3",
6969
"slugify": "1.6.6",
7070
"url-template": "3.1.1",

frontend/src/components/activity/ActivityResponsibles.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<script>
3333
import { serverErrorToString } from '@/helpers/serverError.js'
3434
import campCollaborationDisplayName from '@/common/helpers/campCollaborationDisplayName.js'
35-
import { isEqual, sortBy } from 'lodash'
35+
import { isEqual, sortBy } from 'lodash-es'
3636
import UserAvatar from '@/components/user/UserAvatar.vue'
3737
3838
export default {

frontend/src/components/activity/ButtonNestedContentNodeAdd.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</v-row>
5959
</template>
6060
<script>
61-
import { camelCase } from 'lodash'
61+
import { camelCase } from 'lodash-es'
6262
import { errorToMultiLineToast } from '@/components/toast/toasts'
6363
import { getEnv } from '@/environment.js'
6464

frontend/src/components/activity/DaySwitcher.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</template>
7777
<script>
7878
import AvatarRow from '@/components/generic/AvatarRow.vue'
79-
import { reduce, sortBy } from 'lodash'
79+
import { reduce, sortBy } from 'lodash-es'
8080
8181
export default {
8282
name: 'DaySwitcher',

frontend/src/components/activity/MenuCardlessContentNode.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<script>
3131
import DialogEntityDelete from '@/components/dialog/DialogEntityDelete.vue'
3232
import { errorToMultiLineToast } from '@/components/toast/toasts'
33-
import camelCase from 'lodash/camelCase.js'
33+
import camelCase from 'lodash-es/camelCase.js'
3434
3535
export default {
3636
name: 'MenuCardlessContentNode',

frontend/src/components/activity/ScheduleEntry.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ Displays a single scheduleEntry
247247
</template>
248248

249249
<script>
250-
import { sortBy } from 'lodash'
250+
import { sortBy } from 'lodash-es'
251251
import ContentCard from '@/components/layout/ContentCard.vue'
252252
import ApiTextField from '@/components/form/api/ApiTextField.vue'
253253
import RootNode from '@/components/activity/RootNode.vue'

0 commit comments

Comments
 (0)