Skip to content
Merged
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
7 changes: 7 additions & 0 deletions apps/Administration-FE/scripts/check-contract-drift.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ const required = [
'admin-cloud-services.v1.ts',
'admin-data-analytics.v1.ts',
'admin-digital-transformation.v1.ts',
'admin-devops-consult.v1.ts',
'admin-infrastructure-management.v1.ts',
'admin-application-development.v1.ts',
'admin-application-modernization.v1.ts',
'admin-mobile-application-development.v1.ts',
'admin-user-centered-design.v1.ts',
'admin-overview.v1.ts',
];

let failed = false;
Expand Down
2 changes: 2 additions & 0 deletions apps/Administration-FE/scripts/check-i18n.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ const files = [
'components/AuthorsList.tsx',
'components/AuthorForm.tsx',
'components/MediaPreview.tsx',
'components/MediaField.tsx',
'components/FormPageHeader.tsx',
'components/CategoriesList.tsx',
'components/CategoryForm.tsx',
'components/ClientLogosList.tsx',
Expand Down
50 changes: 50 additions & 0 deletions apps/Administration-FE/scripts/generate-client.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,28 @@ const digitalTransformationContractsDir = join(
repoRoot,
'specs/015-admin-digital-transformation/contracts',
);
const devopsConsultContractsDir = join(repoRoot, 'specs/016-admin-devops-consult/contracts');
const infrastructureManagementContractsDir = join(
repoRoot,
'specs/017-admin-infrastructure-management/contracts',
);
const applicationDevelopmentContractsDir = join(
repoRoot,
'specs/018-admin-application-development/contracts',
);
const applicationModernizationContractsDir = join(
repoRoot,
'specs/019-admin-application-modernization/contracts',
);
const mobileApplicationDevelopmentContractsDir = join(
repoRoot,
'specs/020-admin-mobile-application-development/contracts',
);
const userCenteredDesignContractsDir = join(
repoRoot,
'specs/021-admin-user-centered-design/contracts',
);
const overviewContractsDir = join(repoRoot, 'specs/022-admin-overview/contracts');

const contractSets = [
{
Expand Down Expand Up @@ -90,6 +112,34 @@ const contractSets = [
dir: digitalTransformationContractsDir,
files: ['admin-digital-transformation.v1.yaml'],
},
{
dir: devopsConsultContractsDir,
files: ['admin-devops-consult.v1.yaml'],
},
{
dir: infrastructureManagementContractsDir,
files: ['admin-infrastructure-management.v1.yaml'],
},
{
dir: applicationDevelopmentContractsDir,
files: ['admin-application-development.v1.yaml'],
},
{
dir: applicationModernizationContractsDir,
files: ['admin-application-modernization.v1.yaml'],
},
{
dir: mobileApplicationDevelopmentContractsDir,
files: ['admin-mobile-application-development.v1.yaml'],
},
{
dir: userCenteredDesignContractsDir,
files: ['admin-user-centered-design.v1.yaml'],
},
{
dir: overviewContractsDir,
files: ['admin-overview.v1.yaml'],
},
];

mkdirSync(outDir, { recursive: true });
Expand Down
69 changes: 69 additions & 0 deletions apps/Administration-FE/src/components/AdminShell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ import DataAnalyticsList from './DataAnalyticsList';
import DataAnalyticsForm from './DataAnalyticsForm';
import DigitalTransformationList from './DigitalTransformationList';
import DigitalTransformationForm from './DigitalTransformationForm';
import LandingList from './LandingList';
import LandingForm from './LandingForm';
import { LANDING_SECTIONS, isLandingFormView, landingByView } from '../lib/landing-sections';

type View = AdminView;

Expand Down Expand Up @@ -92,6 +95,7 @@ function applyRoute(
setEditingCloudServiceId: (id: string | null) => void;
setEditingDataAnalyticId: (id: string | null) => void;
setEditingDigitalTransformationId: (id: string | null) => void;
setEditingLandingId: (id: string | null) => void;
},
) {
setters.setView(route.view);
Expand Down Expand Up @@ -121,6 +125,7 @@ function applyRoute(
setters.setEditingDigitalTransformationId(
route.view === 'digital_transformation_form' ? route.editingId : null,
);
setters.setEditingLandingId(isLandingFormView(route.view) ? route.editingId : null);
}

export default function AdminShell() {
Expand Down Expand Up @@ -205,6 +210,10 @@ export default function AdminShell() {
const route = readAdminLocation();
return route.view === 'digital_transformation_form' ? route.editingId : null;
});
const [editingLandingId, setEditingLandingId] = useState<string | null>(() => {
const route = readAdminLocation();
return isLandingFormView(route.view) ? route.editingId : null;
});
const [session, setSession] = useState<SessionContext | null>(null);
const [siteSettings, setSiteSettings] = useState<Record<string, unknown> | null>(null);
const [message, setMessage] = useState<string | null>(null);
Expand Down Expand Up @@ -261,6 +270,7 @@ export default function AdminShell() {
setEditingCloudServiceId,
setEditingDataAnalyticId,
setEditingDigitalTransformationId,
setEditingLandingId,
});
}, []);

Expand Down Expand Up @@ -358,6 +368,11 @@ export default function AdminShell() {
document.title = t('admin.workspace.digital_transformation');
return;
}
const landing = landingByView(view);
if (landing) {
document.title = t(`admin.workspace.${landing.resource}`);
return;
}
if (view === 'blogs' || view === 'blog_form') {
document.title = t('admin.workspace.blogs');
return;
Expand Down Expand Up @@ -574,6 +589,15 @@ export default function AdminShell() {
const canPublishCloudServices = hasPermission(session, 'cloud_services.publish');
const canPublishDataAnalytics = hasPermission(session, 'data_analytics.publish');
const canPublishDigitalTransformation = hasPermission(session, 'digital_transformation.publish');
const canReadLandings = Object.fromEntries(
LANDING_SECTIONS.map((section) => [section.resource, canReadResource(session, section.resource)]),
);
const canPublishLandings = Object.fromEntries(
LANDING_SECTIONS.map((section) => [
section.resource,
hasPermission(session, `${section.resource}.publish`),
]),
);
const canManageRoles = canManageRolesFrom(session);
const settingsCurrent = view === 'roles' || view === 'role_form';
const initial = session.email.slice(0, 1).toUpperCase();
Expand Down Expand Up @@ -607,6 +631,7 @@ export default function AdminShell() {
canReadCloudServices ||
canReadDataAnalytics ||
canReadDigitalTransformation ||
LANDING_SECTIONS.some((section) => canReadLandings[section.resource]) ||
canReadBlogs ||
canReadCaseStudies ||
canReadIndustries ||
Expand Down Expand Up @@ -787,6 +812,25 @@ export default function AdminShell() {
</a>
</li>
)}
{LANDING_SECTIONS.map(
(section) =>
canReadLandings[section.resource] && (
<li key={section.resource}>
<a
href={adminListHref(section.listView as AdminView)}
className={view === section.listView || view === section.formView ? 'active' : ''}
aria-current={
view === section.listView || view === section.formView ? 'page' : undefined
}
onClick={(event) =>
onNavClick(event, adminListHref(section.listView as AdminView))
}
>
{t(`admin.workspace.${section.resource}`)}
</a>
</li>
),
)}
{canReadBlogs && (
<li>
<a
Expand Down Expand Up @@ -1121,6 +1165,31 @@ export default function AdminShell() {
}
/>
)}
{LANDING_SECTIONS.map((section) =>
view === section.listView ? (
<LandingList
key={`${section.resource}-${listEpoch}`}
section={section}
notice={message}
onAdd={() => openForm(section.listView as AdminView, null)}
onEdit={(id) => openForm(section.listView as AdminView, id)}
/>
) : view === section.formView ? (
<LandingForm
key={`${section.resource}-form`}
section={section}
entryId={editingLandingId}
canPublish={Boolean(canPublishLandings[section.resource])}
onCancel={() => openList(section.listView as AdminView)}
onSaved={() =>
afterListSave(
() => openList(section.listView as AdminView),
t(`${section.ns}.saved`),
)
}
/>
) : null,
)}
{view === 'blogs' && (
<BlogsList
key={`blogs-${listEpoch}`}
Expand Down
88 changes: 43 additions & 45 deletions apps/Administration-FE/src/components/AiServiceForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import {
import { adminListHref } from '../lib/admin-routes';
import { hydrateRichText, persistRichText } from '../lib/rich-text';
import { t } from '../lib/i18n';
import MediaPreview from './MediaPreview';
import FormPageHeader from './FormPageHeader';
import MediaField from './MediaField';
import MultiSelect from './MultiSelect';
import RepeatableSection from './RepeatableSection';
import RichTextEditor from './RichTextEditor';
Expand Down Expand Up @@ -220,9 +221,11 @@ export default function AiServiceForm({ entryId, canPublish, onCancel, onSaved }

return (
<section className="role-form-page">
<div className="panel-header">
<h2>{entryId ? t('admin.ai_services.edit') : t('admin.ai_services.add')}</h2>
</div>
<FormPageHeader
title={entryId ? t('admin.ai_services.edit') : t('admin.ai_services.add')}
onBack={onCancel}
disabled={saving}
/>
<form
onSubmit={(event: FormEvent) => {
event.preventDefault();
Expand All @@ -238,18 +241,16 @@ export default function AiServiceForm({ entryId, canPublish, onCancel, onSaved }
autoComplete="off"
/>
</label>
<label>
{t('admin.ai_services.banner_image')}
<input
type="file"
accept="image/jpeg,image/png,image/gif,image/webp"
onChange={(event) => setBannerFile(event.target.files?.[0] || null)}
/>
</label>
<MediaPreview
mediaKeys={bannerFile ? [] : bannerKey ? [bannerKey] : []}
files={bannerFile ? [bannerFile] : []}
<MediaField
label={t('admin.ai_services.banner_image')}
alt={bannerTitle || t('admin.ai_services.banner_image')}
storedKey={bannerKey}
file={bannerFile}
onFile={setBannerFile}
onClear={() => {
setBannerFile(null);
setBannerKey(null);
}}
/>
<label>
{t('admin.ai_services.introduction_title')}
Expand Down Expand Up @@ -329,26 +330,25 @@ export default function AiServiceForm({ entryId, canPublish, onCancel, onSaved }
maxLength={200}
/>
</label>
<label>
{t('admin.ai_services.industry_image')}
<input
type="file"
accept="image/jpeg,image/png,image/gif,image/webp"
onChange={(event) =>
setIndustryItems((rows) =>
rows.map((row, rowIndex) =>
rowIndex === index
? { ...row, imageFile: event.target.files?.[0] || null }
: row,
),
)
}
/>
</label>
<MediaPreview
mediaKeys={item.imageFile ? [] : item.image_key ? [item.image_key] : []}
files={item.imageFile ? [item.imageFile] : []}
<MediaField
label={t('admin.ai_services.industry_image')}
alt={item.title || t('admin.ai_services.industry_image')}
storedKey={item.image_key}
file={item.imageFile}
onFile={(file) =>
setIndustryItems((rows) =>
rows.map((row, rowIndex) =>
rowIndex === index ? { ...row, imageFile: file } : row,
),
)
}
onClear={() =>
setIndustryItems((rows) =>
rows.map((row, rowIndex) =>
rowIndex === index ? { ...row, imageFile: null, image_key: null } : row,
),
)
}
/>
</>
)}
Expand All @@ -362,18 +362,16 @@ export default function AiServiceForm({ entryId, canPublish, onCancel, onSaved }
autoComplete="off"
/>
</label>
<label>
{t('admin.ai_services.ai_expertise_image')}
<input
type="file"
accept="image/jpeg,image/png,image/gif,image/webp"
onChange={(event) => setExpertiseFile(event.target.files?.[0] || null)}
/>
</label>
<MediaPreview
mediaKeys={expertiseFile ? [] : expertiseKey ? [expertiseKey] : []}
files={expertiseFile ? [expertiseFile] : []}
<MediaField
label={t('admin.ai_services.ai_expertise_image')}
alt={expertiseTitle || t('admin.ai_services.ai_expertise_image')}
storedKey={expertiseKey}
file={expertiseFile}
onFile={setExpertiseFile}
onClear={() => {
setExpertiseFile(null);
setExpertiseKey(null);
}}
/>
<RepeatableSection
title={t('admin.ai_services.ai_expertise_accordion')}
Expand Down
Loading
Loading