Compare commits
2 Commits
release/20
...
fix/team-e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
694d371887 | ||
|
|
297c2f1be3 |
@@ -165,8 +165,8 @@ const props = withDefaults(
|
|||||||
defineProps<{
|
defineProps<{
|
||||||
show: boolean
|
show: boolean
|
||||||
action: "edit" | "new"
|
action: "edit" | "new"
|
||||||
editingEnvironmentIndex: number | "Global" | null
|
editingEnvironmentIndex?: number | "Global" | null
|
||||||
editingVariableName: string | null
|
editingVariableName?: string | null
|
||||||
envVars?: () => Environment["variables"]
|
envVars?: () => Environment["variables"]
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ import * as A from "fp-ts/Array"
|
|||||||
import * as O from "fp-ts/Option"
|
import * as O from "fp-ts/Option"
|
||||||
import * as TE from "fp-ts/TaskEither"
|
import * as TE from "fp-ts/TaskEither"
|
||||||
import { flow, pipe } from "fp-ts/function"
|
import { flow, pipe } from "fp-ts/function"
|
||||||
import { parseTemplateStringE } from "@hoppscotch/data"
|
import { Environment, parseTemplateStringE } from "@hoppscotch/data"
|
||||||
import { refAutoReset } from "@vueuse/core"
|
import { refAutoReset } from "@vueuse/core"
|
||||||
import { clone } from "lodash-es"
|
import { clone } from "lodash-es"
|
||||||
import { useToast } from "@composables/toast"
|
import { useToast } from "@composables/toast"
|
||||||
@@ -173,16 +173,20 @@ const props = withDefaults(
|
|||||||
defineProps<{
|
defineProps<{
|
||||||
show: boolean
|
show: boolean
|
||||||
action: "edit" | "new"
|
action: "edit" | "new"
|
||||||
editingEnvironment: TeamEnvironment | null
|
editingEnvironment?: TeamEnvironment | null
|
||||||
editingTeamId: string | undefined
|
editingTeamId: string | undefined
|
||||||
editingVariableName: string | null
|
editingVariableName?: string | null
|
||||||
isViewer: boolean
|
isViewer?: boolean
|
||||||
|
envVars?: () => Environment["variables"]
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
show: false,
|
show: false,
|
||||||
action: "edit",
|
action: "edit",
|
||||||
editingEnvironment: null,
|
editingEnvironment: null,
|
||||||
editingTeamId: "",
|
editingTeamId: "",
|
||||||
|
editingVariableName: null,
|
||||||
|
isViewer: false,
|
||||||
|
envVars: () => [],
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -226,10 +230,16 @@ watch(
|
|||||||
() => props.show,
|
() => props.show,
|
||||||
(show) => {
|
(show) => {
|
||||||
if (show) {
|
if (show) {
|
||||||
if (props.editingEnvironment === null) {
|
if (props.action === "new") {
|
||||||
name.value = null
|
name.value = null
|
||||||
vars.value = []
|
vars.value = pipe(
|
||||||
} else {
|
props.envVars() ?? [],
|
||||||
|
A.map((e: { key: string; value: string }) => ({
|
||||||
|
id: idTicker.value++,
|
||||||
|
env: clone(e),
|
||||||
|
}))
|
||||||
|
)
|
||||||
|
} else if (props.editingEnvironment !== null) {
|
||||||
name.value = props.editingEnvironment.environment.name ?? null
|
name.value = props.editingEnvironment.environment.name ?? null
|
||||||
vars.value = pipe(
|
vars.value = pipe(
|
||||||
props.editingEnvironment.environment.variables ?? [],
|
props.editingEnvironment.environment.variables ?? [],
|
||||||
|
|||||||
@@ -197,11 +197,20 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<EnvironmentsMyDetails
|
<EnvironmentsMyDetails
|
||||||
:show="showModalDetails"
|
:show="showMyEnvironmentDetailsModal"
|
||||||
action="new"
|
action="new"
|
||||||
:env-vars="getAdditionVars"
|
:env-vars="getAdditionVars"
|
||||||
@hide-modal="displayModalAdd(false)"
|
@hide-modal="displayModalAdd(false)"
|
||||||
/>
|
/>
|
||||||
|
<EnvironmentsTeamsDetails
|
||||||
|
:show="showTeamEnvironmentDetailsModal"
|
||||||
|
action="new"
|
||||||
|
:env-vars="getAdditionVars"
|
||||||
|
:editing-team-id="
|
||||||
|
workspace.type === 'team' ? workspace.teamID : undefined
|
||||||
|
"
|
||||||
|
@hide-modal="displayModalAdd(false)"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -225,6 +234,7 @@ import IconClose from "~icons/lucide/x"
|
|||||||
|
|
||||||
import { useColorMode } from "~/composables/theming"
|
import { useColorMode } from "~/composables/theming"
|
||||||
import { useVModel } from "@vueuse/core"
|
import { useVModel } from "@vueuse/core"
|
||||||
|
import { workspaceStatus$ } from "~/newstore/workspace"
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
modelValue: HoppTestResult | null | undefined
|
modelValue: HoppTestResult | null | undefined
|
||||||
@@ -239,10 +249,15 @@ const testResults = useVModel(props, "modelValue", emit)
|
|||||||
const t = useI18n()
|
const t = useI18n()
|
||||||
const colorMode = useColorMode()
|
const colorMode = useColorMode()
|
||||||
|
|
||||||
const showModalDetails = ref(false)
|
const workspace = useReadonlyStream(workspaceStatus$, { type: "personal" })
|
||||||
|
|
||||||
|
const showMyEnvironmentDetailsModal = ref(false)
|
||||||
|
const showTeamEnvironmentDetailsModal = ref(false)
|
||||||
|
|
||||||
const displayModalAdd = (shouldDisplay: boolean) => {
|
const displayModalAdd = (shouldDisplay: boolean) => {
|
||||||
showModalDetails.value = shouldDisplay
|
if (workspace.value.type === "personal")
|
||||||
|
showMyEnvironmentDetailsModal.value = shouldDisplay
|
||||||
|
else showTeamEnvironmentDetailsModal.value = shouldDisplay
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user