@kumori/aurora-backend-handler 1.1.79 → 1.1.81
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/api/deploy-service-helper.ts +12 -14
- package/helpers/user-helper.ts +2 -1
- package/package.json +1 -1
- package/websocket-manager.ts +5 -4
|
@@ -955,13 +955,11 @@ export async function generateServiceSpec(
|
|
|
955
955
|
memoryRequirements: withDefaultValue(form.memoryRequirements, 0) * 1000,
|
|
956
956
|
registryUrl: withDefaultValue(form.registryUrl, "docker.io").trim(),
|
|
957
957
|
imageTag: withDefaultValue(form.imageTag, "").trim(),
|
|
958
|
-
registryCredentialsSecret: form.config.resources
|
|
959
|
-
|
|
960
|
-
|
|
961
|
-
|
|
962
|
-
|
|
963
|
-
})
|
|
964
|
-
.find((name) => name !== undefined),
|
|
958
|
+
registryCredentialsSecret: form.config.resources.map((r) => {
|
|
959
|
+
if (r.type === "secret" && r.key === "registryCredentials") {
|
|
960
|
+
return r.name;
|
|
961
|
+
}
|
|
962
|
+
})[0],
|
|
965
963
|
config: {
|
|
966
964
|
parameters,
|
|
967
965
|
resources: componentResources,
|
|
@@ -1658,13 +1656,13 @@ async function generateServiceSpecDSL(
|
|
|
1658
1656
|
memoryRequirements: withDefaultValue(form.memoryRequirements, 0) * 1000,
|
|
1659
1657
|
registryUrl: withDefaultValue(form.registryUrl, "docker.io").trim(),
|
|
1660
1658
|
imageTag: withDefaultValue(form.imageTag, "").trim(),
|
|
1661
|
-
registryCredentialsSecret: form.
|
|
1662
|
-
.
|
|
1663
|
-
|
|
1664
|
-
|
|
1665
|
-
|
|
1666
|
-
|
|
1667
|
-
|
|
1659
|
+
registryCredentialsSecret: form.registryCredentialsSecret
|
|
1660
|
+
? form.config.resources.find(
|
|
1661
|
+
(r) => r.type === "secret" && r.name === form.registryCredentialsSecret,
|
|
1662
|
+
)?.name
|
|
1663
|
+
: form.config.resources.find(
|
|
1664
|
+
(r) => r.type === "secret" && r.key === "registryCredentials",
|
|
1665
|
+
)?.name,
|
|
1668
1666
|
config: {
|
|
1669
1667
|
parameters,
|
|
1670
1668
|
resources: componentResources,
|
package/helpers/user-helper.ts
CHANGED
|
@@ -159,7 +159,7 @@ export const handleUserEvent = ({
|
|
|
159
159
|
deletedTenantKeys,
|
|
160
160
|
};
|
|
161
161
|
};
|
|
162
|
-
export const
|
|
162
|
+
export const handleUserDelete = (): UserData => {
|
|
163
163
|
return {
|
|
164
164
|
id: "",
|
|
165
165
|
name: "",
|
|
@@ -173,5 +173,6 @@ export const handleUserOperationError = (): UserData => {
|
|
|
173
173
|
axebowPlan: "freemium",
|
|
174
174
|
companyName: "",
|
|
175
175
|
rol: "",
|
|
176
|
+
status: "notlogged",
|
|
176
177
|
};
|
|
177
178
|
};
|
package/package.json
CHANGED
package/websocket-manager.ts
CHANGED
|
@@ -29,8 +29,8 @@ import {
|
|
|
29
29
|
handleTenantOperationSuccess,
|
|
30
30
|
} from "./helpers/tenant-helper";
|
|
31
31
|
import {
|
|
32
|
+
handleUserDelete,
|
|
32
33
|
handleUserEvent,
|
|
33
|
-
handleUserOperationError,
|
|
34
34
|
} from "./helpers/user-helper";
|
|
35
35
|
import {
|
|
36
36
|
handleEnvironmentEvent,
|
|
@@ -349,7 +349,7 @@ export const initializeGlobalWebSocketClient = async (
|
|
|
349
349
|
message.error?.code === "_unknown_user_" &&
|
|
350
350
|
message.error?.content !== "Unknown proposed user."
|
|
351
351
|
) {
|
|
352
|
-
userData.status = "
|
|
352
|
+
userData.status = "notlogged";
|
|
353
353
|
user = new User(userData);
|
|
354
354
|
eventHelper.user.publish.loaded(user);
|
|
355
355
|
}
|
|
@@ -1516,8 +1516,9 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
|
|
|
1516
1516
|
break;
|
|
1517
1517
|
case "user":
|
|
1518
1518
|
if (action === "DELETE") {
|
|
1519
|
-
|
|
1520
|
-
|
|
1519
|
+
const newUser = handleUserDelete();
|
|
1520
|
+
userData = newUser;
|
|
1521
|
+
user = new User(newUser);
|
|
1521
1522
|
}
|
|
1522
1523
|
break;
|
|
1523
1524
|
case "resource":
|