commit c41fbcf40c981b8e3fbe50de4dbb8760d4dc90ab parent a288dc05a8a53bf8c7c0f2a16e27c4a37fa30623 Author: Sebastian <sebasjm@gmail.com> Date: Mon, 7 Apr 2025 11:07:05 -0300 fix #9705 #9704 Diffstat:
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/packages/merchant-backoffice-ui/src/components/instance/DefaultInstanceFormFields.tsx b/packages/merchant-backoffice-ui/src/components/instance/DefaultInstanceFormFields.tsx @@ -50,7 +50,7 @@ export function DefaultInstanceFormFields({ addonBefore={new URL("instances/", state.backendUrl.href).href} readonly={readonlyId} label={i18n.str`Identifier`} - tooltip={i18n.str`Name of the instance in URLs. The 'default' instance is special in that it is used to administer other instances.`} + tooltip={i18n.str`Name of the instance in URLs. The 'admin' instance is special in that it is used to administer other instances.`} /> )} diff --git a/packages/merchant-backoffice-ui/src/context/session.ts b/packages/merchant-backoffice-ui/src/context/session.ts @@ -42,7 +42,7 @@ export type SessionState = LoggedIn | LoggedOut; interface LoggedIn { status: "loggedIn"; - // is this instance admin? usually "default" name + // is this instance admin? usually "admin" name isAdmin: boolean; // url where all the request will be made @@ -122,7 +122,7 @@ export interface SessionStateHandler { impersonate(baseUrl: URL): void; } -export const DEFAULT_ADMIN_USERNAME = "default"; +export const DEFAULT_ADMIN_USERNAME = "admin"; export const INSTANCE_ID_LOOKUP = /\/instances\/([^/]*)\/?$/; diff --git a/packages/merchant-backoffice-ui/src/hooks/instance.test.ts b/packages/merchant-backoffice-ui/src/hooks/instance.test.ts @@ -413,7 +413,7 @@ describe("instance admin api interaction with listing", () => { response: { instances: [ { - id: "default", + id: "admin", name: "instance_name", } as TalerMerchantApi.Instance, { @@ -445,7 +445,7 @@ describe("instance admin api interaction with listing", () => { // expect(query.data).deep.equals({ // instances: [ // { - // id: "default", + // id: "admin", // name: "instance_name", // }, // { @@ -460,7 +460,7 @@ describe("instance admin api interaction with listing", () => { response: { instances: [ { - id: "default", + id: "admin", name: "instance_name", } as TalerMerchantApi.Instance, ], @@ -479,7 +479,7 @@ describe("instance admin api interaction with listing", () => { // expect(query.data).deep.equals({ // instances: [ // { - // id: "default", + // id: "admin", // name: "instance_name", // }, // ], @@ -518,7 +518,7 @@ describe("instance admin api interaction with listing", () => { // expect(result.current.query.data).equals({ // instances: [{ - // id: 'default', + // id: 'admin', // name: 'instance_name' // }, { // id: 'the_id', @@ -537,7 +537,7 @@ describe("instance admin api interaction with listing", () => { // env.addRequestExpectation(API_LIST_INSTANCES, { // response: { // instances: [{ - // id: 'default', + // id: 'admin', // name: 'instance_name' // } as TalerMerchantApi.Instance] // }, @@ -554,7 +554,7 @@ describe("instance admin api interaction with listing", () => { // expect(result.current.query.data).equals({ // instances: [{ - // id: 'default', + // id: 'admin', // name: 'instance_name' // }] // }); @@ -567,7 +567,7 @@ describe("instance admin api interaction with listing", () => { response: { instances: [ { - id: "default", + id: "admin", name: "instance_name", } as TalerMerchantApi.Instance, { @@ -599,7 +599,7 @@ describe("instance admin api interaction with listing", () => { // expect(query.data).deep.equals({ // instances: [ // { - // id: "default", + // id: "admin", // name: "instance_name", // }, // { @@ -618,7 +618,7 @@ describe("instance admin api interaction with listing", () => { response: { instances: [ { - id: "default", + id: "admin", name: "instance_name", } as TalerMerchantApi.Instance, ], @@ -637,7 +637,7 @@ describe("instance admin api interaction with listing", () => { // expect(query.data).deep.equals({ // instances: [ // { - // id: "default", + // id: "admin", // name: "instance_name", // }, // ], diff --git a/packages/merchant-backoffice-ui/src/hooks/testing.tsx b/packages/merchant-backoffice-ui/src/hooks/testing.tsx @@ -165,7 +165,7 @@ export class ApiMockEnvironment extends MockEnvironment { // <InstanceContextProvider // value={{ // token: undefined, - // id: "default", + // id: "admin", // admin: true, // changeToken: () => null, // }} diff --git a/packages/merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx b/packages/merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx @@ -201,7 +201,7 @@ export function CreatePage({ onCreate, onBack, forceId }: Props): VNode { > <DefaultInstanceFormFields readonlyId={!!forceId} - showId={true} + showId={!forceId} showLessFields={!pref.advanceInstanceMode} /> </FormProvider> diff --git a/packages/merchant-backoffice-ui/src/paths/admin/list/View.stories.tsx b/packages/merchant-backoffice-ui/src/paths/admin/list/View.stories.tsx @@ -39,7 +39,7 @@ export const WithDefaultInstance = (a: any) => <View {...a} />; WithDefaultInstance.args = { instances: [ { - id: "default", + id: "admin", name: "the default instance", merchant_pub: "abcdef", payment_targets: [], diff --git a/packages/merchant-backoffice-ui/src/paths/notfound/index.tsx b/packages/merchant-backoffice-ui/src/paths/notfound/index.tsx @@ -50,8 +50,8 @@ export function NotFoundPageOrAdminCreate(): VNode { <Fragment> <NotificationCard notification={{ - message: i18n.str`No 'default' instance configured yet.`, - description: i18n.str`Create a 'default' instance to begin using the merchant backoffice.`, + message: i18n.str`No 'admin' instance configured yet.`, + description: i18n.str`Create an 'admin' instance to begin using the merchant backoffice.`, type: "INFO", }} />