Skip to content

Commit fb9163d

Browse files
waleedlatif1waleedlatif1
authored
revert(org): hold the org view and People redesigns for #9687 (#9740)
* Revert "improvement(org): move the People page onto the new design system (#9720)" This reverts commit 7625929. * Revert "fix(org): drop the removed shortcuts slot from the landing test (#9715)" This reverts commit f17f1b6. * Revert "improvement(org): move the organization view onto the new design system (#9708)" The redesigned org view ships all at once with #9687. The shared modules later staging work builds on stay: member-integrations and the accounts key factory. The legacy integration detail opens the saved-credential modal for Jama and Flow, which #9723 added only to the new view. * fix(org): keep staging's shared modules and revert only the redesigned views Hooks, contracts, key factories and lib helpers stay at staging, and the legacy view adapts to them. Jama and Flow reconnect through the saved-credential modal and disconnect through Search. Exports only the new views used are unexported or deleted, and the e2e script returns to the legacy view's selectors.
1 parent 99a029d commit fb9163d

415 files changed

Lines changed: 6880 additions & 32229 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/ci-suites.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
"group": "organization-search",
2525
"task": "ci:e2e-organization-search"
2626
},
27-
{
28-
"group": "org-redesign",
29-
"task": "ci:e2e-org-redesign"
30-
},
3127
{
3228
"group": "browser-extension-navigation",
3329
"task": "ci:e2e-browser-extension"

‎.github/scripts/ci-plan.gql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ query($base: String!, $head: String!) {
33
affectedTasks(base: $base, head: $head, tasks: [
44
"test", "build", "type-check", "ci:integration", "ci:desktop-live",
55
"ci:e2e-scim", "ci:e2e-cli", "ci:e2e-stop-after", "ci:e2e-desktop-inbox",
6-
"ci:e2e-assistant-actions", "ci:e2e-organization-search", "ci:e2e-org-redesign",
6+
"ci:e2e-assistant-actions", "ci:e2e-organization-search",
77
"ci:e2e-docs-platform",
88
"ci:e2e-browser-extension", "ci:e2e-project-files", "ci:e2e-mobile", "ci:e2e-seo"
99
]) {

‎.github/scripts/http-e2e.sh‎

Lines changed: 2 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# CI groups, which reuse the production build from `e2e-build`.
44
# The job extracts it into apps/sim/.next before running these suites.
55
#
6-
# Usage: http-e2e.sh <scim|cli|stop-after|desktop-inbox|assistant-actions|organization-search|org-redesign|browser-extension|browser-extension-native|browser-extension-navigation|browser-extension-composer|browser-extension-access|project-files|mobile|seo> (run from apps/sim)
6+
# Usage: http-e2e.sh <scim|cli|stop-after|desktop-inbox|assistant-actions|organization-search|browser-extension|browser-extension-native|browser-extension-navigation|browser-extension-composer|browser-extension-access|project-files|mobile|seo> (run from apps/sim)
77
#
88
# The job provides DATABASE_URL, BETTER_AUTH_SECRET and ENCRYPTION_KEY; each group sets the rest of
99
# its app's environment here. Reports and server logs land in $RUNNER_TEMP/e2e.
@@ -20,7 +20,7 @@
2020
# telemetry flush runs detached and still writes .next/dev).
2121
set -euo pipefail
2222

23-
group=${1:?usage: http-e2e.sh <scim|cli|stop-after|desktop-inbox|assistant-actions|organization-search|org-redesign|browser-extension|browser-extension-native|browser-extension-navigation|browser-extension-composer|browser-extension-access|project-files|mobile|seo>}
23+
group=${1:?usage: http-e2e.sh <scim|cli|stop-after|desktop-inbox|assistant-actions|organization-search|browser-extension|browser-extension-native|browser-extension-navigation|browser-extension-composer|browser-extension-access|project-files|mobile|seo>}
2424
report_dir="$RUNNER_TEMP/e2e"
2525
ready_timeout_seconds=600
2626
mkdir -p "$report_dir"
@@ -32,7 +32,6 @@ status_log=''
3232
realtime_pid=''
3333
realtime_tag=''
3434
realtime_log=''
35-
agent_pid=''
3635
browsers_pid=''
3736
local_app_url=''
3837
# `dev` or `start`; a group sets it before start_app.
@@ -64,10 +63,6 @@ finish() {
6463
tail -n 100 "$realtime_log"
6564
fi
6665
fi
67-
if [ -n "$agent_pid" ]; then
68-
kill "$agent_pid" 2>/dev/null || true
69-
wait "$agent_pid" 2>/dev/null || true
70-
fi
7166
if [ -n "$browsers_pid" ]; then
7267
kill -- "-$browsers_pid" 2>/dev/null || true
7368
wait "$browsers_pid" 2>/dev/null || true
@@ -138,13 +133,6 @@ start_realtime() {
138133
wait_ready "$realtime_pid" "http://127.0.0.1:$port/health" "$name realtime server"
139134
}
140135

141-
# stop_app: stops the app start_app started, so a group can start it again under other flags.
142-
stop_app() {
143-
bash "$GITHUB_WORKSPACE/.github/scripts/stop-session.sh" "$server_pid" "$app_tag"
144-
wait "$server_pid" 2>/dev/null || true
145-
server_pid=''
146-
}
147-
148136
# wait_ready <pid> <health-url> <label>
149137
wait_ready() {
150138
local pid=$1 url=$2 label=$3
@@ -280,59 +268,6 @@ case "$group" in
280268
esac
281269
;;
282270

283-
# One hosted Enterprise organization, a scripted worker in place of the
284-
# model, and the app twice: with People off, then on. Hosted is decided by the
285-
# app's hostname, which the job maps to loopback. Both phases report, whichever fails.
286-
org-redesign)
287-
app_server=start
288-
export REDIS_URL=redis://127.0.0.1:6379
289-
export E2E_APP_PUBLIC_URL=http://org-redesign.sim.ai:3029
290-
export NEXT_PUBLIC_APP_URL="$E2E_APP_PUBLIC_URL"
291-
export INTERNAL_API_BASE_URL=http://127.0.0.1:3029 TRUSTED_ORIGINS=http://127.0.0.1:3029
292-
export NEXT_PUBLIC_SOCKET_URL=http://127.0.0.1:3030 SOCKET_SERVER_URL=http://127.0.0.1:3030
293-
export BILLING_ENABLED=true NEXT_PUBLIC_BILLING_ENABLED=true
294-
export ENTERPRISE_ENABLED=true NEXT_PUBLIC_ENTERPRISE_ENABLED=true
295-
export ORGANIZATIONS_ENABLED=true NEXT_PUBLIC_ORGANIZATIONS_ENABLED=true
296-
export SSO_ENABLED=true NEXT_PUBLIC_SSO_ENABLED=true
297-
export KNOWLEDGE_MEMBER_ACCESS=true CREDENTIAL_GROUPS=true ACCESS_CONTROL_ENABLED=true
298-
export NEXT_PUBLIC_ACCESS_CONTROL_ENABLED=true SIM_LINKS=true
299-
export COPILOT_TOOL_PERMISSIONS_ENABLED=true
300-
export INTERNAL_API_SECRET=org-redesign-ci-local-secret-at-least-32-characters
301-
export COPILOT_API_KEY=org-redesign-ci-local-copilot-key MOTHERSHIP_SIM_TRANSPORT=direct
302-
export SIM_AGENT_API_URL=http://127.0.0.1:3031
303-
export GOOGLE_CLIENT_ID=org-redesign-google-client GOOGLE_CLIENT_SECRET=org-redesign-google-secret
304-
export JIRA_CLIENT_ID=org-redesign-jira-client JIRA_CLIENT_SECRET=org-redesign-jira-secret
305-
export CONFLUENCE_CLIENT_ID=org-redesign-confluence-client CONFLUENCE_CLIENT_SECRET=org-redesign-confluence-secret
306-
export STRIPE_SECRET_KEY=sk_test_org_redesign STRIPE_WEBHOOK_SECRET=whsec_org_redesign
307-
export DB_TX_TRIPWIRE=throw
308-
export BROWSER_EXTENSION_IDS=abcdefghijklmnopabcdefghijklmnop
309-
bun --no-env-file scripts/org-redesign-seed.ts
310-
start_browser_install org-redesign --only-shell chromium
311-
bun --no-env-file scripts/org-redesign-e2e/scripted-agent.ts 3031 \
312-
> "$report_dir/org-redesign-agent.log" 2>&1 &
313-
agent_pid=$!
314-
wait_ready "$agent_pid" http://127.0.0.1:3031/health 'scripted agent'
315-
start_app org-redesign 3029 'organization redesign' record-http-status
316-
start_realtime org-redesign 3030
317-
wait_for_browsers
318-
run_status=0
319-
ORG_REDESIGN_E2E_ORIGIN="$E2E_APP_PUBLIC_URL" \
320-
ORG_REDESIGN_E2E_DATABASE_URL="$DATABASE_URL" \
321-
ORG_REDESIGN_E2E_AUTH_SECRET="$BETTER_AUTH_SECRET" \
322-
ORG_REDESIGN_E2E_REPORT_PATH="$report_dir/org-redesign-ui-report.json" \
323-
bun --no-env-file scripts/test-org-redesign-e2e.ts || run_status=$?
324-
stop_app
325-
export PEOPLE=true
326-
start_app org-redesign-people 3029 'organization redesign, People on'
327-
ORG_REDESIGN_E2E_PHASE=people \
328-
ORG_REDESIGN_E2E_ORIGIN="$E2E_APP_PUBLIC_URL" \
329-
ORG_REDESIGN_E2E_DATABASE_URL="$DATABASE_URL" \
330-
ORG_REDESIGN_E2E_AUTH_SECRET="$BETTER_AUTH_SECRET" \
331-
ORG_REDESIGN_E2E_REPORT_PATH="$report_dir/org-redesign-people-ui-report.json" \
332-
bun --no-env-file scripts/test-org-redesign-e2e.ts || run_status=$?
333-
exit "$run_status"
334-
;;
335-
336271
browser-extension|browser-extension-native|browser-extension-navigation|browser-extension-composer|browser-extension-access)
337272
extension_group=all
338273
case "$group" in

‎.github/workflows/checks.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ jobs:
207207
needs: [changes, e2e-build]
208208
if: needs.changes.outputs.http == 'true'
209209
runs-on: ubuntu-24.04
210-
timeout-minutes: ${{ matrix.group == 'org-redesign' && 45 || 20 }}
210+
timeout-minutes: 20
211211
strategy:
212212
fail-fast: false
213213
matrix: ${{ fromJSON(needs.changes.outputs.http_matrix) }}
@@ -227,7 +227,7 @@ jobs:
227227
--health-retries 10
228228
# Desktop inbox, browser extension, and Project Files use Redis.
229229
redis:
230-
image: ${{ (matrix.group == 'desktop-inbox' || matrix.group == 'assistant-actions' || matrix.group == 'organization-search' || matrix.group == 'org-redesign' || startsWith(matrix.group, 'browser-extension-') || matrix.group == 'project-files') && 'redis:8.2-alpine' || '' }}
230+
image: ${{ (matrix.group == 'desktop-inbox' || matrix.group == 'assistant-actions' || matrix.group == 'organization-search' || startsWith(matrix.group, 'browser-extension-') || matrix.group == 'project-files') && 'redis:8.2-alpine' || '' }}
231231
ports:
232232
- 6379:6379
233233
options: >-
@@ -293,10 +293,6 @@ jobs:
293293
if: matrix.group == 'scim'
294294
run: printf '127.0.0.1 scim-e2e.sim.ai\n' | sudo tee -a /etc/hosts
295295

296-
- name: Map the hosted organization fixture to loopback
297-
if: matrix.group == 'org-redesign'
298-
run: printf '127.0.0.1 org-redesign.sim.ai\n' | sudo tee -a /etc/hosts
299-
300296
# No step timeout: the job's bound covers a hang without cutting a slow but healthy suite
301297
# short of writing its report.
302298
- name: Run end-to-end suites

‎apps/sim/app/_shell/providers/get-query-client.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { isServer, QueryClient } from '@tanstack/react-query'
22
import { isDesktopApp } from '@/lib/desktop'
33

4-
export function makeQueryClient() {
4+
function makeQueryClient() {
55
return new QueryClient({
66
defaultOptions: {
77
queries: {

‎apps/sim/app/api/organizations/[id]/home/calendar/route.ts‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎apps/sim/app/api/organizations/[id]/home/email/route.ts‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎apps/sim/app/api/organizations/[id]/search/history/sources/route.ts‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎apps/sim/app/api/organizations/[id]/sim-links/route.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
internalRateLimits,
66
internalSessionAuth,
77
} from '@/lib/api/server/routes'
8-
import { presentSimLink, presentSimLinkPage } from '@/lib/api/server/sim-link-presenters'
8+
import { presentSimLink } from '@/lib/api/server/sim-link-presenters'
99
import { createSimLink, listSimLinks } from '@/lib/sim-links/application/use-cases'
1010

1111
const policy = {
@@ -21,7 +21,7 @@ export const GET = defineInternalJsonRoute({
2121
operation: listSimLinks.operation,
2222
useCase: listSimLinks,
2323
mapInput: ({ params, query }) => ({ organizationId: params.id, ...query }),
24-
present: presentSimLinkPage,
24+
present: ({ links, nextCursor }) => ({ links: links.map(presentSimLink), nextCursor }),
2525
})
2626

2727
export const POST = defineInternalJsonRoute({

‎apps/sim/app/o/[organizationId]/_redesign/hydrated.tsx‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)