Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/devel' into FILES-841-Handle-ope…
Browse files Browse the repository at this point in the history
…n-with-docs-over-size-failures
  • Loading branch information
beawar committed Oct 18, 2024
2 parents 160e831 + 201d96c commit b51cc66
Show file tree
Hide file tree
Showing 204 changed files with 4,113 additions and 8,247 deletions.
42 changes: 0 additions & 42 deletions .reuse/dep5

This file was deleted.

15 changes: 15 additions & 0 deletions REUSE.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version = 1
SPDX-PackageName = "carbonio-files-ui"
SPDX-PackageSupplier = "<>"

[[annotations]]
path = "**.json"
precedence = "aggregate"
SPDX-FileCopyrightText = "2023 Zextras <https://www.zextras.com>"
SPDX-License-Identifier = "AGPL-3.0-only"

[[annotations]]
path = ["THIRDPARTIES", ".nvmrc", ".npmrc", ".husky/**", ".github/**", "CHANGELOG.md", "REUSE.toml"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2023 Zextras <https://www.zextras.com>"
SPDX-License-Identifier = "CC0-1.0"
6 changes: 3 additions & 3 deletions __mocks__/@zextras/carbonio-shell-ui.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import * as shell from '@zextras/carbonio-shell-ui';
import { useHistory } from 'react-router-dom';

import { FILES_APP_ID, FILES_ROUTE } from '../../src/carbonio-files-ui-common/constants';
import { LOGGED_USER } from '../../src/mocks/constants';
import { LOGGED_USER_ACCOUNT } from '../../src/mocks/constants';

export const useReplaceHistoryCallback: typeof shell.useReplaceHistoryCallback = () => {
const history = useHistory();
Expand Down Expand Up @@ -54,8 +54,8 @@ export const soapFetch: typeof shell.soapFetch = (req, body) =>
)
);

export const useUserAccount: typeof shell.useUserAccount = () => LOGGED_USER;
export const getUserAccount: typeof shell.getUserAccount = () => LOGGED_USER;
export const useUserAccount: typeof shell.useUserAccount = () => LOGGED_USER_ACCOUNT;
export const getUserAccount: typeof shell.getUserAccount = () => LOGGED_USER_ACCOUNT;
export const report: typeof shell.report = () => '';
export const ACTION_TYPES: Partial<typeof shell.ACTION_TYPES> = {
NEW: 'new'
Expand Down
14 changes: 11 additions & 3 deletions codegen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,20 @@ import { TypeScriptResolversPluginConfig } from '@graphql-codegen/typescript-res
const typescriptPluginConfig: TypeScriptPluginConfig = {
useImplementingTypes: true,
defaultScalarType: 'unknown',
nonOptionalTypename: false,
nonOptionalTypename: true,
scalars: {
DateTime: 'number',
UploadItem: 'ClientTypes.UploadItem'
},
strictScalars: true,
useTypeImports: true
useTypeImports: true,
avoidOptionals: {
field: true,
object: false,
inputValue: false,
resolvers: false,
defaultValue: false
}
};

const config: CodegenConfig = {
Expand Down Expand Up @@ -60,7 +67,8 @@ const config: CodegenConfig = {
config: {
...typescriptPluginConfig,
exportFragmentSpreadSubTypes: true,
mergeFragmentTypes: true
mergeFragmentTypes: true,
skipTypeNameForRoot: true
} satisfies TypeScriptPluginConfig &
TypeScriptDocumentsPluginConfig &
TypeScriptTypedDocumentNodesConfig
Expand Down
Loading

0 comments on commit b51cc66

Please sign in to comment.