Skip to content

Commit 8ff4b00

Browse files
authored
Merge pull request #66 from KelvinTegelaar/main
[pull] main from KelvinTegelaar:main
2 parents 384eaf1 + 0710355 commit 8ff4b00

8 files changed

Lines changed: 44 additions & 12 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cipp",
3-
"version": "10.4.4",
3+
"version": "10.4.5",
44
"author": "CIPP Contributors",
55
"homepage": "https://cipp.app/",
66
"bugs": {

public/manifest.json

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
11
{
2-
"short_name": "Carpatin",
3-
"name": "Carpatin",
2+
"short_name": "CIPP",
3+
"name": "CIPP - CyberDrian Improved Partner Portal",
44
"icons": [
55
{
66
"src": "favicon.ico",
77
"sizes": "64x64 32x32 24x24 16x16",
88
"type": "image/x-icon"
9+
},
10+
{
11+
"src": "android-chrome-192x192.png",
12+
"sizes": "192x192",
13+
"type": "image/png"
14+
},
15+
{
16+
"src": "android-chrome-512x512.png",
17+
"sizes": "512x512",
18+
"type": "image/png"
919
}
1020
],
11-
"start_url": ".",
21+
"start_url": "/",
22+
"scope": "/",
1223
"display": "standalone",
13-
"theme_color": "#000000",
24+
"theme_color": "#ffffff",
1425
"background_color": "#ffffff"
15-
}
26+
}

public/sw.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// Minimal service worker to satisfy Chrome's installability criteria.
2+
// This does NOT cache anything or provide offline support — it simply
3+
// passes all requests through to the network so Chrome treats the site
4+
// as an installable web app.
5+
6+
self.addEventListener('install', () => self.skipWaiting())
7+
self.addEventListener('activate', (event) => event.waitUntil(self.clients.claim()))
8+
self.addEventListener('fetch', () => {})

public/version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "10.4.4"
2+
"version": "10.4.5"
33
}

src/components/CippComponents/CippIntunePolicyDetails.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ export const CippIntunePolicyDetails = ({ row, tenant }) => {
6060
)
6161
}
6262

63-
return <CippJsonView object={settingsObject} type="intune" defaultOpen title="Policy Settings" />
63+
return <CippJsonView object={settingsObject} type="intune" defaultOpen title="Policy Settings" tenant={tenantFilter} />
6464
}

src/components/CippFormPages/CippJSONView.jsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,27 +248,29 @@ function CippJsonView({
248248
type,
249249
defaultOpen = false,
250250
title = 'Policy Details',
251+
tenant = null,
251252
}) {
252253
const [viewJson, setViewJson] = useState(false)
253254
const [accordionOpen, setAccordionOpen] = useState(defaultOpen)
254255
const [drilldownData, setDrilldownData] = useState([]) // Array of { data, title }
255256

257+
const objectTenant =
258+
tenant || object?.Tenant || object?.tenant || object?.TenantFilter || object?.tenantFilter || null
259+
256260
// Use the GUID resolver hook
257-
const { guidMapping, isLoadingGuids, resolveGuids, isGuid } = useGuidResolver()
261+
const { guidMapping, isLoadingGuids, resolveGuids, isGuid } = useGuidResolver(objectTenant)
258262
const resolvedType =
259263
type ||
260264
(object?.omaSettings || object?.settings || object?.definitionValues || object?.added
261265
? 'intune'
262266
: undefined)
263-
const adminTemplateTenant =
264-
object?.Tenant || object?.tenant || object?.TenantFilter || object?.tenantFilter || null
265267
const {
266268
definitionsMap: addedDefinitionsMap,
267269
isLoadingDefinitions,
268270
isDefinitionsError,
269271
} = useAdminTemplateDefinitions({
270272
added: object?.added,
271-
manualTenant: adminTemplateTenant,
273+
manualTenant: objectTenant,
272274
waiting: resolvedType === 'intune',
273275
})
274276

src/pages/_app.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ const App = (props) => {
8080
useEffect(() => {
8181
if (typeof window === 'undefined') return
8282

83+
// Register minimal service worker for Chrome installability
84+
if ('serviceWorker' in navigator) {
85+
navigator.serviceWorker.register('/sw.js').catch(() => {})
86+
}
87+
8388
const language = navigator.language || navigator.userLanguage || 'en-US'
8489
const baseLang = language.split('-')[0]
8590

src/pages/_document.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ class CustomDocument extends Document {
88
return (
99
<Html lang="en">
1010
<Head>
11+
<link rel="manifest" href="/manifest.json" />
12+
<meta name="theme-color" content="#ffffff" />
13+
<meta name="apple-mobile-web-app-capable" content="yes" />
14+
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
15+
<meta name="apple-mobile-web-app-title" content="CIPP" />
16+
<link rel="apple-touch-icon" href="/apple-touch-icon.png" />
1117
<link
1218
rel="preconnect"
1319
href="https://fonts.googleapis.com"

0 commit comments

Comments
 (0)