Merge pull request #468 from digirati-co-uk/feature/bug-fixes-2

Bug fixes
digirati-co-uk · Oct 29, 2021 · 08686c7 · 08686c7
2 parents 51490b9 + 59a1bce
commit 08686c7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/services/madoc-ts/src/frontend/admin/pages/system/generate-api-key.tsx b/services/madoc-ts/src/frontend/admin/pages/system/generate-api-key.tsx
@@ -19,6 +19,7 @@ import { Button } from '../../../shared/navigation/Button';
 const scopeDefinitions = [
   { label: 'Site admin', value: 'site.admin' },
   { label: 'Capture model admin', value: 'model.admin' },
+  { label: 'Tasks admin', value: 'tasks.admin' },
 ];
 
 export const GenerateApiKey: React.FC = () => {

diff --git a/services/madoc-ts/src/frontend/site/features/ManifestHero.tsx b/services/madoc-ts/src/frontend/site/features/ManifestHero.tsx
@@ -4,9 +4,10 @@ import { IIIFHero } from '../../shared/components/IIIFHero';
 import { useManifest } from '../hooks/use-manifest';
 import { useRelativeLinks } from '../hooks/use-relative-links';
 
-export const ManifestHero: React.FC<{ backgroundColor?: string; hideAsset?: boolean }> = ({
+export const ManifestHero: React.FC<{ backgroundColor?: string; hideAsset?: boolean; titleOverride?: string }> = ({
   backgroundColor,
   hideAsset,
+  titleOverride,
 }) => {
   const { data } = useManifest();
   const manifest = data?.manifest;
@@ -18,7 +19,7 @@ export const ManifestHero: React.FC<{ backgroundColor?: string; hideAsset?: bool
 
   return (
     <IIIFHero
-      title={manifest.label}
+      title={titleOverride ? { none: [titleOverride] } : manifest.label}
       description={manifest.summary}
       backgroundImage={manifest.items.length ? manifest.items[0].thumbnail : ''}
       asset={
@@ -44,8 +45,10 @@ blockEditorFor(ManifestHero, {
   defaultProps: {
     backgroundColor: '#000',
     hideAsset: false,
+    titleOverride: '',
   },
   editor: {
+    titleOverride: { type: 'text-field', label: 'Override the hero title' },
     backgroundColor: { type: 'text-field', label: 'Background color (right side)' },
     hideAsset: { type: 'checkbox-field', label: 'Hide asset', inlineLabel: 'Check this to hide asset on the right' },
   },

diff --git a/services/madoc-ts/src/frontend/site/features/ManifestMetadata.tsx b/services/madoc-ts/src/frontend/site/features/ManifestMetadata.tsx
@@ -20,7 +20,8 @@ export const ManifestMetadata: React.FC<{ hidden?: boolean; compact?: boolean; s
   const { resolvedData: data } = usePaginatedData(ManifestLoader, undefined, { enabled: !!manifestId && !hidden });
   const { data: metadataConfig } = useSiteMetadataConfiguration({ enabled: !hidden });
   const user = useUser();
-  const canSuggest = user && user.scope.indexOf('models.contribute') !== -1;
+  const canSuggest =
+    user && (user.scope.indexOf('models.contribute') !== -1 || user.scope.indexOf('site.admin') !== -1);
 
   if (!data || !metadataConfig || hidden) {
     return null;

diff --git a/services/madoc-ts/src/frontend/site/pages/suggest-metadata.tsx b/services/madoc-ts/src/frontend/site/pages/suggest-metadata.tsx
@@ -27,7 +27,8 @@ export const SuggestMetadata: React.FC = () => {
   const { t } = useTranslation();
   const createLink = useRelativeLinks();
   const config = useMetadataSuggestionConfiguration();
-  const canSuggest = user && user.scope.indexOf('models.contribute') !== -1;
+  const canSuggest =
+    user && (user.scope.indexOf('models.contribute') !== -1 || user.scope.indexOf('site.admin') !== -1);
 
   const { data: canvasRequest } = apiHooks.getSiteCanvasMetadata(() => (canvasId ? [canvasId] : undefined));
   const { data: manifestRequest } = apiHooks.getSiteManifestMetadata(() =>