Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 392060bf23 | |||
| 8cb5e4fa96 | |||
| c60a0ed536 | |||
| 087b8c0bb3 | |||
| ffe7ffbde9 | |||
| b9a3d79b5f |
23
changelog.md
23
changelog.md
@@ -1,5 +1,28 @@
|
||||
# Changelog
|
||||
|
||||
## 2026-03-20 - 1.7.0 - feat(organization)
|
||||
add organization rename redirects and redirect management endpoints
|
||||
|
||||
- add OrgRedirect model and resolve organizations by historical names
|
||||
- support renaming organizations while preserving the previous handle as a redirect alias
|
||||
- add typed requests to list and delete organization redirects with admin permission checks
|
||||
- allow organization update actions to send name changes
|
||||
|
||||
## 2026-03-20 - 1.6.0 - feat(web-organizations)
|
||||
add organization detail editing and isolate detail view state from global navigation
|
||||
|
||||
- adds an update organization action to persist organization detail edits from the detail view
|
||||
- updates organization and package views to track selected detail entities locally instead of mutating global ui state
|
||||
- preserves resolved app shell tabs for role-based filtering after async tab loading
|
||||
- includes type-cast fixes for admin auth provider responses and bundled file Response bodies
|
||||
|
||||
## 2026-03-20 - 1.5.1 - fix(web-app)
|
||||
update dashboard navigation to use the router directly and refresh admin tabs on login changes
|
||||
|
||||
- removes the global router workaround in the dashboard and imports appRouter directly
|
||||
- re-filters resolved view tabs when login state changes so the Admin tab matches system admin access
|
||||
- adds dashboard navigation support for the organizations view
|
||||
|
||||
## 2026-03-20 - 1.5.0 - feat(opsserver,web)
|
||||
replace the Angular UI and REST management layer with a TypedRequest-based ops server and bundled web frontend
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@stack.gallery/registry",
|
||||
"version": "1.5.0",
|
||||
"version": "1.7.0",
|
||||
"exports": "./mod.ts",
|
||||
"nodeModulesDir": "auto",
|
||||
"tasks": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@stack.gallery/registry",
|
||||
"version": "1.5.0",
|
||||
"version": "1.7.0",
|
||||
"private": true,
|
||||
"description": "Enterprise-grade multi-protocol package registry",
|
||||
"type": "module",
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@stack.gallery/registry',
|
||||
version: '1.5.0',
|
||||
version: '1.7.0',
|
||||
description: 'Enterprise-grade multi-protocol package registry'
|
||||
}
|
||||
|
||||
@@ -15,6 +15,9 @@ export { ApiToken } from './apitoken.ts';
|
||||
export { Session } from './session.ts';
|
||||
export { AuditLog } from './auditlog.ts';
|
||||
|
||||
// Organization redirects
|
||||
export { OrgRedirect } from './org.redirect.ts';
|
||||
|
||||
// External authentication models
|
||||
export { AuthProvider } from './auth.provider.ts';
|
||||
export { ExternalIdentity } from './external.identity.ts';
|
||||
|
||||
59
ts/models/org.redirect.ts
Normal file
59
ts/models/org.redirect.ts
Normal file
@@ -0,0 +1,59 @@
|
||||
/**
|
||||
* OrgRedirect model - stores old org handles as redirect aliases
|
||||
* When an org is renamed, the old name becomes a redirect pointing to the org.
|
||||
* Redirects can be explicitly deleted by org admins.
|
||||
*/
|
||||
|
||||
import * as plugins from '../plugins.ts';
|
||||
import { db } from './db.ts';
|
||||
|
||||
@plugins.smartdata.Collection(() => db)
|
||||
export class OrgRedirect extends plugins.smartdata.SmartDataDbDoc<OrgRedirect, OrgRedirect> {
|
||||
@plugins.smartdata.unI()
|
||||
public id: string = '';
|
||||
|
||||
@plugins.smartdata.svDb()
|
||||
@plugins.smartdata.index({ unique: true })
|
||||
public oldName: string = '';
|
||||
|
||||
@plugins.smartdata.svDb()
|
||||
@plugins.smartdata.index()
|
||||
public organizationId: string = '';
|
||||
|
||||
@plugins.smartdata.svDb()
|
||||
public createdAt: Date = new Date();
|
||||
|
||||
/**
|
||||
* Create a redirect from an old org name to the current org
|
||||
*/
|
||||
public static async create(oldName: string, organizationId: string): Promise<OrgRedirect> {
|
||||
const redirect = new OrgRedirect();
|
||||
redirect.id = `redirect:${oldName}`;
|
||||
redirect.oldName = oldName;
|
||||
redirect.organizationId = organizationId;
|
||||
redirect.createdAt = new Date();
|
||||
await redirect.save();
|
||||
return redirect;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find a redirect by the old name
|
||||
*/
|
||||
public static async findByName(name: string): Promise<OrgRedirect | null> {
|
||||
return await OrgRedirect.getInstance({ oldName: name } as any);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all redirects for an organization
|
||||
*/
|
||||
public static async getByOrgId(organizationId: string): Promise<OrgRedirect[]> {
|
||||
return await OrgRedirect.getInstances({ organizationId } as any);
|
||||
}
|
||||
|
||||
/**
|
||||
* Find a redirect by ID
|
||||
*/
|
||||
public static async findById(id: string): Promise<OrgRedirect | null> {
|
||||
return await OrgRedirect.getInstance({ id } as any);
|
||||
}
|
||||
}
|
||||
@@ -26,7 +26,7 @@ export class AdminHandler {
|
||||
try {
|
||||
const providers = await AuthProvider.getAllProviders();
|
||||
return {
|
||||
providers: providers.map((p) => p.toAdminInfo()),
|
||||
providers: providers.map((p) => p.toAdminInfo() as unknown as interfaces.data.IAuthProvider),
|
||||
};
|
||||
} catch (error) {
|
||||
if (error instanceof plugins.typedrequest.TypedResponseError) throw error;
|
||||
@@ -124,7 +124,7 @@ export class AdminHandler {
|
||||
},
|
||||
});
|
||||
|
||||
return { provider: provider.toAdminInfo() };
|
||||
return { provider: provider.toAdminInfo() as unknown as interfaces.data.IAuthProvider };
|
||||
} catch (error) {
|
||||
if (error instanceof plugins.typedrequest.TypedResponseError) throw error;
|
||||
throw new plugins.typedrequest.TypedResponseError('Failed to create provider');
|
||||
@@ -146,7 +146,7 @@ export class AdminHandler {
|
||||
throw new plugins.typedrequest.TypedResponseError('Provider not found');
|
||||
}
|
||||
|
||||
return { provider: provider.toAdminInfo() };
|
||||
return { provider: provider.toAdminInfo() as unknown as interfaces.data.IAuthProvider };
|
||||
} catch (error) {
|
||||
if (error instanceof plugins.typedrequest.TypedResponseError) throw error;
|
||||
throw new plugins.typedrequest.TypedResponseError('Failed to get provider');
|
||||
@@ -235,7 +235,7 @@ export class AdminHandler {
|
||||
metadata: { providerName: provider.name },
|
||||
});
|
||||
|
||||
return { provider: provider.toAdminInfo() };
|
||||
return { provider: provider.toAdminInfo() as unknown as interfaces.data.IAuthProvider };
|
||||
} catch (error) {
|
||||
if (error instanceof plugins.typedrequest.TypedResponseError) throw error;
|
||||
throw new plugins.typedrequest.TypedResponseError('Failed to update provider');
|
||||
|
||||
@@ -2,7 +2,7 @@ import * as plugins from '../../plugins.ts';
|
||||
import * as interfaces from '../../../ts_interfaces/index.ts';
|
||||
import type { OpsServer } from '../classes.opsserver.ts';
|
||||
import { requireValidIdentity } from '../helpers/guards.ts';
|
||||
import { Organization, OrganizationMember, User } from '../../models/index.ts';
|
||||
import { Organization, OrganizationMember, OrgRedirect, User } from '../../models/index.ts';
|
||||
import { PermissionService } from '../../services/permission.service.ts';
|
||||
import { AuditService } from '../../services/audit.service.ts';
|
||||
|
||||
@@ -19,9 +19,18 @@ export class OrganizationHandler {
|
||||
* Helper to resolve organization by ID or name
|
||||
*/
|
||||
private async resolveOrganization(idOrName: string): Promise<Organization | null> {
|
||||
return idOrName.startsWith('Organization:')
|
||||
? await Organization.findById(idOrName)
|
||||
: await Organization.findByName(idOrName);
|
||||
if (idOrName.startsWith('Organization:')) {
|
||||
return await Organization.findById(idOrName);
|
||||
}
|
||||
// Try direct name lookup first
|
||||
const org = await Organization.findByName(idOrName);
|
||||
if (org) return org;
|
||||
// Check redirects
|
||||
const redirect = await OrgRedirect.findByName(idOrName);
|
||||
if (redirect) {
|
||||
return await Organization.findById(redirect.organizationId);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private registerHandlers(): void {
|
||||
@@ -232,6 +241,36 @@ export class OrganizationHandler {
|
||||
throw new plugins.typedrequest.TypedResponseError('Admin access required');
|
||||
}
|
||||
|
||||
// Handle rename
|
||||
if (dataArg.name && dataArg.name !== org.name) {
|
||||
const newName = dataArg.name;
|
||||
// Validate name format
|
||||
if (!/^[a-z0-9]([a-z0-9.-]*[a-z0-9])?$/.test(newName)) {
|
||||
throw new plugins.typedrequest.TypedResponseError(
|
||||
'Name must be lowercase alphanumeric with optional hyphens and dots',
|
||||
);
|
||||
}
|
||||
// Check new name not taken by another org
|
||||
const existingOrg = await Organization.findByName(newName);
|
||||
if (existingOrg && existingOrg.id !== org.id) {
|
||||
throw new plugins.typedrequest.TypedResponseError('Organization name already taken');
|
||||
}
|
||||
// Check new name not taken by a redirect pointing elsewhere
|
||||
const existingRedirect = await OrgRedirect.findByName(newName);
|
||||
if (existingRedirect && existingRedirect.organizationId !== org.id) {
|
||||
throw new plugins.typedrequest.TypedResponseError(
|
||||
'Name is reserved as a redirect for another organization',
|
||||
);
|
||||
}
|
||||
// If new name is one of our own redirects, delete that redirect
|
||||
if (existingRedirect && existingRedirect.organizationId === org.id) {
|
||||
await existingRedirect.delete();
|
||||
}
|
||||
// Create redirect from old name
|
||||
await OrgRedirect.create(org.name, org.id);
|
||||
org.name = newName;
|
||||
}
|
||||
|
||||
if (dataArg.displayName !== undefined) org.displayName = dataArg.displayName;
|
||||
if (dataArg.description !== undefined) org.description = dataArg.description;
|
||||
if (dataArg.avatarUrl !== undefined) org.avatarUrl = dataArg.avatarUrl;
|
||||
@@ -544,5 +583,69 @@ export class OrganizationHandler {
|
||||
},
|
||||
),
|
||||
);
|
||||
|
||||
// Get Org Redirects
|
||||
this.typedrouter.addTypedHandler(
|
||||
new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_GetOrgRedirects>(
|
||||
'getOrgRedirects',
|
||||
async (dataArg) => {
|
||||
await requireValidIdentity(this.opsServerRef.authHandler, dataArg);
|
||||
|
||||
try {
|
||||
const org = await this.resolveOrganization(dataArg.organizationId);
|
||||
if (!org) {
|
||||
throw new plugins.typedrequest.TypedResponseError('Organization not found');
|
||||
}
|
||||
|
||||
const redirects = await OrgRedirect.getByOrgId(org.id);
|
||||
return {
|
||||
redirects: redirects.map((r) => ({
|
||||
id: r.id,
|
||||
oldName: r.oldName,
|
||||
organizationId: r.organizationId,
|
||||
createdAt: r.createdAt instanceof Date
|
||||
? r.createdAt.toISOString()
|
||||
: String(r.createdAt),
|
||||
})),
|
||||
};
|
||||
} catch (error) {
|
||||
if (error instanceof plugins.typedrequest.TypedResponseError) throw error;
|
||||
throw new plugins.typedrequest.TypedResponseError('Failed to get redirects');
|
||||
}
|
||||
},
|
||||
),
|
||||
);
|
||||
|
||||
// Delete Org Redirect
|
||||
this.typedrouter.addTypedHandler(
|
||||
new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_DeleteOrgRedirect>(
|
||||
'deleteOrgRedirect',
|
||||
async (dataArg) => {
|
||||
await requireValidIdentity(this.opsServerRef.authHandler, dataArg);
|
||||
|
||||
try {
|
||||
const redirect = await OrgRedirect.findById(dataArg.redirectId);
|
||||
if (!redirect) {
|
||||
throw new plugins.typedrequest.TypedResponseError('Redirect not found');
|
||||
}
|
||||
|
||||
// Check permission on the org
|
||||
const canManage = await this.permissionService.canManageOrganization(
|
||||
dataArg.identity.userId,
|
||||
redirect.organizationId,
|
||||
);
|
||||
if (!canManage && !dataArg.identity.isSystemAdmin) {
|
||||
throw new plugins.typedrequest.TypedResponseError('Admin access required');
|
||||
}
|
||||
|
||||
await redirect.delete();
|
||||
return { message: 'Redirect deleted successfully' };
|
||||
} catch (error) {
|
||||
if (error instanceof plugins.typedrequest.TypedResponseError) throw error;
|
||||
throw new plugins.typedrequest.TypedResponseError('Failed to delete redirect');
|
||||
}
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -325,7 +325,7 @@ export class StackGalleryRegistry {
|
||||
// Get bundled file
|
||||
const file = bundledFileMap.get(filePath);
|
||||
if (file) {
|
||||
return new Response(file.data, {
|
||||
return new Response(file.data as unknown as BodyInit, {
|
||||
status: 200,
|
||||
headers: { 'Content-Type': file.contentType },
|
||||
});
|
||||
@@ -334,7 +334,7 @@ export class StackGalleryRegistry {
|
||||
// SPA fallback: serve index.html for unknown paths
|
||||
const indexFile = bundledFileMap.get('/index.html');
|
||||
if (indexFile) {
|
||||
return new Response(indexFile.data, {
|
||||
return new Response(indexFile.data as unknown as BodyInit, {
|
||||
status: 200,
|
||||
headers: { 'Content-Type': 'text/html' },
|
||||
});
|
||||
|
||||
@@ -42,6 +42,13 @@ export interface IOrganizationMember {
|
||||
} | null;
|
||||
}
|
||||
|
||||
export interface IOrgRedirect {
|
||||
id: string;
|
||||
oldName: string;
|
||||
organizationId: string;
|
||||
createdAt: string;
|
||||
}
|
||||
|
||||
// Re-export types used by settings
|
||||
import type { TRepositoryVisibility } from './repository.ts';
|
||||
import type { TRegistryProtocol } from './package.ts';
|
||||
|
||||
@@ -61,6 +61,7 @@ export interface IReq_UpdateOrganization extends
|
||||
request: {
|
||||
identity: data.IIdentity;
|
||||
organizationId: string;
|
||||
name?: string;
|
||||
displayName?: string;
|
||||
description?: string;
|
||||
avatarUrl?: string;
|
||||
@@ -159,3 +160,37 @@ export interface IReq_RemoveOrganizationMember extends
|
||||
message: string;
|
||||
};
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Organization Redirect Requests
|
||||
// ============================================================================
|
||||
|
||||
export interface IReq_GetOrgRedirects extends
|
||||
plugins.typedrequestInterfaces.implementsTR<
|
||||
plugins.typedrequestInterfaces.ITypedRequest,
|
||||
IReq_GetOrgRedirects
|
||||
> {
|
||||
method: 'getOrgRedirects';
|
||||
request: {
|
||||
identity: data.IIdentity;
|
||||
organizationId: string;
|
||||
};
|
||||
response: {
|
||||
redirects: data.IOrgRedirect[];
|
||||
};
|
||||
}
|
||||
|
||||
export interface IReq_DeleteOrgRedirect extends
|
||||
plugins.typedrequestInterfaces.implementsTR<
|
||||
plugins.typedrequestInterfaces.ITypedRequest,
|
||||
IReq_DeleteOrgRedirect
|
||||
> {
|
||||
method: 'deleteOrgRedirect';
|
||||
request: {
|
||||
identity: data.IIdentity;
|
||||
redirectId: string;
|
||||
};
|
||||
response: {
|
||||
message: string;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
*/
|
||||
export const commitinfo = {
|
||||
name: '@stack.gallery/registry',
|
||||
version: '1.5.0',
|
||||
version: '1.7.0',
|
||||
description: 'Enterprise-grade multi-protocol package registry'
|
||||
}
|
||||
|
||||
@@ -276,6 +276,31 @@ export const createOrganizationAction = organizationsStatePart.createAction<{
|
||||
}
|
||||
});
|
||||
|
||||
export const updateOrganizationAction = organizationsStatePart.createAction<{
|
||||
organizationId: string;
|
||||
name?: string;
|
||||
displayName?: string;
|
||||
description?: string;
|
||||
website?: string;
|
||||
isPublic?: boolean;
|
||||
}>(async (statePartArg, dataArg) => {
|
||||
const context = getActionContext();
|
||||
if (!context.identity) return statePartArg.getState();
|
||||
try {
|
||||
const typedRequest = createTypedRequest<interfaces.requests.IReq_UpdateOrganization>(
|
||||
'updateOrganization',
|
||||
);
|
||||
const response = await typedRequest.fire({
|
||||
identity: context.identity,
|
||||
...dataArg,
|
||||
});
|
||||
// Update the current org in state
|
||||
return { ...statePartArg.getState(), currentOrg: response.organization };
|
||||
} catch {
|
||||
return statePartArg.getState();
|
||||
}
|
||||
});
|
||||
|
||||
export const deleteOrganizationAction = organizationsStatePart.createAction<{
|
||||
organizationId: string;
|
||||
}>(async (statePartArg, dataArg) => {
|
||||
|
||||
@@ -72,19 +72,23 @@ export class SgAppShell extends DeesElement {
|
||||
},
|
||||
];
|
||||
|
||||
private allResolvedViewTabs: Array<{ name: string; iconName?: string; element: any }> = [];
|
||||
private resolvedViewTabs: Array<{ name: string; iconName?: string; element: any }> = [];
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
document.title = 'Stack.Gallery Registry';
|
||||
|
||||
// Make appRouter globally accessible for view elements
|
||||
(globalThis as any).__sgAppRouter = appRouter;
|
||||
|
||||
const loginSubscription = appstate.loginStatePart
|
||||
.select((s) => s)
|
||||
.subscribe((loginState) => {
|
||||
this.loginState = loginState;
|
||||
// Re-filter tabs when login state changes
|
||||
if (loginState.isLoggedIn && this.allResolvedViewTabs.length > 0) {
|
||||
this.resolvedViewTabs = loginState.identity?.isSystemAdmin
|
||||
? this.allResolvedViewTabs
|
||||
: this.allResolvedViewTabs.filter((t) => t.name !== 'Admin');
|
||||
}
|
||||
});
|
||||
this.rxSubscriptions.push(loginSubscription);
|
||||
|
||||
@@ -148,7 +152,7 @@ export class SgAppShell extends DeesElement {
|
||||
this.fetchAuthProviders();
|
||||
|
||||
// Resolve async view tab imports
|
||||
const allTabs = await Promise.all(
|
||||
this.allResolvedViewTabs = await Promise.all(
|
||||
this.viewTabs.map(async (tab) => ({
|
||||
name: tab.name,
|
||||
iconName: tab.iconName,
|
||||
@@ -158,8 +162,8 @@ export class SgAppShell extends DeesElement {
|
||||
|
||||
// Filter admin tab based on user role
|
||||
this.resolvedViewTabs = this.loginState.identity?.isSystemAdmin
|
||||
? allTabs
|
||||
: allTabs.filter((t) => t.name !== 'Admin');
|
||||
? this.allResolvedViewTabs
|
||||
: this.allResolvedViewTabs.filter((t) => t.name !== 'Admin');
|
||||
|
||||
this.requestUpdate();
|
||||
await this.updateComplete;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import * as appstate from '../appstate.js';
|
||||
import * as shared from './shared/index.js';
|
||||
import { appRouter } from '../router.js';
|
||||
import {
|
||||
css,
|
||||
cssManager,
|
||||
@@ -77,24 +78,15 @@ export class SgViewDashboard extends DeesElement {
|
||||
private handleNavigate(e: CustomEvent) {
|
||||
const { type, id } = e.detail;
|
||||
if (type === 'org' && id) {
|
||||
const { appRouter } = await_import_router();
|
||||
appRouter.navigateToEntity('organizations', id);
|
||||
} else if (type === 'org') {
|
||||
appRouter.navigateToView('organizations');
|
||||
} else if (type === 'package' && id) {
|
||||
const { appRouter } = await_import_router();
|
||||
appRouter.navigateToEntity('packages', id);
|
||||
} else if (type === 'packages') {
|
||||
const { appRouter } = await_import_router();
|
||||
appRouter.navigateToView('packages');
|
||||
} else if (type === 'tokens') {
|
||||
const { appRouter } = await_import_router();
|
||||
appRouter.navigateToView('tokens');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Lazy import to avoid circular dependency
|
||||
function await_import_router() {
|
||||
// Dynamic import not needed here since router is a separate module
|
||||
// We use a workaround by importing at the module level
|
||||
return { appRouter: (globalThis as any).__sgAppRouter };
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import * as appstate from '../appstate.js';
|
||||
import * as shared from './shared/index.js';
|
||||
import { appRouter } from '../router.js';
|
||||
import {
|
||||
css,
|
||||
cssManager,
|
||||
@@ -23,6 +24,9 @@ export class SgViewOrganizations extends DeesElement {
|
||||
@state()
|
||||
accessor uiState: appstate.IUiState = { activeView: 'organizations' };
|
||||
|
||||
@state()
|
||||
accessor detailOrgId: string | null = null;
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
const orgSub = appstate.organizationsStatePart
|
||||
@@ -48,9 +52,10 @@ export class SgViewOrganizations extends DeesElement {
|
||||
async connectedCallback() {
|
||||
super.connectedCallback();
|
||||
await appstate.organizationsStatePart.dispatchAction(appstate.fetchOrganizationsAction, null);
|
||||
// If there's an entity ID, load the detail
|
||||
// If there's an entity ID from the URL, copy it to internal state
|
||||
if (this.uiState.activeEntityId) {
|
||||
await this.loadOrgDetail(this.uiState.activeEntityId);
|
||||
this.detailOrgId = this.uiState.activeEntityId;
|
||||
await this.loadOrgDetail(this.detailOrgId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,7 +75,7 @@ export class SgViewOrganizations extends DeesElement {
|
||||
}
|
||||
|
||||
public render(): TemplateResult {
|
||||
if (this.uiState.activeEntityId && this.organizationsState.currentOrg) {
|
||||
if (this.detailOrgId && this.organizationsState.currentOrg) {
|
||||
return html`
|
||||
<sg-organization-detail-view
|
||||
.organization="${this.organizationsState.currentOrg}"
|
||||
@@ -79,6 +84,8 @@ export class SgViewOrganizations extends DeesElement {
|
||||
@back="${() => this.goBack()}"
|
||||
@select-repo="${(e: CustomEvent) => this.selectRepo(e.detail.repositoryId)}"
|
||||
@create-repo="${() => {/* TODO: create repo modal */}}"
|
||||
@edit="${(e: CustomEvent) => this.handleEditOrg(e.detail)}"
|
||||
@delete="${(e: CustomEvent) => this.handleDeleteOrg(e.detail.organizationId)}"
|
||||
></sg-organization-detail-view>
|
||||
`;
|
||||
}
|
||||
@@ -93,10 +100,7 @@ export class SgViewOrganizations extends DeesElement {
|
||||
}
|
||||
|
||||
private selectOrg(orgId: string) {
|
||||
appstate.uiStatePart.setState({
|
||||
...appstate.uiStatePart.getState(),
|
||||
activeEntityId: orgId,
|
||||
});
|
||||
this.detailOrgId = orgId;
|
||||
this.loadOrgDetail(orgId);
|
||||
}
|
||||
|
||||
@@ -106,10 +110,7 @@ export class SgViewOrganizations extends DeesElement {
|
||||
}
|
||||
|
||||
private goBack() {
|
||||
appstate.uiStatePart.setState({
|
||||
...appstate.uiStatePart.getState(),
|
||||
activeEntityId: undefined,
|
||||
});
|
||||
this.detailOrgId = null;
|
||||
appstate.organizationsStatePart.setState({
|
||||
...appstate.organizationsStatePart.getState(),
|
||||
currentOrg: null,
|
||||
@@ -118,6 +119,31 @@ export class SgViewOrganizations extends DeesElement {
|
||||
});
|
||||
}
|
||||
|
||||
private async handleEditOrg(data: {
|
||||
organizationId: string;
|
||||
displayName?: string;
|
||||
description?: string;
|
||||
website?: string;
|
||||
isPublic?: boolean;
|
||||
}) {
|
||||
await appstate.organizationsStatePart.dispatchAction(
|
||||
appstate.updateOrganizationAction,
|
||||
data,
|
||||
);
|
||||
// Re-load detail to reflect changes
|
||||
if (this.detailOrgId) {
|
||||
await this.loadOrgDetail(this.detailOrgId);
|
||||
}
|
||||
}
|
||||
|
||||
private async handleDeleteOrg(organizationId: string) {
|
||||
await appstate.organizationsStatePart.dispatchAction(
|
||||
appstate.deleteOrganizationAction,
|
||||
{ organizationId },
|
||||
);
|
||||
this.goBack();
|
||||
}
|
||||
|
||||
private async createOrg(data: { name: string; displayName?: string; description?: string }) {
|
||||
await appstate.organizationsStatePart.dispatchAction(
|
||||
appstate.createOrganizationAction,
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import * as appstate from '../appstate.js';
|
||||
import * as shared from './shared/index.js';
|
||||
import { appRouter } from '../router.js';
|
||||
import {
|
||||
css,
|
||||
cssManager,
|
||||
@@ -25,6 +26,9 @@ export class SgViewPackages extends DeesElement {
|
||||
@state()
|
||||
accessor uiState: appstate.IUiState = { activeView: 'packages' };
|
||||
|
||||
@state()
|
||||
accessor detailPackageId: string | null = null;
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
const pkgSub = appstate.packagesStatePart
|
||||
@@ -49,8 +53,10 @@ export class SgViewPackages extends DeesElement {
|
||||
|
||||
async connectedCallback() {
|
||||
super.connectedCallback();
|
||||
// If there's an entity ID from the URL, copy it to internal state
|
||||
if (this.uiState.activeEntityId) {
|
||||
await this.loadPackageDetail(this.uiState.activeEntityId);
|
||||
this.detailPackageId = this.uiState.activeEntityId;
|
||||
await this.loadPackageDetail(this.detailPackageId);
|
||||
} else {
|
||||
await appstate.packagesStatePart.dispatchAction(
|
||||
appstate.searchPackagesAction,
|
||||
@@ -71,7 +77,7 @@ export class SgViewPackages extends DeesElement {
|
||||
}
|
||||
|
||||
public render(): TemplateResult {
|
||||
if (this.uiState.activeEntityId && this.packagesState.currentPackage) {
|
||||
if (this.detailPackageId && this.packagesState.currentPackage) {
|
||||
return html`
|
||||
<sg-package-detail-view
|
||||
.package="${this.packagesState.currentPackage}"
|
||||
@@ -98,18 +104,12 @@ export class SgViewPackages extends DeesElement {
|
||||
}
|
||||
|
||||
private selectPackage(packageId: string) {
|
||||
appstate.uiStatePart.setState({
|
||||
...appstate.uiStatePart.getState(),
|
||||
activeEntityId: packageId,
|
||||
});
|
||||
this.detailPackageId = packageId;
|
||||
this.loadPackageDetail(packageId);
|
||||
}
|
||||
|
||||
private goBack() {
|
||||
appstate.uiStatePart.setState({
|
||||
...appstate.uiStatePart.getState(),
|
||||
activeEntityId: undefined,
|
||||
});
|
||||
this.detailPackageId = null;
|
||||
appstate.packagesStatePart.setState({
|
||||
...appstate.packagesStatePart.getState(),
|
||||
currentPackage: null,
|
||||
|
||||
Reference in New Issue
Block a user