Skip to content
Draft
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
3 changes: 3 additions & 0 deletions src/lib/bullmq.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ export enum JobType {
Email_ProjectImportReport = 'Project Import Report',
// Svelte Project SSE
SvelteSSE_UpdateProject = 'Update Project',
SvelteSSE_UpdateProjectGroups = 'Update Project Groups',
SvelteSSE_UpdateProjectOrg = 'Update Project Org',
SvelteSSE_UpdateProjectProducts = 'Update Project Products',
SvelteSSE_UpdateUserTasks = 'Update UserTasks'
}

Expand Down
31 changes: 14 additions & 17 deletions src/lib/icons/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import type { Prisma } from '@prisma/client';
import type { ValidI13nKey } from '$lib/locales.svelte';
import type { Locale } from '$lib/paraglide/runtime';
import {
ApplicationType,
Expand All @@ -12,6 +10,7 @@ import {
WorkflowType
} from '$lib/prisma';
import { ProductActionType } from '$lib/products';
import type { Action } from '$lib/projects/components/ProjectActionEntry.svelte';
import { ProductType, WorkflowAction } from '$lib/workflowTypes';

export function getActionIcon(type: ProductActionType) {
Expand Down Expand Up @@ -89,7 +88,7 @@ export function getFlagIcon(locale: Locale) {
}
}

export function getProductIcon(type: ProductType) {
export function getProductIcon(type?: ProductType) {
switch (type) {
case ProductType.Web:
return 'mdi:web';
Expand All @@ -100,19 +99,17 @@ export function getProductIcon(type: ProductType) {
}
}

export function getProjectActionIcon(
args: Prisma.ProjectActionsGetPayload<{ select: { ActionType: true; Action: true; Value: true } }>
) {
switch (args.ActionType) {
export function getProjectActionIcon(args: Pick<Action, 'T' | 'A' | 'V'>) {
switch (args.T) {
case ProjectActionType.Archival:
switch (args.Action as ValidI13nKey) {
switch (args.A) {
case ProjectActionString.Archive:
return Icons.Archive;
default:
return Icons.ReactivateProject;
}
case ProjectActionType.Access:
switch (args.Action.replace(/Project /, '')) {
switch (args.A.replace(/Project /, '')) {
case 'Upload':
return 'material-symbols:upload';
case 'Download':
Expand All @@ -121,35 +118,35 @@ export function getProjectActionIcon(
return Icons.Star;
}
case ProjectActionType.OwnerGroup:
switch (args.Action as ValidI13nKey) {
switch (args.A) {
case ProjectActionString.AssignGroup:
return Icons.AddGroup;
default:
return Icons.AddUser;
}
case ProjectActionType.Product:
switch (args.Action as ValidI13nKey) {
switch (args.A) {
case ProjectActionString.AddProduct:
return Icons.AddProduct;
default:
return Icons.Trash;
}
case ProjectActionType.Author:
switch (args.Action as ValidI13nKey) {
switch (args.A) {
case ProjectActionString.AddAuthor:
return Icons.AddAuthor;
default:
return Icons.Trash;
}
case ProjectActionType.Reviewer:
switch (args.Action as ValidI13nKey) {
switch (args.A) {
case ProjectActionString.AddReviewer:
return Icons.AddReviewer;
default:
return Icons.Trash;
}
case ProjectActionType.EditField:
switch (args.Value as ValidI13nKey) {
switch (args.V) {
case ProjectActionValue.AutoPublishOn:
return Icons.RefreshOn;
case ProjectActionValue.AutoPublishOff:
Expand Down Expand Up @@ -215,9 +212,9 @@ export function getTransitionIcon(
return getActionIcon(ProductActionType.CancelWorkflow);
case ProductTransitionType.ProjectAccess:
return getProjectActionIcon({
ActionType: ProjectActionType.Access,
Action: command ?? '',
Value: null
T: ProjectActionType.Access,
A: command ?? '',
V: null
});
case ProductTransitionType.Migration:
return Icons.Transfer;
Expand Down
18 changes: 17 additions & 1 deletion src/lib/organizations/components/StoreListDisplay.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@
>
import type { Prisma } from '@prisma/client';
import type { Snippet } from 'svelte';
import { page } from '$app/state';
import Tooltip from '$lib/components/Tooltip.svelte';
import DataDisplayBox from '$lib/components/settings/DataDisplayBox.svelte';
import { Icons, getStoreIcon } from '$lib/icons';
import IconContainer from '$lib/icons/IconContainer.svelte';
import type { ValidI13nKey } from '$lib/locales.svelte';
import { m } from '$lib/paraglide/messages';
import { getLocale } from '$lib/paraglide/runtime';
import { StoreType, displayStoreGPTitle } from '$lib/prisma';
import { isSuperAdmin } from '$lib/utils/roles';
import { byName } from '$lib/utils/sorting';

interface Props {
editable: boolean;
Expand All @@ -21,9 +25,10 @@
getTitle: (store: Store) => string;
extra?: Snippet<[Store]>;
showDescription?: boolean;
users?: (Prisma.OrganizationsGetPayload<{ select: { Name: true } }> & { Products: number })[];
}

let { editable, editLink, store, getTitle, extra, showDescription }: Props = $props();
let { editable, editLink, store, getTitle, extra, showDescription, users }: Props = $props();

const missingGPTitle = $derived(
store.StoreTypeId === StoreType.GooglePlay && editable && !store.GooglePlayTitle
Expand Down Expand Up @@ -55,6 +60,17 @@
snippet: missingGPTitle ? gpTitleError : undefined
}
]
: []),
...(users?.length && isSuperAdmin(page.data.session!.user.roles)
? [
{
key: 'org_title' as ValidI13nKey,
value: users
.toSorted((a, b) => byName(a, b, getLocale()))
.map((u) => `${u.Name} (${u.Products})`)
.join(', ')
}
]
: [])
]}
>
Expand Down
6 changes: 3 additions & 3 deletions src/lib/products/components/BuildArtifacts.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
linkToBuildEngine(
buildEngineUrl,
{
BuildEngineJobId: 0,
CurrentBuildId: build.BuildEngineBuildId,
CurrentReleaseId: null
J: 0,
CB: build.BuildEngineBuildId,
CR: null
},
WorkflowState.Product_Build
),
Expand Down
Loading
Loading