Skip to content

Commit

Permalink
TCHAP: update space patch and fix translation
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarcWadai
MarcWadai committed Nov 21, 2024
1 parent d0242b9 commit ce40d02
Show file tree
Hide file tree
Showing 3 changed files with 109 additions and 66 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tchap_static_analysis.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:

# Needs branch matching as it inherits .stylelintrc.js from matrix-react-sdk
- name: Install Dependencies
run: "./scripts/tchap/install-yarn-linked-repositories.sh"
run: "yarn install --pure-lockfile"

- name: Run i18n-tchap
run: "yarn i18n-tchap"
Expand Down
4 changes: 3 additions & 1 deletion modules/tchap-translations/tchap_translations_removed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,7 @@
"room_list|add_space_label",
"spaces|error_no_permission_add_space",
"auth|continue_with_sso",
"room|header_avatar_open_settings_label"
"room|header_avatar_open_settings_label",
"voip|disabled_no_perms_start_voice_call",
"voip|disabled_no_perms_start_video_call"
]
169 changes: 105 additions & 64 deletions src/components/views/spaces/SpaceCreateMenu.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import defaultDispatcher from "../../../dispatcher/dispatcher";
import { Action } from "../../../dispatcher/actions";
import { Filter } from "../dialogs/spotlight/Filter";
import { OpenSpotlightPayload } from "../../../dispatcher/payloads/OpenSpotlightPayload.ts";
import TchapUrls from "~tchap-web/src/tchap/util/TchapUrls"; // :TCHAP: space-remove-public-and-subspace

export const createSpace = async (
client: MatrixClient,
Expand Down Expand Up @@ -273,71 +274,111 @@ const SpaceCreateMenu: React.FC<{
};

let body;
if (visibility === null) {
body = (
<React.Fragment>
<h2>{_t("create_space|label")}</h2>
<p>{_t("create_space|explainer")}</p>

<SpaceCreateMenuType
title={_t("common|public")}
description={_t("create_space|public_description")}
className="mx_SpaceCreateMenuType_public"
onClick={() => setVisibility(Visibility.Public)}
/>
<SpaceCreateMenuType
title={_t("common|private")}
description={_t("create_space|private_description")}
className="mx_SpaceCreateMenuType_private"
onClick={() => setVisibility(Visibility.Private)}
/>

{supportsSpaceFiltering && (
<AccessibleButton kind="primary_outline" onClick={onSearchClick}>
{_t("create_space|search_public_button")}
</AccessibleButton>
)}
</React.Fragment>
);
} else {
body = (
<React.Fragment>
<AccessibleButton
className="mx_SpaceCreateMenu_back"
onClick={() => setVisibility(null)}
title={_t("action|go_back")}
/>

<h2>
{visibility === Visibility.Public
? _t("create_space|public_heading")
: _t("create_space|private_heading")}
</h2>
<p>
{_t("create_space|add_details_prompt")} {_t("create_space|add_details_prompt_2")}
</p>

<SpaceCreateForm
busy={busy}
onSubmit={onSpaceCreateClick}
setAvatar={setAvatar}
name={name}
setName={setName}
nameFieldRef={spaceNameField}
topic={topic}
setTopic={setTopic}
alias={alias}
setAlias={setAlias}
showAliasField={visibility === Visibility.Public}
aliasFieldRef={spaceAliasField}
/>
// :TCHAP: space-remove-public-and-subspace
// if (visibility === null) {
// body = (
// <React.Fragment>
// <h2>{_t("create_space|label")}</h2>
// <p>{_t("create_space|explainer")}</p>

// <SpaceCreateMenuType
// title={_t("common|public")}
// description={_t("create_space|public_description")}
// className="mx_SpaceCreateMenuType_public"
// onClick={() => setVisibility(Visibility.Public)}
// />
// <SpaceCreateMenuType
// title={_t("common|private")}
// description={_t("create_space|private_description")}
// className="mx_SpaceCreateMenuType_private"
// onClick={() => setVisibility(Visibility.Private)}
// />

// {supportsSpaceFiltering && (
// <AccessibleButton kind="primary_outline" onClick={onSearchClick}>
// {_t("create_space|search_public_button")}
// </AccessibleButton>
// )}
// </React.Fragment>
// );
// } else {
// body = (
// <React.Fragment>
// <AccessibleButton
// className="mx_SpaceCreateMenu_back"
// onClick={() => setVisibility(null)}
// title={_t("action|go_back")}
// />

// <h2>
// {visibility === Visibility.Public
// ? _t("create_space|public_heading")
// : _t("create_space|private_heading")}
// </h2>
// <p>
// {_t("create_space|add_details_prompt")} {_t("create_space|add_details_prompt_2")}
// </p>

// <SpaceCreateForm
// busy={busy}
// onSubmit={onSpaceCreateClick}
// setAvatar={setAvatar}
// name={name}
// setName={setName}
// nameFieldRef={spaceNameField}
// topic={topic}
// setTopic={setTopic}
// alias={alias}
// setAlias={setAlias}
// showAliasField={visibility === Visibility.Public}
// aliasFieldRef={spaceAliasField}
// />

// <AccessibleButton kind="primary" onClick={onSpaceCreateClick} disabled={busy}>
// {busy ? _t("create_space|creating") : _t("action|create")}
// </AccessibleButton>
// </React.Fragment>
// );
// }
body = (
<React.Fragment>
<h2>
{_t("create_space|private_heading")}
</h2>
<p>
{_t("create_space|add_details_prompt")} {_t("create_space|add_details_prompt_2", {}, {
a: (sub) => (
<AccessibleButton kind="link_inline" onClick={() => {
window.open(TchapUrls.helpCreateSpace, "_blank")
}}>
{sub}
</AccessibleButton>
),
})
}
</p>

<SpaceCreateForm
busy={busy}
onSubmit={onSpaceCreateClick}
setAvatar={setAvatar}
name={name}
setName={setName}
nameFieldRef={spaceNameField}
topic={topic}
setTopic={setTopic}
alias={alias}
setAlias={setAlias}
showAliasField={visibility === Visibility.Public}
aliasFieldRef={spaceAliasField}
/>

<AccessibleButton kind="primary" onClick={onSpaceCreateClick} disabled={busy}>
{busy ? _t("create_space|creating") : _t("action|create")}
</AccessibleButton>
</React.Fragment>
);
}
<AccessibleButton kind="primary" onClick={onSpaceCreateClick} disabled={busy}>
{busy ? _t("create_space|creating") : _t("action|create")}
</AccessibleButton>
</React.Fragment>
);
// end :TCHAP:

return (
<ContextMenu
Expand Down

0 comments on commit ce40d02

Please sign in to comment.