Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"sandboxes": ["new", "vanilla"],
"node": "16",
"installCommand": "custom-install",
"buildCommand": "custom-build",
"packages": [
"services/madoc-ts/npm/components",
"services/madoc-ts/npm/config",
"services/madoc-ts/npm/capture-models",
"services/madoc-ts/npm/registry"
],
"publishDirectory": {
"@madoc.io/components": "services/madoc-ts/npm/components",
"@madoc.io/config": "services/madoc-ts/npm/config",
"@madoc.io/capture-models": "services/madoc-ts/npm/capture-models",
"@madoc.io/registry": "services/madoc-ts/npm/registry"
}
}
6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"scripts": {
"custom-install": "cd services/madoc-ts && yarn install",
"custom-build": "cd services/madoc-ts && yarn build-npm"
}
}
3 changes: 2 additions & 1 deletion services/madoc-ts/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module.exports = {
},
rules: {
'react/prop-types': 0,
'import/no-unresolved': 0,
'import/named': 0,
'@typescript-eslint/explicit-function-return-type': 0,
'@typescript-eslint/no-explicit-any': 0,
Expand Down Expand Up @@ -77,4 +78,4 @@ module.exports = {
version: 'detect'
}
}
};
};
3 changes: 3 additions & 0 deletions services/madoc-ts/npm/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**/dist
**/dist-umd
**/index.d.ts
67 changes: 67 additions & 0 deletions services/madoc-ts/npm/capture-models/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{
"name": "@madoc.io/capture-models",
"version": "1.0.0",
"type": "module",
"main": "dist/cjs/index.cjs",
"module": "dist/esm/index.mjs",
"files": [
"dist",
"index.d.ts",
"dist-umd"
],
"_types": "index.d.ts",
"keywords": [
"iiif",
"typescript"
],
"exports": {
".": {
"require": "./dist/cjs/index.js",
"import": "./dist/esm/index.mjs"
},
"./index.d.ts": {
"require": "./index.d.ts",
"import": "./index.d.ts"
}
},
"typesVersions": {
"*": {
"*": [
"index.d.ts"
]
}
},
"dependencies": {
"@madoc.io/registry": "latest",
"@atlas-viewer/atlas": "https://pkg.csb.dev/atlas-viewer/atlas/commit/842002cd/@atlas-viewer/atlas",
"@iiif/parser": "^1.0.13",
"@iiif/presentation-2": "^1.0.2",
"@iiif/presentation-3": "^1.1.3",
"@iiif/vault": "^0.9.19",
"@iiif/vault-helpers": "^0.9.8",
"deepmerge": "4.2.2",
"draft-js": "^0.11.7",
"draft-js-export-html": "^1.4.1",
"draft-js-import-element": "^1.4.0",
"draft-js-import-html": "^1.4.1",
"draft-js-utils": "^1.4.0",
"easy-peasy": "^3.3.0",
"immer": "^9.0.6",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-functional-select": "^3.3.3",
"react-helmet": "^6.1.0",
"react-i18next": "11.18.4",
"react-iiif-vault": "https://pkg.csb.dev/digirati-co-uk/react-iiif-vault/commit/85a8ada5/react-iiif-vault",
"react-query": "^2.26.4",
"react-router": "^6.4.0-pre.13",
"react-router-dom": "^6.4.0-pre.13",
"react-window": "^1.8.6",
"rich-markdown-editor": "11.17.8",
"styled-components": "5.3.3",
"uuid": "^7.0.1"
},
"publishConfig": {
"access": "public"
}
}
45 changes: 45 additions & 0 deletions services/madoc-ts/npm/components/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"name": "@madoc.io/components",
"version": "1.0.0",
"type": "module",
"main": "dist/cjs/index.cjs",
"module": "dist/esm/index.mjs",
"files": [
"dist",
"index.d.ts",
"dist-umd"
],
"types": "index.d.ts",
"keywords": [
"iiif",
"typescript"
],
"exports": {
".": {
"require": "./dist/cjs/index.js",
"import": "./dist/esm/index.mjs"
},
"./index.d.ts": {
"require": "./index.d.ts",
"import": "./index.d.ts"
}
},
"typesVersions": {
"*": {
"*": [
"index.d.ts"
]
}
},
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.4.0-pre.13",
"react-query": "^2.26.4",
"styled-components": "5.3.3"
},
"publishConfig": {
"access": "public"
},
"globalName": "MadocComponents"
}
27 changes: 27 additions & 0 deletions services/madoc-ts/npm/config/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"name": "@madoc.io/config",
"version": "1.0.0",
"type": "module",
"main": "dist/cjs/index.cjs",
"module": "dist/esm/index.mjs",
"files": [
"dist",
"dist-umd"
],
"keywords": [
"iiif",
"typescript"
],
"exports": {
".": {
"require": "./dist/cjs/index.js",
"import": "./dist/esm/index.mjs"
}
},
"dependencies": {
"csv-stringify": "^6.4.0"
},
"publishConfig": {
"access": "public"
}
}
43 changes: 43 additions & 0 deletions services/madoc-ts/npm/registry/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"name": "@madoc.io/registry",
"version": "1.0.0",
"type": "module",
"main": "dist/cjs/index.cjs",
"module": "dist/esm/index.mjs",
"files": [
"dist",
"index.d.ts",
"dist-umd"
],
"keywords": [
"iiif",
"typescript"
],
"types": "index.d.ts",
"exports": {
".": {
"require": "./dist/cjs/index.js",
"import": "./dist/esm/index.mjs"
},
"./index.d.ts": {
"require": "./index.d.ts",
"import": "./index.d.ts"
}
},
"typesVersions": {
"*": {
"*": [
"index.d.ts"
]
}
},
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.4.0-pre.13",
"styled-components": "5.3.3"
},
"publishConfig": {
"access": "public"
}
}
8 changes: 7 additions & 1 deletion services/madoc-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"test": "jest",
"test-storybook": "test-storybook --url http://localhost:6500 --maxWorkers 1",
"build": "concurrently yarn:generate-schema yarn:build:vite yarn:build:frontend yarn:shim-modules",
"build-npm": "node ./vite/build-packages.mjs",
"dev:vite": "vite --config vite/vite.dev-server.js --host",
"start": "concurrently yarn:watch:vite-producer yarn:watch:vite-auth yarn:watch:vite-server yarn:watch:vite-scheduler",
"build:vite": "concurrently yarn:build:vite-producer yarn:build:vite-auth yarn:build:vite-server yarn:build:vite-scheduler",
Expand Down Expand Up @@ -59,6 +60,7 @@
"dnd-multi-backend": "6.0.0",
"html-entities": "1.4.0",
"formik": "^2.2.9",
"openseadragon": "^3.1.0",
"react": "17.0.2",
"react-dom": "17.0.2",
"@types/react": "^17.0.50",
Expand All @@ -78,6 +80,7 @@
"@iiif/vault-helpers": "^0.9.8",
"@koa/router": "^10.1.1",
"@madoc.io/types": "./npm/madoc-types",
"@recogito/annotorious-openseadragon": "^2.6.0",
"@slonik/migrator": "^0.2.0",
"@styled-icons/entypo": "^10.34.0",
"adm-zip": "^0.5.10",
Expand Down Expand Up @@ -143,6 +146,7 @@
"node-stream-zip": "^1.13.2",
"nodemailer": "^6.6.3",
"object-assign": "^4.1.1",
"openseadragon": "^3.1.0",
"passport": "^0.5.0",
"passport-custom": "^1.1.1",
"passport-github2": "^0.1.12",
Expand Down Expand Up @@ -272,6 +276,7 @@
"bundle-duplicates-plugin": "^0.0.1",
"chalk": "4.1.2",
"concurrently": "^7.0.0",
"dts-bundle-generator": "^8.0.1",
"eslint": "^7.29.0",
"eslint-import-resolver-typescript": "^3.5.0",
"eslint-plugin-babel": "^5.3.1",
Expand All @@ -282,13 +287,14 @@
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-storybook": "^0.6.10",
"execa": "^7.1.1",
"happy-dom": "^5.3.1",
"inspectpack": "^4.5.2",
"jest": "^29.4.2",
"jest-environment-jsdom": "^29.4.2",
"jsdom": "^16.5.1",
"koa-connect": "^2.1.0",
"prettier": "^1.19.1",
"prettier": "^3.0.0",
"react-is": "^16.13.1",
"react-query-devtools": "^2.4.7",
"react-refresh": "^0.10.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { BaseField } from '../../frontend/shared/capture-models/types/field-type
import { blockConfigFor } from '../../frontend/shared/plugins/external/block-config-for';
import { BlockHook } from '../../types/block-hook';
import { EditorialContext } from '../../types/schemas/site-page';
import { PageBlockDefinition, PageBlockEditor, PageBlockExtension } from './extension';
import { PageBlockDefinition, PageBlockEditor, PageBlockExtension } from '@/npm/registry';

export function blockEditorFor<Props, MappedProps = Props>(
Component: React.FC<Props>,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { canvasAnnotationExport } from './canvas/canvas-annotation-export';
import { canvasApiExport } from './canvas/canvas-api-export';
import { canvasModelExport } from './canvas/canvas-model-export';
import { canvasPlaintextExport } from './canvas/canvas-plaintext-export';
import { manifestApiExport } from './manifest/manifest-api-export';
import { projectApiExport } from './project/project-api-export';
import { projectCsvSimpleExport } from './project/project-csv-simple-export';

export const allExports = {
canvasApiExport,
canvasModelExport,
canvasPlaintextExport,
canvasAnnotationExport,
manifestApiExport,
projectApiExport,
projectCsvSimpleExport,
};
20 changes: 6 additions & 14 deletions services/madoc-ts/src/extensions/project-export/extension.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import { ApiClient } from '../../gateway/api';
import { BaseExtension, defaultDispose } from '../extension-manager';
import { RegistryExtension } from '../registry-extension';
import { canvasAnnotationExport } from './export-configs/canvas/canvas-annotation-export';
import { canvasApiExport } from './export-configs/canvas/canvas-api-export';
import { canvasModelExport } from './export-configs/canvas/canvas-model-export';
import { canvasPlaintextExport } from './export-configs/canvas/canvas-plaintext-export';
import { manifestApiExport } from './export-configs/manifest/manifest-api-export';
import { projectApiExport } from './export-configs/project/project-api-export';
import { projectCsvSimpleExport } from './export-configs/project/project-csv-simple-export';
import { allExports } from './export-configs/index';
import { ExportConfig } from './types';

export class ProjectExportExtension extends RegistryExtension<ExportConfig> implements BaseExtension {
Expand All @@ -20,14 +14,12 @@ export class ProjectExportExtension extends RegistryExtension<ExportConfig> impl
registryName: ProjectExportExtension.REGISTRY,
});
this.api = api;

// List of default export options.
ProjectExportExtension.register(canvasApiExport);
ProjectExportExtension.register(canvasModelExport);
ProjectExportExtension.register(canvasPlaintextExport);
ProjectExportExtension.register(canvasAnnotationExport);
ProjectExportExtension.register(manifestApiExport);
ProjectExportExtension.register(projectApiExport);
ProjectExportExtension.register(projectCsvSimpleExport);
const extensions = Object.values(allExports);
for (const extension of extensions) {
ProjectExportExtension.register(extension);
}
}

dispose() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { RouteObject } from 'react-router-dom';
import { PageBlockExtension } from '../../../extensions/page-blocks/extension';
import { PageBlockExtension } from '@/npm/registry';
import { ProjectExportExtension } from '../../../extensions/project-export/extension';
import { ProjectTemplateExtension } from '../../../extensions/projects/extension';
import { ThemeExtension } from '../../../extensions/themes/extension';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PageBlockExtension } from '../../../extensions/page-blocks/extension';
import { PageBlockExtension } from '@/npm/registry';

export function registerBlocks(blockMap: any) {
const keys = Object.keys(blockMap);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ serverRendererFor(ReviewListingPage, {
const slug = vars.projectSlug;
const project = await api.getProject(slug);

return api.getTasks(vars.page, {
return api.getTasks(vars.query.page, {
all_tasks: false,
type: 'crowdsourcing-task',
root_task_id: project.task_id,
Expand Down
2 changes: 1 addition & 1 deletion services/madoc-ts/src/gateway/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { plainTextSource } from '../extensions/capture-models/DynamicDataSources
import { ExtensionManager } from '../extensions/extension-manager';
import { NotificationExtension } from '../extensions/notifications/extension';
import { getDefaultPageBlockDefinitions } from '../extensions/page-blocks/default-definitions';
import { PageBlockExtension } from '../extensions/page-blocks/extension';
import { PageBlockExtension } from '@/npm/registry';
import { MediaExtension } from '../extensions/media/extension';
import { ProjectExportExtension } from '../extensions/project-export/extension';
import { ProjectTemplateExtension } from '../extensions/projects/extension';
Expand Down
Loading