From 03d3efc0a1b85117cf0609c8a1d9cad7b8c025d4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2024 16:01:42 +0000 Subject: [PATCH 1/2] fix(deps): bump @nextcloud/sharing from 0.2.3 to ^0.2.3 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index cf1c7bcaa..f1293ea9b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "@nextcloud/moment": "^1.3.1", "@nextcloud/paths": "^2.2.1", "@nextcloud/router": "^3.0.1", - "@nextcloud/sharing": "^0.2.2", + "@nextcloud/sharing": "^0.2.3", "@nextcloud/vue": "^8.18.0", "@shortcm/qr-image": "^9.0.4", "@vueuse/core": "^11.0.3", diff --git a/package.json b/package.json index dfb660bd4..fd312dc7b 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "@nextcloud/moment": "^1.3.1", "@nextcloud/paths": "^2.2.1", "@nextcloud/router": "^3.0.1", - "@nextcloud/sharing": "^0.2.2", + "@nextcloud/sharing": "^0.2.3", "@nextcloud/vue": "^8.18.0", "@shortcm/qr-image": "^9.0.4", "@vueuse/core": "^11.0.3", From d1c78b1988c78faa42ebf66686036dd5adf99c37 Mon Sep 17 00:00:00 2001 From: Grigory V Date: Mon, 16 Sep 2024 10:47:52 +0200 Subject: [PATCH 2/2] chore(constants): Remove deprecated Type and implement ShareType Signed-off-by: Grigory V --- src/models/constants.d.ts | 4 ++-- src/models/constants.ts | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/models/constants.d.ts b/src/models/constants.d.ts index b6634927e..e69bfbbde 100644 --- a/src/models/constants.d.ts +++ b/src/models/constants.d.ts @@ -2,7 +2,7 @@ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later */ -import { Type } from '@nextcloud/sharing'; +import { ShareType } from '@nextcloud/sharing'; export type DefaultGroup = string; export type DefaultChart = string; export type CircleConfig = number; @@ -32,7 +32,7 @@ export declare const PUBLIC_CIRCLE_CONFIG: { export declare const CIRCLES_MEMBER_GROUPING: { id: string; label: string; - share: Type; + share: ShareType; type: number; }[]; export declare const SHARES_TYPES_MEMBER_MAP: {}; diff --git a/src/models/constants.ts b/src/models/constants.ts index 27ebd5c1d..38d2e1eca 100644 --- a/src/models/constants.ts +++ b/src/models/constants.ts @@ -5,7 +5,7 @@ /// import { translate as t } from '@nextcloud/l10n' -import { Type } from '@nextcloud/sharing' +import { ShareType } from '@nextcloud/sharing' export type DefaultGroup = string export type DefaultChart = string @@ -115,47 +115,47 @@ export const PUBLIC_CIRCLE_CONFIG = { // sorting of the members list export const CIRCLES_MEMBER_GROUPING = [ { - id: `picker-${Type.SHARE_TYPE_USER}`, + id: `picker-${ShareType.User}`, label: t('contacts', 'users'), - share: Type.SHARE_TYPE_USER, + share: ShareType.User, type: MEMBER_TYPE_USER, }, { - id: `picker-${Type.SHARE_TYPE_GROUP}`, + id: `picker-${ShareType.Group}`, label: t('contacts', 'groups'), - share: Type.SHARE_TYPE_GROUP, + share: ShareType.Group, type: MEMBER_TYPE_GROUP, }, // TODO: implement federated // { - // id: `picker-${Type.SHARE_TYPE_REMOTE}`, + // id: `picker-${ShareType.Remote}`, // label: t('contacts', 'federated users'), - // share: Type.SHARE_TYPE_REMOTE, + // share: ShareType.Remote, // type: MEMBER_TYPE_USER // }, // { - // id: `picker-${Type.SHARE_TYPE_REMOTE_GROUP}`, + // id: `picker-${ShareType.RemoteGroup}`, // label: t('contacts', 'federated groups'), - // share: Type.SHARE_TYPE_REMOTE_GROUP, + // share: ShareType.RemoteGroup, // type: MEMBER_TYPE_GROUP // }, { - id: `picker-${Type.SHARE_TYPE_CIRCLE}`, + id: `picker-${ShareType.Team}`, label: t('contacts', 'teams'), - share: Type.SHARE_TYPE_CIRCLE, + share: ShareType.Team, type: MEMBER_TYPE_CIRCLE, }, { - id: `picker-${Type.SHARE_TYPE_EMAIL}`, + id: `picker-${ShareType.Email}`, label: t('contacts', 'email addresses'), - share: Type.SHARE_TYPE_EMAIL, + share: ShareType.Email, type: MEMBER_TYPE_MAIL, }, // TODO: implement SHARE_TYPE_CONTACT { id: 'picker-contact', label: t('contacts', 'teams'), - share: Type.SHARE_TYPE_EMAIL, + share: ShareType.Email, type: MEMBER_TYPE_CONTACT, }, ]