Merge branch 'develop'

CHANGELOG.md

@@ -8,6 +8,20 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
+## [4.3.1]
+
+### Added
+
+- Always show contributor card in resource and collection pages
+
+### Fixed
+
+- Fixed subtle exceptions in text extraction procedures, also added fallback
+
+### Improvements
+
+- Added fallback page for not-found resources (401/404)
+
 ## [4.3.0]
 
 ### Added

packages/arangodb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moodlenet/arangodb",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "publishConfig": {
     "access": "public"
   },
@@ -31,12 +31,12 @@
     "arangojs": "8.3.0"
   },
   "devDependencies": {
-    "@moodlenet/core": "^0.9.0",
+    "@moodlenet/core": "^0.9.1",
     "@types/node": "17.0.35",
     "typescript": "5.4"
   },
   "peerDependencies": {
-    "@moodlenet/core": "^0.9.0"
+    "@moodlenet/core": "^0.9.1"
   },
   "scripts": {},
   "gitHead": "4b8737c02083f2eca71b432c601ba3f595cd4f51"

packages/collection/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moodlenet/collection",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "publishConfig": {
     "access": "public"
   },
@@ -26,26 +26,26 @@
     "dist/"
   ],
   "dependencies": {
-    "@moodlenet/component-library": "^0.9.0",
-    "@moodlenet/key-value-store": "^0.9.0",
-    "@moodlenet/simple-file-store": "^0.9.0",
+    "@moodlenet/component-library": "^0.9.1",
+    "@moodlenet/key-value-store": "^0.9.1",
+    "@moodlenet/simple-file-store": "^0.9.1",
     "formik": "2.2.9",
     "yup": "0.32.11"
   },
   "peerDependencies": {
     "@mui/icons-material": "5.14.9",
     "@mui/material": "5.14.9",
-    "@moodlenet/core": "^0.9.0",
-    "@moodlenet/ed-resource": "^0.9.0",
-    "@moodlenet/react-app": "^0.9.0",
-    "@moodlenet/system-entities": "^0.9.0"
+    "@moodlenet/core": "^0.9.1",
+    "@moodlenet/ed-resource": "^0.9.1",
+    "@moodlenet/react-app": "^0.9.1",
+    "@moodlenet/system-entities": "^0.9.1"
   },
   "devDependencies": {
     "@lingui/macro": "3.14.0",
-    "@moodlenet/core": "^0.9.0",
-    "@moodlenet/ed-resource": "^0.9.0",
-    "@moodlenet/react-app": "^0.9.0",
-    "@moodlenet/system-entities": "^0.9.0",
+    "@moodlenet/core": "^0.9.1",
+    "@moodlenet/ed-resource": "^0.9.1",
+    "@moodlenet/react-app": "^0.9.1",
+    "@moodlenet/system-entities": "^0.9.1",
     "@mui/icons-material": "5.14.9",
     "@mui/material": "5.14.9",
     "@storybook/addon-actions": "7.4.2",

packages/collection/src/webapp/components/pages/Collection/Collection.tsx

@@ -286,9 +286,9 @@ export const Collection: FC<CollectionProps> = ({
     />
   )
 
-  const contributorCard = isPublished ? (
+  const contributorCard = (
     <CollectionContributorCard {...collectionContributorCardProps} key="contributor-card" />
-  ) : null
+  )
 
   const publishButton = !isEditing && canPublish && !isPublished /*  && !isEditing */ && (
     <PrimaryButton onClick={checkFormsAndPublish} color="green">

packages/component-library/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moodlenet/component-library",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "publishConfig": {
     "access": "public"
   },

packages/core-domain/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moodlenet/core-domain",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "publishConfig": {
     "access": "public"
   },

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moodlenet/core",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "publishConfig": {
     "access": "public"
   },

packages/create-moodlenet/bin/defaultCorePackages.mjs

@@ -1,18 +1,18 @@
 export const defaultCorePackages = {
-  'core': '^0.9.0',
-  'arangodb': '^0.9.0',
-  'crypto': '^0.9.0',
-  'http-server': '^0.9.0',
-  'organization': '^0.9.0',
-  'system-entities': '^0.9.0',
-  'email-service': '^0.9.0',
-  'react-app': '^0.9.0',
-  'extensions-manager': '^0.9.0',
-  'simple-email-auth': '^0.9.0',
-  'openid': '^0.9.0',
-  'ed-resource': '^0.9.0',
-  'collection': '^0.9.0',
-  'web-user': '^0.9.0',
-  'ed-meta': '^0.9.0',
-  'moodle-lms-integration': '^0.9.0',
+  'core': '^0.9.1',
+  'arangodb': '^0.9.1',
+  'crypto': '^0.9.1',
+  'http-server': '^0.9.1',
+  'organization': '^0.9.1',
+  'system-entities': '^0.9.1',
+  'email-service': '^0.9.1',
+  'react-app': '^0.9.1',
+  'extensions-manager': '^0.9.1',
+  'simple-email-auth': '^0.9.1',
+  'openid': '^0.9.1',
+  'ed-resource': '^0.9.1',
+  'collection': '^0.9.1',
+  'web-user': '^0.9.1',
+  'ed-meta': '^0.9.1',
+  'moodle-lms-integration': '^0.9.1',
 }

packages/create-moodlenet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moodlenet/create",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "license": "AGPL-3.0",
   "type": "module",
   "engines": {

packages/crypto/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moodlenet/crypto",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "publishConfig": {
     "access": "public"
   },
@@ -31,10 +31,10 @@
     "ulidx": "2.2.1"
   },
   "peerDependencies": {
-    "@moodlenet/core": "^0.9.0"
+    "@moodlenet/core": "^0.9.1"
   },
   "devDependencies": {
-    "@moodlenet/core": "^0.9.0",
+    "@moodlenet/core": "^0.9.1",
     "@types/argon2": "0.15.0",
     "@types/node": "17.0.35",
     "typescript": "5.4"

packages/ed-meta/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moodlenet/ed-meta",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "publishConfig": {
     "access": "public"
   },
@@ -26,23 +26,23 @@
     "dist/"
   ],
   "dependencies": {
-    "@moodlenet/component-library": "^0.9.0",
-    "@moodlenet/key-value-store": "^0.9.0",
+    "@moodlenet/component-library": "^0.9.1",
+    "@moodlenet/key-value-store": "^0.9.1",
     "formik": "2.2.9",
     "yup": "0.32.11"
   },
   "peerDependencies": {
     "@mui/icons-material": "5.14.9",
     "@mui/material": "5.14.9",
-    "@moodlenet/core": "^0.9.0",
-    "@moodlenet/react-app": "^0.9.0",
-    "@moodlenet/system-entities": "^0.9.0"
+    "@moodlenet/core": "^0.9.1",
+    "@moodlenet/react-app": "^0.9.1",
+    "@moodlenet/system-entities": "^0.9.1"
   },
   "devDependencies": {
     "@lingui/macro": "3.14.0",
-    "@moodlenet/core": "^0.9.0",
-    "@moodlenet/react-app": "^0.9.0",
-    "@moodlenet/system-entities": "^0.9.0",
+    "@moodlenet/core": "^0.9.1",
+    "@moodlenet/react-app": "^0.9.1",
+    "@moodlenet/system-entities": "^0.9.1",
     "@mui/icons-material": "5.14.9",
     "@mui/material": "5.14.9",
     "@types/node": "17.0.35",

packages/ed-resource/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moodlenet/ed-resource",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "publishConfig": {
     "access": "public"
   },
@@ -26,10 +26,10 @@
     "dist/"
   ],
   "dependencies": {
-    "@moodlenet/component-library": "^0.9.0",
-    "@moodlenet/core-domain": "^0.9.0",
-    "@moodlenet/key-value-store": "^0.9.0",
-    "@moodlenet/simple-file-store": "^0.9.0",
+    "@moodlenet/component-library": "^0.9.1",
+    "@moodlenet/core-domain": "^0.9.1",
+    "@moodlenet/key-value-store": "^0.9.1",
+    "@moodlenet/simple-file-store": "^0.9.1",
     "formik": "2.2.9",
     "moment": "2.29.4",
     "xbytes": "1.8.0",
@@ -39,19 +39,19 @@
   "peerDependencies": {
     "@mui/icons-material": "5.14.9",
     "@mui/material": "5.14.9",
-    "@moodlenet/core": "^0.9.0",
-    "@moodlenet/ed-meta": "^0.9.0",
-    "@moodlenet/http-server": "^0.9.0",
-    "@moodlenet/react-app": "^0.9.0",
-    "@moodlenet/system-entities": "^0.9.0"
+    "@moodlenet/core": "^0.9.1",
+    "@moodlenet/ed-meta": "^0.9.1",
+    "@moodlenet/http-server": "^0.9.1",
+    "@moodlenet/react-app": "^0.9.1",
+    "@moodlenet/system-entities": "^0.9.1"
   },
   "devDependencies": {
     "@lingui/macro": "3.14.0",
-    "@moodlenet/core": "^0.9.0",
-    "@moodlenet/ed-meta": "^0.9.0",
-    "@moodlenet/http-server": "^0.9.0",
-    "@moodlenet/react-app": "^0.9.0",
-    "@moodlenet/system-entities": "^0.9.0",
+    "@moodlenet/core": "^0.9.1",
+    "@moodlenet/ed-meta": "^0.9.1",
+    "@moodlenet/http-server": "^0.9.1",
+    "@moodlenet/react-app": "^0.9.1",
+    "@moodlenet/system-entities": "^0.9.1",
     "@mui/icons-material": "5.14.9",
     "@mui/material": "5.14.9",
     "@storybook/addon-actions": "7.4.2",

packages/ed-resource/src/webapp/ResourceHooks.tsx

@@ -51,6 +51,7 @@ export const useResourceBaseProps = ({ resourceKey }: myProps) => {
 
       .then(res => {
         if (!res) {
+          setResource(null)
           return
         }
         // res.state.value === 'Autogenerating-Meta' && schedulePolling()

packages/ed-resource/src/webapp/components/pages/Resource/Resource.tsx

@@ -37,6 +37,7 @@ import { MainResourceCard } from '../../organisms/MainResourceCard/MainResourceC
 import './Resource.scss'
 
 export type ResourceProps = {
+  isCreating: boolean
   saveState: SaveState
   mainLayoutProps: MainLayoutProps
   mainResourceCardSlots: MainResourceCardSlots
@@ -61,6 +62,7 @@ export type ResourceProps = {
 }
 
 export const Resource: FC<ResourceProps> = ({
+  isCreating,
   mainLayoutProps,
   resourceContributorCardProps,
 
@@ -256,7 +258,7 @@ export const Resource: FC<ResourceProps> = ({
     uploadProgress !== undefined ||
     (autofillState !== undefined && autofillState !== 'ai-completed')
 
-  const contributorCard = isPublished && (
+  const contributorCard = !isCreating && (
     <ResourceContributorCard {...resourceContributorCardProps} key="contributor-card" />
   )
 

packages/ed-resource/src/webapp/components/pages/Resource/ResourcePageHooks.tsx

@@ -75,6 +75,7 @@ export const useResourcePageProps = ({ resourceKey }: ResourcePageHookArg) => {
     extraDetailsItems: [],
   }
   const resourceProps: ProxiedResourceProps = {
+    isCreating,
     saveState,
     mainLayoutProps,
     mainResourceCardSlots,

packages/email-service/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moodlenet/email-service",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "publishConfig": {
     "access": "public"
   },
@@ -31,23 +31,23 @@
   "repository": "https://github.com/moodle/moodlenet",
   "author": "https://github.com/aleclofabbro",
   "dependencies": {
-    "@moodlenet/key-value-store": "^0.9.0",
+    "@moodlenet/key-value-store": "^0.9.1",
     "dot": "1.1.3",
     "nodemailer": "6.6.1",
     "@react-email/render": "^0.0.12"
   },
   "peerDependencies": {
-    "@moodlenet/core": "^0.9.0",
-    "@moodlenet/component-library": "^0.9.0",
-    "@moodlenet/organization": "^0.9.0",
-    "@moodlenet/react-app": "^0.9.0"
+    "@moodlenet/core": "^0.9.1",
+    "@moodlenet/component-library": "^0.9.1",
+    "@moodlenet/organization": "^0.9.1",
+    "@moodlenet/react-app": "^0.9.1"
   },
   "devDependencies": {
     "react": "18.3.1",
-    "@moodlenet/core": "^0.9.0",
-    "@moodlenet/component-library": "^0.9.0",
-    "@moodlenet/organization": "^0.9.0",
-    "@moodlenet/react-app": "^0.9.0",
+    "@moodlenet/core": "^0.9.1",
+    "@moodlenet/component-library": "^0.9.1",
+    "@moodlenet/organization": "^0.9.1",
+    "@moodlenet/react-app": "^0.9.1",
     "@types/dot": "1.1.5",
     "@types/node": "17.0.35",
     "@types/nodemailer": "6.4.5",

packages/extensions-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moodlenet/extensions-manager",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "publishConfig": {
     "access": "public"
   },
@@ -35,7 +35,7 @@
   "repository": "https://github.com/moodle/moodlenet",
   "author": "https://github.com/aleclofabbro",
   "dependencies": {
-    "@moodlenet/component-library": "^0.9.0",
+    "@moodlenet/component-library": "^0.9.1",
     "axios": "1.6.2",
     "formik": "2.2.9",
     "react-markdown": "8.0.3",
@@ -46,12 +46,12 @@
   "peerDependencies": {
     "@mui/icons-material": "5.14.9",
     "@mui/material": "5.14.9",
-    "@moodlenet/core": "^0.9.0",
-    "@moodlenet/react-app": "^0.9.0"
+    "@moodlenet/core": "^0.9.1",
+    "@moodlenet/react-app": "^0.9.1"
   },
   "devDependencies": {
-    "@moodlenet/core": "^0.9.0",
-    "@moodlenet/react-app": "^0.9.0",
+    "@moodlenet/core": "^0.9.1",
+    "@moodlenet/react-app": "^0.9.1",
     "@mui/icons-material": "5.14.9",
     "@mui/material": "5.14.9",
     "@storybook/addon-actions": "7.4.2",